diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
-rw-r--r-- | translations/subsurface_ru_RU.ts | 422 |
1 files changed, 211 insertions, 211 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index d7a769479..c7e180856 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -3041,62 +3041,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="164"/> + <location filename="../qt-models/diveplannermodel.cpp" line="169"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="265"/> + <location filename="../qt-models/diveplannermodel.cpp" line="270"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="369"/> + <location filename="../qt-models/diveplannermodel.cpp" line="376"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="378"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="380"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="382"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="384"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="386"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1031"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1034"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1081"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -4434,7 +4434,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -4730,13 +4730,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="245"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation>Повторить</translation> </message> @@ -4776,57 +4776,57 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="409"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1650"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="565"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="610"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> <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="570"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2046"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="575"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="720"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="716"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="718"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="726"/> + <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="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="752"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="906"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1024"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1907"/> + <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"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4836,12 +4836,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="266"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> <source>The following backup printing templates were created: %1 @@ -4855,213 +4855,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> <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="686"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> <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="696"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="697"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="793"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="794"/> <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="906"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> <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="966"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1024"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1148"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> - <source>Subsurface files</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <source>Cochran</source> + <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> - <source>DiveLogs.de</source> + <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <source>Cochran</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> - <source>JDiveLog</source> + <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"/> - <source>Liquivision</source> + <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> - <source>Suunto</source> + <source>Liquivision</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> - <source>UDCF</source> + <source>Suunto</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> - <source>UDDF</source> - <translation>UDDF</translation> + <source>UDCF</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> - <source>XML</source> - <translation type="unfinished"/> + <source>UDDF</source> + <translation>UDDF</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> - <source>Divesoft</source> + <source>XML</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> - <source>Datatrak/WLog</source> + <source>Divesoft</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> - <source>MkVI files</source> + <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"/> - <source>APD log viewer</source> + <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"/> - <source>OSTCtools</source> + <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"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1467"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> <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="1470"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> <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="685"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1475"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1768"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1860"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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="1872"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1873"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2046"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -6425,79 +6425,79 @@ Please export this template to a different file.</source> <translation>Ожидание местоположения GPS</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1331"/> + <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="768"/> - <location filename="../core/qthelper.cpp" line="1330"/> + <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="794"/> + <location filename="../core/qthelper.cpp" line="793"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="795"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1306"/> + <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="823"/> - <location filename="../core/qthelper.cpp" line="1307"/> + <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="848"/> - <location filename="../core/qthelper.cpp" line="1356"/> + <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="850"/> - <location filename="../core/qthelper.cpp" line="1355"/> + <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="871"/> - <location filename="../core/qthelper.cpp" line="1283"/> + <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="873"/> + <location filename="../core/qthelper.cpp" line="872"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1011"/> + <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="1283"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1378"/> + <location filename="../core/qthelper.cpp" line="1377"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1379"/> + <location filename="../core/qthelper.cpp" line="1378"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -6581,7 +6581,7 @@ Please export this template to a different file.</source> <translation>Метки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -8751,8 +8751,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="36"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1163"/> - <location filename="../core/planner.c" line="1166"/> + <location filename="../core/planner.c" line="1161"/> + <location filename="../core/planner.c" line="1164"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8776,13 +8776,13 @@ Maximum</source> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="656"/> + <location filename="../core/qthelper.cpp" line="655"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="659"/> + <location filename="../core/qthelper.cpp" line="658"/> <source>psi</source> <translation>psi</translation> </message> @@ -8798,15 +8798,15 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="572"/> - <location filename="../core/qthelper.cpp" line="587"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="586"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="575"/> - <location filename="../core/qthelper.cpp" line="589"/> + <location filename="../core/qthelper.cpp" line="574"/> + <location filename="../core/qthelper.cpp" line="588"/> <source>ft</source> <translation>фут</translation> </message> @@ -8832,23 +8832,23 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="598"/> - <location filename="../core/qthelper.cpp" line="608"/> + <location filename="../core/qthelper.cpp" line="597"/> + <location filename="../core/qthelper.cpp" line="607"/> <source>lbs</source> <translation>фунт</translation> </message> <message> <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="596"/> - <location filename="../core/qthelper.cpp" line="606"/> + <location filename="../core/qthelper.cpp" line="595"/> + <location filename="../core/qthelper.cpp" line="605"/> <source>kg</source> <translation>кг</translation> </message> <message> <location filename="../core/divelist.c" line="683"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1159"/> - <location filename="../core/planner.c" line="1162"/> + <location filename="../core/planner.c" line="1157"/> + <location filename="../core/planner.c" line="1160"/> <source>air</source> <translation>воздух</translation> </message> @@ -9346,70 +9346,70 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="112"/> + <location filename="../core/plannernotes.c" line="115"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="106"/> + <location filename="../core/plannernotes.c" line="109"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Расчет деко прекращен из-за большой длительности</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <location filename="../core/plannernotes.c" line="453"/> - <location filename="../core/plannernotes.c" line="459"/> - <location filename="../core/plannernotes.c" line="498"/> - <location filename="../core/plannernotes.c" line="531"/> - <location filename="../core/plannernotes.c" line="565"/> + <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="464"/> + <location filename="../core/plannernotes.c" line="470"/> + <location filename="../core/plannernotes.c" line="509"/> + <location filename="../core/plannernotes.c" line="542"/> <location filename="../core/plannernotes.c" line="576"/> + <location filename="../core/plannernotes.c" line="587"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="398"/> + <location filename="../core/plannernotes.c" line="409"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="324"/> + <location filename="../core/planner.c" line="322"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> <source>SP change</source> <translation>изменение SP</translation> </message> <message> - <location filename="../core/plannernotes.c" line="95"/> + <location filename="../core/plannernotes.c" line="98"/> <source>VPM-B</source> <translation>VPM-B</translation> </message> <message> - <location filename="../core/plannernotes.c" line="97"/> + <location filename="../core/plannernotes.c" line="100"/> <source>BUHLMANN</source> <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="149"/> + <location filename="../core/plannernotes.c" line="152"/> <source>Runtime: %dmin<br></div></source> <translation>Рантайм: %dмин<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="153"/> + <location filename="../core/plannernotes.c" line="156"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/plannernotes.c" line="155"/> + <location filename="../core/plannernotes.c" line="158"/> <source>duration</source> <translation>длительность</translation> </message> <message> <location filename="../core/plannernotes.c" line="49"/> - <location filename="../core/plannernotes.c" line="157"/> + <location filename="../core/plannernotes.c" line="160"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/plannernotes.c" line="159"/> + <location filename="../core/plannernotes.c" line="162"/> <source>gas</source> <translation>смесь</translation> </message> @@ -9434,213 +9434,213 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="229"/> - <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> - <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="236"/> - <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> - <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="282"/> + <location filename="../core/plannernotes.c" line="290"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="286"/> - <location filename="../core/plannernotes.c" line="291"/> + <location filename="../core/plannernotes.c" line="294"/> + <location filename="../core/plannernotes.c" line="299"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/plannernotes.c" line="301"/> - <location filename="../core/plannernotes.c" line="323"/> - <source>(SP = %.1fbar)</source> - <translation>(SP = %.1fбар)</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="354"/> + <location filename="../core/plannernotes.c" line="365"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="356"/> + <location filename="../core/plannernotes.c" line="367"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="385"/> + <location filename="../core/plannernotes.c" line="396"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="386"/> + <location filename="../core/plannernotes.c" line="397"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="394"/> + <location filename="../core/plannernotes.c" line="405"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> </message> <message> - <location filename="../core/plannernotes.c" line="485"/> + <location filename="../core/plannernotes.c" line="496"/> <source>Minimum gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="486"/> + <location filename="../core/plannernotes.c" line="497"/> <source>based on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="488"/> + <location filename="../core/plannernotes.c" line="499"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="507"/> + <location filename="../core/plannernotes.c" line="518"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="512"/> + <location filename="../core/plannernotes.c" line="523"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="515"/> + <location filename="../core/plannernotes.c" line="526"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="121"/> - <location filename="../core/plannernotes.c" line="128"/> - <location filename="../core/plannernotes.c" line="136"/> + <location filename="../core/plannernotes.c" line="124"/> + <location filename="../core/plannernotes.c" line="131"/> + <location filename="../core/plannernotes.c" line="139"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="138"/> + <location filename="../core/plannernotes.c" line="141"/> <source>dive plan</b> (surface interval </source> <translation>план погружения</b> (поверх. интервал </translation> </message> <message> - <location filename="../core/plannernotes.c" line="140"/> + <location filename="../core/plannernotes.c" line="143"/> <source>created on</source> <translation>создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="130"/> + <location filename="../core/plannernotes.c" line="133"/> <source>dive plan</b> created on</source> <translation>план погружения</b> создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="126"/> <source>dive plan</b> (overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="146"/> + <location filename="../core/plannernotes.c" line="149"/> <source>Runtime: %dmin%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="206"/> + <location filename="../core/plannernotes.c" line="213"/> <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="207"/> - <location filename="../core/plannernotes.c" line="215"/> + <location filename="../core/plannernotes.c" line="214"/> + <location filename="../core/plannernotes.c" line="222"/> <source>Ascend</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="207"/> - <location filename="../core/plannernotes.c" line="215"/> + <location filename="../core/plannernotes.c" line="214"/> + <location filename="../core/plannernotes.c" line="222"/> <source>Descend</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="214"/> + <location filename="../core/plannernotes.c" line="221"/> <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="391"/> + <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"/> + </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"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="309"/> + <location filename="../core/plannernotes.c" line="332"/> + <source>(SP = %.1fbar CCR)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="402"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="396"/> + <location filename="../core/plannernotes.c" line="407"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="400"/> + <location filename="../core/plannernotes.c" line="411"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Рекреационный режим по модели Bühlmann ZHL-16B с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="408"/> + <location filename="../core/plannernotes.c" line="419"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="423"/> + <location filename="../core/plannernotes.c" line="434"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="425"/> + <location filename="../core/plannernotes.c" line="436"/> <source>Gas consumption (based on SAC</source> <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> + <location filename="../core/plannernotes.c" line="465"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="460"/> + <location filename="../core/plannernotes.c" line="471"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/plannernotes.c" line="499"/> + <location filename="../core/plannernotes.c" line="510"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="504"/> + <location filename="../core/plannernotes.c" line="515"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s из <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="532"/> + <location filename="../core/plannernotes.c" line="543"/> <source>Isobaric counterdiffusion conditions exceeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="563"/> + <location filename="../core/plannernotes.c" line="574"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="574"/> + <location filename="../core/plannernotes.c" line="585"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="895"/> + <location filename="../core/planner.c" line="893"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1167"/> + <location filename="../core/planner.c" line="1165"/> <source>ean</source> <translation>ean</translation> </message> @@ -9915,61 +9915,61 @@ EADD: %d%s / %.1fg/ℓ <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="66"/> + <location filename="../core/qthelper.cpp" line="65"/> <source>%1km</source> <translation>%1км</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="68"/> + <location filename="../core/qthelper.cpp" line="67"/> <source>%1m</source> <translation>%1м</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="72"/> + <location filename="../core/qthelper.cpp" line="71"/> <source>%1mi</source> <translation>%1миля</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="74"/> + <location filename="../core/qthelper.cpp" line="73"/> <source>%1yd</source> <translation>%1ярд</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="90"/> - <location filename="../core/qthelper.cpp" line="225"/> + <location filename="../core/qthelper.cpp" line="89"/> + <location filename="../core/qthelper.cpp" line="224"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="90"/> - <location filename="../core/qthelper.cpp" line="226"/> + <location filename="../core/qthelper.cpp" line="89"/> + <location filename="../core/qthelper.cpp" line="225"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="91"/> - <location filename="../core/qthelper.cpp" line="227"/> + <location filename="../core/qthelper.cpp" line="90"/> + <location filename="../core/qthelper.cpp" line="226"/> <source>E</source> <translation>В</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="91"/> - <location filename="../core/qthelper.cpp" line="228"/> + <location filename="../core/qthelper.cpp" line="90"/> + <location filename="../core/qthelper.cpp" line="227"/> <source>W</source> <translation>З</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="617"/> + <location filename="../core/qthelper.cpp" line="616"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="620"/> + <location filename="../core/qthelper.cpp" line="619"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="948"/> + <location filename="../core/qthelper.cpp" line="947"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> @@ -10560,7 +10560,7 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/plannernotes.c" line="58"/> - <location filename="../core/plannernotes.c" line="490"/> + <location filename="../core/plannernotes.c" line="501"/> <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>мин</translation> |