diff options
Diffstat (limited to 'translations')
30 files changed, 10382 insertions, 10468 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 1c882d317..2a7db464b 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -382,22 +382,22 @@ <translation>ПИН</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Регистрация</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Влезте или се регистрирайте</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Режим без облак</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Нужно е потвърждение на акаунта за облака. Въведете ПИН в настройките.</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Изтегли</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Отмяна</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth не е включен</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Производител:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Леководолазен компютър</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Връзка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Опитай пак</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Пресканиране</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Изтеглени гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Селектирай всички</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Деселектирай всички</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Обходи папки с изображения</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Отвори</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Отмени</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Върни</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>Облаковия слад е онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Свържи се към</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Излючи се от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Обходи папки с изображения</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Сканирай</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4839,12 +4882,12 @@ p, li { white-space: pre-wrap; } <translation>Опит за смесване на гмуркания с %1мин. интервал помежду им</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Създаден бе бекъп на темплейти</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4867,213 +4910,213 @@ can overwrite them on startup.</source> Subsurface може да ги подменя при стартирането си.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да стартирате онлайн режима.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Имате незаписани промени. Желаете ли да ги добавите в облаковия склад? Ако кажете "Не", облакът ще бъде синхорнизиран при следващото повикване към "Отвори облаковия склад" или "Запиши в облаковия склад".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Грешка при зареждане на облаковия слад онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Гмуркачески регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Всички файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[локален кеш за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[облаков склад за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Отваряне на файл от стара версия</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Връзване към обклаковия склад...</translation> </message> @@ -5408,7 +5451,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Геореференция</translation> </message> @@ -5582,7 +5625,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Покажи средна дълбочина в профила</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Профил</translation> </message> @@ -6017,7 +6060,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>десетичен</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Единици</translation> </message> @@ -6153,128 +6196,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Непознат гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Планирано гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Ръчно добавено гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (бут. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Добави set-point промяна</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Смени режим на гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Редакция на профил</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation> Името е прекалено дълго!</translation> </message> @@ -6282,146 +6330,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Стартиране...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Отвори локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Отварянето на локален файл с данни неуспешно</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 гмуркания заредени от локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>режим на работа без облак</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Грешка при разряда на локалния склад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>няма облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Моля въведете валидни облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Грешен формат на имейл адрес</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Опит за отваряна не облаковия склад с нови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Тестване на облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Няма отговор от облаковия сървър за да провери вашите данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Грешнен потребител или парола към облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Няма връзка към облаковия слад - акаунтът ви не е проверен</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Облаковите пълномощия са невалидни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Облаковия склад не може да бъде отворен: грешка в HTTPS връзката</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Облаковия склад не може да бъде отворен: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Няма връзка към облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Зареждане на гмуркания...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Грешка в облаков слад: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Зареждане на гмуркания от локален склад (режим без облак)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Не може да бъде осъществена връзка с облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облаковия слад беше отворен успешно. Няма гмуркания в регистъра.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>ч.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>сек.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Непозната GPS позиция</translation> </message> @@ -6435,175 +6483,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Усвояване на GPS позиция</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>м</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>фута</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>кг</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>паунда</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>бара</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Въздух</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n гмуркане(гмуркания))</numerusform><numerusform>(%n dive(s))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>КИСЛОРОД</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>л</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>кб.фута</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>неизвестно</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>мин</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>ч.</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>сек.</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Изтрий тази точка</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Средно</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Минимум</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Максимум</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Грешен отговор от сървъра</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Очакван XML таг 'DiveDateReader', вместо това получен '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Очакван XML таг 'DiveDates' не беше намерен</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Грешен XML отговор. Ред %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Няма категории за оформление на място за гмуркане в настройките!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Тагове</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Не записвай празен регистър в облака</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8795,12 +8674,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>бара</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8811,6 +8694,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>кб.фута</translation> </message> @@ -8818,6 +8702,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>м</translation> </message> @@ -8825,6 +8711,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>фута</translation> </message> @@ -8852,6 +8740,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>паунда</translation> </message> @@ -8859,6 +8749,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>кг</translation> </message> @@ -9096,6 +8988,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>неизвестно</translation> @@ -9330,12 +9223,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Зареди гмуркания от лакален кеш</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Данните за гмурканията бяха заредни успешно</translation> </message> @@ -9989,19 +9882,47 @@ EADD: %d%s / %.1fгр./л. </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Въздух</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>повече от %1 дни</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>КИСЛОРОД</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>л</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10100,6 +10021,12 @@ EADD: %d%s / %.1fгр./л. <translation>Водолазен костюм</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Няма категории за оформление на място за гмуркане в настройките!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Тагове</translation> @@ -10588,13 +10515,33 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Продължителност:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>мин</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>ч.</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>сек.</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Макс. дълбочина:</translation> @@ -10735,30 +10682,80 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Град</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Започни запис на данни</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Започни запис на гмуркания</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Локален кеш създаден</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Подготовка за запис на данни</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>смяна на режим</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Усвояване на GPS позиция</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Изтрий тази точка</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Не записвай празен регистър в облака</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Средно</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Минимум</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Максимум</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Грешен отговор от сървъра</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Очакван XML таг 'DiveDateReader', вместо това получен '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Очакван XML таг 'DiveDates' не беше намерен</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Грешен XML отговор. Ред %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index f454201e1..c9700ea8b 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registra</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Signa o registra</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Mode sense el núvol</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Cal verificació del compte del núvol, introduïu el PIN a les preferències</translation> </message> @@ -3702,9 +3702,9 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Baixa</translation> </message> @@ -3730,7 +3730,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> @@ -3745,57 +3745,57 @@ a la llista d'immersions.</translation> <translation>El bluetooth no està habilitat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation> Nom del venedor: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Ordinador de busseig:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Connexió:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Torna a intentar-ho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Surt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Torna a explorar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Immersions baixades</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Informació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Selecciona-ho tot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Desselecciona-ho tot</translation> </message> @@ -3932,6 +3932,65 @@ a la llista d'immersions.</translation> </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation>Troba les imatges mogudes</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation>Imatges trobades</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation>Coincideix només amb les imatges en la/es immersió/ons seleccionada/es</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation>Explorant:</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation>Selecciona la carpeta i explora</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Travessa els directoris amb imatges</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation>Atura l'exploració</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation>S'ha cancel·lat l'xploració -els resultats poden estar incomplets-</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation>No s'ha trobat cap imatge coincident</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation>S'han trobat <b>%1</b> imatges al seu lloc actual.</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation>S'han trobat <b>%1</b> imatges a les noves ubicacions:</translation> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4040,7 +4099,7 @@ a la llista d'immersions.</translation> <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source>, %n dive(s) here)</source> - <translation><numerusform>, %n immersió aquí)</numerusform><numerusform>, %n immersions aquí)</numerusform></translation> + <translation><numerusform>, %n immersions aquí)</numerusform><numerusform>, %n immersió aquí)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> @@ -4440,7 +4499,7 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Obre</translation> </message> @@ -4736,13 +4795,13 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Desfés</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Refés</translation> </message> @@ -4782,57 +4841,41 @@ Segur que voleu continuar?</translation> <translation>Emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Connecta a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Desconnecta de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Obre un fitxer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Travessa els directoris amb imatges</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Explora</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Avís</translation> </message> @@ -4842,12 +4885,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <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="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4870,214 +4913,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'estar en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Teniu canvis sense desar. Els voleu publicar a l'emmagatzematge al núvol? Si responeu no, el núvol només se sincronitzarà en la següent crida a «Obre l'emmagatzematge en el núvol» o «Desar a l'emmagatzematge en el núvol».</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Ha fallat en prendre l'emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Imprimeix la taula del temps acumulat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Fitxers del diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>Fitxers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>Visor del registre de l'APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Deso els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Desa el fitxer com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cau local per a] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[emmagatzematge al núvol de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Obre un fitxer de diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>S'està contactant amb el servei al núvol...</translation> </message> @@ -5412,7 +5455,7 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferència</translation> </message> @@ -5586,7 +5629,7 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <translation>Mostra la profunditat mitjana en el perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -6021,7 +6064,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unitats</translation> </message> @@ -6157,128 +6200,133 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (núm. %1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Ordinador de busseig desconegut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar la LND / TTS ha estat inhabilitat per un temps de procès excessiu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Afegeix un canvi de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Crea el primer ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Immersió planificada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Immersió afegida manualment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Suprimeix aquest ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (amp. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Afegeix un canvi de punt d'ajust</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Afegeix una adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation>Divideix en dos la immersió</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Canvia el mode de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Edita el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Elimina l'esdeveniment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Oculta els esdeveniments similars</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Edita el nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusta la pressió de l'ampolla %1 (actualment interpolada com %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Revela tots els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Oculta els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Oculto tots els esdeveniments %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Elimino l'esdeveniment seleccionat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Edita el nom de l'adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nom personalitzat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>El nom és massa llarg!</translation> </message> @@ -6286,146 +6334,146 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>S'està començant...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Obre un fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Ha fallat en obrir el fitxer de dades local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>S'han carregat %1 immersions des del fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Es treballa en el mode sense el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Error en analitzar l'emmagatzematge local i s'abandona</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Sense les credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Introduïu unes credencials vàlides pel núvol.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correu i la contrasenya de l'emmagatzematge al núvol només pot contenir lletres, números i els caràcters «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Format no vàlid per a l'adreça de correu electrònic</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>S'està intentant obrir l'emmagatzematge en el núvol amb les credencials noves</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>S'estan provant les credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>No hi ha resposta del servidor al núvol per a validar les credencials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Credencials per al núvol incorrectes</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>No s'ha pogut connectar amb l'emmagatzematge al núvol -el compte al núvol no ha estat verificat-</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Les credencials del núvol no són vàlides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>No s'ha pogut obrir l'emmagatzematge al núvol: un error en crear la connexió HTTPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>No s'ha pogut obrir l'emmagatzematge al núvol: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>No s'ha pogut connectar amb l'emmagatzematge al núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Les credencials del núvol són vàlides, s'estan carregant les immersions...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Error amb l'emmagatzematge al núvol: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>S'estan carregant les immersions des de l'emmagatzematge local (mode «sense el núvol»)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ha fallat en connectar amb el servidor del núvol, no s'ha rebut l'estat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>L'emmagatzematge al núvol s'ha obert amb èxit. No hi ha immersions a la llista de busseig.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Ubicació GPS desconeguda</translation> </message> @@ -6439,175 +6487,6 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>A l'espera per adquirir la ubicació GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>peu</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AIRE</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n immersió)</numerusform><numerusform>(%n immersions)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXIGEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>peus</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>Desconegut</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>seg</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Elimina aquest lloc</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Mitjana</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Mínim</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Màxim</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Resposta del servidor no vàlida</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>S'esperava l'etiqueta XML «DiveDateReader», s'ha rebut %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>No s'ha trobat l'etiqueta XML esperada «DiveDates»</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Resposta en XML amb format incorrecte. Línia %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>No hi ha cap disposició del punt d'immersió establerta a les preferències!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Etiquetes</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>No desis un registre buit al núvol</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8796,12 +8675,16 @@ Màxim</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8812,6 +8695,7 @@ Màxim</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8819,6 +8703,8 @@ Màxim</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8826,6 +8712,8 @@ Màxim</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8853,6 +8741,8 @@ Màxim</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8860,6 +8750,8 @@ Màxim</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9097,6 +8989,7 @@ Màxim</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>Desconegut</translation> @@ -9328,12 +9221,12 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>nom addicional per aquest lloc: %s</translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Carrega les immersions des del cau local</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>S'han obert amb èxit les dades de busseig</translation> </message> @@ -9980,19 +9873,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AIRE</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>més de %1 dies</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation><numerusform>(%n immersions)</numerusform><numerusform>(%n immersió)</numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXIGEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10091,6 +10012,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Vestit</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>No hi ha cap disposició del punt d'immersió establerta a les preferències!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Etiquetes</translation> @@ -10579,13 +10506,33 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Durada:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>seg</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. màxima:</translation> @@ -10726,30 +10673,80 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Ciutat</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Comença a desar les dades</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Comença a desar les immersions</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>S'ha realitzat la creació del cau local</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>S'està realitzant la preparació per a desar les dades</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>Canvi de mode</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>A l'espera per adquirir la ubicació GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Elimina aquest lloc</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Mitjana</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Mínim</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Màxim</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Resposta del servidor no vàlida</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>S'esperava l'etiqueta XML «DiveDateReader», s'ha rebut %1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>No s'ha trobat l'etiqueta XML esperada «DiveDates»</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Resposta en XML amb format incorrecte. Línia %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index b0407506a..1859b1a8f 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Přihlásit nebo registrovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Režim bez serveru</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Je vyžadováno ověření přístupu k serveru, v nastavení zadejte PIN</translation> </message> @@ -3698,9 +3698,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Stáhnout</translation> </message> @@ -3726,7 +3726,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -3741,57 +3741,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth není povolen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Název prodejce: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Potápěčský počítač:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Připojení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Opakovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Prohledat znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Stažené ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Označit vše</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Odznačit vše</translation> </message> @@ -3928,6 +3928,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Procházet adresáře obrázků</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4436,7 +4495,7 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Otevřít</translation> </message> @@ -4732,13 +4791,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="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Zpět</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Znovu</translation> </message> @@ -4778,57 +4837,41 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Serverové úložiště online.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Připojit k</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Odpojit od</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Procházet adresáře obrázků</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Prohledat</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Varování</translation> </message> @@ -4838,12 +4881,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Záloha šablony vytvořena</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4866,214 +4909,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Před online připojením prosím uložte nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Máte neuložené změny. Chcete je odeslat na serverové úložiště? Pokud odpovíte ne, serverové úložiště bude synchronizováno pouze při příštím volání "Otevřít serverové úložiště" nebo "Uložit do serverového úložiště".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Chyba online připojení serverového úložiště.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Vypsat tabulku koncových časů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Soubory potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>Prohlížeč záznamů APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Všechny soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Uložit změny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Uložit soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[místní vyrovnávací paměť pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[serverové úložiště pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <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="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Spojení se serverovou službou...</translation> </message> @@ -5407,7 +5450,7 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeference</translation> </message> @@ -5581,7 +5624,7 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <translation>Zobrazit střední hodnotu hloubky v profilu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6016,7 +6059,7 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>desetinný</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Jednotky</translation> </message> @@ -6152,128 +6195,133 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Neznámý potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Přidat změnu plynu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>První potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Plánovaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Ručně přidaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Smazat tento potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (lahev %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Přidat změnu setpointu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Přidat záložku</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Editovat profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Odstranit událost</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Skrýt podobné události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Upravit název</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Upravit tlak v lahvi %1 (v současnosti interpolován jako %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Zrušit skrytí všech událostí</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Skrýt události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Skrýt všech %1 událostí?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Odstranit vybranou událost?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Upravit název záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Vlastní název:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Název je příliš dlouhý!</translation> </message> @@ -6281,146 +6329,146 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Spouštění...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Otevřít místní soubor s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Otevřít místní soubor s daty se nepodařilo</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 ponorů nahráno z místního souboru s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>režim práce bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Chyba při zpracování místního úložiště. Vzdává se</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>žádné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Prosím zadejte platné přístupové údaje k serveru.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, čísla a '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Neplatný formát pro adresy elektronické pošty</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Pokus o otevření serverového úložiště s novými přístupovými údaji</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Zkoušení přístupových údajů k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Žádná odpověď serveru k ověření přístupových údajů</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Nesprávné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Nelze se připojit k serverovému úložišti - serverový účet neověřen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Neplatné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Nelze otevřít serverové úložiště: Chyba vytvoření https spojení</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Nelze otevřít serverové úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Nelze se připojit k serverovému úložišti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Přihlašovací údaje k serveru platné. Nahrávají se ponory...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Chyba serverového úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Nahrávají se ponory s místního úložiště (režim žádný server)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Selhalo připojení k serveru, návrat ke stavu bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Serverové úložiště úspěšně otevřeno. Žádné ponory v seznamu.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Neznámá GPS pozice</translation> </message> @@ -6434,175 +6482,6 @@ Exportujte prosím šablonu do jiného souboru.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Čekání na získání GPS pozice</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>VZDUCH</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n ponor(y))</numerusform><numerusform>(%n ponor(y))</numerusform><numerusform>(%n ponor(y))</numerusform><numerusform>(%n ponor(y))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>KYSLÍK</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>neznámo</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>s</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Odstranit tento bod</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Průměr</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Nejmenší</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Největší</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Neplatná odpověď serveru</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Byl očekáván XML tag 'DiveDateReader', místo toho nalezeno '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Očekávaný XML tag 'DiveDates' nenalezen</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Špatný formát XML odpovědi. Řádek %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Žádné kategorie rozvržení potápěčské lokality v nastavení!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Štítky</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Neukládat prázdný log do serveru</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8794,12 +8673,16 @@ Průměr</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8810,6 +8693,7 @@ Průměr</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8817,6 +8701,8 @@ Průměr</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8824,6 +8710,8 @@ Průměr</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8851,6 +8739,8 @@ Průměr</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>libra US</translation> </message> @@ -8858,6 +8748,8 @@ Průměr</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9095,6 +8987,7 @@ Průměr</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>neznámý</translation> @@ -9327,12 +9220,12 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Nahrát ponory s místní vyrovnávací paměti</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Úspěšně otevřena data ponoru</translation> </message> @@ -9985,19 +9878,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>VZDUCH</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>víc než %1 dní</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>KYSLÍK</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10096,6 +10017,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Oblek</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Žádné kategorie rozvržení potápěčské lokality v nastavení!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Štítky</translation> @@ -10584,13 +10511,33 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Délka:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>s</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Největší hloubka:</translation> @@ -10731,30 +10678,80 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Město</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Začít ukládat data</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Začít ukládat ponory</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Vytvoření místní vyrovnávací paměti dokončeno</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Připravuje se uložit data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Čekání na získání GPS pozice</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Odstranit tento bod</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Průměr</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Nejmenší</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Největší</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Neplatná odpověď serveru</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Byl očekáván XML tag 'DiveDateReader', místo toho nalezeno '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Očekávaný XML tag 'DiveDates' nenalezen</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Špatný formát XML odpovědi. Řádek %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index ad670cc94..82c1c03df 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -378,22 +378,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrér</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Log ind eller registrér</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3690,9 +3690,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Download</translation> </message> @@ -3718,7 +3718,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Fortryd</translation> </message> @@ -3733,57 +3733,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Priducent:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Dykkercomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Prøv igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Downloadrede dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Vælg alle:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Fravælg alle</translation> </message> @@ -3920,6 +3920,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4427,7 +4486,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Åben</translation> </message> @@ -4723,13 +4782,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Fortryd</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4769,57 +4828,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Skan</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4829,12 +4872,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4848,212 +4891,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5385,7 +5428,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5559,7 +5602,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5991,7 +6034,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Enheder</translation> </message> @@ -6126,128 +6169,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 af %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Ukendt dykker computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Tilføj bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Rediger profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Slet hændelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Skjul tilsvarende hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Vis alle hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Skjul hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Fjern de valgte hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Rediger bogmærke navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Brugerdefineret navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Navn er for langt!</translation> </message> @@ -6255,146 +6303,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Ukendt GPS-position</translation> </message> @@ -6408,175 +6456,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>LUFT</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>ILT</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>Ukendt</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min.</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Fjern dette punkt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Gennemsnit</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maksimal</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ugyldigt svar fra serveren</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Forventet XML tag 'DiveDateReader', fik istedet '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Forventet XML tag 'DiveDates' ikke fundet</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Ugyldig XML svar. Linje %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tags</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8760,12 +8639,16 @@ Gennemsnit</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8776,6 +8659,7 @@ Gennemsnit</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8783,6 +8667,8 @@ Gennemsnit</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8790,6 +8676,8 @@ Gennemsnit</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>fod</translation> </message> @@ -8817,6 +8705,8 @@ Gennemsnit</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>pund (lbs)</translation> </message> @@ -8824,6 +8714,8 @@ Gennemsnit</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9061,6 +8953,7 @@ Gennemsnit</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>Ukendt</translation> @@ -9289,12 +9182,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9931,19 +9824,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>LUFT</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>ILT</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10042,6 +9963,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Dragt</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tags</translation> @@ -10525,13 +10452,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Varighed:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min.</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. dybde</translation> @@ -10672,30 +10619,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Fjern dette punkt</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Gennemsnit</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maksimal</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ugyldigt svar fra serveren</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Forventet XML tag 'DiveDateReader', fik istedet '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Forventet XML tag 'DiveDates' ikke fundet</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Ugyldig XML svar. Linje %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 7d13a18eb..8ba07c479 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -381,22 +381,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Anmelden oder Registrieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Kein Cloud-Modus</translation> </message> @@ -404,7 +404,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Bestätigung des Cloud-Kontos erforderlich, bitte PIN in Einstellungen eintragen</translation> </message> @@ -3698,9 +3698,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3726,7 +3726,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3741,57 +3741,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ist nicht aktiviert</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Hersteller:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Tauchcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation> Verbindung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Neu scannen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3928,6 +3928,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Bilder Verzeichnisse durchsuchen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4436,7 +4495,7 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -4732,13 +4791,13 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>R&ueckgängig</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Wiederholen</translation> </message> @@ -4778,57 +4837,41 @@ Möchtest Du fortfahren?</translation> <translation>Cloud-Speicher ist online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Bilder Verzeichnisse durchsuchen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Durchsuchen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4838,12 +4881,12 @@ Möchtest Du fortfahren?</translation> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Sicherungskopie der Druckvorlage erstellt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4864,214 +4907,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor online gegangen wird</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Es gibt ungesicherte Änderungen. Sollen diese in die Cloud gespeichert werden? Bei "nein" wird die Cloud erst beim nächsten "Cloudspeicher öffnen" oder "In Cloud speichern" synchronisiert.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Fehler beim Verbinden des Cloud-Speichers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[Cloud Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Kontaktiere Cloud Service...</translation> </message> @@ -5406,7 +5449,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferenz</translation> </message> @@ -5580,7 +5623,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Mittlere Tiefe im Profil anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6015,7 +6058,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Dezimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Einheiten</translation> </message> @@ -6151,128 +6194,133 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Geplanter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Manuell hinzugefügter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Tauchmodus wechseln</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6280,146 +6328,146 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Lokale Tauchdatendatei öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 Tauchgänge aus der lokalen Tauchdatendatei geladen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Fehler beim Lesen der lokalen Daten, ich gebe auf</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>keine Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Ungültiges Format für E-Mail-Adresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Es wird versucht, den Cloud-Speicher mit neuen Anmeldeinformationen zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Cloud-Anmeldedaten werden getestet</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort des Cloud-Servers zur Validierung der Anmeldeinformationen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Falsche Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Anmeldedaten sind ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <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="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud-Anmeldedaten gültig, Tauchgänge werden geladen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Tauchgänge werden aus dem lokalen Speicher geladen (Modus 'keine Cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud-Speicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6433,175 +6481,6 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Erwarte GPS-Position</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>US Pfund</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Luft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>SAUERSTOFF</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>unbekannt</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>s</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Diesen Punkt entfernen</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Ø</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Min.</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Max.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ungültige Serverantwort</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>XML Tag 'DiveDates' nicht gefunden.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Ungültige XML Antwort. Zeile %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Stichwörter</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Kein leeres Logbuch in der Cloud speichern</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8793,12 +8672,16 @@ Durchschnitt</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8809,6 +8692,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8816,6 +8700,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8823,6 +8709,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8850,6 +8738,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>US Pfund</translation> </message> @@ -8857,6 +8747,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9094,6 +8986,7 @@ Durchschnitt</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>unbekannt</translation> @@ -9327,12 +9220,12 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Lade Tauchgänge aus dem lokalen Zwischenspeicher</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Tauchdaten erfolgreich geöffnet</translation> </message> @@ -9986,19 +9879,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Luft</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mehr als %1 Tage</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>SAUERSTOFF</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10097,6 +10018,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Anzug</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Stichwörter</translation> @@ -10585,13 +10512,33 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Dauer:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>s</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. Tiefe:</translation> @@ -10732,30 +10679,80 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Grossstadt</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Beginne Datenspeicherung</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Beginne Tauchgänge zu speichern</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Lokaler Zwischenspeicher erzeugt</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Bereite Datenspeicherung vor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>Tauchmoduswechsel</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Erwarte GPS-Position</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Diesen Punkt entfernen</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Ø</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Min.</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Max.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ungültige Serverantwort</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>XML Tag 'DiveDates' nicht gefunden.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Ungültige XML Antwort. Zeile %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 25e727e48..7fc4d1ab5 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -381,22 +381,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Anmelden oder Registrieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Kein Cloud-Modus</translation> </message> @@ -404,7 +404,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Bestätigung des Cloud-Kontos erforderlich, bitte PIN in Einstellungen eintragen</translation> </message> @@ -3697,9 +3697,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3725,7 +3725,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3740,57 +3740,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ist nicht aktiviert</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Hersteller:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Tauchcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation> Verbindung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Neu scannen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3927,6 +3927,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation>Verschobene Bilder finden</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation>Bilder gefunden</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation>Nur Bilder von ausgewählten Tauchgäng(en) berücksichtigen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation>Suche in:</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation>Ordner auswählen und durchsuchen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Bildverzeichnisse durchsuchen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation>Durchsuchen abbrechen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation>Durchsuchen abgebrochen - Fundorte eventuell unvollständig</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation>Keine passenden Bilder gefunden</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation><b>%1</b> Bilder am ursprünglichen Ort gefunden.</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation><b>%1</b> Bilder an neuem Ort gefunden:</translation> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4435,7 +4494,7 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -4731,13 +4790,13 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <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="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Wiederherstellen</translation> </message> @@ -4777,57 +4836,41 @@ Trotzdem fortfahren?</translation> <translation>Cloud-Speicher ist online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Bildverzeichnisse durchsuchen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Durchsuchen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4837,12 +4880,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Sicherungskopie der Druckvorlage erstellt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4863,214 +4906,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor online gegangen wird</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Es gibt ungesicherte Änderungen. Sollen diese in die Cloud gespeichert werden? Bei "nein" wird die Cloud erst beim nächsten "Cloudspeicher öffnen" oder "In Cloud speichern" synchronisiert.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Fehler beim Verbinden des Cloud-Speichers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Runtimetabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[Cloud-Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation> </message> @@ -5405,7 +5448,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferenz</translation> </message> @@ -5579,7 +5622,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Mittlere Tiefe im Profil anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6014,7 +6057,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Dezimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Einheiten</translation> </message> @@ -6150,128 +6193,133 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Geplanter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Manuell hinzugefügter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation>Tauchgang aufteilen</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Tauchmodus wechseln</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6279,146 +6327,146 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Lokale Tauchdatendatei öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 Tauchgänge aus der lokalen Tauchdatendatei geladen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Fehler beim Lesen der lokalen Daten, ich gebe auf</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>keine Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Ungültiges Format für E-Mail-Adresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Es wird versucht, den Cloud-Speicher mit neuen Anmeldeinformationen zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Cloud-Anmeldedaten werden getestet</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort des Cloud-Servers zur Validierung der Anmeldeinformationen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Falsche Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Anmeldedaten sind ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <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="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud-Anmeldedaten gültig, Tauchgänge werden geladen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Tauchgänge werden aus dem lokalen Speicher geladen (Modus 'keine Cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud-Speicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6432,175 +6480,6 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Erwarte GPS-Position</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>US Pfund</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Luft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>SAUERSTOFF</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>unbekannt</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>s</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Diesen Punkt entfernen</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Ø</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Min.</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Max.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ungültige Serverantwort</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>XML Tag 'DiveDates' nicht gefunden.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Ungültige XML Antwort. Zeile %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Stichwörter</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Kein leeres Logbuch in der Cloud speichern</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8792,12 +8671,16 @@ Durchschnitt</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8808,6 +8691,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cft</translation> </message> @@ -8815,6 +8699,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8822,6 +8708,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8849,6 +8737,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>US Pfund</translation> </message> @@ -8856,6 +8746,8 @@ Durchschnitt</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9093,6 +8985,7 @@ Durchschnitt</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>unbekannt</translation> @@ -9326,12 +9219,12 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Lade Tauchgänge aus dem lokalen Zwischenspeicher</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Tauchdaten erfolgreich geöffnet</translation> </message> @@ -9985,19 +9878,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Luft</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mehr als %1 Tage</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation><numerusform>(%n Tauchgang(e))</numerusform><numerusform>(%n Tauchgäng(e))</numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>SAUERSTOFF</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10096,6 +10017,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Anzug</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Stichwörter</translation> @@ -10584,13 +10511,33 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Dauer:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>s</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. Tiefe:</translation> @@ -10731,30 +10678,80 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Großstadt</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Beginne Datenspeicherung</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Beginne Tauchgänge zu speichern</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Lokaler Zwischenspeicher erzeugt</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Bereite Datenspeicherung vor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>Tauchmoduswechsel</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Erwarte GPS-Position</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Diesen Punkt entfernen</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Ø</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Min.</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Max.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ungültige Serverantwort</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>XML Tag 'DiveDates' nicht gefunden.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Ungültige XML Antwort. Zeile %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index ce46c894b..06a1ea829 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -378,22 +378,22 @@ <translation>PIN (προσωπικός αριθμός αναγνώρισης)</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3690,9 +3690,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Λήψη</translation> </message> @@ -3718,7 +3718,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> @@ -3733,57 +3733,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Επωνυμία προμηθευτή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Καταδυτικός υπολογιστής:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Επαναπροσπάθεια</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Παραίτηση</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Ληφθείσες καταδύσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Επιλογή όλων</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Αποεπιλογή Όλων</translation> </message> @@ -3920,6 +3920,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Εξερεύνηση αρχείων εικόνων</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4428,7 +4487,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> @@ -4724,13 +4783,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Αναίρεση</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Άρση αναίρεσης</translation> </message> @@ -4770,57 +4829,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Σύνδεση με</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Αποσύνδεση από</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Άνοιγμα αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Εξερεύνηση αρχείων εικόνων</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Σάρωση</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>Σάρωση εικόνων...(αυτή η ενέργεια μπορεί να καθυστερήσει) </translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> @@ -4830,12 +4873,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4849,213 +4892,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Εκτύπωση πίνακα ολικού χρόνου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Προσπάθεια να επανασχεδιαστεί μία κατάδυση που δεν ήταν μια σχεδιασμένη κατάδυση. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Παρακαλώ πρώτα τελειώστε την τρέχουσα επεξεργασία πριν προσπαθήσετε να επεξεργαστείτε εκ νέου. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Αποθήκευση αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Αποθήκευση αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[τοπική κρυφή μνήμη για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[αποθήκευση στο αποθηκευτικό νέφος για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Άνοιγμα αρχείου δεδομένων από παλαιότερη έκδοση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Άνοιγμα αρχείου καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Επικοινωνία με την υπηρεσία αποθηκευτικού νέφους... </translation> </message> @@ -5389,7 +5432,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Γεωαναφορά</translation> </message> @@ -5563,7 +5606,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Προβολή μέσου βάθους στο γράφημα</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Προφίλ</translation> </message> @@ -5995,7 +6038,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Δεκαδικά ψηφία</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Μονάδες Μέτρησης</translation> </message> @@ -6130,128 +6173,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 από %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Άγνωστος καταδυτικός υπολογιστής</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Η εμφάνιση του Ορίου Μη Αποσυμπίεσης / Συνολικού Χρόνου Μέχρι την Επιφάνεια, απενεργοποιήθηκε λόγω υπέρμετρου χρόνου επεξεργασίας</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Προσθήκη αλλαγής μείγματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(φιάλη %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Προσθήκη σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Επεξεργασία του γραφήματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Αφαίρεση συμβάντος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Απόκρυψη παρόμοιων συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Επεξεργασία ονόματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Απόκρυψη όλων των %1 συμβάντων;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Επεξεργασία ονόματος σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Ειδικό όνομα:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Το όνομα είναι πολύ μεγάλο! </translation> </message> @@ -6259,146 +6307,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>εργασία εκτός αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Δεν υπάρχουν διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Παρακαλώ εισάγετε έγκυρα διαπιστευτήρια νέφους </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Προσπάθεια ανοίγματος αποθήκευσης νέφους με νέα διαπιστευτήρια </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Έλεγχος διαπιστευτηρίων νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Καμία απόκριση από τον διαμεσολαβητή του αποθηκευτικού νέφους για έλεγχο εγκυρότητας των διαπιστευτηρίων </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος - ο λογαριασμός αποθηκευτικού νέφους δεν έχει επιβεβαιωθεί </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Λανθασμένα διαπιστευτήρια αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: Σφάλμα στη δημιουργία συνδέσεων https </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Σφάλμα αποθήκευσης στο αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Αποτυχία σύνδεσης με τον διακομιστή του αποθηκευτικού νέφους, επαναφορά σε καθεστώς λειτουργίας χωρίς αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Το αποθηκευτικό νέφος ανοίχθηκε με επιτυχία. Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Άγνωστη θέση GPS</translation> </message> @@ -6412,175 +6460,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Αναμονή για την πρόσκτηση τοποθεσίας από το GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>ΑΕΡΑΣ</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>Εμπλουτισμένο μείγμα Nitrox</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n κατάδυση(ύσεις))</numerusform><numerusform>(%n κατάδυση(ύσεις))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>ΟΞΥΓΟΝΟ</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>άγνωστο</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>ώρα</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>δευτερόλεπτα</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Αφαίρεση αυτού του σημείου</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Μέσος όρος</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Ελάχιστο</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Μέγιστο</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Άκυρη απάντηση από τον διακομιστή</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Αντί της αναμενόμενης ετικέτας XML 'DiveDateReader', εμφανίστηκε '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Expected XML tag 'DiveDates' not found</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Παραμορφωμένη απάντηση XML. Γραμμή %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Ετικέτες</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8769,12 +8648,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8785,6 +8668,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8792,6 +8676,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8799,6 +8685,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8826,6 +8714,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8833,6 +8723,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9070,6 +8962,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>άγνωστο</translation> @@ -9300,12 +9193,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9949,19 +9842,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>ΑΕΡΑΣ</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>Εμπλουτισμένο μείγμα Nitrox</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>ΟΞΥΓΟΝΟ</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10060,6 +9981,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Στολή</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Ετικέτες</translation> @@ -10546,13 +10473,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Διάρκεια:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>ώρα</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>δευτερόλεπτα</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Μέγιστο βάθος:</translation> @@ -10693,30 +10640,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Αναμονή για την πρόσκτηση τοποθεσίας από το GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Αφαίρεση αυτού του σημείου</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Μέσος όρος</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Ελάχιστο</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Μέγιστο</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Άκυρη απάντηση από τον διακομιστή</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Αντί της αναμενόμενης ετικέτας XML 'DiveDateReader', εμφανίστηκε '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Expected XML tag 'DiveDates' not found</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Παραμορφωμένη απάντηση XML. Γραμμή %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 7f9b2d8e2..0af55eb60 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Register</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Sign-in or register</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>No cloud mode</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Cloud account verification required, enter PIN in preferences</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Download</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth is not enabled</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation> Vendor name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation> Dive Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Rescan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Traverse image directories</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Open</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Redo</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>Cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Traverse image directories</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scan</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4839,12 +4882,12 @@ 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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Template backup created</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Please save or cancel the current dive edit before going online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>You have unsaved changes. Do you want to commit them to cloud storage now? If you answer no, the cloud will only be synced next time you "Open cloud storage" or "Save to cloud storage".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Failure taking cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Dive log files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -5409,7 +5452,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeference</translation> </message> @@ -5583,7 +5626,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Show mean depth in Profile</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profile</translation> </message> @@ -6018,7 +6061,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Units</translation> </message> @@ -6154,128 +6197,133 @@ Please export this template to a different file.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Change dive mode</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <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="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -6283,146 +6331,146 @@ Please export this template to a different file.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <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="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <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="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <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="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <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="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6436,175 +6484,6 @@ Please export this template to a different file.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Waiting to aquire GPS location</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AIR</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n dive)</numerusform><numerusform>(%n dives)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXYGEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>unknown</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Remove this point</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Average</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Invalid response from server</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Expected XML tag 'DiveDates' not found</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Malformed XML response. Line %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>No dive site layout categories set in preferences.</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tags</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Don't save an empty log to the cloud</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8797,12 +8676,16 @@ Maximum</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8813,6 +8696,7 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8820,6 +8704,8 @@ Maximum</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8827,6 +8713,8 @@ Maximum</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8854,6 +8742,8 @@ Maximum</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8861,6 +8751,8 @@ Maximum</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9098,6 +8990,7 @@ Maximum</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>unknown</translation> @@ -9331,12 +9224,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Load dives from local cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Successfully opened dive data</translation> </message> @@ -9990,19 +9883,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AIR</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>more than %1 days</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXYGEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10101,6 +10022,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Suit</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>No dive site layout categories set in preferences.</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tags</translation> @@ -10589,13 +10516,33 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Duration:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. depth:</translation> @@ -10736,30 +10683,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation>Done creating local cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>mode change</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Waiting to aquire GPS location</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Remove this point</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Average</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maximum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Invalid response from server</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Expected XML tag 'DiveDates' not found</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Malformed XML response. Line %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 679742cd1..d3b9036ef 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrarse</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Conectarse o registrarse</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Sin conexión a la nube</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Es necesario verificar la cuneta en la nube, introduce el PIN en preferencias</translation> </message> @@ -3700,9 +3700,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Descargar</translation> </message> @@ -3728,7 +3728,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3743,57 +3743,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth no está habilitado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Nombre del fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Ordenador de buceo:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Conexión:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Intentar de nuevo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Volver a escanear</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Descargar inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Des-seleccionar todo</translation> </message> @@ -3930,6 +3930,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Buscar en directorios de imágenes</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4438,7 +4497,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4734,13 +4793,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Deshacer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Rehacer</translation> </message> @@ -4780,57 +4839,41 @@ p, li { white-space: pre-wrap; } <translation>Almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Conectar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Desconectar de </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Buscar en directorios de imágenes</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Escanear</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Advertencia</translation> </message> @@ -4840,12 +4883,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="270"/> <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="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de ir en línea</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Hay cambios sin guardar. Quiere guardar en la nube? Si selecciona no, la nube solo sera sincronizada en la próxima llamada de "abrir el almacenamiento" o "guardar el almacenamiento".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Error en activar almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Archivos de registro de inmersiones </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>archivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtool</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[caché local de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[almacenamiento en la nube de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Contactando con el servicio en la nube ...</translation> </message> @@ -5409,7 +5452,7 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeference</translation> </message> @@ -5583,7 +5626,7 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <translation>Mostrar profundidad media en el perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -6018,7 +6061,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unidades</translation> </message> @@ -6154,128 +6197,133 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Ordenador de buceo desconocido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Convertir en ordenador de buceo principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Inmersión planeada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Inmersión añadida a mano</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Borrar este ordenador de buceo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(bot. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Añadir cambio de "set-point"</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Añadir marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Cambiar el modo de buceo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Editar el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Borrar evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Ocultar eventos similares</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Editar nombre</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusta la presión de Bot. %1 (actualmente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Revelar todos los eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>¿ Ocultar todos los eventos %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>¿ Borrar el evento seleccionado ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Editar el nombre de la marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nombre personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>¡El nombre es demasiado largo!</translation> </message> @@ -6283,146 +6331,146 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Abrir archivo de datos local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <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="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <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="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Funcionando en modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <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="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>sin credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <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="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <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="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Comprobando credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <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="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Credenciales de la nube incorrectas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Credenciales para la nube invalidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <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="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <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="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <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="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Error en almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <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="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Posición GPS desconocida</translation> </message> @@ -6436,175 +6484,6 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Esperando a obtener posición GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AIRE</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n inmersión)</numerusform><numerusform>(%n inmersiónes)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXÍGENO</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>desconocido</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>seg</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Borrar este punto</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Promedio</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Mínima</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Máxima</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Respuesta del servidor inválida</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Esperada etiqueta XML 'DiveDateReader', se recibió '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>No encontrada etiqueta XML esperada 'DiveDates'</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Respuesta XML mal formada. Línea %1:%2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>¡No se han ajustado categorías de la configuración de la ubicación de buceo en las preferencias!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Etiquetas</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>No guardar un divelog vacío en la nube</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8798,12 +8677,16 @@ Media</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8814,6 +8697,7 @@ Media</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>pie³</translation> </message> @@ -8821,6 +8705,8 @@ Media</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8828,6 +8714,8 @@ Media</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8855,6 +8743,8 @@ Media</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8862,6 +8752,8 @@ Media</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9099,6 +8991,7 @@ Media</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>desconocido</translation> @@ -9332,12 +9225,12 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <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="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Abiertos datos de inmersiones</translation> </message> @@ -9990,19 +9883,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AIRE</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>más de %1 días</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXÍGENO</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10101,6 +10022,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Traje</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>¡No se han ajustado categorías de la configuración de la ubicación de buceo en las preferencias!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Etiquetas</translation> @@ -10589,13 +10516,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Duración:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>seg</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. máxima;</translation> @@ -10736,30 +10683,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation>Crear caché local terminado</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Preparando el guardado de datos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>Cambio de modo</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Esperando a obtener posición GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Borrar este punto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>No guardar un divelog vacío en la nube</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Promedio</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Mínima</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Máxima</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Respuesta del servidor inválida</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Esperada etiqueta XML 'DiveDateReader', se recibió '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>No encontrada etiqueta XML esperada 'DiveDates'</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Respuesta XML mal formada. Línea %1:%2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 96c4a76cd..049e8cf46 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -379,22 +379,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -402,7 +402,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3701,9 +3701,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Allalaadimine</translation> </message> @@ -3729,7 +3729,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -3744,57 +3744,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Tarnija nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Sukeldumiskompuuter:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Korda</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Välju</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Allalaetud sukeldumised</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Vali kõik</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Tühista kõik</translation> </message> @@ -3931,6 +3931,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4439,7 +4498,7 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Ava</translation> </message> @@ -4735,13 +4794,13 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4781,57 +4840,41 @@ Oled kindel et soovid jätkata?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Ühenda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Ühenda lahti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Skaneeri</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Hoiatus</translation> </message> @@ -4841,12 +4884,12 @@ Oled kindel et soovid jätkata?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4860,212 +4903,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5397,7 +5440,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georefereering</translation> </message> @@ -5571,7 +5614,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Näita keskmist sügavust profiilis</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profiil</translation> </message> @@ -6003,7 +6046,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Ühikud</translation> </message> @@ -6138,128 +6181,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 %2st)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Tundmatu sukeldumiskompuuter</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(balloon %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Lisa järjehoidja</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Toimeta profiili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Eemalda sündmus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Peida sarnased sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Toimeta nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Peida kõik sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Peida sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Peida kõik %1 sündmust?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Eemalda valitud sündmus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Toimeta järjehoidja nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Kohandatud nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Nimi on liiga pikk!</translation> </message> @@ -6267,146 +6315,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Alustan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Töötamine mitte-pilve režiimis</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>pole pilve volitusi</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Palun sisesta kehtivad pilve volitused.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Pilve volituste testimine</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Ei saa avada pilve salvestit: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Ei saa ühendust pilve salvestiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Pilve salvesti viga: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Tundmatu GPS koht</translation> </message> @@ -6420,175 +6468,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>jalg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>nael</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>ÕHK</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n sukeldumist)</numerusform><numerusform>(%n sukeldumist)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>HAPNIK</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>kuupjalg</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>tundmatu</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sek</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Eemalda punkt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Keskmine</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Miinimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maksimum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Vigane vastus serverilt</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Oodatava XML märgendi 'DiveDateReader' asemel on '%1'</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Oodatud XML märgendit 'DiveDates' ei leitud</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Vigane XML vastus. Rida %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Märgendid</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8775,12 +8654,16 @@ Max</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8791,6 +8674,7 @@ Max</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>kuupjalg</translation> </message> @@ -8798,6 +8682,8 @@ Max</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8805,6 +8691,8 @@ Max</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>jalg</translation> </message> @@ -8832,6 +8720,8 @@ Max</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>nael</translation> </message> @@ -8839,6 +8729,8 @@ Max</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9076,6 +8968,7 @@ Max</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>tundmatu</translation> @@ -9304,12 +9197,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9946,19 +9839,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>ÕHK</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>HAPNIK</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10057,6 +9978,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Ülikond</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Märgendid</translation> @@ -10540,13 +10467,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Kestus:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sek</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max sügavus</translation> @@ -10687,30 +10634,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Eemalda punkt</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Keskmine</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Miinimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maksimum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Vigane vastus serverilt</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Oodatava XML märgendi 'DiveDateReader' asemel on '%1'</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Oodatud XML märgendit 'DiveDates' ei leitud</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Vigane XML vastus. Rida %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index f84a62edf..53c9aa16d 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Rekisteröidy</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Kirjaudu sisään tai rekisteröidy</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Off-line -tila</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Pilvipalvelun tunnus pitää vahvistaa, syötä PIN asetuksissa</translation> </message> @@ -3698,9 +3698,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Lataa</translation> </message> @@ -3726,7 +3726,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -3741,57 +3741,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ei ole päällä</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Valmistajan nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Sukellustietokone:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Yhteys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Yritä uudestaan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Hae uudelleen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Ladatut sukellukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Tietoja:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Valitse kaikki</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Poista valinnat</translation> </message> @@ -3928,6 +3928,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Hae kuvia alihakemistoista</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4435,7 +4494,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Avaa</translation> </message> @@ -4731,13 +4790,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Peruuta</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Tee uudelleen</translation> </message> @@ -4777,57 +4836,41 @@ p, li { white-space: pre-wrap; } <translation>Pilvitallennus yhdistetty</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Yhdistä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Katkaise yhteys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Hae kuvia alihakemistoista</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Etsi</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Varoitus</translation> </message> @@ -4837,12 +4880,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Templaatista otettiin varmuuskopio</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4865,214 +4908,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Tallenna tai peruuta sukelluksen muutokset ennen yhdistämistä verkkoon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Sinulla on tallentamattomia muutoksia. Haluatko tallentaa ne pilvitallennustilaan? Mikäli et, muutokset synkronoidaan pilveen vasta, kun valitset "Avaa pilvitallennustila" tai "Tallenna pilveen"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Yhdistäminen pilveen epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Sukelluslokit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Kaikki tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -5407,7 +5450,7 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Maantieteellinen sijainti</translation> </message> @@ -5581,7 +5624,7 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <translation>Näytä profiilissa keskisyvyys</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profiilikuvaaja</translation> </message> @@ -6015,7 +6058,7 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>desimaali</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Yksiköt</translation> </message> @@ -6151,128 +6194,133 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Aseta ensimmäiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Suunniteltu sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Käsin lisätty sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Aseta setpoint-muutos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Muokkaa profiilia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Muokkaa säiliön %1 painetta (arvioitu %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -6280,146 +6328,146 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Avaa paikallinen sukelluslokitiedosto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Paikallisen tiedoston avaus epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 sukellusta ladattu paikallisesta tiedostosta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Virhe paikallisen tallenteen jäsentämisessä, keskeytetään</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Virheellinen sähköpostiosoite</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Testataan pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Käyttäjätunnusta ei voitu vahvistaa, koska pilvipalvelin ei vastaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Virheelliset pilvitunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Yhteys pilvipalveluun epäonnistui - käyttäjätunnusta ei voida vahvistaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Virheelliset pilvipalvelun tunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Pilvitunnukset OK, ladataan sukelluksia...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Ladataan sukellukset paikallisesta tallennustilasta ('ei pilve' tila)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -6433,175 +6481,6 @@ Tallenna muokkauksesi eri nimelle.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Odotetaan GPS -sijaintia</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>pauna</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Ilma</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n sukellus)</numerusform><numerusform>(%n sukelluksia)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>HAPPI</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>ft³</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>tuntematon</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>t</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sek</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Poista tämä etappi</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Keskim.</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Alin</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Korkein</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Virheellinen vastaus palvelimelta</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Odotettu XML tägi on 'DiveDateReader', mutta saatiin '%1'</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Odotettua XML -tägiä 'DiveDates' ei löydy</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Virheellinen XML vastasu. Rivi %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Asetuksissa ei ole sukelluskohteiden määrityksiä!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Avainsanat</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8792,12 +8671,16 @@ Keski</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8808,6 +8691,7 @@ Keski</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -8815,6 +8699,8 @@ Keski</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8822,6 +8708,8 @@ Keski</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8849,6 +8737,8 @@ Keski</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>pauna</translation> </message> @@ -8856,6 +8746,8 @@ Keski</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9093,6 +8985,7 @@ Keski</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>tuntematon</translation> @@ -9325,12 +9218,12 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Lataa sukellukset paikallisesta välimuistista</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Sukellusdatan avaus onnistui</translation> </message> @@ -9983,19 +9876,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Ilma</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>yli %1 päivää</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>HAPPI</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10094,6 +10015,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Puku</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Asetuksissa ei ole sukelluskohteiden määrityksiä!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Avainsanat</translation> @@ -10581,13 +10508,33 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Kesto:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>t</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sek</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Suurin syvyys:</translation> @@ -10728,30 +10675,80 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Kaupunki</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Tallenna tiedot</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Tallenna sukellukset</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Paikallisen välitallennustilan luonti valmis</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Valmistellaan datan tallennus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Odotetaan GPS -sijaintia</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Poista tämä etappi</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Keskim.</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Alin</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Korkein</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Virheellinen vastaus palvelimelta</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Odotettu XML tägi on 'DiveDateReader', mutta saatiin '%1'</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Odotettua XML -tägiä 'DiveDates' ei löydy</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Virheellinen XML vastasu. Rivi %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index d7f015a1e..547b3c7de 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>S'enregistrer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>S'identifier ou s'enregistrer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Pas de mode cloud</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Vérification du compte cloud nécessaire, entrer le PIN dans les préférences</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Télécharger</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Le Bluetooth n'est pas activé</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Nom du fournisseur :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Ordinateur de plongée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Connexion :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Réessayer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Rescanner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Plongées téléchargées</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Traverser les dossiers d'images</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Ouvrir</translation> </message> @@ -4733,13 +4792,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="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Annuler</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Refaire</translation> </message> @@ -4779,57 +4838,41 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Stockage cloud en ligne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Se connecter à</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Se déconnecter de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Traverser les dossiers d'images</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scanner</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4839,12 +4882,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Sauvegarde du modèle créée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de se connecter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Vous avez des modifications non enregistrées. Voulez-vous les envoyer vers le stockage cloud ? Si vous répondez non, le cloud ne sera synchronisé qu'au prochain appelle de "Ouvrir le stockage dans le cloud" ou "Enregistrer vers le cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Fichiers de carnet de plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>Fichiers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>Visualiseur de log APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <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="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -5409,7 +5452,7 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Géoréférencement</translation> </message> @@ -5583,7 +5626,7 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>Afficher la profondeur moyenne dans le profile</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6018,7 +6061,7 @@ Voir http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>décimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unités</translation> </message> @@ -6154,128 +6197,133 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Ordinateur de plongée inconnu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Choisir comme odinateur principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Plongée planifiée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Plongée ajoutée manuellement </translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(Bloc. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Ajouter un changement de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Modifier le mode de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Modifier le profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Supprimer l'évènement</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Masquer les évènements similaires</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Afficher tous les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Masquer les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Masquer tous les évènements %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Supprimer l'évènement sélectionné ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -6283,146 +6331,146 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Démarrage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Ouvrir les données de plongée local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>L'ouverture du fichier local de données a échoué</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 plongées chargées depuis le fichier local de données de plongées</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Travail hors-ligne</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Erreur d'analyse du fichier de stockage local, abandon</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Pas d'information de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Entrez vos informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Format invalide pour l'adresse e-mail</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Essais d'ouverture du stockage dans le cloud avec les nouvelles informations de connexion</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Test des informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Pas de réponses du serveur pour la validation des informations de connexion</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Informations de connexion au cloud incorrectes</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Impossible de se connecter au cloud, compte non vérifié</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Informations de connexion pour le cloud invalides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Impossible de se connecter au cloud: Erreur à la création de la connexion https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Impossible d'ouvrir le stockage dans le cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Informations de connexion au cloud valides, chargement des plongées...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Erreur cloud : %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Chargement des plongées depuis le stockage local (mode 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Echec de la connexion vers le serveur cloud, retour vers l'état sans cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Stockage cloud ouvert avec succès. Aucune plongée dans la liste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Location GPS inconnue</translation> </message> @@ -6436,175 +6484,6 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Attente de l'acquisition du signal GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AIR</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>Nitrox</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n plongée)</numerusform><numerusform>(%n plongées)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXYGÈNE</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>inconnu</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Supprimer ce point</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Moyenne</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Réponse invalide du serveur</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Le tag XML 'DiveDateReader' est attendu, '%1' a été obtenu à la place</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Le tag XML 'DiveDates' attendu n'a pas été trouvé</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Réponse XML mal formée. Ligne %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Aucune catégorie de structure des sites de plongées définie dans les préférences !</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Étiquettes</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Ne pas enregistrer un journal vide dans le cloud</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8799,12 +8678,16 @@ Maximum</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8815,6 +8698,7 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8822,6 +8706,8 @@ Maximum</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8829,6 +8715,8 @@ Maximum</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8856,6 +8744,8 @@ Maximum</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8863,6 +8753,8 @@ Maximum</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9100,6 +8992,7 @@ Maximum</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>inconnu</translation> @@ -9333,12 +9226,12 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Chargement des plongées depuis le cache local</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Succès de l'ouverture des données de plongée</translation> </message> @@ -9992,19 +9885,47 @@ EADD : %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AIR</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>Nitrox</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>plus de %1 jours</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXYGÈNE</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10103,6 +10024,12 @@ EADD : %d%s / %.1fg/ℓ <translation>Combinaison</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Aucune catégorie de structure des sites de plongées définie dans les préférences !</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Étiquettes</translation> @@ -10591,13 +10518,33 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Durée :</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. max :</translation> @@ -10738,30 +10685,80 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Ville</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Début de la sauvegarde des données</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Début de la sauvegarde des plongées</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Cache local crée</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Préparation de la sauvegarde des données</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>modechange</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Attente de l'acquisition du signal GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Supprimer ce point</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Moyenne</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maximum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Réponse invalide du serveur</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Le tag XML 'DiveDateReader' est attendu, '%1' a été obtenu à la place</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Le tag XML 'DiveDates' attendu n'a pas été trouvé</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Réponse XML mal formée. Ligne %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index bb291255a..793fa369b 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -382,22 +382,22 @@ <translation>מספר זיהוי</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>להירשם</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>היכנס או הירשם</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>ללא חיבור לענן</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>נדרש אימות של חשבון Cloud, הזן PIN בהעדפות</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>הורדה</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>בטל</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth לא מופעל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>שם יצרן :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>מחשב צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>חיבור:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>נסה שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>סרוק שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>צלילות שהורדו</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>פרטים:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>בחר הכל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>בטל בחירת הכל</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>פצל ספריות של תמונת</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>פתח</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>בטל שינוי</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>בצע שינוי שוב</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>אחסון בענן במצב פעיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>התחבר אל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>התנתק מ-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>פתח קובץ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>פצל ספריות של תמונת</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>סרוק</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>סורק תמונות... (יכול להיות תהליך ארוך)</translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>אזהרה</translation> </message> @@ -4839,12 +4882,12 @@ p, li { white-space: pre-wrap; } <translation>מנסה למזג צלילות עם מרווח של 1% דקות ביניהם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>נוצר גיבוי תבניות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ can overwrite them on startup.</source> יכול להחליף אותם בעת ההפעלה.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני חיבור לענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>יש לך שינויים שלא נשמרו. האם אתה רוצה לשמור אותם לאחסון ענן? אם לא, הענן יסונכרן רק בפעם הבאה שבוחרים "פתח אחסון ענן" או "שמור לאחסון ענן".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>חיבור לאחסון בענן נכשלה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>הדפס טבלת זמנים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>מנסה לערוך מחדש צלילה שאינה צלילה מתוכננת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>ראשית סיים את המהדורה הנוכחית לפני יצירת אחרת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>קבצי יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>קבצי Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>קבצי MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>תצוגה של קבצי APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>כל הקבצים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>שמור שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[עותק מקומי עבור] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[אחסון בענן ל-] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>פותח קובץ מגרסה ישנה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>פתח קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>מתחבר לאחסון בענן</translation> </message> @@ -5409,7 +5452,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>התייחסות גיאוגרפית</translation> </message> @@ -5583,7 +5626,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>הצג עומק ממוצע בפרופיל.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>פרופיל</translation> </message> @@ -6018,7 +6061,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>עשרוני</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>יחידות</translation> </message> @@ -6154,128 +6197,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 מתוך %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>מחשב צלילה לא מוכר</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>הצגת NDL / TTS הושבתה בגלל זמן עיבוד חריג</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>הוסף שינוי גז</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>בחר מחשב צלילה ראשונה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>צלילה מתוכננת</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>צלילה הוזן ידנית</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>מחק מחשב צלילה זה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(מכל %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>הוסף שינוי נקודה קבועה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>הוספת סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>שינוי מוד צלילה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>ערוך פרופיל צלילה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>הסר את האירוע</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>הסתר אירועים דומים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>ערוך שם</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>שינוי לחץ במיכל %1 (כרגע מחושב כ-%2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>חשוף את כל האירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>הסתר אירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>הסתר את כל %1 האירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>הסר את האירוע שנבחרו?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>שינוי שם סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>שם חופשי:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>שם ארוך מדי!</translation> </message> @@ -6283,146 +6331,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>פתח קובץ יומן צלילה מקומי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>פתיחת קובץ יומן צלילה מקומי נכשלה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 צלילות טעונות מאיחסין מקומי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>עובד במצב של חוסר תקשורת עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>שגיאה בקריאת קובץ מקומי, מבטל</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>אין פרטי זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>נא להזין פרטי זיהוי חוקיים לענן.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>פורמט מייל לא חוקי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>מנסה להתחבר לענן עם זיהוי חדש</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>בודק זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>אין תגובה משרת ענן כדי לאמת את האישורים</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>פרטי זיהוי לענן לא נכונים</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>אין אפשרות להתחבר לענן - חשבון ענן לא מאומת</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>זיהוי לענן לא חוקי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>אין אפשרות להתחבר לענן: תקלה ביצירת קשר https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>אין אפשרות להתחבר לענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>אין אפשרות להתחבר לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>פרטי זיהוי לענן נכונים, טוען צלילות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>שגיאת איחסון ענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>טוען צלילות מקובץ מקומי (מוד ללא איחסון בענן)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>שגיאה בחיבור לשרת ענן, חוזר למצב של עבודה מקומית</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>שעה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>שניות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>נ"צ לא מוכר</translation> </message> @@ -6436,175 +6484,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>ממתין לחישוב נ"צ</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>מטר</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>רגל</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>קילוגרם</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>ליברה</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>אוויר</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n צליל(ה/ות))</numerusform><numerusform>(%n צליל(ה/ות))</numerusform><numerusform>(%n צליל(ה/ות))</numerusform><numerusform>(%n צליל(ה/ות))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>חמצן</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>רגל מעוקב</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>לא ידוע</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>דקה</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>שעה</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>שניות</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>הסר נקודה זו</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>ממוצע</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>מינימום</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>מקסימום</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>תגובה לא חוקית מהשרת</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>צפיתי לתגית XML 'DiveDateReader', נמצא %1 במקומו.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>תג XML הצפוי 'DiveDates' לא נמצא</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>תגובת XML פגומה. שורה %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>לא מוגדר קטגוריות של פריסת אתר צלילה בהגדרות!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>תגיות</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>נא לא לשמור יומן ריק לענן</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8797,12 +8676,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8813,6 +8696,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8820,6 +8704,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>מטר</translation> </message> @@ -8827,6 +8713,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>רגל</translation> </message> @@ -8854,6 +8742,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8861,6 +8751,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>קילוגרם</translation> </message> @@ -9098,6 +8990,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>לא ידוע</translation> @@ -9331,12 +9224,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>טען צלילות מקובץ מקומי</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>פתיחת נתוני צלילה עברה בהצלחה</translation> </message> @@ -9991,19 +9884,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>אוויר</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>יותר מ-%1 ימים</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>חמצן</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10102,6 +10023,12 @@ EADD: %d%s / %.1fg/ℓ <translation>חליפה</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>לא מוגדר קטגוריות של פריסת אתר צלילה בהגדרות!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>תגיות</translation> @@ -10590,13 +10517,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>משך הצלילה:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>דקה</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>שעה</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>שניות</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>עומק מירבי:</translation> @@ -10737,30 +10684,80 @@ 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="951"/> <source>Start saving data</source> <translation>התחיל לשמור נתונים</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>התחיל לשמור צלילות</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>יצירת מטמון מקומי בוצע</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>מתכונן לשמור נתונים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>שינוי מוד</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>ממתין לחישוב נ"צ</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>הסר נקודה זו</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>נא לא לשמור יומן ריק לענן</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>ממוצע</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>מינימום</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>מקסימום</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>תגובה לא חוקית מהשרת</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>צפיתי לתגית XML 'DiveDateReader', נמצא %1 במקומו.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>תג XML הצפוי 'DiveDates' לא נמצא</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>תגובת XML פגומה. שורה %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 7b4e190d6..537c870bc 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3685,9 +3685,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3713,7 +3713,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3728,57 +3728,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Pokušaj ponovo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Izlaz</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3915,6 +3915,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4422,7 +4481,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4718,13 +4777,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4764,57 +4823,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4824,12 +4867,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4843,212 +4886,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5380,7 +5423,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5554,7 +5597,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5986,7 +6029,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Jedinice</translation> </message> @@ -6121,128 +6164,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6250,146 +6298,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6403,175 +6451,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Zrak</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>nepoznato</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Ø</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Min.</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Max.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8737,12 +8616,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8753,6 +8636,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8760,6 +8644,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8767,6 +8653,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8794,6 +8682,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8801,6 +8691,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9038,6 +8930,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>nepoznato</translation> @@ -9266,12 +9159,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9888,19 +9781,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Zrak</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -9999,6 +9920,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Odijelo</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation type="unfinished"/> @@ -10482,13 +10409,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10629,30 +10576,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Ø</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Min.</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Max.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index bf074769a..f62dd80a4 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -379,22 +379,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -402,7 +402,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3686,9 +3686,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3714,7 +3714,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3729,57 +3729,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Kilépés</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3916,6 +3916,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4423,7 +4482,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4719,13 +4778,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4765,57 +4824,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4825,12 +4868,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4844,212 +4887,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5381,7 +5424,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5555,7 +5598,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation type="unfinished"/> </message> @@ -5987,7 +6030,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Mértékegységek</translation> </message> @@ -6122,128 +6165,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6251,146 +6299,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6404,175 +6452,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>LÉG</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Átlag</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8738,12 +8617,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation type="unfinished"/> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -8754,6 +8637,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation type="unfinished"/> </message> @@ -8761,6 +8645,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation type="unfinished"/> </message> @@ -8768,6 +8654,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation type="unfinished"/> </message> @@ -8795,6 +8683,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation type="unfinished"/> </message> @@ -8802,6 +8692,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation type="unfinished"/> </message> @@ -9039,6 +8931,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation type="unfinished"/> @@ -9267,12 +9160,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9888,19 +9781,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>LÉG</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation type="unfinished"/> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -9999,6 +9920,12 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation type="unfinished"/> @@ -10482,13 +10409,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10629,30 +10576,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Átlag</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maximum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 0375dd089..e238a22c1 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3685,9 +3685,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3713,7 +3713,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Batal</translation> </message> @@ -3728,57 +3728,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3915,6 +3915,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4422,7 +4481,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Buka</translation> </message> @@ -4718,13 +4777,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4764,57 +4823,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4824,12 +4867,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4843,212 +4886,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5380,7 +5423,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5554,7 +5597,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation type="unfinished"/> </message> @@ -5986,7 +6029,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Satuan</translation> </message> @@ -6121,128 +6164,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6250,146 +6298,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6403,175 +6451,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kgkg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>UDARA</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>I</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>Tak dikenal</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>menit</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Rata-rata</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimal</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maksimal</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tag</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8745,12 +8624,16 @@ Rata-rata</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8761,6 +8644,7 @@ Rata-rata</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8768,6 +8652,8 @@ Rata-rata</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8775,6 +8661,8 @@ Rata-rata</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8802,6 +8690,8 @@ Rata-rata</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8809,6 +8699,8 @@ Rata-rata</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9046,6 +8938,7 @@ Rata-rata</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>Tak dikenal</translation> @@ -9274,12 +9167,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9895,19 +9788,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>UDARA</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>I</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10006,6 +9927,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Pakaian</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tag</translation> @@ -10489,13 +10416,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>menit</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10636,30 +10583,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Rata-rata</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimal</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maksimal</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 455ffc84d..9e174e3a7 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrati</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Accedi o Registrati</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Modalità off-line</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>E' richiesta una verifica dell'account del cloud, inserisci il PIN nelle preferenze</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Download</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Il Bluetooth non è abilitato</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Marca:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Connessione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Riprova</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Riscansiona</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Immersioni scaricate</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Seleziona tutto</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Deseleziona tutto</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Visita le cartelle delle immagini</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Apri</translation> </message> @@ -4733,13 +4792,13 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Annulla</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Ripeti</translation> </message> @@ -4779,57 +4838,41 @@ Sei sicuro di voler continuare?</translation> <translation>Cloud connesso</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Connetti a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Disconnetti da</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aprire un nuovo file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Apri file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Visita le cartelle delle immagini</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scansione</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Avviso</translation> </message> @@ -4839,12 +4882,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Backup del modello creato</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Salva o cancella le modifiche all'immersione corrente prima di connetterti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Ci sono modifiche non salvate. Vuoi salvarle nel Cloud? In caso negativo, il Cloud verrá sincronizzato solo alla prossima operazione di "Connessione al Cloud" or "Salva nel Cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Errore nella connessione con il Cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>File di log delle immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>File MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cache locale for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[memoria cloud per] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Sto contattando il servizio cloud...</translation> </message> @@ -5409,7 +5452,7 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferenza</translation> </message> @@ -5583,7 +5626,7 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <translation>Mostra la profondità media nel Profilo</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profilo</translation> </message> @@ -6018,7 +6061,7 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <translation>decimale</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unità</translation> </message> @@ -6154,128 +6197,133 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(nº%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Computer sconosciuto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Aggiungi un cambio gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Rendi il computer principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Immersione pianificata</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Immersione inserita manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Cancella questo computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (bot. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Aggiungi cambio setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Aggiungi un segnalibro</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Cambia la modalità di immersione</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Modifica il profilo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Rimuovi evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Nascondi eventi simili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Modifica il nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Mostra tutti gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Nascondi gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Nascondi tutti gli eventi %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Rimuovere l'evento selezionato?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Modifica il nome del bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nome personalizzato:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Il nome è troppo lungo</translation> </message> @@ -6283,146 +6331,146 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Avvio...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Apri file di log immersioni locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Apertura del file locale fallita</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 immersioni caricate dal file locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>sto lavorando in modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Errore nella decodifica dell'archivio locale, abbandono</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Credenziali cloud mancanti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Prego inserire credenziali valide per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Formato email errato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Sto cercando di aprire la memoria cloud con le nuove credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Controlle le credenziali per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Nessuna risposta del server cloud per la validazione delle credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Credenziali per il cloud errate</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Non è possibile connettersi al cloud storage - account cloud non verificato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Le credenziali per il cloud non sono valide</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Non è possibile aprire il cloud storage: errore nella creazione della connessione https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Non è possibile aprire il cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Non è possibile connettersi al cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenziali per il cloud valide, sto caricando le immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Errore cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Sto caricando le immersioni dalla memoria locale (modalità "no cloud")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Impossibile connettersi al server cloud, passo alla modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Memoria cloud aperta con successo. Non ho trovato immersioni.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Posizione GPS sconosciuta</translation> </message> @@ -6436,175 +6484,6 @@ Per favore esporta questo modello in un file diverso.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>In attesa della posizione GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>ARIA</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n immersione(i))</numerusform><numerusform>(%n immersione(i))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OSSIGENO</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>piedi cubi</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>sconosciuto</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Rimuovi questo punto</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Media</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimo</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Massimo</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Risposta non valida dal server</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Tag XML atteso 'DiveDateReader', trovato invece '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Tag XML atteso 'DiveDateReader' non trovato</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Risposta XML malformata. Linea %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Nessun layout del sito di immersione salvato nelle preferenze!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tags</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Non salvare un log vuoto nel cloud</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8797,12 +8676,16 @@ Media</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8813,6 +8696,7 @@ Media</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>piedi cubi</translation> </message> @@ -8820,6 +8704,8 @@ Media</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8827,6 +8713,8 @@ Media</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8854,6 +8742,8 @@ Media</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8861,6 +8751,8 @@ Media</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9098,6 +8990,7 @@ Media</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>sconosciuto</translation> @@ -9331,12 +9224,12 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Carica le immersioni dalla cache locale</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Dati di immersione letti correttamente</translation> </message> @@ -9992,19 +9885,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>ARIA</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>più di %1 giorni</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OSSIGENO</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10103,6 +10024,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Muta</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Nessun layout del sito di immersione salvato nelle preferenze!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tags</translation> @@ -10591,13 +10518,33 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Durata:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>profondità massima</translation> @@ -10738,30 +10685,80 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Città</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Inizio salvataggio dei dati</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Inizio salvataggio delle immersioni</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Creazione della cache locale riuscita</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Preparazione al salvataggio dei dati</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>cambia modalità</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>In attesa della posizione GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Rimuovi questo punto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Media</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimo</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Massimo</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Risposta non valida dal server</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Tag XML atteso 'DiveDateReader', trovato invece '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Tag XML atteso 'DiveDateReader' non trovato</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Risposta XML malformata. Linea %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 9c586cad0..9ae5302c7 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3687,9 +3687,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Lejupielādēt</translation> </message> @@ -3715,7 +3715,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Atcelt</translation> </message> @@ -3730,57 +3730,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Atkārtot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3917,6 +3917,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4424,7 +4483,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Atvērt</translation> </message> @@ -4720,13 +4779,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4766,57 +4825,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Atvērt failu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> @@ -4826,12 +4869,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4845,212 +4888,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Gada statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5382,7 +5425,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5556,7 +5599,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profils</translation> </message> @@ -5988,7 +6031,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Mērvienības</translation> </message> @@ -6123,128 +6166,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 no %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Pievienot gāzes maiņu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Pievienot grāmatzīmi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Noņemt notikumu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Paslēpt līdzīgus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Rediģēt vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Parādīt visus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Paslēpt notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Paslēpt visus %1 notikumus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Nodzēst izvēlēto notikumu?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Rediģēt grāmatzīmes vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Vārds:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6252,146 +6300,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6405,175 +6453,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>pēda</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>mārciņa</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Gaisa</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>kub. pēda</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>nezināms</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Noņemt šo vietu</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Vidējais</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimums</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maksimums</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Nederīga servera atbilde</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Gaidīja XML tagu 'DiveDateReader', bet saņēma '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Gaidīts XML tags 'DiveDates' nav atrasts</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tagi</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8750,12 +8629,16 @@ Vidējais</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8766,6 +8649,7 @@ Vidējais</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8773,6 +8657,8 @@ Vidējais</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8780,6 +8666,8 @@ Vidējais</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8807,6 +8695,8 @@ Vidējais</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8814,6 +8704,8 @@ Vidējais</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9051,6 +8943,7 @@ Vidējais</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>nezināms</translation> @@ -9279,12 +9172,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9924,19 +9817,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Gaisa</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10035,6 +9956,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Kostīms</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tagi</translation> @@ -10518,13 +10445,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ilgums:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10665,30 +10612,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Noņemt šo vietu</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Vidējais</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimums</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maksimums</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Nederīga servera atbilde</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Gaidīja XML tagu 'DiveDateReader', bet saņēma '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Gaidīts XML tags 'DiveDates' nav atrasts</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index e9c30c99b..64d4c3394 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -381,22 +381,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Logg inn eller registrer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Ingen skymodus</translation> </message> @@ -404,7 +404,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Verifikasjon av skykonto kreves, legg inn PIN i valgpanelet</translation> </message> @@ -3697,9 +3697,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3725,7 +3725,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3740,57 +3740,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth er ikke skrudd på</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Skann på nytt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3927,6 +3927,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Gå gjennom bildekataloger</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4435,7 +4494,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4731,13 +4790,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4777,57 +4836,41 @@ Er du sikker på at du vil fortsette?</translation> <translation>Skylagring er på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Gå gjennom bildekataloger</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scan</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4837,12 +4880,12 @@ 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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Sikkerhertskopi av templat opprettet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4865,214 +4908,214 @@ templatene være skrivebeskyttet og bør ikke redigeres direkte, siden programmet kan overskrive dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Lagre eller avbryt redigeringen av dykk før du går online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Du har ulagrede endringer. Ønsker du å lagre dem til skyen? Hvis du svarer nei vil skylagring kun bli synkronisert neste gang du velger "Åpne skylagring" eller "Lagre til skyen"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Kunne ikke skru på skylagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Dykkeloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -5407,7 +5450,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Geo-referanse</translation> </message> @@ -5581,7 +5624,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Vis snittdybde i profil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6016,7 +6059,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>desimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Enheter</translation> </message> @@ -6152,128 +6195,133 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Endre dykkemodus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Juster trykket på syl. %1 (interpolert som %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -6281,146 +6329,146 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <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="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <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="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <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="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <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="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6434,175 +6482,6 @@ Eksporter denne templaten til en annen fil.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Venter på GPS-posisjon</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>pund</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Luft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>Oksygen</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>ft³</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>ukjent</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>t</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sek</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Fjern dette punktet</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Gjennomsnitt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maksimum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ugyldig svar fra tjener</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Fant ikke XML-tag 'DiveDates' som forventet</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Feil formattert XML-svar. Linje %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Ingen kategorier for dykkesteds-layout er satt i valgpanelet!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Emner</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Ikke lagre en tom logg til skyen</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8794,12 +8673,16 @@ Snitt</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8810,6 +8693,7 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -8817,6 +8701,8 @@ Snitt</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8824,6 +8710,8 @@ Snitt</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8851,6 +8739,8 @@ Snitt</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>pund</translation> </message> @@ -8858,6 +8748,8 @@ Snitt</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9095,6 +8987,7 @@ Snitt</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>ukjent</translation> @@ -9328,12 +9221,12 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> @@ -9987,19 +9880,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Luft</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mer enn %1 dager</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>Oksygen</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10098,6 +10019,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Drakt</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Ingen kategorier for dykkesteds-layout er satt i valgpanelet!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Emner</translation> @@ -10587,13 +10514,33 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Lengde:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>t</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sek</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maksdybde</translation> @@ -10734,30 +10681,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>modusendring</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Venter på GPS-posisjon</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Fjern dette punktet</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Ikke lagre en tom logg til skyen</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Gjennomsnitt</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maksimum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ugyldig svar fra tjener</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Fant ikke XML-tag 'DiveDates' som forventet</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Feil formattert XML-svar. Linje %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 651765ef7..5d77aa02a 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registreer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Log-in of Registreer</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Geen cloud</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Cloud account vereist verificatie, voer PIN in bij de voorkeuren</translation> </message> @@ -2572,12 +2572,12 @@ GPS locatie:</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> - <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma's</translation> + <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma's.</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> <source>Comma separated values describing the dive profile.</source> - <translation>Waarden gescheiden door komma's die het duikprofiel beschrijven</translation> + <translation>Waarden gescheiden door komma's die het duikprofiel beschrijven.</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Downloaden</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth staat uit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Leveranciersnaam:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Duikcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Verbinding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Scan opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Geladen duiken</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Informatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Alles selecteren</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Selectie ongedaan maken</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Doorloop mappen met afbeeldingen</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Open</translation> </message> @@ -4733,13 +4792,13 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Ongedaan maken</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Opnieuw</translation> </message> @@ -4779,57 +4838,41 @@ Bent u zeker?</translation> <translation>Cloud opslag online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Verbind met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Verbreek verbinding met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Doorloop mappen met afbeeldingen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scan</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> @@ -4839,12 +4882,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="270"/> <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="271"/> <source>The following backup printing templates were created: %1 @@ -4867,214 +4910,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u online gaat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Er zijn niet bewaarde wijzigingen. Wilt u deze opslaan in de cloud opslag? Bij antwoord nee, zal de cloud pas gesynchroniseerd worden bij de eerstvolgende "Open cloud opslag" of "Bewaar in cloud opslag".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Cloud opslag online gaan is mislukt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Duiklog bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[locale cache voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[cloud opslag voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Contact opnemen met cloud service...</translation> </message> @@ -5409,7 +5452,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferentie</translation> </message> @@ -5583,7 +5626,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <translation>Toon gemiddelde diepte in profiel</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profiel</translation> </message> @@ -6018,7 +6061,7 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>decimaal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Eenheden</translation> </message> @@ -6154,128 +6197,133 @@ Exporteer naar een ander bestand.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 van %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Onbekende duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Maak eerste duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Geplande duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Handmatig toegevoegde duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Verwijder deze duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (fles %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Voeg setpoint wissel toe</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Bladwijzer toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Duikmodus wijzigen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Profiel bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Gebeurtenis verwijderen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Gelijkaardige gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Naam bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Pas drukken aan van cilinder %1 (nu geinterpoleerd als %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Toon alle gebeurtenissen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Alle %1 gebeurtenissen verbergen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Geselecteerde gebeurtenis verwijderen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Naam bladwijzer bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Deze naam is te lang!</translation> </message> @@ -6283,147 +6331,147 @@ Exporteer naar een ander bestand.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Open lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Open lokale duikgegevens mislukt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <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="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>werkt met lokale data</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <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="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Geen cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Voer geldige cloud rechten in</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Ongeldig formaat voor e-mailadres</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Cloud rechten worden gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <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="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Onjuiste cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Cloud rechten zijn ongeldig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Kan cloud opslag niet openen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <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="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud rechten zijn geldig. duiken ophalen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Cloud opslag fout: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <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="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Onbekende GPS locatie</translation> </message> @@ -6437,175 +6485,6 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Wacht op GPS fix</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>US pond</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AIR</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>ZUURSTOF</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>onbekend</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Dit punt verwijderen</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Gemiddelde</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Kleinste</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Grootste</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ongeldig antwoord van de server</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>XML etiket 'DiveDateReader' werd verwacht, maar kreeg '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Verwacht XML etket 'DiveDates' werd niet gevonden</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Geen duikplek layout categorieën in voorkeuren!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Trefwoorden</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Bewaar geen lege duiklog in de cloud</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8797,12 +8676,16 @@ Maximum</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8813,6 +8696,7 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8820,6 +8704,8 @@ Maximum</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8827,6 +8713,8 @@ Maximum</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8854,6 +8742,8 @@ Maximum</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>US pond</translation> </message> @@ -8861,6 +8751,8 @@ Maximum</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9098,6 +8990,7 @@ Maximum</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>onbekend</translation> @@ -9331,12 +9224,12 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Duiken laden uit lokale cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Duik data openen gelukt</translation> </message> @@ -9990,19 +9883,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AIR</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>meer dan %1 dagen</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>ZUURSTOF</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10101,6 +10022,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Pak</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Geen duikplek layout categorieën in voorkeuren!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Trefwoorden</translation> @@ -10589,13 +10516,33 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Duur:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. diepte:</translation> @@ -10736,30 +10683,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation>Lokale cache aangemaakt</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Voorbereiden data opslag</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>Duikmodus wijziging</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Wacht op GPS fix</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Dit punt verwijderen</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Bewaar geen lege duiklog in de cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Gemiddelde</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Kleinste</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Grootste</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ongeldig antwoord van de server</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>XML etiket 'DiveDateReader' werd verwacht, maar kreeg '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Verwacht XML etiket 'DiveDates' werd niet gevonden</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index cc78effb1..25663d8ff 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3694,9 +3694,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Pobierz</translation> </message> @@ -3722,7 +3722,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -3737,57 +3737,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Ponów</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Wyjście</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Wybierz wszystko</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3924,6 +3924,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Katalogi zdjęć do przejrzenia</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4432,7 +4491,7 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Otwórz</translation> </message> @@ -4728,13 +4787,13 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Cofnij</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Ponów</translation> </message> @@ -4774,57 +4833,41 @@ Czy na pewno kontynuować?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Katalogi zdjęć do przejrzenia</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Skanuj</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> @@ -4834,12 +4877,12 @@ Czy na pewno kontynuować?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4853,213 +4896,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[zapis w chmurze dla] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Otwarto plik ze starszej wersji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Łączenie się z chmurą...</translation> </message> @@ -5391,7 +5434,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Geolokalizacja</translation> </message> @@ -5565,7 +5608,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5997,7 +6040,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>dziesiętne</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Jednostki</translation> </message> @@ -6132,128 +6175,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Nieznany komputer nurkowy</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Edytuj profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Nazwa jest za długa!</translation> </message> @@ -6261,146 +6309,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6414,175 +6462,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>POWIETRZE</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>TLEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>nieznana</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Usuń ten punkt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>średnia</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>min.</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>max.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Niepoprawna odpowiedź z serwera</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Tagi</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8768,12 +8647,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8784,6 +8667,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8791,6 +8675,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8798,6 +8684,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8825,6 +8713,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8832,6 +8722,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9069,6 +8961,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>nieznana</translation> @@ -9299,12 +9192,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9948,19 +9841,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>POWIETRZE</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>TLEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10059,6 +9980,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Skafander</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Tagi</translation> @@ -10547,13 +10474,33 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Długość:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maks. głębokość:</translation> @@ -10694,30 +10641,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Usuń ten punkt</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>średnia</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>min.</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>max.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Niepoprawna odpowiedź z serwera</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index b689e131f..f43a3b930 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Entrar ou Registrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Modo sem nuvem</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Conta da nuvem requer verificação, entre o PIN nas preferências</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Receber</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth não está habilitado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Nome do fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Computador de mergulho:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Conexão:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Encerrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Procurar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Mergulhos baixados</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Desfazer seleções</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ Tem certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4733,13 +4792,13 @@ Tem certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Refazer</translation> </message> @@ -4779,57 +4838,41 @@ Tem certeza que quer continuar?</translation> <translation>Armazenamento remoto online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Conectar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Desconectar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Buscar</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>Procurar imagens...(isto pode demorar um pouco)</translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4839,12 +4882,12 @@ Tem certeza que quer continuar?</translation> <translation>Tentando juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Criada cópia de segurança do modelo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4865,214 +4908,214 @@ Localização: A partir desta versão do Subsurface os modelos padrão são arquivos apenas de leitura e não devem ser editados diretamente, uma vez que a aplicação poderá recriar-los na inicialização.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor salvar ou cancelar a edição do mergulho atual antes de usar o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Existem mudanças que não foram gravadas. Quer guardá-las no armazenamento remoto? Se responder não, o armazenamento remoto será sincronizado apenas da próxima vez que seleccionar "Abrir armazenamento remoto" ou "Guardar no armazenamento remoto".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentando replanejar um mergulho que não foi criado no planejador.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Arquivos de registro de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Arquivos subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>Arquivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Todos arquivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Abrir arquivo de uma versão antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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 arquivo 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 diz a gestão de pontos 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 pontos de mergulho para garantir que tudo está correto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Contactando serviço remoto...</translation> </message> @@ -5407,7 +5450,7 @@ Se o seu computador de mergulho usa Bluetooth, antes de continuar com o update p <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georreferenciar</translation> </message> @@ -5581,7 +5624,7 @@ Se o seu computador de mergulho usa Bluetooth, antes de continuar com o update p <translation>Mostrar profundidade média no Perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -6016,7 +6059,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unidades</translation> </message> @@ -6151,128 +6194,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Computador de mergulho desconhecido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>A visualização do NDL /TTS foi desativada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Mergulho planejado</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Mergulho adicionado manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(cil. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Alterar modo do mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Editar o perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Esconder todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Remover o evento selecionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Editar nome do favorito</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Apelido:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Nome é muito grande!</translation> </message> @@ -6280,146 +6328,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Abrir arquivo local com dados de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Falha ao abrir arquivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 mergulhos carregados do arquivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Trabalhando em modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Erro ao ler armazenamento local. Cancelando</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Sem credenciais remotas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Favor inserir credenciais válidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e senha do armazenamento remoto pode conter somente letras, números, e '.', '-', '_' e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Formato de email inválido</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Tentando abrir armazenamento remoto com novas credenciais</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Testando credenciais remotas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Credenciais incorretas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Não foi possível conectar ao armazenamento remoto - conta não verificada</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Credenciais inválidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Não foi possível abrir o armazenamento remoto: Erro criando conexão https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Não foi possível abrir o armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Não foi possível conectar o armazenamento remoto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Erro no armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Carregando mergulhos do armazenamento local (modo 'sem nuvem')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Armazenamento remoto aberto com sucesso. Sem mergulhos na lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Localização GPS desconhecida</translation> </message> @@ -6433,175 +6481,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Aguardando adquirir localização GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>pé(s)</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AR</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n mergulho(s))</numerusform><numerusform>(%n mergulho(s))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXIGÊNIO</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>pés cúbicos</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>desconhecido</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>seg</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Remover este ponto</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Média</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Mínimo</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Máximo</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Resposta inválida do servidor</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Esperava rótulo XML 'DiveDateReader', recebido '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Rótulo XML 'DiveDates' esperado não foi encontrado</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Resposta XML defeituosa. Linha %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Rótulos</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Não salvar arquivos vazios remotamente</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8791,12 +8670,16 @@ Médio</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8807,6 +8690,7 @@ Médio</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> @@ -8814,6 +8698,8 @@ Médio</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8821,6 +8707,8 @@ Médio</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>pé(s)</translation> </message> @@ -8848,6 +8736,8 @@ Médio</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8855,6 +8745,8 @@ Médio</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9092,6 +8984,7 @@ Médio</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>desconhecido</translation> @@ -9323,12 +9216,12 @@ Você pode criar este arquivo de log selecionando a opção correspondente no di </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Carregar dados do armazenamento local</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Dados dos mergulhos abertos com sucesso</translation> </message> @@ -9969,19 +9862,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AR</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mais de %1 dias</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXIGÊNIO</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10080,6 +10001,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Roupa</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Rótulos</translation> @@ -10563,13 +10490,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Duração:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>seg</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Profundidade máx:</translation> @@ -10710,30 +10657,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Aguardando adquirir localização GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Remover este ponto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Não salvar arquivos vazios remotamente</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Média</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Mínimo</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Máximo</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Resposta inválida do servidor</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Esperava rótulo XML 'DiveDateReader', recebido '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Rótulo XML 'DiveDates' esperado não foi encontrado</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Resposta XML defeituosa. Linha %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 447ebcf40..398d0eb2d 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Faça log in ou registe-se</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Modo local </translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>É necessária a verificação da conta de armazenamento remoto; introduzir o PIN nas preferências</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Transferir</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth está desactivado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Nome do fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Computador de mergulho:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Ligação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Voltar a procurar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Mergulhos descarregados</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Informação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Seleccionar todos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Desmarcar todos</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Atravessar as pastas das imagens</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4733,13 +4792,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="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Refazer</translation> </message> @@ -4779,57 +4838,41 @@ Tem a certeza que quer continuar?</translation> <translation>Armazenamento remoto em linha</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Ligar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Desligar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Atravessar as pastas das imagens</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Procurar</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4839,12 +4882,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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Criada cópia de segurança do modelo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4865,214 +4908,214 @@ 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="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor grave ou cancele as edições ao mergulho antes de usar o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Existem mudanças que não foram gravadas. Quer guardá-las no armazenamento remoto? Se responder não, o armazenamento remoto será sincronizado apenas da próxima vez que seleccionar "Abrir armazenamento remoto" ou "Guardar no armazenamento remoto".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Falha ao colocar o armazenamento remoto em linha</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>A contactar o serviço remoto...</translation> </message> @@ -5407,7 +5450,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georreferenciar</translation> </message> @@ -5581,7 +5624,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <translation>Mostrar profundidade média no Perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -6015,7 +6058,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unidades</translation> </message> @@ -6151,128 +6194,133 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Computador de mergulho desconhecido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Marca do computador de mergulho principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Mergulho planeado</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Mergulho adicionado manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(garr. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Mudar modo de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Editar o perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajustar a pressão da garrafa %1 (presentemente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>O nome é demasiado comprido!</translation> </message> @@ -6280,146 +6328,146 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>A inicial...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Abrir ficheiro local com dados de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Não foi possível abrir o ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 mergulhos carregados a partir do ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>A trabalhar em modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Erro na análise do armazenamento local, a cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>Não existem credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor insira credenciais de nuvem válidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Formato de endereço de correio electrónico inválido</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>A tentar abrir o armazenamento remoto com as novas credenciais</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>A testar as credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Não houve resposta do servidor remoto para validar as credenciais</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Credenciais remotas inválidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Não foi possível ligar-se ao armazenamento remoto - conta remota não verificada</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>As credenciais são inválidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Não foi possível abrir o armazenamento remoto: erro ao criar a ligação HTTPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Não é possível abrir o armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Não é possível ligar-se com o armazenamento remoto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciais remotas válidas, a carregar os mergulhos...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Erro no armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>A carregar mergulhos do armazenamento local (modo 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Falha na ligação ao servidor remoto. A passar para modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Armazenamento remoto aberto com sucesso. Não existem mergulhos na lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Localização GPS desconhecida</translation> </message> @@ -6433,175 +6481,6 @@ Por favor exporte o modelo para outro ficheiro.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>À espera para adquirir uma localização de GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>pé</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>libra</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Ar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EANx</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXIGÉNIO</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>pé cúbico</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>desconhecido</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>seg</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Remover este ponto</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Média</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Mínima</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Máxima</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Resposta inválida do servidor</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso foi recebida a '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>A tag XML esperada 'DiveDates' não foi encontrada</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Resposta XML mal formada. Linha %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Não foram definidas nas preferências, as categorias para o layout dos locais de mergulho!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Categorias</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Não gravar um ficheiro vazio remotamente</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8793,12 +8672,16 @@ Média</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8809,6 +8692,7 @@ Média</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> @@ -8816,6 +8700,8 @@ Média</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8823,6 +8709,8 @@ Média</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>pés</translation> </message> @@ -8850,6 +8738,8 @@ Média</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>libras</translation> </message> @@ -8857,6 +8747,8 @@ Média</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9094,6 +8986,7 @@ Média</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>desconhecido</translation> @@ -9327,12 +9220,12 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Carregar dados do armazenamento local</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Dados de mergulho abertos com sucesso</translation> </message> @@ -9986,19 +9879,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Ar</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EANx</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mais de %1 dias</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXIGÉNIO</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10097,6 +10018,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Fato</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Não foram definidas nas preferências, as categorias para o layout dos locais de mergulho!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Categorias</translation> @@ -10585,13 +10512,33 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Duração:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>seg</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Profundidade máxima:</translation> @@ -10732,30 +10679,80 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Cidade</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Iniciar registo dos dados</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Iniciar registo dos mergulhos</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Armazenamento local criado com sucesso</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>A prerarar para gravar dados</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>alterar modo</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>À espera para adquirir uma localização de GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Remover este ponto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <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/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Média</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Mínima</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Máxima</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Resposta inválida do servidor</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso foi recebida a '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>A tag XML esperada 'DiveDates' não foi encontrada</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Resposta XML mal formada. Linha %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index 5daa75961..fd0dd7a78 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -380,22 +380,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Inregistrare</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Logare sau Inregistrare</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Mod fara Cloud</translation> </message> @@ -403,7 +403,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Verificare cont Cloud necesare, introdu PIN la preferinte</translation> </message> @@ -3697,9 +3697,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Descarcă</translation> </message> @@ -3725,7 +3725,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Anulează</translation> </message> @@ -3740,57 +3740,57 @@ p, li { white-space: pre-wrap; } <translation>Nu este activat Bluetooth</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Nume producător:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Computer scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Conexiune:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Reîncearcă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Ieșire</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Rescanare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Scufundari descarcate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Informație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Selectează totul</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Deselecteaza tot</translation> </message> @@ -3927,6 +3927,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Imagine direcții traverse</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4435,7 +4494,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Deschide</translation> </message> @@ -4731,13 +4790,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Anulează</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Refă</translation> </message> @@ -4777,57 +4836,41 @@ p, li { white-space: pre-wrap; } <translation>Stocare cloud activa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Conectați-vă la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Deconectați-vă de la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Deschideți fișier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Imagine direcții traverse</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Scanare</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Avertizare</translation> </message> @@ -4837,12 +4880,12 @@ 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="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Sablonul a fost salvat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4865,214 +4908,214 @@ sabloanele implicite sunt numai pentru citire si nu ar trebui editate direct deoarece aplicatia le poate suprascrie la pornire.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Va rugam salvati sau anulati editarea curenta a scufundarii inainte de a trece online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Aveti modificari nesalvate. Vreti sa le salvati in cloud? Daca raspundeti nu, sincronizarea cu cloud-ul se va face la urmatoare apelare a functiei "Deschidere stocare cloud" sau "Salvare in cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Eroare in accesarea stocarii in cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Printați tabelul de execuție</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>Fisiere jurnal scufundare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Fisiere Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>Fisiere MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>Editor jurnale APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Toate fisierele</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Doriți să salvați modificările?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[cache local pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[intregistrare din cloud pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Deschideți înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Se contactează serviciul cloud</translation> </message> @@ -5407,7 +5450,7 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Georeferință</translation> </message> @@ -5581,7 +5624,7 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>Afișează adâncimea medie în Profil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6016,7 +6059,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>zecimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Unități</translation> </message> @@ -6152,128 +6195,133 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation>(#%1 din %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Calculator de scufundări necunoscut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Adaugă gazul modificat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Definește ca primul computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Scufundare planificată</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Scufundare adăugată manual</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Șterge acest computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (but. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Adaugă schimbare de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Adaugă marcaj</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation>Schimba modul de scufundare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Modifică profilul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Șterge evenimentul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Ascunde evenimente similare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Modifică numele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusteza presiuneal but. %1 (mementan interpolata ca %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Arată toate evenimentele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Ascunde evenimente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Ascunde toate %1 evenimentele?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Înlătură evenimentul selectat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Modifică numele marcajului</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Nume presonalizat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Numele este prea lung</translation> </message> @@ -6281,146 +6329,146 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <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="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <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="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <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="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>operare în mod local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Eroare in parsarea stocarii locale, se renunta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>utilizator/parola pentru cloud lipsesc</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Va rugam introduceti utilizator/parola pentru cloud valide.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Format invalid a adresei de e-mail</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Incercare accesare cloud cu noile utilizator/parola</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Testare utilizator/parola cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Nici un raspuns de la serverul cloud pentru validarea utilizatorului/parola</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Utilizator/parola cloud incorecte</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Nu se poate conecta la cloud - contul cloud nu este verificat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Utilizator/parola cloud invalive</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Nu se poate accesa cloud: Nu se poate realiza conexiunea https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Nu se poate deschide cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Nu se poate conecta la cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Utilizator/parola cloud valide, incacare scufundari...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Eroare cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Incarcare scufundari de pe local (mod 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Eroare de conectare la serverul cloud, revenire la local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Accesare cloud cu succes. Nici o scufundare in tabel.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Locatie GPS necunoscuta</translation> </message> @@ -6434,175 +6482,6 @@ Va rugam exportati sablonul in alt fisier.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Asteapta sa obtina date GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>picioare</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>livre</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>livre pe inch pătrat</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>AER</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n scufundare(i))</numerusform><numerusform>(%n scufundare(i))</numerusform><numerusform>(%n scufundare(i))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXIGEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>picioare cubice</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>necunoscut</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Elimină acest punct</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Medie</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minim</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maxim</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Răspuns invalid de la server</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Tag XML așteptat 'DiveDateReader', dar s-a întâmpinat „%1”</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Tag-ul XML așteptat 'DiveDates' nu a fost găsit</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Răspuns XML incorect. Linia %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Nu exista categorii setate in preferinte pentru planul locatiei de scufundare!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Etichete</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Nu salva un jurnal gol in cloud</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8794,12 +8673,16 @@ Medie</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> @@ -8810,6 +8693,7 @@ Medie</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>picioare cubice</translation> </message> @@ -8817,6 +8701,8 @@ Medie</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8824,6 +8710,8 @@ Medie</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>picioare</translation> </message> @@ -8851,6 +8739,8 @@ Medie</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>livre</translation> </message> @@ -8858,6 +8748,8 @@ Medie</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9095,6 +8987,7 @@ Medie</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>necunoscut</translation> @@ -9328,12 +9221,12 @@ Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarca </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Scufundari incarcate din cache local</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Date de scufundare accesate cu succes</translation> </message> @@ -9987,19 +9880,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>AER</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mai mult de %1 zile</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXIGEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10098,6 +10019,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Costum</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Nu exista categorii setate in preferinte pentru planul locatiei de scufundare!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Etichete</translation> @@ -10586,13 +10513,33 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Durată:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Adâncime maximă:</translation> @@ -10733,30 +10680,80 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Oras</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>Start salvare date</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>Start salvare scufundari</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>Creare cache local terminat</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Pregatire salvare date</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation>schimbare mod</translation> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Asteapta sa obtina date GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Elimină acest punct</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Nu salva un jurnal gol in cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Medie</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minim</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maxim</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Răspuns invalid de la server</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Tag XML așteptat 'DiveDateReader', dar s-a întâmpinat „%1”</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Tag-ul XML așteptat 'DiveDates' nu a fost găsit</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Răspuns XML incorect. Linia %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index d4ed60998..33b1b3a55 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Регистрация</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Войти или зарегистрироваться</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth выключен</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Производитель : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Дайв-компьютер:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Соединение:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Сканировать директории с фото</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>Повторить</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>Облачное хранилище подключено</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Сканировать директории с фото</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Сканировать</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>Поиск изображений, подождите...</translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4839,12 +4882,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4858,213 +4901,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>Файлы MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5398,7 +5441,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Геопоиск</translation> </message> @@ -5572,7 +5615,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Показывать среднюю глубину на профиле</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Профиль</translation> </message> @@ -6004,7 +6047,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>десятичное</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Единицы</translation> </message> @@ -6139,128 +6182,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6268,146 +6316,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6421,175 +6469,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Ожидание местоположения GPS</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>м</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>фут</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>кг</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>фунт</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>бар</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>воздух</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n дайв)</numerusform><numerusform>(%n дайва)</numerusform><numerusform>(%n дайвов)</numerusform><numerusform>(%n dive(s))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>КИСЛОРОД</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>л</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>куб. фут</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>неизвестно</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>мин</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>ч</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>с</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Удалить эту точку</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Среднее</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Минимум</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Максимум</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Неверный ответ сервера</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>XML тег 'DiveDates' не найден</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Неверный XML ответ. Строка %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Метки</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8780,12 +8659,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8796,6 +8679,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -8803,6 +8687,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>м</translation> </message> @@ -8810,6 +8696,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>фут</translation> </message> @@ -8837,6 +8725,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>фунт</translation> </message> @@ -8844,6 +8734,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>кг</translation> </message> @@ -9081,6 +8973,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>неизвестно</translation> @@ -9311,12 +9204,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9968,19 +9861,47 @@ EADD: %d%s / %.1fг/л </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>воздух</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>КИСЛОРОД</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>л</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10079,6 +10000,12 @@ EADD: %d%s / %.1fг/л <translation>Костюм</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Метки</translation> @@ -10567,13 +10494,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Длительность:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>мин</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>ч</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>с</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Макс. глуб.:</translation> @@ -10714,30 +10661,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Ожидание местоположения GPS</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Удалить эту точку</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Среднее</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Минимум</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Максимум</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Неверный ответ сервера</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>XML тег 'DiveDates' не найден</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Неверный XML ответ. Строка %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index d4cf1f9f1..c949c1fae 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3690,9 +3690,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Stiahnutie</translation> </message> @@ -3718,7 +3718,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -3733,57 +3733,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Skús znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Koniec</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Vybrať všetky</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3920,6 +3920,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4427,7 +4486,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Otvor</translation> </message> @@ -4723,13 +4782,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4769,57 +4828,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Upozornenie</translation> </message> @@ -4829,12 +4872,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4848,212 +4891,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5385,7 +5428,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5559,7 +5602,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5991,7 +6034,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Jednotky</translation> </message> @@ -6126,128 +6169,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Pridať Bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Vymazať udalosť</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Schovaj podobné udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Editovať meno</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Zobraziť všetky udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Schovaj udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Schovať všetky %1 udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Zmazať vybrané udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Editovať meno záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Voliteľné meno:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Príliš dlhý názov!</translation> </message> @@ -6255,146 +6303,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6408,175 +6456,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>US libra</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>Vzduch</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>KYSLÍK</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>neznámy</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Odstrániť tento bod</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Priemer</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Neplatná odpoveď zo servera</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Očakávaný XML tag 'DiveDates' nebol nájdený</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Značky</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8752,12 +8631,16 @@ Maximum</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8768,6 +8651,7 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8775,6 +8659,8 @@ Maximum</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8782,6 +8668,8 @@ Maximum</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8809,6 +8697,8 @@ Maximum</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>US libra</translation> </message> @@ -8816,6 +8706,8 @@ Maximum</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9053,6 +8945,7 @@ Maximum</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>neznámy</translation> @@ -9281,12 +9174,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9927,19 +9820,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>Vzduch</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>KYSLÍK</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10038,6 +9959,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Oblek</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Značky</translation> @@ -10521,13 +10448,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Trvanie:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. hĺbka:</translation> @@ -10668,30 +10615,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Odstrániť tento bod</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Priemer</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maximum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Neplatná odpoveď zo servera</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Očakávaný XML tag 'DiveDates' nebol nájdený</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index a09011fa8..b333c0ff4 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>Registrera</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>Logga in eller resistrera</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>Molnfritt läge</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Verifikation av molnkonto krävs, ange PIN i inställningarna</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>Ladda ned</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Blåtand är inte aktiverad</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>Tillverkar namn:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>Dykdator:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>Anslutning:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Försök igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Avsluta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>Ny sökning</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>Nerladdade dyk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Markera Samtliga</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>Avmarkera alla</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>Traversera bild kataloger</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Öppna</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>&Ångra</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>&Gör om</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>Molnlagring aktiv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>Anslut till</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>Kopplan ner från</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>Traversera bild kataloger</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>Sök</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <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="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Varning</translation> </message> @@ -4839,12 +4882,12 @@ p, li { white-space: pre-wrap; } <translation>Försöker slå ihop dyk med %1min interval emellan. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>Templat kopia skapad</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4858,213 +4901,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du går online.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>Aktivering av molnlagring misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>dykloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD loggvisare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>Alla filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <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="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[lokal cache för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[molnlagring för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <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="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>Kontaktar molntjänst...</translation> </message> @@ -5399,7 +5442,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>Geografisk referens</translation> </message> @@ -5573,7 +5616,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>Visa medeldjup i profilen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -6005,7 +6048,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>decimal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Enheter</translation> </message> @@ -6141,128 +6184,133 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>Okänd dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <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> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>Planera dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>Manuellt tillagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>Ta bort denna dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation>(cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>Lägg till setpoint byte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>Editera profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>Namnet är för långt!</translation> </message> @@ -6270,146 +6318,146 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>Startar...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>Öppna lokal dyklogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>Öppnande av lokal dyklogg misslyckades</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dyk ladade från lokal dyklogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>Arbetar i molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>Kunde inte läsa lokal lagring, ger upp.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>inga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>Vänligen ange giltiga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>Ogiltigt format för epostadress</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <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="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>Testar moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <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="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>Felaktiga molnreferenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>Moln referenser är ogiltiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <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="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>Kan inte öppna molnlagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>Kan inte ansluta till moln lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>Molnreferenser giltiga, läser in dyk...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>Molnlagrings fel: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Läser in dyk från lokal lagring ('molnfritt' läge)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <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="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>Okänd GPS position</translation> </message> @@ -6423,175 +6471,6 @@ Vänligen exportera mallen till en ny fil.</translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>Väntar på att få GPS position</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>pund</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>LUFT</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n dyka)</numerusform><numerusform>(%n dyk)</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXYGEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>ft³</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>okänd</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>Min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sek</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Ta bort denna punkt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Genomsnitt</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Ogiltigt svar från server</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Felformaterat XML svar. Rad %1: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>Inga kategorier för att arrangera dykplatser är konfigurerade i inställningar!</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Taggar</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>Spara inte en tom logbok i molnet</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8779,12 +8658,16 @@ Medel</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8795,6 +8678,7 @@ Medel</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -8802,6 +8686,8 @@ Medel</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8809,6 +8695,8 @@ Medel</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8836,6 +8724,8 @@ Medel</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>pund</translation> </message> @@ -8843,6 +8733,8 @@ Medel</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9080,6 +8972,7 @@ Medel</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>okänd</translation> @@ -9312,12 +9205,12 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>Dyk ladade från lokal buffert</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>Lyckades med att öppna dykdata</translation> </message> @@ -9970,19 +9863,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>LUFT</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>mer än %1 dagar</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXYGEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10081,6 +10002,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Dräkt</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Inga kategorier för att arrangera dykplatser är konfigurerade i inställningar!</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Taggar</translation> @@ -10569,13 +10496,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Varaktighet:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>Min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sek</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maximalt djup</translation> @@ -10716,30 +10663,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation>Färdig med att skapa en lokal buffert</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>Förbereder att spara data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>Väntar på att få GPS position</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Ta bort denna punkt</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>Spara inte en tom logbok i molnet</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Genomsnitt</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Minimum</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Maximum</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Ogiltigt svar från server</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Felformaterat XML svar. Rad %1: %2</translation> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 3d27a09aa..8917eacf8 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3687,9 +3687,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>İndir</translation> </message> @@ -3715,7 +3715,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -3730,57 +3730,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Yeniden dene</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Uygula</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>Tümünü Seç</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3917,6 +3917,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4424,7 +4483,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>Aç</translation> </message> @@ -4720,13 +4779,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4766,57 +4825,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>Dosya aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Uyarı</translation> </message> @@ -4826,12 +4869,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4845,212 +4888,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>Yıllık istatistikler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5382,7 +5425,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5556,7 +5599,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5988,7 +6031,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Birimler</translation> </message> @@ -6123,128 +6166,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>Gaz değişimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>Yerimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>OLay kaldır</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Benzer olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>İsmi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>Olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <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="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>Yeriminde ismi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>Özel isim:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>İsim çok uzun!</translation> </message> @@ -6252,146 +6300,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6405,175 +6453,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>fit</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>libre</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>HAVA</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>fitküp</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>bilinmeyen</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>dak</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>Bu noktayı kaldır</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Ortalama</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Asgari</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Azami</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>Sunucudan geçersiz yanıt</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>Etiketler</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8755,12 +8634,16 @@ Ortalama</translation> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -8771,6 +8654,7 @@ Ortalama</translation> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation type="unfinished"/> </message> @@ -8778,6 +8662,8 @@ Ortalama</translation> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8785,6 +8671,8 @@ Ortalama</translation> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>fit</translation> </message> @@ -8812,6 +8700,8 @@ Ortalama</translation> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>libre</translation> </message> @@ -8819,6 +8709,8 @@ Ortalama</translation> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9056,6 +8948,7 @@ Ortalama</translation> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>bilinmeyen</translation> @@ -9284,12 +9177,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9913,19 +9806,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>HAVA</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation type="unfinished"/> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10024,6 +9945,12 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>Etiketler</translation> @@ -10507,13 +10434,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Süre:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>dak</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10654,30 +10601,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>Bu noktayı kaldır</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Ortalama</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Asgari</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Azami</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>Sunucudan geçersiz yanıt</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index d5fdba106..7d70b7984 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -378,22 +378,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> @@ -401,7 +401,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation type="unfinished"/> </message> @@ -3686,9 +3686,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3714,7 +3714,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3729,57 +3729,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>Thử lại</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>Thoát</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3916,6 +3916,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -4423,7 +4482,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4719,13 +4778,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4765,57 +4824,41 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4825,12 +4868,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4844,212 +4887,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <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="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5381,7 +5424,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation type="unfinished"/> </message> @@ -5555,7 +5598,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>Hồ sơ</translation> </message> @@ -5987,7 +6030,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>Đơn vị</translation> </message> @@ -6122,128 +6165,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6251,146 +6299,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <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="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6404,175 +6452,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>ký</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>KHÔNG KHÍ</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>chưa rõ</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>nhỏ nhất</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>Trung bình</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>Nhỏ nhất</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>Tối đa</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -8738,12 +8617,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8754,6 +8637,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8761,6 +8645,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8768,6 +8654,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8795,6 +8683,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8802,6 +8692,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>ký</translation> </message> @@ -9039,6 +8931,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>chưa rõ</translation> @@ -9267,12 +9160,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9889,19 +9782,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>KHÔNG KHÍ</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10000,6 +9921,12 @@ EADD: %d%s / %.1fg/ℓ <translation>Đồ lặn</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation type="unfinished"/> @@ -10483,13 +10410,33 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10630,30 +10577,80 @@ 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="951"/> <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="960"/> <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="993"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>Trung bình</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>Nhỏ nhất</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>Tối đa</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 37dce0090..1b2783479 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -33,7 +33,7 @@ <message> <location filename="../mobile-widgets/qml/About.qml" line="62"/> <source>Copy logs to clipboard</source> - <translation type="unfinished"/> + <translation>複製日誌到剪貼簿</translation> </message> </context> <context> @@ -382,22 +382,22 @@ <translation>PIN</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/> <source>Register</source> <translation>註冊</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/> <source>Sign-in or Register</source> <translation>登入或註冊</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> <translation>無雲端模式</translation> </message> @@ -405,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="64"/> + <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>雲端帳號需要認證, 請於設置頁面輸入密碼</translation> </message> @@ -3699,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> <source>Download</source> <translation>下載</translation> </message> @@ -3727,7 +3727,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="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -3742,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>藍芽未被啟用</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> <source> Vendor name: </source> <translation>廠商名稱: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> <source> Dive Computer:</source> <translation>潛水電腦:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation>連線:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> <source>Retry</source> <translation>重試</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> <source>Quit</source> <translation>結束</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Rescan</source> <translation>重新掃描</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> <source> Downloaded dives</source> <translation>下載潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Info:</source> <translation>資訊:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="263"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> <source>Select All</source> <translation>選擇全部</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Unselect All</source> <translation>取消選取</translation> </message> @@ -3929,6 +3929,65 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FindMovedImagesDialog</name> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <source>Find moved images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <source>Found images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <source>Match only images in selected dive(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <source>Scanning:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <source>Select folder and scan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <source>Traverse image directories</source> + <translation>經過照片路徑</translation> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <source>Stop scanning</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <source>Scanning cancelled - results may be incomplete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <source>No matching images found</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <source>Found <b>%1</b> images at their current place.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <source>Found <b>%1</b> images at new locations:</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FirmwareUpdateThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> @@ -3998,7 +4057,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../core/gpslocation.cpp" line="135"/> <source>Unknown GPS location (no GPS source)</source> - <translation type="unfinished"/> + <translation>未知的GPS位置 (無GPS來源)</translation> </message> </context> <context> @@ -4437,7 +4496,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> <source>Open</source> <translation>開啟</translation> </message> @@ -4733,13 +4792,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Undo</source> <translation>復原</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Redo</source> <translation>取消還原</translation> </message> @@ -4779,57 +4838,41 @@ p, li { white-space: pre-wrap; } <translation>線上雲端儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> <source>Connect to</source> <translation>連結至</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Disconnect from</source> <translation>從中斷</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> <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="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> - <source>Traverse image directories</source> - <translation>經過照片路徑</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <source>Scan</source> - <translation>掃描</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <source>Scanning images...(this can take a while)</source> - <translation>掃描影像...(需要稍待一段時間)</translation> - </message> - <message> <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="753"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>提醒</translation> </message> @@ -4839,12 +4882,12 @@ p, li { white-space: pre-wrap; } <translation>以 %1 min 時間區間嘗試合併潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>Template backup created</source> <translation>儲存備份範本</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>The following backup printing templates were created: %1 @@ -4866,213 +4909,214 @@ can overwrite them on startup.</source> 且是自程式啟動覆蓋設定後, 無法直接編輯.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Please save or cancel the current dive edit before going online</source> <translation>前往線上版之前請先儲存或取消目前的日誌修改</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> - <translation type="unfinished"/> + <translation>有未儲存的變更. 想要上傳至雲端空間嗎? +如果選擇否, 雲端只會在下一次點選"開啟雲端空間", 或"儲存至雲端空間"選項時, 才會進行同步.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> <source>Failure taking cloud storage online</source> <translation>取得線上雲端儲存失敗</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <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="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>Dive log files</source> <translation>潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> <source>Subsurface files</source> <translation>Subsurface檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> <source>MkVI files</source> <translation>MkVI檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> <source>APD log viewer</source> <translation>APD日誌瀏覽器</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>OSTCtools</source> <translation>OSTC工具</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> <source>All files</source> <translation>全部檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <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="686"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> <source>Save changes?</source> <translation>儲存變更? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存，所做變更將會遺失。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> <source>[local cache for] %1</source> <translation>[本地端暫存] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> <source>[cloud storage for] %1</source> <translation>[雲端裝置] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> <source>Opening datafile from older version</source> <translation>從較舊的版本中開啟資料檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> <source>Contacting cloud service...</source> <translation>聯絡雲端服務...</translation> </message> @@ -5098,17 +5142,17 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛 <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open in Google Maps</source> - <translation type="unfinished"/> + <translation>在Google地圖下開啟</translation> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy coordinates to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>複製位置至剪貼簿 (十進制)</translation> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy coordinates to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>複製位置至剪貼簿 (六十進制)</translation> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> @@ -5407,7 +5451,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>/</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/> <source>Georeference</source> <translation>座標參考</translation> </message> @@ -5512,22 +5556,22 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/> <source>Show O₂ sensor values when viewing pO₂</source> - <translation type="unfinished"/> + <translation>當查看pO₂時, 顯示O₂感測器數值</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/> <source>Show CCR setpoints when viewing pO₂</source> - <translation type="unfinished"/> + <translation>當查看pO₂時, 顯示CCR設定點</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/> <source>pSCR metabolic rate O₂</source> - <translation type="unfinished"/> + <translation>pSCR 代謝速率 O₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/> <source>Show equivalent OC pO₂ with pSCR pO₂</source> - <translation type="unfinished"/> + <translation>依 pSCR pO₂ 顯示等化的 OC pO₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/> @@ -5542,7 +5586,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="374"/> <source>Recalculate thumbnails if older than image</source> - <translation type="unfinished"/> + <translation>當縮圖太舊時重新產生</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5581,7 +5625,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>於資料中顯示平均深度</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> <source>Profile</source> <translation>資訊</translation> </message> @@ -5799,12 +5843,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> - <translation type="unfinished"/> + <translation>忽略變更. 雲端空間帳號的 email 與密碼, 只能以字母, 數字, 和 '.', '-', '_', '+' 組成.</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> - <translation type="unfinished"/> + <translation>忽略變更. 雲端空間帳號的 email 與新密碼, 只能以字母, 數字, 和 '.', '-', '_', '+' 組成.</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> @@ -6016,7 +6060,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>十進制</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/> + <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/> <source>Units</source> <translation>單位</translation> </message> @@ -6108,7 +6152,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <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"/> + <translation>範本 '%1' 是唯讀且無法被編輯. +請匯出此範本至不同檔案.</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="148"/> @@ -6151,128 +6196,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="790"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="794"/> <source>Unknown dive computer</source> <translation>未知的潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="814"/> + <location filename="../profile-widget/profilewidget2.cpp" line="822"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>當超過處理時間，顯示關閉 NDL / TTS</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Make first dive computer</source> <translation>設定優先潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source>Planned dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="792"/> <source>Manually added dive</source> <translation>手動新增潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> <source>Delete this dive computer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add setpoint change</source> <translation>增加設置點變更</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1429"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <source>Change divemode</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1431"/> + <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> + <source>Change divemode</source> + <translation>變更潛水模式</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Edit the profile</source> <translation>編輯摘要</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1481"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1512"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1519"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>調整氣瓶壓力 %1 (目前添加為 %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件？</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1756"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1762"/> <source>Name is too long!</source> <translation>名稱太長！</translation> </message> @@ -6280,146 +6330,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Starting...</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> <source>Open local dive data file</source> <translation>開啟本機端潛水資料檔</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> <source>Opening local data file failed</source> <translation>開啟本機端檔案失敗</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Error parsing local storage, giving up</source> <translation>本機端解析錯誤, 中斷</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="420"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> <source>Invalid format for email address</source> <translation>錯誤的email格式</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Attempting to open cloud storage with new credentials</source> <translation>嘗試使用新的憑證開啟雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Testing cloud credentials</source> <translation>測試雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>No response from cloud server to validate the credentials</source> <translation>雲端伺服器認證憑證無回應</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> <translation>不正確的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>無法連結雲端儲存 - 未認證的帳號</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="580"/> <source>Cloud credentials are invalid</source> <translation>不合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Cannot open cloud storage: %1</source> <translation>無法開啟雲端儲存: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/> <source>Cannot connect to cloud storage</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> <source>Cloud credentials valid, loading dives...</source> <translation>雲端認證成功, 載入日誌</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>從本機端載入日誌 (本機模式)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -6433,175 +6483,6 @@ Please export this template to a different file.</source> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="../core/gpslocation.h" line="14"/> - <source>Waiting to aquire GPS location</source> - <translation>等待擷取 GPS 位置</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1330"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1329"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="793"/> - <source>C</source> - <translation>C</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="795"/> - <source>F</source> - <translation>F</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1305"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1306"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1355"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1354"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>AIR</source> - <translation>空氣</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="872"/> - <source>EAN</source> - <translation>EAN</translation> - </message> - <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> - <source>(%n dive(s))</source> - <translation><numerusform>(%n dive(s))</numerusform></translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1282"/> - <source>OXYGEN</source> - <translation>OXYGEN</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1377"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../core/qthelper.cpp" line="1378"/> - <source>cuft</source> - <translation>cuft</translation> - </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> - <source>unknown</source> - <translation>未知</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="110"/> - <source>h</source> - <translation>h</translation> - </message> - <message> - <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> - <source>sec</source> - <translation>sec</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> - <source>Remove this point</source> - <translation>移除此點</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> - <source>Average</source> - <translation>平均</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> - <source>Minimum</source> - <translation>最低</translation> - </message> - <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> - <source>Maximum</source> - <translation>最高</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> - <source>Invalid response from server</source> - <translation>主機回傳不正確的回應.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>預期的 XML 標籤 'DiveDateReader', 取代了 '%1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>無法找到預期的 XML 標籤 'DiveDates'</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>異常的 XML 回應. 第 %1 行: %2</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="20"/> - <source>No dive site layout categories set in preferences!</source> - <translation>設置頁面裡無潛點輸出類別設定</translation> - </message> - <message> - <location filename="../core/divesite-helper.cpp" line="28"/> - <source>Tags</source> - <translation>標籤</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <source>Don't save an empty log to the cloud</source> - <translation>無法上傳空白日誌至雲端</translation> - </message> -</context> -<context> <name>ReadSettingsThread</name> <message> <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> @@ -7170,7 +7051,7 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/> <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 button 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="50"/> @@ -7423,7 +7304,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> <source>Recalculate selected thumbnails</source> - <translation type="unfinished"/> + <translation>重新產生選擇的縮圖</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> @@ -7818,7 +7699,7 @@ mixed from Air and using: <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/ToolBarApplicationHeader.qml" line="125"/> <source>More Actions</source> - <translation type="unfinished"/> + <translation>變更動作</translation> </message> </context> <context> @@ -8794,12 +8675,16 @@ Maximum</source> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> <location filename="../core/qthelper.cpp" line="655"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1311"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="304"/> <location filename="../core/qthelper.cpp" line="658"/> + <location filename="../core/qthelper.cpp" line="849"/> + <location filename="../core/qthelper.cpp" line="1310"/> <source>psi</source> <translation>psi</translation> </message> @@ -8810,6 +8695,7 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="346"/> + <location filename="../core/qthelper.cpp" line="1334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -8817,6 +8703,8 @@ Maximum</source> <location filename="../core/dive.c" line="387"/> <location filename="../core/qthelper.cpp" line="571"/> <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="1286"/> <source>m</source> <translation>m</translation> </message> @@ -8824,6 +8712,8 @@ Maximum</source> <location filename="../core/dive.c" line="392"/> <location filename="../core/qthelper.cpp" line="574"/> <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="1285"/> <source>ft</source> <translation>ft</translation> </message> @@ -8851,6 +8741,8 @@ Maximum</source> <location filename="../core/dive.c" line="443"/> <location filename="../core/qthelper.cpp" line="597"/> <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="822"/> + <location filename="../core/qthelper.cpp" line="1262"/> <source>lbs</source> <translation>lbs</translation> </message> @@ -8858,6 +8750,8 @@ Maximum</source> <location filename="../core/dive.c" line="447"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="820"/> + <location filename="../core/qthelper.cpp" line="1261"/> <source>kg</source> <translation>kg</translation> </message> @@ -9095,6 +8989,7 @@ Maximum</source> <message> <location filename="../core/import-divinglog.c" line="314"/> <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>未知</translation> @@ -9294,7 +9189,8 @@ Maximum</source> <location filename="../core/libdivecomputer.c" line="1389"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> - <translation type="unfinished"/> + <translation>開啟裝置錯誤 %s %s (%s). +在多數情況下, 為了追蹤此問題, 將日誌檔案傳送給開發者, 是有幫助的. 您可以在關於頁面點選按鈕來複製至剪貼簿. </translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1391"/> @@ -9327,12 +9223,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1663"/> <source>Load dives from local cache</source> <translation>自本機端載入潛水</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1667"/> <source>Successfully opened dive data</source> <translation>成功開啟潛水資料</translation> </message> @@ -9575,18 +9471,18 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="236"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)</source> - <translation type="unfinished"/> + <translation>停留於 %.*f %s for %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar CCR)</translation> </message> <message> <location filename="../core/plannernotes.c" line="243"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s</source> - <translation type="unfinished"/> + <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation> </message> <message> <location filename="../core/plannernotes.c" line="309"/> <location filename="../core/plannernotes.c" line="332"/> <source>(SP = %.1fbar CCR)</source> - <translation type="unfinished"/> + <translation>(SP = %.1fbar CCR)</translation> </message> <message> <location filename="../core/plannernotes.c" line="402"/> @@ -9869,7 +9765,8 @@ EADD: %d%s / %.1fg/ℓ <location filename="../core/profile.c" line="1510"/> <source>ICD in leading tissue </source> - <translation type="unfinished"/> + <translation>領先組織的 ICD +</translation> </message> <message> <location filename="../core/profile.c" line="1512"/> @@ -9978,19 +9875,47 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/qthelper.cpp" line="616"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> <location filename="../core/qthelper.cpp" line="619"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="870"/> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>AIR</source> + <translation>空氣</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="872"/> + <source>EAN</source> + <translation>EAN</translation> + </message> + <message> <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation>超過 %1 日</translation> </message> + <message numerus="yes"> + <location filename="../core/qthelper.cpp" line="1010"/> + <source>(%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1238"/> + <source>OXYGEN</source> + <translation>OXYGEN</translation> + </message> + <message> + <location filename="../core/qthelper.cpp" line="1333"/> + <source>l</source> + <translation>l</translation> + </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> @@ -10089,6 +10014,12 @@ EADD: %d%s / %.1fg/ℓ <translation>防寒衣</translation> </message> <message> + <location filename="../core/divesite-helper.cpp" line="21"/> + <source>No dive site layout categories set in preferences!</source> + <translation>設置頁面裡無潛點輸出類別設定</translation> + </message> + <message> + <location filename="../core/divesite-helper.cpp" line="29"/> <location filename="../core/save-html.c" line="511"/> <source>Tags</source> <translation>標籤</translation> @@ -10577,13 +10508,33 @@ Uemis Zurich 已正確插入？</translation> <translation>時間:</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../core/divelogexportlogic.cpp" line="56"/> + <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/qthelper.h" line="73"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <source>sec</source> + <translation>sec</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>最大深度</translation> @@ -10724,29 +10675,79 @@ Uemis Zurich 已正確插入？</translation> <translation>城市</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="951"/> <source>Start saving data</source> <translation>開始儲存資料</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="960"/> <source>Start saving dives</source> <translation>開始儲存潛水記錄</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="993"/> <source>Done creating local cache</source> <translation>分配本機端空間成功</translation> </message> <message> - <location filename="../core/save-git.c" line="1245"/> + <location filename="../core/save-git.c" line="1241"/> <source>Preparing to save data</source> <translation>準備儲存資料</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1632"/> <source>modechange</source> - <translation type="unfinished"/> + <translation>模式變更</translation> + </message> + <message> + <location filename="../core/gpslocation.h" line="14"/> + <source>Waiting to aquire GPS location</source> + <translation>等待擷取 GPS 位置</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> + <source>Remove this point</source> + <translation>移除此點</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <source>Don't save an empty log to the cloud</source> + <translation>無法上傳空白日誌至雲端</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> + <source>Average</source> + <translation>平均</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> + <source>Minimum</source> + <translation>最低</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> + <source>Maximum</source> + <translation>最高</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <source>Invalid response from server</source> + <translation>主機回傳不正確的回應.</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>預期的 XML 標籤 'DiveDateReader', 取代了 '%1</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>無法找到預期的 XML 標籤 'DiveDates'</translation> + </message> + <message> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>異常的 XML 回應. 第 %1 行: %2</translation> </message> </context> <context> @@ -10769,7 +10770,7 @@ Uemis Zurich 已正確插入？</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="275"/> <source>Disable auto cloud sync</source> - <translation type="unfinished"/> + <translation>關閉雲端同步</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="275"/> |