diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 2034 |
1 files changed, 1146 insertions, 888 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index c7b7e9a59..bcbc86172 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -1,153 +1,75 @@ <?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0"> <context> - <name>CSVImportDialog</name> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="31"/> - <source>Import File (CSV)</source> - <translation>Файл CSV</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="40"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="135"/> - <source>PO2</source> - <translation>PO2</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="209"/> - <source>Field Separator</source> - <translation>Разделитель</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="65"/> - <source>Field Configuration</source> - <translation>Положение полей</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="14"/> - <source>Import CSV file</source> - <translation>Импорт файла CSV</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="81"/> - <source>Time</source> - <translation>Время</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="98"/> - <source>Depth</source> - <translation>Глуб.</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="115"/> - <source>Temp</source> - <translation>Темп.</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="155"/> - <source>Cns</source> - <translation>CNS</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="175"/> - <source>Stopdepth</source> - <translation>Остановка</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.ui" line="227"/> - <source>Pre-configured imports</source> - <translation>Шаблоны</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> - <source>Open CSV Log File</source> - <translation>Журнал в формате CSV</translation> - </message> - <message> - <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> - <source>CSV Files (*.csv);;All Files(*)</source> - <translation>CSV файлы (*.csv);;Все файлы(*)</translation> - </message> -</context> -<context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>Size</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>WorkPress</source> <translation>Раб.давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>StartPress</source> <translation>Нач.давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>EndPress</source> <translation>Кон.давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> - <source>Switch at</source> - <translation>Замена на</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="68"/> + <location filename="../qt-ui/models.cpp" line="69"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="151"/> + <location filename="../qt-ui/models.cpp" line="158"/> <source>Clicking here will remove this cylinder.</source> <translation>Удалить этот баллон.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="331"/> + <location filename="../qt-ui/models.cpp" line="341"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="332"/> + <location filename="../qt-ui/models.cpp" line="342"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Нельзя удалять баллоны, которые используются в погружении.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="478"/> + <location filename="../qt-ui/models.cpp" line="488"/> <source>psi</source> - <translation type="unfinished"/> + <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="479"/> + <location filename="../qt-ui/models.cpp" line="489"/> <source>bar</source> - <translation type="unfinished"/> + <translation>Бар</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="502"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>l</source> - <translation type="unfinished"/> + <translation>л</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="503"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>cuft</source> - <translation type="unfinished"/> + <translation>куб. фут</translation> </message> </context> <context> @@ -173,35 +95,78 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1298"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1298"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1298"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source>Nickname</source> <translation>Имя устройства</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1320"/> + <location filename="../qt-ui/models.cpp" line="1444"/> <source>Clicking here will remove this divecomputer.</source> <translation>Удалить этот дайв-компьютер.</translation> </message> </context> <context> + <name>DiveEventItem</name> + <message> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/> + <source>air</source> + <translation>воздух</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/> + <source>EAN%1</source> + <translation>EAN%1</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/> + <source>Bailing out to OC</source> + <translation>Переход на Откр. Цикл</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/> + <source> begin</source> + <comment>Starts with space!</comment> + <translation> начало</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/> + <source> end</source> + <comment>Starts with space!</comment> + <translation> конец</translation> + </message> +</context> +<context> + <name>DiveGasPressureItem</name> + <message> + <location filename="../qt-ui/profile/diveprofileitem.cpp" line="456"/> + <source>air</source> + <translation>воздух</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/> + <source>EAN%1</source> + <translation>EAN%1</translation> + </message> +</context> +<context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1241"/> <source> l/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1243"/> <source> cuft/min</source> <translation>куб.фут/мин</translation> </message> @@ -209,102 +174,261 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="43"/> + <location filename="../qt-ui/divelistview.cpp" line="48"/> <source>Show Search Box</source> <translation>Показать поле поиска</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>expand all</source> <translation>развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>collapse all</source> <translation>свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>collapse others</source> <translation>свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>remove dive(s) from trip</source> <translation>удалить погружение(-я) из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="715"/> <source>create new trip above</source> <translation>создать новую поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="716"/> <source>add dive(s) to trip immediately above</source> <translation>добавить к поездке выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="714"/> + <location filename="../qt-ui/divelistview.cpp" line="719"/> <source>merge trip with trip above</source> <translation>объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="715"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> <source>merge trip with trip below</source> <translation>объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="719"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>delete dive(s)</source> <translation>удалить погружение(-я)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="721"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>mark dive(s) invalid</source> <translation>пометить как некорректные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>save As</source> <translation>сохранить как</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="728"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>export As UDDF</source> <translation>экспорт UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="729"/> + <location filename="../qt-ui/divelistview.cpp" line="734"/> <source>shift times</source> <translation>сдвинуть время</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="735"/> + <source>load images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="738"/> <source>upload dive(s) to divelogs.de</source> <translation>выгрузить на divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="758"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>Save Dives As...</source> <translation>Сохранить погружения как...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="777"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Save File as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="778"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="725"/> + <location filename="../qt-ui/divelistview.cpp" line="801"/> + <source>Open Image Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="801"/> + <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="730"/> <source>merge selected dives</source> <translation>объединить выбранные </translation> </message> </context> <context> + <name>DiveLogImportDialog</name> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> + <source>Import dive log file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> + <source>Import CSV Dive Log Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> + <source>CSV options</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="651"/> + <source>Field Separator</source> + <translation>Разделитель</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="86"/> + <source>Pre-configured imports</source> + <translation>Шаблоны</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="114"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="290"/> + <source>Field Configuration</source> + <translation>Положение полей</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="153"/> + <source>Depth</source> + <translation>Глубина</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="173"/> + <source>Stopdepth</source> + <translation>Остановка</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="180"/> + <source>PO2</source> + <translation>PO2</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="187"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="328"/> + <source>Time</source> + <translation>Время</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="194"/> + <source>Temp</source> + <translation>Темп.</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="224"/> + <source>Cns</source> + <translation>CNS</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="674"/> + <source>Units</source> + <translation>Единицы</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="265"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="687"/> + <source>Metric</source> + <translation>Метрическая</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="692"/> + <source>Imperial</source> + <translation>Имперская</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> + <source>Manual dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> + <source>Dive #</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="341"/> + <source>Duration</source> + <translation>Длительность</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="354"/> + <source>Tags</source> + <translation>Метки</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="367"/> + <source>Location</source> + <translation>Местонахождение</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <source>Gps</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> + <source>Max depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> + <source>Mean depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> + <source>Buddy</source> + <translation>Партнер</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="432"/> + <source>Notes</source> + <translation>Примечания</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="445"/> + <source>Weight</source> + <translation>Вес</translation> + </message> +</context> +<context> <name>DivePlanner</name> <message> <location filename="../qt-ui/diveplanner.ui" line="71"/> @@ -345,22 +469,22 @@ <context> <name>DivePlannerGraphics</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="132"/> + <location filename="../qt-ui/diveplanner.cpp" line="117"/> <source>10m</source> <translation>10м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="134"/> + <location filename="../qt-ui/diveplanner.cpp" line="119"/> <source>30ft</source> <translation>30фут</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="364"/> <source>Handler Position Error</source> <translation>Ошибка позиции обработчика</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="365"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Одна или несколько остановок будут утеряны во время этой @@ -370,37 +494,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="468"/> + <location filename="../qt-ui/diveplanner.cpp" line="446"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1097"/> + <location filename="../qt-ui/diveplanner.cpp" line="1085"/> <source>Final Depth</source> <translation>Конечная глубина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1098"/> + <location filename="../qt-ui/diveplanner.cpp" line="1087"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1099"/> + <location filename="../qt-ui/diveplanner.cpp" line="1089"/> <source>Used Gas</source> <translation>Используемый газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1100"/> + <location filename="../qt-ui/diveplanner.cpp" line="1091"/> <source>CC Set Point</source> <translation>Настройка CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1305"/> + <location filename="../qt-ui/diveplanner.cpp" line="1297"/> <source>Discard the Plan?</source> <translation>Отменить план?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1306"/> + <location filename="../qt-ui/diveplanner.cpp" line="1298"/> <source>You are about to discard your plan.</source> <translation>Вы собираетесь отказаться от плана.</translation> </message> @@ -408,85 +532,158 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="955"/> + <location filename="../qt-ui/diveplanner.cpp" line="933"/> <source>Dive Planner Points</source> <translation>Точки погружения</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="958"/> + <location filename="../qt-ui/diveplanner.cpp" line="936"/> <source>Available Gases</source> <translation>Доступные газы</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="975"/> + <location filename="../qt-ui/diveplanner.cpp" line="954"/> <source>add dive data point</source> <translation>Добавить точку погружения</translation> </message> </context> <context> + <name>DivePlotDataModel</name> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/> + <source>Depth</source> + <translation>Глубина</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/> + <source>Time</source> + <translation>Время</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/> + <source>Pressure</source> + <translation>Давление</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <source>Temperature</source> + <translation>Температура</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>Color</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <source>User Entered</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <source>Cylinder Index</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <source>Pressure S</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <source>Pressure I</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <source>Ceiling</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <source>PN2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <source>PHE</source> + <translation>pHe</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <source>PO2</source> + <translation>PO2</translation> + </message> +</context> +<context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1202"/> + <location filename="../qt-ui/models.cpp" line="1288"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1203"/> + <location filename="../qt-ui/models.cpp" line="1291"/> <source>date</source> <translation>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1205"/> + <location filename="../qt-ui/models.cpp" line="1297"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1205"/> + <location filename="../qt-ui/models.cpp" line="1297"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1206"/> + <location filename="../qt-ui/models.cpp" line="1300"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1208"/> + <location filename="../qt-ui/models.cpp" line="1306"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1208"/> + <location filename="../qt-ui/models.cpp" line="1306"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1209"/> + <location filename="../qt-ui/models.cpp" line="1309"/> <source>suit</source> <translation>костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1210"/> + <location filename="../qt-ui/models.cpp" line="1312"/> <source>cyl</source> <translation>баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1215"/> + <location filename="../qt-ui/models.cpp" line="1327"/> <source>location</source> <translation>местоположение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1212"/> + <location filename="../qt-ui/models.cpp" line="1318"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1213"/> + <location filename="../qt-ui/models.cpp" line="1321"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1214"/> + <location filename="../qt-ui/models.cpp" line="1324"/> <source>maxCNS</source> <translation>макс.CNS</translation> </message> @@ -494,115 +691,115 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/> <source>no dives were selected</source> <translation>не выбраны погружения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> <source>failed to create zip file for upload: %1</source> <translation>ошибка создания zip-файла для выгрузки: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/> <source>cannot create temporary file: %1</source> <translation>ошибка создания временного файла: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/> <source>internal error: %1</source> <translation>внутренняя ошибка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> <source>internal error</source> <translation>внутренняя ошибка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> @@ -610,48 +807,54 @@ Please, remove them first.</source> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> + <source>Find Uemis dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> <source>Choose file for divecomputer download logfile</source> <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Log files (*.log)</source> <translation>Файлы журналов (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/> <source>Choose file for divecomputer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Dump files (*.bin)</source> <translation>Дамп-файлы (*.bin)</translation> </message> @@ -719,7 +922,7 @@ Please, remove them first.</source> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="100"/> + <location filename="../qt-ui/globe.cpp" line="103"/> <source>Edit Selected Dive Locations</source> <translation>Изменить место погружений</translation> </message> @@ -728,13 +931,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="431"/> + <location filename="../qt-ui/maintab.cpp" line="444"/> <source>Dive Notes</source> <translation>Погружение</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="455"/> + <location filename="../qt-ui/maintab.cpp" line="468"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -760,11 +963,13 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> + <location filename="../qt-ui/maintab.cpp" line="235"/> <source>Air temp</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> + <location filename="../qt-ui/maintab.cpp" line="236"/> <source>Water temp</source> <translation>Темп. воды</translation> </message> @@ -790,7 +995,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="456"/> + <location filename="../qt-ui/maintab.cpp" line="469"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -901,92 +1106,102 @@ Please, remove them first.</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="75"/> + <location filename="../qt-ui/maintab.cpp" line="78"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="76"/> + <location filename="../qt-ui/maintab.cpp" line="79"/> <source>Add Cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="79"/> + <location filename="../qt-ui/maintab.cpp" line="82"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="80"/> + <location filename="../qt-ui/maintab.cpp" line="83"/> <source>Add Weight System</source> <translation>Добавить груз</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="424"/> + <location filename="../qt-ui/maintab.cpp" line="437"/> <source>Trip Location</source> <translation>Местонахождение поездки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="402"/> - <location filename="../qt-ui/maintab.cpp" line="426"/> + <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="439"/> <source>Trip Notes</source> <translation>Заметки к поездке</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="39"/> + <location filename="../qt-ui/maintab.cpp" line="42"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="43"/> + <location filename="../qt-ui/maintab.cpp" line="46"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="232"/> + <source>Air temp [%1]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="233"/> + <source>Water temp [%1]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="250"/> + <location filename="../qt-ui/maintab.cpp" line="264"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="252"/> + <location filename="../qt-ui/maintab.cpp" line="266"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="478"/> - <location filename="../qt-ui/maintab.cpp" line="486"/> - <location filename="../qt-ui/maintab.cpp" line="515"/> - <location filename="../qt-ui/maintab.cpp" line="516"/> - <location filename="../qt-ui/maintab.cpp" line="517"/> + <location filename="../qt-ui/maintab.cpp" line="491"/> + <location filename="../qt-ui/maintab.cpp" line="499"/> + <location filename="../qt-ui/maintab.cpp" line="528"/> + <location filename="../qt-ui/maintab.cpp" line="529"/> + <location filename="../qt-ui/maintab.cpp" line="530"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="493"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="989"/> + <location filename="../qt-ui/maintab.cpp" line="1006"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="989"/> + <location filename="../qt-ui/maintab.cpp" line="1006"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="990"/> + <location filename="../qt-ui/maintab.cpp" line="1007"/> <source>E</source> <translation>В</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="990"/> + <location filename="../qt-ui/maintab.cpp" line="1007"/> <source>W</source> <translation>З</translation> </message> @@ -994,428 +1209,518 @@ Please, remove them first.</source> <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="184"/> + <location filename="../qt-ui/mainwindow.ui" line="594"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="143"/> + <location filename="../qt-ui/mainwindow.ui" line="545"/> <source>&File</source> <translation>Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="158"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="169"/> + <location filename="../qt-ui/mainwindow.ui" line="578"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="190"/> + <location filename="../qt-ui/mainwindow.ui" line="600"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="197"/> + <location filename="../qt-ui/mainwindow.ui" line="607"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="214"/> + <location filename="../qt-ui/mainwindow.ui" line="623"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="626"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="220"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="225"/> + <location filename="../qt-ui/mainwindow.ui" line="634"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="228"/> + <location filename="../qt-ui/mainwindow.ui" line="637"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="231"/> + <location filename="../qt-ui/mainwindow.ui" line="640"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="236"/> + <location filename="../qt-ui/mainwindow.ui" line="645"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="239"/> + <location filename="../qt-ui/mainwindow.ui" line="648"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="242"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="247"/> - <location filename="../qt-ui/mainwindow.ui" line="250"/> + <location filename="../qt-ui/mainwindow.ui" line="656"/> + <location filename="../qt-ui/mainwindow.ui" line="659"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="253"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="258"/> - <location filename="../qt-ui/mainwindow.ui" line="261"/> + <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="264"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="269"/> - <location filename="../qt-ui/mainwindow.ui" line="272"/> - <location filename="../qt-ui/mainwindow.cpp" line="172"/> - <source>Import Files</source> - <translation>Импорт файлов</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="275"/> + <location filename="../qt-ui/mainwindow.ui" line="865"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="678"/> <source>Export &UDDF</source> <translation>Экспорт UDDF</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="283"/> + <location filename="../qt-ui/mainwindow.ui" line="138"/> + <source>Enable the pN2 Graph</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="164"/> + <source>Enable the pHe graph</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="326"/> + <source>Enable EAD, END, and EADD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="352"/> + <source>Show NDL / TTS</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Rescale depth axis</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="681"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="288"/> + <location filename="../qt-ui/mainwindow.ui" line="686"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="299"/> + <location filename="../qt-ui/mainwindow.ui" line="697"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="307"/> + <location filename="../qt-ui/mainwindow.ui" line="705"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="318"/> + <location filename="../qt-ui/mainwindow.ui" line="716"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="326"/> + <location filename="../qt-ui/mainwindow.ui" line="724"/> <source>Import &GPS data from Subsurface Service</source> <translation>Импорт данных GPS из сервиса Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="329"/> + <location filename="../qt-ui/mainwindow.ui" line="727"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="334"/> + <location filename="../qt-ui/mainwindow.ui" line="732"/> <source>&Edit Device Names</source> <translation>Список дайвкомпьютеров</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="342"/> + <location filename="../qt-ui/mainwindow.ui" line="740"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="347"/> + <location filename="../qt-ui/mainwindow.ui" line="745"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="350"/> + <location filename="../qt-ui/mainwindow.ui" line="748"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> - <source>Toggle &Zoom</source> - <translation>Переключить масштаб</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>&Yearly Statistics</source> <translation>Статистика за год</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="764"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="376"/> + <location filename="../qt-ui/mainwindow.ui" line="769"/> <source>Dive List</source> <translation>Список погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="384"/> + <location filename="../qt-ui/mainwindow.ui" line="777"/> <source>Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="392"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="400"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="442"/> + <location filename="../qt-ui/mainwindow.ui" line="835"/> <source>User &Manual</source> <translation>Руководство</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="450"/> + <location filename="../qt-ui/mainwindow.ui" line="843"/> <source>Globe</source> <translation>Карта</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="458"/> + <location filename="../qt-ui/mainwindow.ui" line="851"/> <source>P&lan Dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="461"/> + <location filename="../qt-ui/mainwindow.ui" line="854"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="466"/> - <source>Import CSV</source> - <translation>Импорт CSV</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="469"/> - <source>Import CS&V</source> - <translation>Импорт CSV</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="474"/> + <location filename="../qt-ui/mainwindow.ui" line="870"/> <source>Import from Divelogs.de</source> <translation>Импорт с сайта Divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="291"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="112"/> + <source>Enable the pO2 Graph</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="115"/> + <location filename="../qt-ui/mainwindow.ui" line="141"/> + <location filename="../qt-ui/mainwindow.ui" line="167"/> + <location filename="../qt-ui/mainwindow.ui" line="196"/> + <location filename="../qt-ui/mainwindow.ui" line="225"/> + <location filename="../qt-ui/mainwindow.ui" line="251"/> + <location filename="../qt-ui/mainwindow.ui" line="277"/> + <location filename="../qt-ui/mainwindow.ui" line="303"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> + <location filename="../qt-ui/mainwindow.ui" line="355"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> + <location filename="../qt-ui/mainwindow.ui" line="433"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="300"/> + <source>Enable MOD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="193"/> + <source>Show the DC Reported Ceiling</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="222"/> + <source>Show the Calculated Ceiling</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="274"/> + <source>Show Calculated Ceiling with 3m Increments</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="248"/> + <source>Calculate All Tissues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> + <source>Show SAC Rate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="404"/> + <source>Enable / Disable the Ruler</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="310"/> + <location filename="../qt-ui/mainwindow.ui" line="708"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="321"/> + <location filename="../qt-ui/mainwindow.ui" line="719"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="339"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Add Dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="358"/> + <location filename="../qt-ui/mainwindow.ui" line="756"/> <source>Auto Group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="772"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="387"/> + <location filename="../qt-ui/mainwindow.ui" line="780"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="395"/> + <location filename="../qt-ui/mainwindow.ui" line="788"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="403"/> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="408"/> + <location filename="../qt-ui/mainwindow.ui" line="801"/> <source>Prev DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="411"/> + <location filename="../qt-ui/mainwindow.ui" line="804"/> <source>Left</source> <translation>Влево</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="416"/> + <location filename="../qt-ui/mainwindow.ui" line="809"/> <source>Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="419"/> + <location filename="../qt-ui/mainwindow.ui" line="812"/> <source>Right</source> <translation>Вправо</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="424"/> + <location filename="../qt-ui/mainwindow.ui" line="817"/> <source>Select Events</source> <translation>Выбрать события</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="429"/> + <location filename="../qt-ui/mainwindow.ui" line="822"/> <source>Input Plan</source> <translation>Ввести план</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="434"/> + <location filename="../qt-ui/mainwindow.ui" line="827"/> <source>About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="445"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="453"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="114"/> + <location filename="../qt-ui/mainwindow.ui" line="859"/> + <source>Import Log Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="862"/> + <source>Import divelog files from other applications</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="878"/> + <source>&Full Screen</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="881"/> + <source>Toggle Full Screen</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="884"/> + <source>F11</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="143"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="149"/> - <location filename="../qt-ui/mainwindow.cpp" line="255"/> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="303"/> + <location filename="../qt-ui/mainwindow.cpp" line="665"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="228"/> + <location filename="../qt-ui/mainwindow.cpp" line="276"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Сохраните или отмените изменения перед открытием планировщика.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="291"/> + <location filename="../qt-ui/mainwindow.cpp" line="342"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="503"/> - <source>User Manual</source> - <translation>Руководство пользователя</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="507"/> - <source>Cannot find the Subsurface manual</source> - <translation>Руководство не найдено</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="544"/> + <location filename="../qt-ui/mainwindow.cpp" line="564"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Сохранить изменения в файле %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="546"/> + <location filename="../qt-ui/mainwindow.cpp" line="566"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Сохранить изменения в файле журнала?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="551"/> + <location filename="../qt-ui/mainwindow.cpp" line="571"/> <source>Save Changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="552"/> + <location filename="../qt-ui/mainwindow.cpp" line="572"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="878"/> - <source>First finish the current edition before trying to do another.</source> - <translation>Закончите редактирование прежде чем редактировать другое.</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="201"/> - <location filename="../qt-ui/mainwindow.cpp" line="756"/> + <location filename="../qt-ui/mainwindow.cpp" line="247"/> + <location filename="../qt-ui/mainwindow.cpp" line="870"/> <source>Save File as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> - <location filename="../qt-ui/mainwindow.cpp" line="149"/> - <location filename="../qt-ui/mainwindow.cpp" line="228"/> - <location filename="../qt-ui/mainwindow.cpp" line="255"/> - <location filename="../qt-ui/mainwindow.cpp" line="291"/> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> - <location filename="../qt-ui/mainwindow.cpp" line="878"/> + <location filename="../qt-ui/mainwindow.cpp" line="140"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="276"/> + <location filename="../qt-ui/mainwindow.cpp" line="303"/> + <location filename="../qt-ui/mainwindow.cpp" line="342"/> + <location filename="../qt-ui/mainwindow.cpp" line="665"/> + <location filename="../qt-ui/mainwindow.cpp" line="1013"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="140"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="202"/> + <location filename="../qt-ui/mainwindow.cpp" line="248"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="757"/> + <location filename="../qt-ui/mainwindow.cpp" line="395"/> + <source>Yearly Statistics</source> + <translation>Статистика за год</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="871"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="990"/> + <source>Open Dive Log File</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="990"/> + <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1013"/> + <source>Please, first finish the current edition before trying to do another.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1485,209 +1790,187 @@ Please, remove them first.</source> <translation>Использовать</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="256"/> + <location filename="../qt-ui/preferences.ui" line="237"/> + <source>Animations</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="243"/> + <source>Speed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="289"/> <source>System</source> <translation>Система мер</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="263"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="273"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="283"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Personalize</source> <translation>Настроить</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="307"/> + <location filename="../qt-ui/preferences.ui" line="340"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="347"/> <source>meter</source> <translation>метр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="324"/> + <location filename="../qt-ui/preferences.ui" line="357"/> <source>feet</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>bar</source> <translation>Бар</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="351"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="401"/> <source>liter</source> <translation>литр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="378"/> + <location filename="../qt-ui/preferences.ui" line="411"/> <source>cu ft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="395"/> + <location filename="../qt-ui/preferences.ui" line="428"/> <source>celsius</source> <translation>цельсий</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="405"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>fahrenheit</source> <translation>фаренгейт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="422"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>kg</source> <translation>кг</translation> </message> + <message> + <location filename="../qt-ui/preferences.ui" line="523"/> + <source>Show units in text labels</source> + <translation type="unfinished"/> + </message> <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="510"/> - <source>pO₂</source> - <translation>pO₂</translation> + <location filename="../qt-ui/preferences.ui" line="560"/> + <source>threshold when showing pO₂</source> + <translation type="unfinished"/> + </message> + <message utf8="true"> + <location filename="../qt-ui/preferences.ui" line="581"/> + <source>threshold when showing pN₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="602"/> + <source>threshold when showing pHe</source> + <translation type="unfinished"/> </message> <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="551"/> - <source>pN₂</source> - <translation>pN₂</translation> + <location filename="../qt-ui/preferences.ui" line="623"/> + <source>max ppO₂ when showing MOD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="644"/> + <source>draw dive computer reported ceiling red</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="655"/> + <source>unused tanks</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="723"/> <source>System Default</source> <translation>Язык системы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="857"/> + <location filename="../qt-ui/preferences.ui" line="743"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="334"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="361"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Volume</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="388"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="415"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="432"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="447"/> + <location filename="../qt-ui/preferences.ui" line="480"/> <source>Time units</source> <translation>Единицы времени</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="486"/> <source>Ascent/Descent speed denominator</source> <translation>Делитель скорости спуска/подъема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="460"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Minutes</source> <translation>Минуты</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="470"/> + <location filename="../qt-ui/preferences.ui" line="503"/> <source>Seconds</source> <translation>Секунды</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="502"/> + <location filename="../qt-ui/preferences.ui" line="549"/> <source>Show</source> <translation>Показывать</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="533"/> - <location filename="../qt-ui/preferences.ui" line="574"/> - <location filename="../qt-ui/preferences.ui" line="615"/> - <source>threshold</source> - <translation>порог</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="592"/> - <source>pHe</source> - <translation>pHe</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="633"/> - <source>MOD</source> - <translation>MOD</translation> - </message> - <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="656"/> - <source>max ppO₂</source> - <translation>макс. ppO₂</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="672"/> - <source>EAD END EADD</source> - <translation>EAD END EADD</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="681"/> - <source>Dive computer reported ceiling</source> - <translation>Потолок компьютера</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="704"/> - <source>draw ceiling red</source> - <translation>потолок красным</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="715"/> - <source>Calculated ceiling</source> - <translation>Расчётный потолок</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="738"/> - <source>show all tissues</source> - <translation>все ткани</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="748"/> - <source>3m increments</source> - <translation>шаг 3м</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="758"/> - <source>Calculate NDL/TTS</source> - <translation>Рассчитывать NDL/TTS</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="821"/> + <location filename="../qt-ui/preferences.ui" line="707"/> <source>GFLow at max depth</source> <translation>GFLow на макс. грубине</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="781"/> + <location filename="../qt-ui/preferences.ui" line="667"/> <source>Misc</source> <translation>Разное</translation> </message> @@ -1697,37 +1980,32 @@ Please, remove them first.</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="769"/> - <source>SAC</source> - <translation>SAC</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="787"/> + <location filename="../qt-ui/preferences.ui" line="673"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="804"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="196"/> + <location filename="../qt-ui/preferences.cpp" line="219"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="197"/> + <location filename="../qt-ui/preferences.cpp" line="220"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="230"/> + <location filename="../qt-ui/preferences.cpp" line="328"/> <source>Open Default Log File</source> <translation>Журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="230"/> + <location filename="../qt-ui/preferences.cpp" line="328"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> @@ -1735,22 +2013,22 @@ Please, remove them first.</source> <context> <name>PrintDialog</name> <message> - <location filename="../qt-ui/printdialog.cpp" line="39"/> + <location filename="../qt-ui/printdialog.cpp" line="32"/> <source>&Preview</source> <translation>Просмотр</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="43"/> + <location filename="../qt-ui/printdialog.cpp" line="36"/> <source>P&rint</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="47"/> + <location filename="../qt-ui/printdialog.cpp" line="40"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="61"/> + <location filename="../qt-ui/printdialog.cpp" line="55"/> <source>Print</source> <translation>Печать</translation> </message> @@ -1874,215 +2152,115 @@ Please, remove them first.</source> </message> </context> <context> - <name>ProfileGraphicsView</name> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="134"/> - <source>Add Gas Change</source> - <translation>Добавить замену смеси</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="145"/> - <source>Add Bookmark</source> - <translation>Добавить закладку</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="153"/> - <source>Remove Event</source> - <translation>Удалить событие</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="158"/> - <source>Hide similar events</source> - <translation>Скрыть похожие события</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="172"/> - <source>Unhide all events</source> - <translation>Показать все события</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="212"/> - <source>Hide events</source> - <translation>Спрятать события</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="213"/> - <source>Hide all %1 events?</source> - <translation>Спрятать все события %1?</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="242"/> - <source>Remove the selected event?</source> - <translation>Удалить выбранное событие?</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="243"/> - <source>%1 @ %2:%3</source> - <translation>%1 @ %2:%3</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="406"/> - <location filename="../qt-ui/profilegraphics.cpp" line="408"/> - <source>unknown divecomputer</source> - <translation>неизвестный компьютер</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="486"/> - <source>Set Duration: 10 minutes</source> - <translation>Длительность: 10 мин</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="528"/> - <source>Scale</source> - <translation>Масштаб</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="529"/> - <source>Ruler</source> - <translation>Рулетка</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="531"/> - <source>Measure properties of dive segments</source> - <translation>Параметры сегмента погружения</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="532"/> - <source>Scale your dive to screen size</source> - <translation>Масштаб по размеру экрана</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="545"/> - <source>Edit</source> - <translation>Редактировать</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="631"/> - <source>pN</source> - <translation>pN</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="657"/> - <source>pHe</source> - <translation>pHe</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="681"/> - <source>pO</source> - <translation>pO</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="769"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1025"/> - <source>air</source> - <translation>воздух</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="771"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1027"/> - <source>EAN%1</source> - <translation>EAN%1</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1035"/> - <source>Bailing out to OC</source> - <translation>Переход на Откр. Цикл</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1037"/> - <source> begin</source> - <comment>Starts with space!</comment> - <translation> начало</translation> - </message> - <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1038"/> - <source> end</source> - <comment>Starts with space!</comment> - <translation> конец</translation> - </message> -</context> -<context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1671"/> + <location filename="../qt-ui/models.cpp" line="1881"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1676"/> + <location filename="../qt-ui/models.cpp" line="1886"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1679"/> + <location filename="../qt-ui/models.cpp" line="1889"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1686"/> + <location filename="../qt-ui/models.cpp" line="1896"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1691"/> + <location filename="../qt-ui/models.cpp" line="1901"/> <source>Gas Used:</source> <translation>Газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1693"/> + <location filename="../qt-ui/models.cpp" line="1903"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1695"/> + <location filename="../qt-ui/models.cpp" line="1905"/> <source>Max. CNS:</source> <translation>Макс. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1697"/> + <location filename="../qt-ui/models.cpp" line="1907"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1702"/> + <location filename="../qt-ui/models.cpp" line="1912"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1709"/> + <location filename="../qt-ui/models.cpp" line="1919"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1711"/> + <location filename="../qt-ui/models.cpp" line="1921"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1713"/> + <location filename="../qt-ui/models.cpp" line="1923"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1715"/> + <location filename="../qt-ui/models.cpp" line="1925"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1717"/> + <location filename="../qt-ui/models.cpp" line="1927"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> </context> <context> + <name>ProfileWidget2</name> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/> + <source>Add Gas Change</source> + <translation>Добавить замену смеси</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/> + <source>Add Bookmark</source> + <translation>Добавить закладку</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/> + <source>Remove Event</source> + <translation>Удалить событие</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/> + <source>Hide similar events</source> + <translation>Скрыть похожие события</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/> + <source>Unhide all events</source> + <translation>Показать все события</translation> + </message> +</context> +<context> <name>QObject</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="35"/> + <location filename="../qt-ui/diveplanner.cpp" line="36"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="734"/> + <location filename="../qt-ui/diveplanner.cpp" line="706"/> <source>Remove this Point</source> <translation>Удалить эту точку</translation> </message> @@ -2092,22 +2270,22 @@ Please, remove them first.</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="27"/> + <location filename="../qt-ui/simplewidgets.cpp" line="32"/> <source>Average</source> <translation>Средняя</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="30"/> + <location filename="../qt-ui/simplewidgets.cpp" line="35"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="33"/> + <location filename="../qt-ui/simplewidgets.cpp" line="38"/> <source>Maximum</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="238"/> + <location filename="../qt-ui/globe.cpp" line="239"/> <source>Move the map and double-click to set the dive location</source> <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> @@ -2126,6 +2304,59 @@ Please, remove them first.</source> </message> </context> <context> + <name>ShiftImageTimesDialog</name> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="20"/> + <source>Shift selected times</source> + <translation>Сдвинуть время</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="31"/> + <source>Shift times of image(s) by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <source>earlier</source> + <translation>раньше</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <source>later</source> + <translation>позже</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="142"/> + <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="152"/> + <source>Determine camera time offset</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Select image of divecomputer showing time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="193"/> + <source>Which date and time are displayed on the image?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <source>Open Image File</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="183"/> + <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ShiftTimesDialog</name> <message> <location filename="../qt-ui/shifttimes.ui" line="20"/> @@ -2161,20 +2392,25 @@ Please, remove them first.</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="19"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Мультиплатформенный журнал погружений<br><span style='font-size: 8pt'>Линус Торвальдс, Дирк Хондел и другие, 2011, 2012, 2013</span></translation> - </message> - <message> - <location filename="../qt-ui/about.cpp" line="23"/> + <location filename="../qt-ui/about.ui" line="80"/> <source>&License</source> <translation>Лицензия</translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="24"/> + <location filename="../qt-ui/about.ui" line="87"/> <source>&Website</source> <translation>Веб-сайт</translation> </message> + <message> + <location filename="../qt-ui/about.ui" line="94"/> + <source>&Close</source> + <translation>Закрыть</translation> + </message> + <message> + <location filename="../qt-ui/about.cpp" line="12"/> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <translation type="unfinished"/> + </message> </context> <context> <name>SubsurfaceWebServices</name> @@ -2184,37 +2420,37 @@ Please, remove them first.</source> <translation>Вебсервис</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> <source>Download finished</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> <source>Download error: %1</source> <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> <source>Connection Error: </source> <translation>Ошибка соединения:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/> <source>Invalid user identifier!</source> <translation>Неверный идентификатор пользователя!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> <source>Cannot parse response!</source> <translation>Невозможно разобрать ответ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> <source>Download Success!</source> <translation>Успешная загрузка!</translation> </message> @@ -2230,17 +2466,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="824"/> + <location filename="../qt-ui/models.cpp" line="835"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="824"/> + <location filename="../qt-ui/models.cpp" line="835"/> <source>ml</source> <translation>мл</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="824"/> + <location filename="../qt-ui/models.cpp" line="835"/> <source>bar</source> <translation>Бар</translation> </message> @@ -2248,20 +2484,33 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> + <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/> <source>Information</source> <translation>Информация</translation> </message> </context> <context> + <name>UserManual</name> + <message> + <location filename="../qt-ui/usermanual.cpp" line="23"/> + <source>User Manual</source> + <translation>Руководство пользователя</translation> + </message> + <message> + <location filename="../qt-ui/usermanual.cpp" line="31"/> + <source>Cannot find the Subsurface manual</source> + <translation>Руководство не найдено</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="696"/> + <location filename="../qt-ui/models.cpp" line="706"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="696"/> + <location filename="../qt-ui/models.cpp" line="706"/> <source>kg</source> <translation>кг</translation> </message> @@ -2284,32 +2533,32 @@ Please, remove them first.</source> <translation>Укажите свой идентификатор</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="39"/> + <location filename="../qt-ui/webservices.ui" line="44"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="63"/> + <location filename="../qt-ui/webservices.ui" line="68"/> <source>User ID</source> <translation>ID пользователя</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="80"/> + <location filename="../qt-ui/webservices.ui" line="85"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="94"/> + <location filename="../qt-ui/webservices.ui" line="99"/> <source>Upload</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/> <source>Transfering data...</source> <translation>Передача данных...</translation> </message> @@ -2317,117 +2566,117 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="346"/> + <location filename="../qt-ui/models.cpp" line="356"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="346"/> + <location filename="../qt-ui/models.cpp" line="356"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="406"/> + <location filename="../qt-ui/models.cpp" line="416"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Удалить эту грузовую систему.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="431"/> + <location filename="../qt-ui/models.cpp" line="441"/> <source>kg</source> - <translation type="unfinished"/> + <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="432"/> + <location filename="../qt-ui/models.cpp" line="442"/> <source>lbs</source> - <translation type="unfinished"/> + <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="455"/> + <location filename="../qt-ui/models.cpp" line="465"/> <source>ft</source> - <translation type="unfinished"/> + <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="456"/> + <location filename="../qt-ui/models.cpp" line="466"/> <source>m</source> - <translation type="unfinished"/> + <translation>м</translation> </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> + <location filename="../qt-ui/models.cpp" line="1639"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1642"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1645"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1477"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1651"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1479"/> + <location filename="../qt-ui/models.cpp" line="1654"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1480"/> + <location filename="../qt-ui/models.cpp" line="1657"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1481"/> - <location filename="../qt-ui/models.cpp" line="1484"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1669"/> + <location filename="../qt-ui/models.cpp" line="1678"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1482"/> - <location filename="../qt-ui/models.cpp" line="1485"/> - <location filename="../qt-ui/models.cpp" line="1488"/> + <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1672"/> + <location filename="../qt-ui/models.cpp" line="1681"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1483"/> + <location filename="../qt-ui/models.cpp" line="1666"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1486"/> + <location filename="../qt-ui/models.cpp" line="1675"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2443,25 +2692,25 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="62"/> - <location filename="../qt-gui.cpp" line="350"/> + <location filename="../qt-gui.cpp" line="348"/> <source>bar</source> <translation>Бар</translation> </message> <message> <location filename="../dive.c" line="66"/> - <location filename="../qt-gui.cpp" line="353"/> + <location filename="../qt-gui.cpp" line="351"/> <source>psi</source> <translation>psi</translation> </message> <message> <location filename="../dive.c" line="103"/> - <location filename="../qt-gui.cpp" line="329"/> + <location filename="../qt-gui.cpp" line="327"/> <source>l</source> <translation>л</translation> </message> <message> <location filename="../dive.c" line="108"/> - <location filename="../qt-gui.cpp" line="334"/> + <location filename="../qt-gui.cpp" line="332"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -2494,17 +2743,17 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1055"/> + <location filename="../dive.c" line="1104"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../divelist.c" line="491"/> - <location filename="../planner.c" line="97"/> - <location filename="../planner.c" line="776"/> - <location filename="../planner.c" line="777"/> - <location filename="../statistics.c" line="356"/> - <location filename="../statistics.c" line="367"/> + <location filename="../divelist.c" line="492"/> + <location filename="../planner.c" line="95"/> + <location filename="../planner.c" line="779"/> + <location filename="../planner.c" line="782"/> + <location filename="../statistics.c" line="358"/> + <location filename="../statistics.c" line="368"/> <source>air</source> <translation>воздух</translation> </message> @@ -2536,20 +2785,16 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="315"/> - <location filename="../file.c" line="317"/> + <location filename="../file.c" line="378"/> + <location filename="../file.c" line="380"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../file.c" line="269"/> - <location filename="../file.c" line="271"/> - <source>Failed to read '%s'. Use import for CSV files.</source> - <translation>Ошибка чтения '%s'. Используйте импорт CSV.</translation> - </message> - <message> - <location filename="../file.c" line="355"/> - <location filename="../file.c" line="357"/> + <location filename="../file.c" line="419"/> + <location filename="../file.c" line="421"/> + <location filename="../file.c" line="498"/> + <location filename="../file.c" line="500"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> @@ -2691,17 +2936,17 @@ Maximum</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../libdivecomputer.c" line="401"/> + <location filename="../libdivecomputer.c" line="403"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="407"/> + <location filename="../libdivecomputer.c" line="409"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../libdivecomputer.c" line="416"/> + <location filename="../libdivecomputer.c" line="417"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> @@ -2716,133 +2961,158 @@ Maximum</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="447"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../libdivecomputer.c" line="458"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="468"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../libdivecomputer.c" line="480"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="489"/> + <location filename="../libdivecomputer.c" line="484"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="497"/> + <location filename="../libdivecomputer.c" line="491"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="619"/> + <location filename="../libdivecomputer.c" line="621"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="627"/> + <location filename="../libdivecomputer.c" line="629"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="687"/> + <location filename="../libdivecomputer.c" line="689"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="692"/> + <location filename="../libdivecomputer.c" line="694"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="712"/> + <location filename="../libdivecomputer.c" line="715"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="750"/> + <location filename="../libdivecomputer.c" line="754"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="757"/> + <location filename="../libdivecomputer.c" line="761"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="479"/> + <location filename="../parse-xml.c" line="484"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1616"/> + <location filename="../parse-xml.c" line="1625"/> <source>Failed to parse '%s'. </source> <translation>Ошибка разбора '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> + <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1815"/> + <location filename="../parse-xml.c" line="1845"/> <source>Database query get_events failed. </source> <translation>Ошибка запроса get_events в БД. </translation> </message> <message> - <location filename="../parse-xml.c" line="1850"/> + <location filename="../parse-xml.c" line="1852"/> + <source>Database query get_tags failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="176"/> <source>Database connection failed '%s'. </source> <translation>Ошибка соединения с БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1857"/> + <location filename="../parse-xml.c" line="1886"/> + <location filename="../parse-xml.c" line="2033"/> <source>Database query failed '%s'. </source> <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1917"/> + <location filename="../parse-xml.c" line="1997"/> + <source>Database query get_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2004"/> + <source>Database query get_changes failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2011"/> + <source>Database query get_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2102"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../planner.c" line="99"/> - <location filename="../statistics.c" line="360"/> + <location filename="../planner.c" line="97"/> + <location filename="../statistics.c" line="361"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="134"/> + <location filename="../planner.c" line="132"/> <source>Can't find gas %d/%d</source> <translation>Не найдена смесь %d/%d</translation> </message> <message> - <location filename="../planner.c" line="321"/> + <location filename="../planner.c" line="324"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</translation> </message> <message> - <location filename="../planner.c" line="501"/> + <location filename="../planner.c" line="504"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2855,274 +3125,262 @@ based on GFlow = %.0f and GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="545"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s </translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="554"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="565"/> <source>Switch gas to %s </source> <translation>Замена смеси на %s </translation> </message> <message> - <location filename="../planner.c" line="570"/> + <location filename="../planner.c" line="573"/> <source>Gas consumption: </source> <translation>Расход газа: </translation> </message> <message> - <location filename="../planner.c" line="581"/> + <location filename="../planner.c" line="584"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="778"/> + <location filename="../planner.c" line="783"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1210"/> - <source>%s -P:%d %s</source> - <translation>%s -P:%d %s</translation> + <location filename="../profile.c" line="1231"/> + <source>@: %d:%02d +D: %.1f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1215"/> - <source>%s -T:%.1f %s</source> - <translation>%s -T:%.1f %s</translation> + <location filename="../profile.c" line="1234"/> + <source>P: %d%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1222"/> - <source>%s -V:%.2f %s</source> - <translation>%s -C:%.2f %s</translation> + <location filename="../profile.c" line="1238"/> + <source>T: %.1f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1308"/> - <source>%s -Calculated ceiling %.0f %s</source> - <translation>%s -Расчетный потолок %.0f %s</translation> + <location filename="../profile.c" line="1244"/> + <source>V: %.1f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1315"/> - <source>%s -Tissue %.0fmin: %.0f %s</source> - <translation>%s -Ткани %.0fмин: %.0f %s</translation> + <location filename="../profile.c" line="1247"/> + <source>SAC: %2.1fl/min +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1262"/> - <source>%s -Safetystop:%umin @ %.0f %s</source> - <translation>%s -Ост.безоп:%uмин @ %.0f %s</translation> + <location filename="../profile.c" line="1249"/> + <source>CNS: %u%% +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1206"/> - <source>@:%d:%02d -D:%.1f %s</source> - <translation>@:%d:%02d -Г:%.1f %s</translation> + <location filename="../profile.c" line="1251"/> + <source>pO%s: %.2fbar +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1226"/> - <source>%s -SAC:%2.1fl/min</source> - <translation>%s -SAC:%2.1fл/мин</translation> + <location filename="../profile.c" line="1253"/> + <source>pN%s: %.2fbar +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1265"/> - <source>%s -Safetystop:unkn time @ %.0f %s</source> - <translation>%s -Ост.безоп:неизв. время @ %.0f %s</translation> + <location filename="../profile.c" line="1255"/> + <source>pHe: %.2fbar +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1270"/> - <source>%s -Deco:%umin @ %.0f %s</source> - <translation>%s -Деко:%uмин @ %.0f %s</translation> + <location filename="../profile.c" line="1258"/> + <source>MOD: %d%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1273"/> - <source>%s -Deco:unkn time @ %.0f %s</source> - <translation>%s -Деко:неизв. время @ %.0f %s</translation> + <location filename="../profile.c" line="1264"/> + <source>EAD: %d%s +END: %d%s +EADD: %d%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1271"/> + <source>Safetystop: %umin @ %.0f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1274"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1279"/> - <source>%s -In deco</source> - <translation>%s -В деко</translation> + <source>Deco: %umin @ %.0f%s +</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1282"/> - <source>%s -NDL:%umin</source> - <translation>%s -NDL:%uмин</translation> + <source>Deco: unkn time @ %.0f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1230"/> - <source>%s -CNS:%u%%</source> - <translation>%s -CNS:%u%%</translation> + <location filename="../profile.c" line="1286"/> + <source>In deco +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1234"/> - <source>%s -pO%s:%.2fbar</source> - <translation>%s -pO%s:%.2fбар</translation> + <location filename="../profile.c" line="1288"/> + <source>NDL: %umin +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1238"/> - <source>%s -pN%s:%.2fbar</source> - <translation>%s -pN%s:%.2fбар</translation> + <location filename="../profile.c" line="1292"/> + <source>Deco: %umin @ %.0f%s (calc) +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1242"/> - <source>%s -pHe:%.2fbar</source> - <translation>%s -pHe:%.2fбар</translation> + <location filename="../profile.c" line="1300"/> + <source>In deco (calc) +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1247"/> - <source>%s -MOD:%d%s</source> - <translation>%s -MOD:%d%s</translation> + <location filename="../profile.c" line="1302"/> + <source>NDL: %umin (calc) +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1254"/> - <source>%s -EAD:%d%s -END:%d%s -EADD:%d%s</source> - <translation>%s -EAD:%d%s -END:%d%s -EADD:%d%s</translation> + <location filename="../profile.c" line="1305"/> + <source>TTS: %umin (calc) +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> - <source>%s -Deco:%umin @ %.0f %s (calc)</source> - <translation>%s -Деко:%uмин @ %.0f %s (расч)</translation> + <location filename="../profile.c" line="1308"/> + <source>Calculated ceiling %.0f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1296"/> - <source>%s -In deco (calc)</source> - <translation>%s -В деко (расч)</translation> + <location filename="../profile.c" line="1314"/> + <source>Tissue %.0fmin: %.0f%s +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1299"/> - <source>%s -NDL:%umin (calc)</source> - <translation>%s -NDL:%uмин (расч)</translation> + <location filename="../profile.c" line="1320"/> + <source>heartbeat: %d +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> - <source>%s -TTS:%umin (calc)</source> - <translation>%s -TTS:%uмин (расч)</translation> + <location filename="../profile.c" line="1322"/> + <source>bearing: %d +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1412"/> + <location filename="../profile.c" line="1414"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1416"/> - <location filename="../profile.c" line="1420"/> - <location filename="../profile.c" line="1424"/> + <location filename="../profile.c" line="1418"/> + <location filename="../profile.c" line="1422"/> + <location filename="../profile.c" line="1426"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1428"/> + <location filename="../profile.c" line="1430"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1432"/> + <location filename="../profile.c" line="1434"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1436"/> - <location filename="../profile.c" line="1440"/> + <location filename="../profile.c" line="1438"/> + <location filename="../profile.c" line="1442"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1447"/> + <location filename="../profile.c" line="1449"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="309"/> + <location filename="../qt-gui.cpp" line="308"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="313"/> + <location filename="../qt-gui.cpp" line="311"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="495"/> + <location filename="../qt-gui.cpp" line="498"/> <source>%1, %2 %3, %4 %5:%6</source> <translation>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="508"/> + <location filename="../qt-gui.cpp" line="511"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="521"/> + <location filename="../qt-gui.cpp" line="524"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 погружений)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="526"/> + <location filename="../qt-gui.cpp" line="529"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 погружение)</translation> </message> @@ -3222,142 +3480,142 @@ TTS:%uмин (расч)</translation> <translation>деко стоп</translation> </message> <message> - <location filename="../statistics.c" line="214"/> + <location filename="../statistics.c" line="216"/> <source>more than %d days</source> <translation>более %d дней</translation> </message> <message> - <location filename="../statistics.c" line="220"/> + <location filename="../statistics.c" line="222"/> <source>%dd %dh %dmin</source> <translation>%dд %dч %dмин</translation> </message> <message> - <location filename="../statistics.c" line="222"/> + <location filename="../statistics.c" line="224"/> <source>%dh %dmin</source> <translation>%dч %dмин</translation> </message> <message> - <location filename="../statistics.c" line="233"/> + <location filename="../statistics.c" line="235"/> <source>for dives #</source> <translation>для погружений №</translation> </message> <message> - <location filename="../statistics.c" line="240"/> + <location filename="../statistics.c" line="242"/> <source>for selected dives</source> <translation>для выбранных погружений</translation> </message> <message> - <location filename="../statistics.c" line="275"/> + <location filename="../statistics.c" line="277"/> <source>for dive #%d</source> <translation>для погружения №%d</translation> </message> <message> - <location filename="../statistics.c" line="277"/> + <location filename="../statistics.c" line="279"/> <source>for selected dive</source> <translation>для выбранного погружения</translation> </message> <message> - <location filename="../statistics.c" line="279"/> + <location filename="../statistics.c" line="281"/> <source>for all dives</source> <translation>для всех погружений</translation> </message> <message> - <location filename="../statistics.c" line="281"/> + <location filename="../statistics.c" line="283"/> <source>(no dives)</source> <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="61"/> + <location filename="../subsurfacestartup.c" line="63"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="70"/> + <location filename="../subsurfacestartup.c" line="72"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="71"/> + <location filename="../subsurfacestartup.c" line="73"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -3387,187 +3645,187 @@ Is the Uemis Zurich plugged in correctly?</source> Проверьте подключение Uemis Zurich.</translation> </message> <message> - <location filename="../uemis-downloader.c" line="106"/> + <location filename="../uemis-downloader.c" line="107"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../uemis-downloader.c" line="372"/> + <location filename="../uemis-downloader.c" line="379"/> <source>Reading %s %s</source> <translation>Чтение %s %s</translation> </message> <message> - <location filename="../uemis-downloader.c" line="392"/> + <location filename="../uemis-downloader.c" line="399"/> <source>data</source> <translation>данные</translation> </message> <message> - <location filename="../uemis-downloader.c" line="413"/> + <location filename="../uemis-downloader.c" line="420"/> <source>divelog entry id</source> <translation>ид. записи журнала</translation> </message> <message> - <location filename="../uemis-downloader.c" line="415"/> + <location filename="../uemis-downloader.c" line="422"/> <source>divespot data id</source> <translation>ид. места погружения</translation> </message> <message> - <location filename="../uemis-downloader.c" line="417"/> + <location filename="../uemis-downloader.c" line="424"/> <source>more data dive id</source> <translation>ид. дополнительных данных погружения</translation> </message> <message> - <location filename="../uemis-downloader.c" line="597"/> + <location filename="../uemis-downloader.c" line="618"/> <source>wetsuit</source> <translation>мокрый</translation> </message> <message> - <location filename="../uemis-downloader.c" line="597"/> + <location filename="../uemis-downloader.c" line="618"/> <source>semidry</source> <translation>полусухой</translation> </message> <message> - <location filename="../uemis-downloader.c" line="597"/> + <location filename="../uemis-downloader.c" line="618"/> <source>drysuit</source> <translation>сухой</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>shorty</source> <translation>короткий</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>vest</source> <translation>жилет</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>long john</source> <translation>комбинезон</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>jacket</source> <translation>куртка</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>full suit</source> <translation>полный</translation> </message> <message> - <location filename="../uemis-downloader.c" line="598"/> + <location filename="../uemis-downloader.c" line="619"/> <source>2 pcs full suit</source> <translation>полный из 2-х</translation> </message> <message> - <location filename="../uemis-downloader.c" line="599"/> + <location filename="../uemis-downloader.c" line="620"/> <source>membrane</source> <translation>мембрана</translation> </message> <message> - <location filename="../uemis-downloader.c" line="781"/> + <location filename="../uemis-downloader.c" line="802"/> <source>Init Communication</source> <translation>Инициализация связи</translation> </message> <message> - <location filename="../uemis-downloader.c" line="783"/> + <location filename="../uemis-downloader.c" line="804"/> <source>Uemis init failed</source> <translation>Ошибка инициализации Uemis</translation> </message> <message> - <location filename="../uemis-downloader.c" line="794"/> + <location filename="../uemis-downloader.c" line="815"/> <source>Start download</source> <translation>Начать загрузку</translation> </message> <message> - <location filename="../uemis.c" line="194"/> + <location filename="../uemis.c" line="196"/> <source>Safety Stop Violation</source> <translation>Нарушение остановки безопасности</translation> </message> <message> - <location filename="../uemis.c" line="196"/> + <location filename="../uemis.c" line="198"/> <source>Speed Alarm</source> <translation>Тревога: скорость</translation> </message> <message> - <location filename="../uemis.c" line="199"/> + <location filename="../uemis.c" line="201"/> <source>Speed Warning</source> <translation>Внимание: скорость</translation> </message> <message> - <location filename="../uemis.c" line="201"/> + <location filename="../uemis.c" line="203"/> <source>PO2 Green Warning</source> <translation>Внимание: PO2 (зеленый)</translation> </message> <message> - <location filename="../uemis.c" line="204"/> + <location filename="../uemis.c" line="206"/> <source>PO2 Ascend Warning</source> <translation>Внимание: PO2 при подъеме</translation> </message> <message> - <location filename="../uemis.c" line="206"/> + <location filename="../uemis.c" line="208"/> <source>PO2 Ascend Alarm</source> <translation>Тревога: PO2 при подъеме</translation> </message> <message> - <location filename="../uemis.c" line="210"/> + <location filename="../uemis.c" line="212"/> <source>Tank Pressure Info</source> <translation>Давление в баллоне</translation> </message> <message> - <location filename="../uemis.c" line="212"/> + <location filename="../uemis.c" line="214"/> <source>RGT Warning</source> <translation>Внимание: RGT</translation> </message> <message> - <location filename="../uemis.c" line="214"/> + <location filename="../uemis.c" line="216"/> <source>RGT Alert</source> <translation>Тревога: RGT</translation> </message> <message> - <location filename="../uemis.c" line="216"/> + <location filename="../uemis.c" line="218"/> <source>Tank Change Suggested</source> <translation>Предложена смена баллона</translation> </message> <message> - <location filename="../uemis.c" line="218"/> + <location filename="../uemis.c" line="220"/> <source>Depth Limit Exceeded</source> <translation>Превышен лимит глубины</translation> </message> <message> - <location filename="../uemis.c" line="220"/> + <location filename="../uemis.c" line="222"/> <source>Max Deco Time Warning</source> <translation>Внимание: макс. время деко</translation> </message> <message> - <location filename="../uemis.c" line="222"/> + <location filename="../uemis.c" line="224"/> <source>Dive Time Info</source> <translation>Время погружения</translation> </message> <message> - <location filename="../uemis.c" line="224"/> + <location filename="../uemis.c" line="226"/> <source>Dive Time Alert</source> <translation>Тревога: время погружения</translation> </message> <message> - <location filename="../uemis.c" line="226"/> + <location filename="../uemis.c" line="228"/> <source>Marker</source> <translation>Метка</translation> </message> <message> - <location filename="../uemis.c" line="228"/> + <location filename="../uemis.c" line="230"/> <source>No Tank Data</source> <translation>Нет данных о баллоне</translation> </message> <message> - <location filename="../uemis.c" line="230"/> + <location filename="../uemis.c" line="232"/> <source>Low Battery Warning</source> <translation>Внимание: заряд батареи</translation> </message> <message> - <location filename="../uemis.c" line="232"/> + <location filename="../uemis.c" line="234"/> <source>Low Battery Alert</source> <translation>Тревога: заряд батареи</translation> </message> |