aboutsummaryrefslogtreecommitdiffstats
path: root/translations/subsurface_ru_RU.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-16 14:24:27 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-16 14:24:27 -0700
commita5c9bc1ef24ee9ffc527f0981a4ddb0f0f8fb2b1 (patch)
tree92d68c9fdb7cf366e5d5e5fb75874a5fd67f9be2 /translations/subsurface_ru_RU.ts
parent14cc59898a9b6405ba239919137a5c57e7e6e0d0 (diff)
downloadsubsurface-a5c9bc1ef24ee9ffc527f0981a4ddb0f0f8fb2b1.tar.gz
Pull latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
-rw-r--r--translations/subsurface_ru_RU.ts2353
1 files changed, 1225 insertions, 1128 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 835498d71..d48a260c8 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -14,28 +14,28 @@
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>WorkPress</source>
- <translation>Раб.давл.</translation>
+ <source>He%</source>
+ <translation>He%</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>StartPress</source>
- <translation>Нач.давл.</translation>
+ <source>O</source>
+ <translation>O</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>EndPress</source>
- <translation>Кон.давл.</translation>
+ <source>Work press.</source>
+ <translation>Раб. давл.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>He%</source>
- <translation>He%</translation>
+ <source>Start press.</source>
+ <translation>Нач. давл.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>O</source>
- <translation>O</translation>
+ <source>End press.</source>
+ <translation>Кон. давл.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="70"/>
@@ -45,50 +45,25 @@
<message>
<location filename="../qt-ui/models.cpp" line="158"/>
<source>Clicking here will remove this cylinder.</source>
- <translation>Удалить этот баллон.</translation>
+ <translation>Нажмите здесь чтобы удалить этот баллон.</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="358"/>
+ <location filename="../qt-ui/models.cpp" line="365"/>
<source>Cylinder cannot be removed</source>
<translation>Баллон не может быть удален</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="359"/>
- <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="507"/>
- <source>psi</source>
- <translation>psi</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="508"/>
- <source>bar</source>
- <translation>Бар</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="532"/>
- <source>l</source>
- <translation>л</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="533"/>
- <source>cuft</source>
- <translation>куб. фут</translation>
+ <location filename="../qt-ui/models.cpp" line="366"/>
+ <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
+ <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
</message>
</context>
<context>
<name>DiveComputerManagementDialog</name>
<message>
- <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
- <source>Edit Dive Computer Nicknames</source>
- <translation>Редактировать имена дайвкомпьютеров</translation>
- </message>
- <message>
<location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
- <source>Remove the selected Dive Computer?</source>
- <translation>Удалить выбранный компьютер?</translation>
+ <source>Remove the selected dive computer?</source>
+ <translation>Удалить компьютер?</translation>
</message>
<message>
<location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
@@ -97,45 +72,50 @@
<translation>Вы действительно хотите удалить
выбранный дайв-компьютер?</translation>
</message>
+ <message>
+ <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
+ <source>Edit dive computer nicknames</source>
+ <translation>Редактировать дайвкомпьютеры</translation>
+ </message>
</context>
<context>
<name>DiveComputerModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Model</source>
<translation>Модель</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Device ID</source>
<translation>Идентификатор</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Nickname</source>
<translation>Имя устройства</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1442"/>
- <source>Clicking here will remove this divecomputer.</source>
- <translation>Удалить этот дайв-компьютер.</translation>
+ <location filename="../qt-ui/models.cpp" line="1452"/>
+ <source>Clicking here will remove this dive computer.</source>
+ <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation>
</message>
</context>
<context>
<name>DiveEventItem</name>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="96"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/>
<source>Bailing out to OC</source>
<translation>Переход на Откр. Цикл</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation> начало</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="99"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation> конец</translation>
@@ -144,7 +124,7 @@
<context>
<name>DiveItem</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1243"/>
+ <location filename="../qt-ui/models.cpp" line="1253"/>
<source>/min</source>
<translation>/мин</translation>
</message>
@@ -153,151 +133,143 @@
<name>DiveListView</name>
<message>
<location filename="../qt-ui/divelistview.cpp" line="53"/>
- <source>Show Search Box</source>
+ <source>Show search box</source>
<translation>Показать поле поиска</translation>
</message>
<message>
+ <location filename="../qt-ui/divelistview.cpp" line="705"/>
+ <source>Expand all</source>
+ <translation>Развернуть все</translation>
+ </message>
+ <message>
<location filename="../qt-ui/divelistview.cpp" line="706"/>
- <source>expand all</source>
- <translation>развернуть все</translation>
+ <source>Collapse all</source>
+ <translation>Свернуть все</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="707"/>
- <source>collapse all</source>
- <translation>свернуть все</translation>
+ <source>Collapse others</source>
+ <translation>Свернуть остальные</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="708"/>
- <source>collapse others</source>
- <translation>свернуть остальные</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="709"/>
+ <source>Remove dive(s) from trip</source>
+ <translation>Удалить из поездки</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="710"/>
- <source>remove dive(s) from trip</source>
- <translation>удалить погружение(-я) из поездки</translation>
+ <source>Create new trip above</source>
+ <translation>Создать поездку выше</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="711"/>
- <source>create new trip above</source>
- <translation>создать новую поездку выше</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="724"/>
+ <source>Add dive(s) to trip immediately above</source>
+ <translation>Добавить к поездке сверху</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="725"/>
- <source>add dive(s) to trip immediately above</source>
- <translation>добавить к поездке выше</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="726"/>
+ <source>Add dive(s) to trip immediately below</source>
+ <translation>Добавить к поездке сверху</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="727"/>
- <source>add dive(s) to trip immediately below</source>
- <translation>назамедлительно добавить погружение(-я) к поездке внизу</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="730"/>
+ <source>Merge trip with trip above</source>
+ <translation>Объединить с поездкой выше</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="731"/>
- <source>merge trip with trip above</source>
- <translation>объединить с поездкой выше</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelistview.cpp" line="732"/>
- <source>merge trip with trip below</source>
- <translation>объединить с поездкой ниже</translation>
+ <source>Merge trip with trip below</source>
+ <translation>Объединить с поездкой ниже</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="736"/>
- <source>delete dive(s)</source>
- <translation>удалить погружение(-я)</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="735"/>
+ <source>Delete dive(s)</source>
+ <translation>Удалить</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="738"/>
- <source>mark dive(s) invalid</source>
- <translation>пометить как некорректные</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="737"/>
+ <source>Mark dive(s) invalid</source>
+ <translation>Пометить как ошибочное(-ые)</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="744"/>
- <source>renumber dive(s)</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelistview.cpp" line="741"/>
+ <source>Merge selected dives</source>
+ <translation>Объединить выбранные</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="745"/>
- <source>shift times</source>
- <translation>сдвинуть время</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="743"/>
+ <source>Renumber dive(s)</source>
+ <translation>Перенумеровать</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="746"/>
- <source>load images</source>
- <translation>загрузить изображения</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="744"/>
+ <source>Shift times</source>
+ <translation>Сдвиг времени</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="767"/>
- <source>Open Image Files</source>
- <translation>Открыть изображения</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="745"/>
+ <source>Load images</source>
+ <translation>Загрузить фото</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="767"/>
- <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
- <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="766"/>
+ <source>Open image files</source>
+ <translation>Открыть файлы изображений</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="742"/>
- <source>merge selected dives</source>
- <translation>объединить выбранные </translation>
+ <location filename="../qt-ui/divelistview.cpp" line="766"/>
+ <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
</context>
<context>
<name>DiveLogExportDialog</name>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
- <source>Export Dive Log Files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
- <source>General Export</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
<source>Export format</source>
- <translation type="unfinished"/>
+ <translation>Формат экспорта</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
<source>Subsurface XML</source>
- <translation type="unfinished"/>
+ <translation>Subsurface XML</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
<source>UDDF</source>
- <translation type="unfinished"/>
+ <translation>UDDF</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
<source>divelogs.de</source>
- <translation type="unfinished"/>
+ <translation>divelogs.de</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
<source>CSV</source>
- <translation type="unfinished"/>
+ <translation>CSV</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
<source>Worldmap</source>
- <translation type="unfinished"/>
+ <translation>Карта мира</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
<source>Selection</source>
- <translation type="unfinished"/>
+ <translation>Выбор</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
<source>Selected dives</source>
- <translation type="unfinished"/>
+ <translation>Выделенные погружения</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
<source>All dives</source>
- <translation type="unfinished"/>
+ <translation>Все погружения</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
@@ -305,39 +277,39 @@
<translation>HTML</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
- <source>General Settings</source>
- <translation>Общие настройки</translation>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+ <source>Minimum Javascript</source>
+ <translation>Минимальный Javascript</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
- <source>Subsurface Numbers</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+ <source>Export dive log files</source>
+ <translation>Экспорт журнала</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
- <source>Selected Dives</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+ <source>General export</source>
+ <translation>Обычный</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
- <source>Minimum Javascript</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+ <source>General settings</source>
+ <translation>Общие настройки</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
- <source>All Dives</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+ <source>Subsurface numbers</source>
+ <translation>Нумерация Subsurface</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
- <source>Export List only</source>
- <translation type="unfinished"/>
+ <source>Export list only</source>
+ <translation>Только список</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
- <source>Style Options</source>
- <translation type="unfinished"/>
+ <source>Style options</source>
+ <translation>Настройки стиля</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
@@ -352,7 +324,7 @@
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
<source>8</source>
- <translation type="unfinished"/>
+ <translation>8</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
@@ -362,88 +334,113 @@
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
<source>12</source>
- <translation type="unfinished"/>
+ <translation>12</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
<source>14</source>
- <translation type="unfinished"/>
+ <translation>14</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
<source>16</source>
- <translation type="unfinished"/>
+ <translation>16</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
<source>18</source>
- <translation type="unfinished"/>
+ <translation>18</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
<source>20</source>
- <translation type="unfinished"/>
+ <translation>20</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
<source>Theme</source>
- <translation type="unfinished"/>
+ <translation>Тема</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
<source>Light</source>
- <translation type="unfinished"/>
+ <translation>Светлая</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
<source>Sand</source>
- <translation type="unfinished"/>
+ <translation>Песочная</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
- <source>Export UDDF File as</source>
- <translation>Экспортировать UDDF файл как</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="154"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation>UDDF файлы (*.uddf *.UDDF)</translation>
</message>
<message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+ <source>CSV files (*.csv *.CSV)</source>
+ <translation>CSV файлы (*.csv *.CSV)</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="58"/>
+ <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
+ <translation>Распространенный формат, используемый для обмена данными между различными дайверскими программами.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="60"/>
+ <source>Comma separated values that include the most relevant information of the dive profile.</source>
+ <translation>Значения, разделенные запятой. Включает наиболее важную информацию о профиле погружения.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="62"/>
+ <source>Send the dive data to divelogs.de website.</source>
+ <translation>Отправить данные погружения на сайт divelogs.de.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="64"/>
+ <source>HTML export of the dive locations, visualized on a world map.</source>
+ <translation>HTML экспорт мест погружений на карте мира.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="66"/>
+ <source>Subsurface native XML format.</source>
+ <translation>Собственный XML-формат Subsurface.</translation>
+ </message>
+ <message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
- <source>Export CSV File as</source>
- <translation>Экспортировать CSV файл как</translation>
+ <source>Export UDDF file as</source>
+ <translation>Файл для UDDF экспорта</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/>
- <source>CSV files (*.csv *.CSV)</source>
- <translation>CSV файлы (*.csv *.CSV)</translation>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="161"/>
+ <source>Export CSV file as</source>
+ <translation>Файл для CSV экспорта</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
- <source>Export World Map</source>
- <translation>Экспортировать карту мира</translation>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="166"/>
+ <source>Export world map</source>
+ <translation>Файл для экспорта карты</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="181"/>
<source>HTML files (*.html)</source>
<translation>HTML файлы (*.html)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="171"/>
<source>Export Subsurface XML</source>
- <translation type="unfinished"/>
+ <translation>Экспорт Subsurface XML</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="172"/>
<source>XML files (*.xml *.ssrf)</source>
- <translation type="unfinished"/>
+ <translation>XML файлы (*.xml *.ssrf)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="180"/>
<source>Export HTML files as</source>
- <translation type="unfinished"/>
+ <translation>Файл для HTML экспорта</translation>
</message>
</context>
<context>
@@ -459,128 +456,143 @@
<translation>Параметры CSV</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="490"/>
- <source>Field Separator</source>
- <translation>Разделитель</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="191"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="243"/>
<source>Pre-configured imports</source>
<translation>Шаблоны</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="41"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="277"/>
- <source>Field Configuration</source>
- <translation>Положение полей</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="74"/>
<source>Depth</source>
<translation>Глубина</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="94"/>
<source>Stopdepth</source>
<translation>Остановка</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
+ <source>Pressure</source>
+ <translation>Давление</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
<source>PO2</source>
<translation>PO2</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="351"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="128"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="399"/>
<source>Time</source>
<translation>Время</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="135"/>
<source>Temp</source>
<translation>Темп.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="165"/>
+ <source>NDL</source>
+ <translation>NDL</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="185"/>
+ <source>TTS</source>
+ <translation>TTS</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="205"/>
<source>Cns</source>
<translation>CNS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="207"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="254"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="231"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="538"/>
+ <source>Field separator</source>
+ <translation>Разделитель</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="259"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
<source>Units</source>
<translation>Единицы</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="220"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="261"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="266"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="309"/>
<source>Metric</source>
<translation>Метрическая</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="225"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="266"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="271"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="314"/>
<source>Imperial</source>
<translation>Имперская</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="296"/>
<source>Manual dives</source>
<translation>Погружения введённые вручную</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="331"/>
<source>Dive #</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="365"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="433"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="518"/>
<source>Tags</source>
<translation>Метки</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="467"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="501"/>
<source>Gps</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="348"/>
<source>Max depth</source>
<translation>Макс. глубина</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="325"/>
+ <source>Field configuration</source>
+ <translation>Порядок полей</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="382"/>
<source>Mean depth</source>
<translation>Сред. глубина</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="416"/>
<source>Buddy</source>
<translation>Партнер</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="450"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="484"/>
<source>Weight</source>
<translation>Вес</translation>
</message>
@@ -588,27 +600,27 @@
<context>
<name>DivePlanner</name>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="106"/>
- <source>Planned Dive Time</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/diveplanner.ui" line="134"/>
<source>Altitude</source>
- <translation type="unfinished"/>
+ <translation>Высота</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/diveplanner.ui" line="106"/>
+ <source>Planned dive time</source>
+ <translation>Планируемое время погружения</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.ui" line="141"/>
- <source>ATM Pressure</source>
- <translation>Атмосферное давление</translation>
+ <source>ATM pressure</source>
+ <translation>Атм. давление</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.ui" line="148"/>
<source>mbar</source>
- <translation type="unfinished"/>
+ <translation>мбар</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="158"/>
+ <location filename="../qt-ui/diveplanner.ui" line="161"/>
<source>m</source>
<translation>м</translation>
</message>
@@ -621,37 +633,37 @@
<translation>неизвестно</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="586"/>
- <source>Final Depth</source>
- <translation>Конечная глубина</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="622"/>
+ <source>Final depth</source>
+ <translation>Глубина</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="588"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="624"/>
<source>Run time</source>
- <translation>Время исполнения</translation>
+ <translation>Время отсчета</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="590"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="626"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="592"/>
- <source>Used Gas</source>
- <translation>Используемый газ</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="628"/>
+ <source>Used gas</source>
+ <translation>Газ</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="594"/>
- <source>CC Set Point</source>
- <translation>Настройка CC</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="630"/>
+ <source>CC set point</source>
+ <translation>Установка CC</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="887"/>
- <source>Discard the Plan?</source>
+ <location filename="../qt-ui/diveplanner.cpp" line="925"/>
+ <source>Discard the plan?</source>
<translation>Отменить план?</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="888"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="926"/>
<source>You are about to discard your plan.</source>
<translation>Вы собираетесь отказаться от плана.</translation>
</message>
@@ -659,19 +671,19 @@
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="252"/>
- <source>Dive Planner Points</source>
- <translation>Точки погружения</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="255"/>
+ <source>Dive planner points</source>
+ <translation>Путевые точки плана</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="256"/>
- <source>Available Gases</source>
- <translation>Доступные газы</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="259"/>
+ <source>Available gases</source>
+ <translation>Доступные смеси</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="279"/>
- <source>add dive data point</source>
- <translation>Добавить точку погружения</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="282"/>
+ <source>Add dive data point</source>
+ <translation>Добавить путевую точку</translation>
</message>
</context>
<context>
@@ -702,19 +714,9 @@
<translation>Цвет</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
- <source>User Entered</source>
- <translation>Пользователь ввёл</translation>
- </message>
- <message>
- <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
- <source>Cylinder Index</source>
- <translation>Номер баллона</translation>
- </message>
- <message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
<source>Pressure S</source>
- <translation type="unfinished"/>
+ <translation>Давление S</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
@@ -737,6 +739,16 @@
<translation>Давление I</translation>
</message>
<message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+ <source>User entered</source>
+ <translation>Пользователь</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+ <source>Cylinder index</source>
+ <translation>Индекс баллона</translation>
+ </message>
+ <message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
<source>Ceiling</source>
<translation>Потолок</translation>
@@ -750,94 +762,74 @@
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1286"/>
+ <location filename="../qt-ui/models.cpp" line="1296"/>
<source>#</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1289"/>
- <source>date</source>
- <translation>дата</translation>
+ <location filename="../qt-ui/models.cpp" line="1299"/>
+ <source>Date</source>
+ <translation>Дата</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1295"/>
+ <location filename="../qt-ui/models.cpp" line="1305"/>
<source>m</source>
<translation>м</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1295"/>
+ <location filename="../qt-ui/models.cpp" line="1305"/>
<source>ft</source>
<translation>фут</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1298"/>
- <source>min</source>
+ <location filename="../qt-ui/models.cpp" line="1308"/>
+ <source>Mins</source>
<translation>мин</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1304"/>
- <source>kg</source>
- <translation>кг</translation>
+ <location filename="../qt-ui/models.cpp" line="1317"/>
+ <source>Suit</source>
+ <translation>Костюм</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1304"/>
- <source>lbs</source>
- <translation>фунт</translation>
+ <location filename="../qt-ui/models.cpp" line="1320"/>
+ <source>Cyl</source>
+ <translation>Баллон</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1307"/>
- <source>suit</source>
- <translation>костюм</translation>
+ <location filename="../qt-ui/models.cpp" line="1332"/>
+ <source>Max CNS</source>
+ <translation>Макс. CNS</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1310"/>
- <source>cyl</source>
- <translation>баллон</translation>
+ <location filename="../qt-ui/models.cpp" line="1335"/>
+ <source>Location</source>
+ <translation>Местонахождение</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1325"/>
- <source>location</source>
- <translation>местоположение</translation>
+ <location filename="../qt-ui/models.cpp" line="1314"/>
+ <source>kg</source>
+ <translation>кг</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1316"/>
+ <location filename="../qt-ui/models.cpp" line="1314"/>
+ <source>lbs</source>
+ <translation>фунт</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="1326"/>
<source>SAC</source>
<translation>SAC</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1319"/>
+ <location filename="../qt-ui/models.cpp" line="1329"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
- <message>
- <location filename="../qt-ui/models.cpp" line="1322"/>
- <source>maxCNS</source>
- <translation>макс.CNS</translation>
- </message>
</context>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/>
- <source>Invalid response from server</source>
- <translation>Неверный ответ сервера</translation>
- </message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/>
- <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
- <translation>XML тег &apos;DiveDateReader&apos; не найден, получен &apos;%1</translation>
- </message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
- <source>Expected XML tag &apos;DiveDates&apos; not found</source>
- <translation>XML тег &apos;DiveDates&apos; не найден</translation>
- </message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
- <source>Malformed XML response. Line %1: %2</source>
- <translation>Неверный XML ответ. Строка %1: %2</translation>
- </message>
- <message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="111"/>
<source>no dives were selected</source>
<translation>не выбраны погружения</translation>
@@ -989,26 +981,26 @@
<context>
<name>DownloadFromDiveComputer</name>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
- <source>Download From Dive Computer</source>
- <translation>Загрузка из компьютера</translation>
- </message>
- <message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
<source>Vendor</source>
<translation>Производитель</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
- <source>Dive Computer</source>
- <translation>Модель компьютера</translation>
+ <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+ <source>Download from dive computer</source>
+ <translation>Загрузка из дайвкомпьютера</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
- <source>Device or Mount Point</source>
+ <source>Device or mount point</source>
<translation>Устройство или точка монтирования</translation>
</message>
<message>
+ <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+ <source>Dive computer</source>
+ <translation>Модель</translation>
+ </message>
+ <message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
@@ -1050,21 +1042,15 @@
<name>GlobeGPS</name>
<message>
<location filename="../qt-ui/globe.cpp" line="120"/>
- <source>Edit Selected Dive Locations</source>
- <translation>Изменить место погружений</translation>
+ <source>Edit selected dive locations</source>
+ <translation>Редактировать местоположение выбранных погружений</translation>
</message>
</context>
<context>
<name>MainTab</name>
<message>
- <location filename="../qt-ui/maintab.ui" line="18"/>
- <location filename="../qt-ui/maintab.cpp" line="416"/>
- <source>Dive Notes</source>
- <translation>Погружение</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="134"/>
- <location filename="../qt-ui/maintab.cpp" line="440"/>
+ <location filename="../qt-ui/maintab.cpp" line="439"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
@@ -1084,18 +1070,6 @@
<translation>Партнер</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="72"/>
- <location filename="../qt-ui/maintab.cpp" line="245"/>
- <source>Air temp</source>
- <translation>Темп. воздуха</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="79"/>
- <location filename="../qt-ui/maintab.cpp" line="246"/>
- <source>Water temp</source>
- <translation>Темп. воды</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="176"/>
<source>Tags</source>
<translation>Метки</translation>
@@ -1116,8 +1090,28 @@
<translation>Костюм</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.ui" line="18"/>
+ <location filename="../qt-ui/maintab.cpp" line="415"/>
+ <source>Dive notes</source>
+ <translation>Погружение</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="72"/>
+ <location filename="../qt-ui/maintab.ui" line="607"/>
+ <location filename="../qt-ui/maintab.cpp" line="244"/>
+ <source>Air temp.</source>
+ <translation>Темп. воздуха</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="79"/>
+ <location filename="../qt-ui/maintab.ui" line="626"/>
+ <location filename="../qt-ui/maintab.cpp" line="245"/>
+ <source>Water temp.</source>
+ <translation>Темп. воды</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.ui" line="88"/>
- <location filename="../qt-ui/maintab.cpp" line="441"/>
+ <location filename="../qt-ui/maintab.cpp" line="440"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
@@ -1127,9 +1121,39 @@
<translation>Снаряжение</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="391"/>
- <source>Dive Info</source>
- <translation>Информация</translation>
+ <location filename="../qt-ui/maintab.ui" line="474"/>
+ <source>Gases used</source>
+ <translation>Исп. газы</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="493"/>
+ <source>Gas consumed</source>
+ <translation>Расход газа</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="531"/>
+ <source>Max. depth</source>
+ <translation>Макс. глубина</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="588"/>
+ <source>Air pressure</source>
+ <translation>Давл. воздуха</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="645"/>
+ <source>Dive time</source>
+ <translation>Время погружения</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="816"/>
+ <source>Total time</source>
+ <translation>Общее время</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="874"/>
+ <source>Gas consumption</source>
+ <translation>Расход газа</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="299"/>
@@ -1143,35 +1167,25 @@
<translation>Время</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.ui" line="391"/>
+ <source>Dive info</source>
+ <translation>Информация</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.ui" line="455"/>
<source>Interval</source>
<translation>Интервал</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="474"/>
- <source>Gases Used</source>
- <translation>Исп. газы</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="493"/>
- <source>Gas Consumed</source>
- <translation>Расход газа</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="512"/>
<location filename="../qt-ui/maintab.ui" line="770"/>
<source>SAC</source>
<translation>SAC</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="531"/>
- <source>Max. Depth</source>
- <translation>Макс. глубина</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="550"/>
- <source>Ave. Depth</source>
- <translation>Ср. глубина</translation>
+ <source>Avg. depth</source>
+ <translation>Сред. глубина</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="569"/>
@@ -1179,26 +1193,6 @@
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="588"/>
- <source>Air Pressure</source>
- <translation>Давление воздуха</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="607"/>
- <source>Air Temperature</source>
- <translation>Температура воздуха</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="626"/>
- <source>Water Temperature</source>
- <translation>Температура воды</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="645"/>
- <source>Dive Time</source>
- <translation>Время погр.</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="664"/>
<source>Salinity</source>
<translation>Соленость</translation>
@@ -1224,57 +1218,36 @@
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="816"/>
- <source>Total Time</source>
- <translation>Общее время</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="835"/>
<source>Dives</source>
<translation>Погружения</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="874"/>
- <source>Gas Consumption</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="919"/>
<source>Photos</source>
<translation>Фотографии</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="89"/>
+ <location filename="../qt-ui/maintab.cpp" line="88"/>
<source>Cylinders</source>
<translation>Баллоны</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="90"/>
+ <location filename="../qt-ui/maintab.cpp" line="89"/>
<source>Add Cylinder</source>
<translation>Добавить баллон</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="93"/>
+ <location filename="../qt-ui/maintab.cpp" line="92"/>
<source>Weights</source>
<translation>Грузы</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="94"/>
+ <location filename="../qt-ui/maintab.cpp" line="93"/>
<source>Add Weight System</source>
<translation>Добавить груз</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="409"/>
- <source>Trip Location</source>
- <translation>Местонахождение поездки</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.cpp" line="387"/>
- <location filename="../qt-ui/maintab.cpp" line="411"/>
- <source>Trip Notes</source>
- <translation>Заметки к поездке</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.cpp" line="48"/>
<source>Save</source>
<translation>Сохранить</translation>
@@ -1285,300 +1258,352 @@
<translation>Отмена</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="242"/>
- <source>Air temp [%1]</source>
- <translation>Темп. возд. [%1]</translation>
+ <location filename="../qt-ui/maintab.cpp" line="241"/>
+ <source>Air temp. [%1]</source>
+ <translation>Темп. воздуха [%1]</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="243"/>
- <source>Water temp [%1]</source>
+ <location filename="../qt-ui/maintab.cpp" line="242"/>
+ <source>Water temp. [%1]</source>
<translation>Темп. воды [%1]</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="278"/>
+ <location filename="../qt-ui/maintab.cpp" line="277"/>
<source>This trip is being edited.</source>
<translation>Редактирование поездки.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="285"/>
+ <location filename="../qt-ui/maintab.cpp" line="284"/>
<source>Multiple dives are being edited.</source>
<translation>Множественное редактирование.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="287"/>
+ <location filename="../qt-ui/maintab.cpp" line="286"/>
<source>This dive is being edited.</source>
<translation>Редактирование погружения.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="462"/>
- <location filename="../qt-ui/maintab.cpp" line="470"/>
+ <location filename="../qt-ui/maintab.cpp" line="386"/>
+ <location filename="../qt-ui/maintab.cpp" line="410"/>
+ <source>Trip notes</source>
+ <translation>Поездка</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="408"/>
+ <source>Trip location</source>
+ <translation>Местоположение</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="461"/>
+ <location filename="../qt-ui/maintab.cpp" line="469"/>
+ <location filename="../qt-ui/maintab.cpp" line="502"/>
<location filename="../qt-ui/maintab.cpp" line="503"/>
<location filename="../qt-ui/maintab.cpp" line="504"/>
- <location filename="../qt-ui/maintab.cpp" line="505"/>
<source>/min</source>
<translation>/мин</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="464"/>
+ <location filename="../qt-ui/maintab.cpp" line="463"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.cpp" line="500"/>
+ <source>Deepest dive</source>
+ <translation>Максимум</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.cpp" line="501"/>
- <source>Deepest Dive</source>
- <translation type="unfinished"/>
+ <source>Shallowest dive</source>
+ <translation>Минимум</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="502"/>
- <source>Shallowest Dive</source>
+ <location filename="../qt-ui/maintab.cpp" line="545"/>
+ <source>These gases could be
+mixed from Air and using:
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="794"/>
- <source>Discard the Changes?</source>
+ <location filename="../qt-ui/maintab.cpp" line="549"/>
+ <source> and </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="795"/>
+ <location filename="../qt-ui/maintab.cpp" line="797"/>
+ <source>Discard the changes?</source>
+ <translation>Отменить изменения?</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="798"/>
<source>You are about to discard your changes.</source>
- <translation type="unfinished"/>
+ <translation>Вы собираетесь отменить свои изменения.</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="695"/>
- <source>Filter</source>
- <translation>Фильтр</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="646"/>
+ <location filename="../qt-ui/mainwindow.ui" line="672"/>
<source>&amp;File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="567"/>
+ <location filename="../qt-ui/mainwindow.ui" line="128"/>
+ <source>Toggle pHe graph</source>
+ <translation>График pHe</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="154"/>
+ <source>Toggle calculating all tissues</source>
+ <translation>Расчет всех тканей</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="183"/>
+ <source>Toggle DC reported ceiling</source>
+ <translation>Потолок компьютера</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="212"/>
+ <source>Toggle calculated ceiling</source>
+ <translation>Расчетный потолок</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="238"/>
+ <source>Toggle NDL, TTS</source>
+ <translation>NDL, TTS</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="264"/>
+ <source>Toggle calculated ceiling with 3m increments</source>
+ <translation>3м шаг для расчетного потолка</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="290"/>
+ <source>Toggle heart rate</source>
+ <translation>Пульс</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="316"/>
+ <source>Toggle MOD</source>
+ <translation>MOD</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="342"/>
+ <source>Toggle EAD, END, EADD</source>
+ <translation>EAD, END, EADD</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="368"/>
+ <source>Toggle SAC rate</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="420"/>
+ <source>Toggle ruler</source>
+ <translation>Рулетка</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="501"/>
+ <source>Toggle viewing picture thumbnails</source>
+ <translation>Миниатюры фотографий</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="593"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Детальный план погружения&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="583"/>
+ <location filename="../qt-ui/mainwindow.ui" line="609"/>
<source>Print</source>
<translation>Печать</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="616"/>
+ <location filename="../qt-ui/mainwindow.ui" line="642"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Courier&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="667"/>
+ <location filename="../qt-ui/mainwindow.ui" line="693"/>
<source>&amp;Log</source>
<translation>Журнал</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="679"/>
+ <location filename="../qt-ui/mainwindow.ui" line="705"/>
<source>&amp;View</source>
<translation>Вид</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="701"/>
+ <location filename="../qt-ui/mainwindow.ui" line="721"/>
<source>&amp;Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="709"/>
+ <location filename="../qt-ui/mainwindow.ui" line="729"/>
<source>&amp;Import</source>
<translation>Импорт</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="725"/>
+ <location filename="../qt-ui/mainwindow.ui" line="744"/>
<source>&amp;New logbook</source>
<translation>Новый журнал</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="728"/>
+ <location filename="../qt-ui/mainwindow.ui" line="747"/>
<source>New</source>
<translation>Новый</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="731"/>
+ <location filename="../qt-ui/mainwindow.ui" line="750"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="736"/>
+ <location filename="../qt-ui/mainwindow.ui" line="755"/>
<source>&amp;Open logbook</source>
<translation>Открыть журнал</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="739"/>
+ <location filename="../qt-ui/mainwindow.ui" line="758"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="742"/>
+ <location filename="../qt-ui/mainwindow.ui" line="761"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="747"/>
+ <location filename="../qt-ui/mainwindow.ui" line="766"/>
<source>&amp;Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="750"/>
+ <location filename="../qt-ui/mainwindow.ui" line="769"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="753"/>
+ <location filename="../qt-ui/mainwindow.ui" line="772"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="758"/>
+ <location filename="../qt-ui/mainwindow.ui" line="777"/>
<source>Sa&amp;ve as</source>
- <translation type="unfinished"/>
+ <translation>Сохранить как</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="761"/>
+ <location filename="../qt-ui/mainwindow.ui" line="780"/>
<source>Save as</source>
<translation>Сохранить как</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="764"/>
+ <location filename="../qt-ui/mainwindow.ui" line="783"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="769"/>
+ <location filename="../qt-ui/mainwindow.ui" line="788"/>
<source>&amp;Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="772"/>
+ <location filename="../qt-ui/mainwindow.ui" line="791"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="775"/>
+ <location filename="../qt-ui/mainwindow.ui" line="794"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="788"/>
+ <location filename="../qt-ui/mainwindow.ui" line="807"/>
<source>P&amp;references</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="831"/>
- <source>&amp;Add Dive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="850"/>
- <source>Auto &amp;Group</source>
- <translation type="unfinished"/>
+ <translation>Предпочтения</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="863"/>
- <source>&amp;Dive List</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="837"/>
+ <source>Import &amp;GPS data from Subsurface web service</source>
+ <translation>Импорт координат из веб-сервиса Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="871"/>
+ <location filename="../qt-ui/mainwindow.ui" line="890"/>
<source>&amp;Profile</source>
- <translation type="unfinished"/>
+ <translation>Профиль</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="879"/>
+ <location filename="../qt-ui/mainwindow.ui" line="898"/>
<source>&amp;Info</source>
- <translation type="unfinished"/>
+ <translation>Информация</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="887"/>
+ <location filename="../qt-ui/mainwindow.ui" line="906"/>
<source>&amp;All</source>
- <translation type="unfinished"/>
+ <translation>Все</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="895"/>
- <source>P&amp;rev DC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="903"/>
+ <location filename="../qt-ui/mainwindow.ui" line="922"/>
<source>&amp;Next DC</source>
- <translation type="unfinished"/>
+ <translation>След. компьютер</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="911"/>
- <source>&amp;Select Events</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="921"/>
+ <location filename="../qt-ui/mainwindow.ui" line="930"/>
<source>&amp;About Subsurface</source>
- <translation type="unfinished"/>
+ <translation>О Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="937"/>
+ <location filename="../qt-ui/mainwindow.ui" line="946"/>
<source>&amp;Globe</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="953"/>
- <source>&amp;Import Log Files</source>
- <translation type="unfinished"/>
+ <translation>Карта</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="959"/>
+ <location filename="../qt-ui/mainwindow.ui" line="968"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1008"/>
- <source>&amp;Export</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="973"/>
+ <source>Import &amp;from divelogs.de</source>
+ <translation>Импорт с сайта divelogs.de</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1011"/>
- <source>Export Dive Logs</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="981"/>
+ <source>&amp;Full screen</source>
+ <translation>Полный экран</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1014"/>
- <source>Ctrl+E</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="472"/>
- <source>Enable the pN2 Graph</source>
- <translation>Показать график pN2</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="984"/>
+ <source>Toggle full screen</source>
+ <translation>Переключить полноэкранный режим</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="128"/>
- <source>Enable the pHe graph</source>
- <translation>Показать график pHe</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+ <source>&amp;Check for updates</source>
+ <translation>Проверить обновления</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="290"/>
- <source>Show/hide heart rate</source>
- <translation>Показать/скрыть пульс</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+ <source>&amp;Export</source>
+ <translation>Экспорт</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="342"/>
- <source>Enable EAD, END, and EADD</source>
- <translation>Показать EAD, END, EADD</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+ <source>Export Dive Logs</source>
+ <translation>Экспорт журнала</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="238"/>
- <source>Show NDL / TTS</source>
- <translation>Показать NDL / TTS</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+ <source>Ctrl+E</source>
+ <translation>Ctrl+E</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="394"/>
@@ -1586,96 +1611,61 @@ p, li { white-space: pre-wrap; }
<translation>Альтернативный масштаб</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="780"/>
+ <location filename="../qt-ui/mainwindow.ui" line="799"/>
<source>&amp;Print</source>
<translation>Печать</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="791"/>
+ <location filename="../qt-ui/mainwindow.ui" line="810"/>
<source>Ctrl+,</source>
<translation>Ctrl+,</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="799"/>
+ <location filename="../qt-ui/mainwindow.ui" line="818"/>
<source>&amp;Quit</source>
<translation>Выход</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="810"/>
+ <location filename="../qt-ui/mainwindow.ui" line="829"/>
<source>Import from &amp;dive computer</source>
<translation>Импорт из дайвкомпьютера</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="818"/>
- <source>Import &amp;GPS data from Subsurface Service</source>
- <translation>Импорт данных GPS из сервиса Subsurface</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="821"/>
+ <location filename="../qt-ui/mainwindow.ui" line="840"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="826"/>
- <source>&amp;Edit Device Names</source>
- <translation>Список дайвкомпьютеров</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="834"/>
+ <location filename="../qt-ui/mainwindow.ui" line="853"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="839"/>
+ <location filename="../qt-ui/mainwindow.ui" line="858"/>
<source>&amp;Renumber</source>
<translation>Перенумеровать</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="842"/>
+ <location filename="../qt-ui/mainwindow.ui" line="861"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="855"/>
- <source>&amp;Yearly Statistics</source>
- <translation>Статистика за год</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="858"/>
+ <location filename="../qt-ui/mainwindow.ui" line="877"/>
<source>Ctrl+Y</source>
<translation>Ctrl+Y</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="929"/>
- <source>User &amp;Manual</source>
- <translation>Руководство</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="945"/>
- <source>P&amp;lan Dive</source>
- <translation>Планировщик</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="948"/>
+ <location filename="../qt-ui/mainwindow.ui" line="957"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1003"/>
- <source>&amp;Check for Updates</source>
- <translation>Проверить обновления</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="783"/>
+ <location filename="../qt-ui/mainwindow.ui" line="802"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="446"/>
- <source>Enable the pO2 Graph</source>
- <translation>Показать график pO2</translation>
- </message>
- <message>
<location filename="../qt-ui/mainwindow.ui" line="131"/>
<location filename="../qt-ui/mainwindow.ui" line="157"/>
<location filename="../qt-ui/mainwindow.ui" line="186"/>
@@ -1689,205 +1679,206 @@ p, li { white-space: pre-wrap; }
<location filename="../qt-ui/mainwindow.ui" line="397"/>
<location filename="../qt-ui/mainwindow.ui" line="423"/>
<location filename="../qt-ui/mainwindow.ui" line="449"/>
- <location filename="../qt-ui/mainwindow.ui" line="475"/>
+ <location filename="../qt-ui/mainwindow.ui" line="478"/>
+ <location filename="../qt-ui/mainwindow.ui" line="504"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="316"/>
- <source>Enable MOD</source>
- <translation>Показать MOD</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="446"/>
+ <source>Toggle pO₂ Graph</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="183"/>
- <source>Show the DC Reported Ceiling</source>
- <translation>Показать потолок компьютера</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="475"/>
+ <source>Toggle pN₂ Graph</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="212"/>
- <source>Show the Calculated Ceiling</source>
- <translation>Показать расчетный потолок</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="821"/>
+ <source>Ctrl+Q</source>
+ <translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="264"/>
- <source>Show Calculated Ceiling with 3m Increments</source>
- <translation>Расчетный потолок с интервалом 3м</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="832"/>
+ <source>Ctrl+D</source>
+ <translation>Ctrl+D</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="154"/>
- <source>Calculate All Tissues</source>
- <translation>Расчет всех тканей</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="845"/>
+ <source>&amp;Edit device names</source>
+ <translation>Мои дайвкомпьютеры</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="368"/>
- <source>Show SAC Rate</source>
- <translation>Показать SAC</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="850"/>
+ <source>&amp;Add dive</source>
+ <translation>Добавить погружение</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="420"/>
- <source>Enable / Disable the Ruler</source>
- <translation>Показать рулетку</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="869"/>
+ <source>Auto &amp;group</source>
+ <translation>Авто-группировка</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="802"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="874"/>
+ <source>&amp;Yearly statistics</source>
+ <translation>Статистика по годам</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="813"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="882"/>
+ <source>&amp;Dive list</source>
+ <translation>Список погружений</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="866"/>
+ <location filename="../qt-ui/mainwindow.ui" line="885"/>
<source>Ctrl+2</source>
<translation>Ctrl+2</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="874"/>
+ <location filename="../qt-ui/mainwindow.ui" line="893"/>
<source>Ctrl+3</source>
<translation>Ctrl+3</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="882"/>
+ <location filename="../qt-ui/mainwindow.ui" line="901"/>
<source>Ctrl+4</source>
<translation>Ctrl+4</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="890"/>
+ <location filename="../qt-ui/mainwindow.ui" line="909"/>
<source>Ctrl+1</source>
<translation>Ctrl+1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="898"/>
+ <location filename="../qt-ui/mainwindow.ui" line="914"/>
+ <source>P&amp;revious DC</source>
+ <translation>Пред. компьютер</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="917"/>
<source>Left</source>
<translation>Влево</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="906"/>
+ <location filename="../qt-ui/mainwindow.ui" line="925"/>
<source>Right</source>
<translation>Вправо</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="916"/>
- <source>Input Plan</source>
- <translation>Ввести план</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="938"/>
+ <source>User &amp;manual</source>
+ <translation>Руководство пользователя</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="932"/>
+ <location filename="../qt-ui/mainwindow.ui" line="941"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="940"/>
+ <location filename="../qt-ui/mainwindow.ui" line="949"/>
<source>Ctrl+5</source>
<translation>Ctrl+5</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="956"/>
- <source>Import divelog files from other applications</source>
- <translation>Импортировать журнал погружений из другой программы</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="964"/>
- <source>Import &amp;from Divelogs.de</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="954"/>
+ <source>P&amp;lan dive</source>
+ <translation>Планировщик</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="972"/>
- <source>&amp;Full Screen</source>
- <translation>Полноэкранный режим</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="962"/>
+ <source>&amp;Import log files</source>
+ <translation>Импорт журналов</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="975"/>
- <source>Toggle Full Screen</source>
- <translation>Переключить полноэкранный режим</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="965"/>
+ <source>Import divelog files from other applications</source>
+ <translation>Импортировать журнал погружений из другой программы</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="978"/>
+ <location filename="../qt-ui/mainwindow.ui" line="987"/>
<source>F11</source>
<translation>F11</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.cpp" line="191"/>
- <source>Open File</source>
- <translation>Открыть файл</translation>
+ <source>Open file</source>
+ <translation>Открыть журнал</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="281"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="283"/>
<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="388"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="390"/>
<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="419"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="421"/>
<source>Print runtime table</source>
- <translation type="unfinished"/>
+ <translation>Печать плана погружения</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="710"/>
- <source>Do you want to save the changes you made in the file %1?</source>
- <translation>Сохранить изменения в файле %1?</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="516"/>
+ <source>Yearly statistics</source>
+ <translation>Статистика по годам</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="712"/>
- <source>Do you want to save the changes you made in the datafile?</source>
- <translation>Сохранить изменения в файле журнала?</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="701"/>
+ <source>Do you want to save the changes that you made in the file %1?</source>
+ <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="717"/>
- <source>Save Changes?</source>
- <translation>Сохранить изменения?</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="703"/>
+ <source>Do you want to save the changes that you made in the data file?</source>
+ <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="718"/>
- <source>Changes will be lost if you don&apos;t save them.</source>
- <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="708"/>
+ <source>Save changes?</source>
+ <translation>Сохранить изменения?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="1075"/>
- <source>Save File as</source>
+ <location filename="../qt-ui/mainwindow.cpp" line="1066"/>
+ <source>Save file as</source>
<translation>Сохранить как</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="249"/>
- <location filename="../qt-ui/mainwindow.cpp" line="388"/>
- <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1190"/>
+ <source>Open dive log file</source>
+ <translation>Открыть журнал погружений</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="1191"/>
+ <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>Файлы журналов (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML файлы (*.xml);;UDDF/UDCF файлы(*.uddf *.udcf);;JDiveLog файлы(*.jlb);;Suunto файлы(*.sde *.db);;CSV файлы(*.csv);;Все файлы(*)</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+ <source>Changes will be lost if you don&apos;t save them.</source>
+ <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="251"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="390"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1216"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.cpp" line="188"/>
- <location filename="../qt-ui/mainwindow.cpp" line="1059"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1050"/>
<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="514"/>
- <source>Yearly Statistics</source>
- <translation>Статистика за год</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1067"/>
<source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
- <source>Open Dive Log File</source>
- <translation>Открыть журнал погружений</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1200"/>
- <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>Файлы журналов (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);; Файлы XML(*.xml);; Файлы UDDF/UDCF(*.uddf *.udcf);; Файлы JDiveLog(*.jlb);; Файлы Suunto(*.sde *.db);;Файлы CSV(*.csv);; Все файлы(*)</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1216"/>
<source>Please, first finish the current edition before trying to do another.</source>
<translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
</message>
@@ -1895,14 +1886,14 @@ p, li { white-space: pre-wrap; }
<context>
<name>PlannerSettingsWidget</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="444"/>
<source>Last stop at 20ft</source>
- <translation type="unfinished"/>
+ <translation>Последняя остановка на 20фт</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="451"/>
<source>Last stop at 6m</source>
- <translation type="unfinished"/>
+ <translation>Последняя остановка на 6м</translation>
</message>
</context>
<context>
@@ -1930,12 +1921,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/preferences.ui" line="125"/>
<source>Network</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="151"/>
- <source>Lists and Tables</source>
- <translation>Списки и таблицы</translation>
+ <translation>Сеть</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="157"/>
@@ -1953,31 +1939,11 @@ p, li { white-space: pre-wrap; }
<translation>Погружения</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="186"/>
- <source>Default Dive file</source>
- <translation>Журнал по умолчанию</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="207"/>
- <source>Display Invalid</source>
- <translation>Показывать ошибочные</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="224"/>
- <source>Default Cylinder</source>
- <translation>Баллон по умолчанию</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="230"/>
- <source>Use Default Cylinder</source>
- <translation>Использовать</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="247"/>
<source>Animations</source>
<translation>Анимация</translation>
@@ -1988,29 +1954,14 @@ p, li { white-space: pre-wrap; }
<translation>Скорость</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="280"/>
- <source>Subsurface Webservice</source>
- <translation>Веб-сервис Subsurface</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="286"/>
- <source>Default User ID</source>
- <translation>ID пользователя по умолчанию</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="296"/>
- <source>Save User ID locally?</source>
- <translation>Сохранить ID пользователя локально?</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="306"/>
<source>Clear all settings</source>
- <translation type="unfinished"/>
+ <translation>Очистить все натройки</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="312"/>
<source>Reset all settings to their default value</source>
- <translation type="unfinished"/>
+ <translation>Сбросить все настройки в значение по умолчанию</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="341"/>
@@ -2050,7 +2001,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/preferences.ui" line="426"/>
<source>bar</source>
- <translation>Бар</translation>
+ <translation>бар</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="436"/>
@@ -2083,49 +2034,39 @@ p, li { white-space: pre-wrap; }
<translation>кг</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="598"/>
- <source>threshold when showing pO₂</source>
- <translation>пороговое значение pO₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="619"/>
- <source>threshold when showing pN₂</source>
- <translation>пороговое значение pN₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="640"/>
- <source>threshold when showing pHe</source>
- <translation>пороговое значение pHe</translation>
+ <location filename="../qt-ui/preferences.ui" line="772"/>
+ <source>System default</source>
+ <translation>Системные настройки</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="811"/>
<source>Proxy</source>
- <translation type="unfinished"/>
+ <translation>Прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="817"/>
<source>Proxy type</source>
- <translation type="unfinished"/>
+ <translation>Тип прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="830"/>
<source>Host</source>
- <translation type="unfinished"/>
+ <translation>Хост</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="856"/>
<source>Port</source>
- <translation type="unfinished"/>
+ <translation>Порт</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="882"/>
<source>Requires authentication</source>
- <translation type="unfinished"/>
+ <translation>Требуется авторизация</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="902"/>
<source>Username</source>
- <translation type="unfinished"/>
+ <translation>Пользователь</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="925"/>
@@ -2133,16 +2074,6 @@ p, li { white-space: pre-wrap; }
<translation>Пароль</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="682"/>
- <source>draw dive computer reported ceiling red</source>
- <translation>показывать потолок компьютера красным</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="772"/>
- <source>System Default</source>
- <translation>Язык системы</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="792"/>
<source>Filter</source>
<translation>Фильтр</translation>
@@ -2153,6 +2084,46 @@ p, li { white-space: pre-wrap; }
<translation>Давление</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.ui" line="151"/>
+ <source>Lists and tables</source>
+ <translation>Списки и таблицы</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="186"/>
+ <source>Default dive log file</source>
+ <translation>Журнал по умолчанию</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="207"/>
+ <source>Display invalid</source>
+ <translation>Показывать ошибочные</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="224"/>
+ <source>Default cylinder</source>
+ <translation>Баллон по умолчанию</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="230"/>
+ <source>Use default cylinder</source>
+ <translation>Использовать по умолчанию</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="280"/>
+ <source>Subsurface web service</source>
+ <translation>Веб-сервис Subsurface</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="286"/>
+ <source>Default user ID</source>
+ <translation>ID пользователя</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="296"/>
+ <source>Save user ID locally?</source>
+ <translation>Сохранять ID пользователя</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.ui" line="446"/>
<source>Volume</source>
<translation>Объем</translation>
@@ -2178,11 +2149,6 @@ p, li { white-space: pre-wrap; }
<translation>Единицы времени</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="538"/>
- <source>Ascent/Descent speed denominator</source>
- <translation>Делитель скорости спуска/подъема</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="545"/>
<source>Minutes</source>
<translation>Минуты</translation>
@@ -2198,21 +2164,6 @@ p, li { white-space: pre-wrap; }
<translation>Показывать</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="661"/>
- <source>max pO₂ when showing MOD</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="693"/>
- <source>Show non-used cylinders in Equipment Tab</source>
- <translation>Показать неиспользованные балоны в табе оборудования</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="704"/>
- <source>show average depth</source>
- <translation>показать среднюю глубину</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="756"/>
<source>GFLow at max depth</source>
<translation>GFLow на макс. грубине</translation>
@@ -2228,6 +2179,46 @@ p, li { white-space: pre-wrap; }
<translation>Предпочтения</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.ui" line="538"/>
+ <source>Ascent/descent speed denominator</source>
+ <translation>Делитель скорости спуска/подъема</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="598"/>
+ <source>Threshold when showing pO₂</source>
+ <translation>Предельное значение pO₂</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="619"/>
+ <source>Threshold when showing pN₂</source>
+ <translation>Предельное значение pN₂</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="640"/>
+ <source>Threshold when showing pHe</source>
+ <translation>Предельное значение pHe</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="661"/>
+ <source>Max pO₂ when showing MOD</source>
+ <translation>Макс. pO₂ при отображении MOD</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="682"/>
+ <source>Draw dive computer reported ceiling red</source>
+ <translation>Показывать потолок дайвкомпьютера красным</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="693"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Показывать неиспользуемые баллоны</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="704"/>
+ <source>Show average depth</source>
+ <translation>Показывать среднюю глубину</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.ui" line="722"/>
<source>GFLow</source>
<translation>GFLow</translation>
@@ -2240,22 +2231,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/preferences.cpp" line="23"/>
<source>No proxy</source>
- <translation type="unfinished"/>
+ <translation>Без прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="24"/>
<source>System proxy</source>
- <translation type="unfinished"/>
+ <translation>Системный прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="25"/>
<source>HTTP proxy</source>
- <translation type="unfinished"/>
+ <translation>HTTP прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="26"/>
<source>SOCKS proxy</source>
- <translation type="unfinished"/>
+ <translation>SOCKS прокси</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="245"/>
@@ -2268,9 +2259,9 @@ p, li { white-space: pre-wrap; }
<translation>Для смены языка необходимо перезапустить Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="381"/>
- <source>Open Default Log File</source>
- <translation>Журнал по умолчанию</translation>
+ <location filename="../qt-ui/preferences.cpp" line="395"/>
+ <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
+ <translation>Если вы нажмете ОК, все настройки Subsurface будут моментально сброшены в значение по умолчанию.</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="381"/>
@@ -2278,15 +2269,15 @@ p, li { white-space: pre-wrap; }
<translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.cpp" line="381"/>
+ <source>Open default log file</source>
+ <translation>Выберите журнал по умолчанию</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.cpp" line="394"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
- <message>
- <location filename="../qt-ui/preferences.cpp" line="395"/>
- <source>If you click OK, all settings of Subsurface are reset to their default values. This will be applied immediately.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>PrintDialog</name>
@@ -2309,37 +2300,37 @@ p, li { white-space: pre-wrap; }
<context>
<name>PrintLayout</name>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="25"/>
+ <location filename="../qt-ui/printlayout.cpp" line="27"/>
<source>Dive#</source>
<translation>Погр#</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="26"/>
+ <location filename="../qt-ui/printlayout.cpp" line="28"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="27"/>
+ <location filename="../qt-ui/printlayout.cpp" line="29"/>
<source>Depth</source>
<translation>Глуб.</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="28"/>
+ <location filename="../qt-ui/printlayout.cpp" line="30"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="29"/>
+ <location filename="../qt-ui/printlayout.cpp" line="31"/>
<source>Master</source>
<translation>Инструктор</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="30"/>
+ <location filename="../qt-ui/printlayout.cpp" line="32"/>
<source>Buddy</source>
<translation>Партнер</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="31"/>
+ <location filename="../qt-ui/printlayout.cpp" line="33"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
@@ -2427,72 +2418,72 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProfilePrintModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1878"/>
+ <location filename="../qt-ui/models.cpp" line="1901"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1883"/>
+ <location filename="../qt-ui/models.cpp" line="1906"/>
<source>Dive #%1 - %2</source>
<translation>Погружение №%1 - %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1886"/>
+ <location filename="../qt-ui/models.cpp" line="1909"/>
<source>Max depth: %1 %2</source>
<translation>Макс. глубина: %1 %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1893"/>
+ <location filename="../qt-ui/models.cpp" line="1916"/>
<source>Duration: %1 min</source>
<translation>Длительность: %1 мин</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1898"/>
- <source>Gas Used:</source>
- <translation>Газы:</translation>
+ <location filename="../qt-ui/models.cpp" line="1921"/>
+ <source>Gas used:</source>
+ <translation>Исп. газы:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1900"/>
- <source>SAC:</source>
- <translation>SAC:</translation>
+ <location filename="../qt-ui/models.cpp" line="1923"/>
+ <source>Tags:</source>
+ <translation>Метки:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1902"/>
- <source>Max. CNS:</source>
- <translation>Макс. CNS:</translation>
+ <location filename="../qt-ui/models.cpp" line="1925"/>
+ <source>SAC:</source>
+ <translation>SAC:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1904"/>
+ <location filename="../qt-ui/models.cpp" line="1927"/>
<source>Weights:</source>
<translation>Грузы:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1909"/>
+ <location filename="../qt-ui/models.cpp" line="1932"/>
<source>Notes:</source>
<translation>Заметки:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1916"/>
+ <location filename="../qt-ui/models.cpp" line="1939"/>
<source>Divemaster:</source>
<translation>Инструктор:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1918"/>
+ <location filename="../qt-ui/models.cpp" line="1941"/>
<source>Buddy:</source>
<translation>Напарник:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1920"/>
+ <location filename="../qt-ui/models.cpp" line="1943"/>
<source>Suit:</source>
<translation>Костюм:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1922"/>
+ <location filename="../qt-ui/models.cpp" line="1945"/>
<source>Viz:</source>
<translation>Видимость:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1924"/>
+ <location filename="../qt-ui/models.cpp" line="1947"/>
<source>Rating:</source>
<translation>Рейтинг:</translation>
</message>
@@ -2500,77 +2491,77 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProfileWidget2</name>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="525"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/>
<source> (#%1 of %2)</source>
- <translation type="unfinished"/>
+ <translation> (#%1 из %2)</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/>
<source>Make first divecomputer</source>
- <translation type="unfinished"/>
+ <translation>Сделать первым компьютером</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/>
<source>Delete this divecomputer</source>
- <translation type="unfinished"/>
+ <translation>Удалить этот дайвкомпьютер</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
- <source>Add Gas Change</source>
- <translation>Добавить замену смеси</translation>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/>
+ <source>Add gas change</source>
+ <translation>Добавить замену газа</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/>
- <source>Add Bookmark</source>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/>
+ <source>Add bookmark</source>
<translation>Добавить закладку</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="928"/>
- <source>Remove Event</source>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/>
+ <source>Remove event</source>
<translation>Удалить событие</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
<source>Hide similar events</source>
<translation>Скрыть похожие события</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="939"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/>
<source>Edit name</source>
<translation>Редактировать имя</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="953"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/>
<source>Unhide all events</source>
<translation>Показать все события</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/>
<source>Hide events</source>
<translation>Скрыть событие</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/>
<source>Hide all %1 events?</source>
<translation>Спрятать все %1 события?</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1022"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/>
<source>Remove the selected event?</source>
<translation>Удалить выбранное событие?</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1023"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/>
<source>%1 @ %2:%3</source>
<translation>%1 @ %2:%3</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1073"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
<source>Edit name of bookmark</source>
<translation>Редактировать имя закладки</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1074"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/>
<source>Custom name:</source>
<translation>Имя:</translation>
</message>
@@ -2583,8 +2574,8 @@ p, li { white-space: pre-wrap; }
<translation>воздух</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="210"/>
- <source>Remove this Point</source>
+ <location filename="../qt-ui/diveplanner.cpp" line="212"/>
+ <source>Remove this point</source>
<translation>Удалить эту точку</translation>
</message>
<message>
@@ -2595,7 +2586,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="27"/>
<source>Average</source>
- <translation>Средняя</translation>
+ <translation>Среднее</translation>
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="30"/>
@@ -2612,6 +2603,66 @@ p, li { white-space: pre-wrap; }
<source>Move the map and double-click to set the dive location</source>
<translation>Выберите место на карте двойным щелчком мыши.</translation>
</message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="472"/>
+ <source>kg</source>
+ <translation>кг</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="473"/>
+ <source>lbs</source>
+ <translation>фунт</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="497"/>
+ <source>ft</source>
+ <translation>фут</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="498"/>
+ <source>m</source>
+ <translation>м</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="521"/>
+ <source>psi</source>
+ <translation>psi</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="522"/>
+ <source>bar</source>
+ <translation>бар</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="546"/>
+ <source>l</source>
+ <translation>л</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="547"/>
+ <source>cuft</source>
+ <translation>куб. фут</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/>
+ <source>Invalid response from server</source>
+ <translation>Неверный ответ сервера</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/>
+ <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+ <translation>XML тег &apos;DiveDateReader&apos; не найден, получен &apos;%1</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
+ <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+ <translation>XML тег &apos;DiveDates&apos; не найден</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+ <source>Malformed XML response. Line %1: %2</source>
+ <translation>Неверный XML ответ. Строка %1: %2</translation>
+ </message>
</context>
<context>
<name>RenumberDialog</name>
@@ -2629,7 +2680,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="126"/>
<source>New number</source>
- <translation type="unfinished"/>
+ <translation>Новый номер</translation>
</message>
</context>
<context>
@@ -2637,17 +2688,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/searchbar.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
</context>
<context>
<name>ShiftImageTimesDialog</name>
<message>
- <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
- <source>Shift selected times</source>
- <translation>Сдвинуть время</translation>
- </message>
- <message>
<location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
<source>Shift times of image(s) by</source>
<translation>Сдвинуть время изображения(-ий) на</translation>
@@ -2658,14 +2704,19 @@ p, li { white-space: pre-wrap; }
<translation>h:mm</translation>
</message>
<message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
+ <source>Shift selected image times</source>
+ <translation>Сдвинуть время изображений</translation>
+ </message>
+ <message>
<location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
- <source>earlier</source>
- <translation>раньше</translation>
+ <source>Earlier</source>
+ <translation>Раньше</translation>
</message>
<message>
<location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
- <source>later</source>
- <translation>позже</translation>
+ <source>Later</source>
+ <translation>Позже</translation>
</message>
<message>
<location filename="../qt-ui/shiftimagetimes.ui" line="148"/>
@@ -2689,21 +2740,21 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="224"/>
- <source>Open Image File</source>
- <translation>Открыть изображения</translation>
+ <source>Open image file</source>
+ <translation>Открыть файл с изображением</translation>
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="226"/>
- <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
- <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+ <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
</context>
<context>
<name>ShiftTimesDialog</name>
<message>
<location filename="../qt-ui/shifttimes.ui" line="23"/>
- <source>Shift selected times</source>
- <translation>Сдвинуть время</translation>
+ <source>Shift selected dive times</source>
+ <translation>Сдвиг времени погружения</translation>
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="49"/>
@@ -2733,13 +2784,13 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="136"/>
- <source>earlier</source>
- <translation>раньше</translation>
+ <source>Earlier</source>
+ <translation>Раньше</translation>
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="143"/>
- <source>later</source>
- <translation>позже</translation>
+ <source>Later</source>
+ <translation>Позже</translation>
</message>
</context>
<context>
@@ -2794,10 +2845,15 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
- <source>Connection Error: </source>
+ <source>Connection error: </source>
<translation>Ошибка соединения:</translation>
</message>
<message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
+ <source>Download successful</source>
+ <translation>Загрузка завершена</translation>
+ </message>
+ <message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/>
<source>Invalid user identifier!</source>
<translation>Неверный идентификатор пользователя!</translation>
@@ -2807,36 +2863,31 @@ p, li { white-space: pre-wrap; }
<source>Cannot parse response!</source>
<translation>Невозможно разобрать ответ!</translation>
</message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
- <source>Download Success!</source>
- <translation>Успешная загрузка!</translation>
- </message>
</context>
<context>
<name>TableView</name>
<message>
<location filename="../qt-ui/tableview.cpp" line="23"/>
- <source>Add Cylinder</source>
+ <source>Add cylinder</source>
<translation>Добавить баллон</translation>
</message>
</context>
<context>
<name>TankInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>Description</source>
<translation>Описание</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>ml</source>
<translation>мл</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>bar</source>
- <translation>Бар</translation>
+ <translation>бар</translation>
</message>
</context>
<context>
@@ -2857,17 +2908,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/updatemanager.cpp" line="36"/>
<source>Subsurface was unable to check for updates.</source>
- <translation type="unfinished"/>
+ <translation>Не получилось проверить наличие обновлений.</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="41"/>
<source>The following error occurred:</source>
- <translation type="unfinished"/>
+ <translation>Возникла ошибка:</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="42"/>
<source>Please check your internet connection.</source>
- <translation type="unfinished"/>
+ <translation>Проверьте Интернет-соединение.</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="51"/>
@@ -2898,8 +2949,8 @@ p, li { white-space: pre-wrap; }
<translation>Руководство пользователя</translation>
</message>
<message>
- <location filename="../qt-ui/usermanual.cpp" line="69"/>
- <location filename="../qt-ui/usermanual.cpp" line="75"/>
+ <location filename="../qt-ui/usermanual.cpp" line="70"/>
+ <location filename="../qt-ui/usermanual.cpp" line="76"/>
<source>Cannot find the Subsurface manual</source>
<translation>Руководство не найдено</translation>
</message>
@@ -2907,136 +2958,140 @@ p, li { white-space: pre-wrap; }
<context>
<name>UserSurvey</name>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="14"/>
- <source>Dialog</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="32"/>
+ <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source>
+ <translation>Мы хотели бы побольше узнать о наших пользователях и их предпочтениях. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface. Укажите все варианты, которые подходят вам.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="47"/>
- <source>Subsurface User Survey</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="14"/>
+ <source>User Survey</source>
+ <translation>Опрос пользователей</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="60"/>
- <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="25"/>
+ <source>Subsurface user survey</source>
+ <translation>Опрос пользователей Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="79"/>
- <source>Recreational DIver</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="52"/>
+ <source>Recreational diver</source>
+ <translation>Рекреационный дайвер</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="92"/>
- <source>Tech Diver</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="45"/>
+ <source>Technical diver</source>
+ <translation>Технический дайвер</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="105"/>
+ <location filename="../qt-ui/usersurvey.ui" line="59"/>
<source>Interested in dive planning</source>
- <translation type="unfinished"/>
+ <translation>Заинтересован в планировщике</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="118"/>
+ <location filename="../qt-ui/usersurvey.ui" line="66"/>
<source>I am downloading dives from supported dive computer</source>
- <translation type="unfinished"/>
+ <translation>Я загружаю погружения из дайвкомпьютера</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="131"/>
+ <location filename="../qt-ui/usersurvey.ui" line="73"/>
<source>I am importing dives from other software / sources</source>
- <translation type="unfinished"/>
+ <translation>Я загружаю погружения из других программ/источников</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="144"/>
+ <location filename="../qt-ui/usersurvey.ui" line="80"/>
<source>I am manually entering dives</source>
- <translation type="unfinished"/>
+ <translation>Я ввожу погружения вручную</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="167"/>
+ <location filename="../qt-ui/usersurvey.ui" line="87"/>
<source>I use the Android companion app to track dive locations</source>
- <translation type="unfinished"/>
+ <translation>Я использую приложения Android для привязки координат</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="190"/>
+ <location filename="../qt-ui/usersurvey.ui" line="94"/>
<source>Please type suggestions (in English) in the following box</source>
- <translation type="unfinished"/>
+ <translation>Оставьте ваши пожелания (на английском) в следующем поле</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="203"/>
+ <location filename="../qt-ui/usersurvey.ui" line="104"/>
<source>The following information about your system will also be submitted</source>
- <translation type="unfinished"/>
+ <translation>Также будет отправлена информация о вашем компьютере</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="28"/>
<source>
Operating System: %1</source>
- <translation type="unfinished"/>
+ <translation>
+Операционная система: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="31"/>
<source>
CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/usersurvey.cpp" line="35"/>
- <source>
-OS CPU Architecture %1</source>
- <translation type="unfinished"/>
+ <translation>
+Архитектура ЦПУ: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="40"/>
<source>
Language: %1</source>
- <translation type="unfinished"/>
+ <translation>
+Язык: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="74"/>
<source>Should we ask you later?</source>
- <translation type="unfinished"/>
+ <translation>Предлагать заполнить опросник в будущем?</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="75"/>
<source>Don&apos;t ask me again</source>
- <translation type="unfinished"/>
+ <translation>Больше не спрашивать</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="75"/>
- <source>Ask Later</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+ <source>Ask later</source>
+ <translation>Спросить позже</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+ <source>Submit user survey.</source>
+ <translation>Отправить опросник.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="77"/>
<source>Ask again?</source>
- <translation type="unfinished"/>
+ <translation>Спрашивать снова?</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="95"/>
- <source>Submit User Survey.</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="36"/>
+ <source>
+OS CPU Architecture: %1</source>
+ <translation>
+ОС ЦПУ Архитектура: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="97"/>
<source>Subsurface was unable to submit the user survey.</source>
- <translation type="unfinished"/>
+ <translation>Не удалось отправить опросник.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="102"/>
<source>The following error occurred:</source>
- <translation type="unfinished"/>
+ <translation>Возникла ошибка:</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="103"/>
<source>Please check your internet connection.</source>
- <translation type="unfinished"/>
+ <translation>Проверьте Интернет-соединение.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="112"/>
<source>Survey successfully submitted.</source>
- <translation type="unfinished"/>
+ <translation>Опросник успешно отправлен.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="117"/>
<source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
<translation>Возникла ошибка во время проверки обновения.&lt;br/&gt;&lt;br/&gt;%1</translation>
</message>
@@ -3044,12 +3099,12 @@ Language: %1</source>
<context>
<name>WSInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="721"/>
+ <location filename="../qt-ui/models.cpp" line="734"/>
<source>Description</source>
<translation>Описание</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="721"/>
+ <location filename="../qt-ui/models.cpp" line="734"/>
<source>kg</source>
<translation>кг</translation>
</message>
@@ -3058,7 +3113,7 @@ Language: %1</source>
<name>WebServices</name>
<message>
<location filename="../qt-ui/webservices.ui" line="14"/>
- <source>Webservice Connection</source>
+ <source>Web service connection</source>
<translation>Соединение с веб-сервисом</translation>
</message>
<message>
@@ -3083,8 +3138,8 @@ Language: %1</source>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="85"/>
- <source>Save User ID locally?</source>
- <translation>Сохранить ID пользователя локально?</translation>
+ <source>Save user ID locally?</source>
+ <translation>Сохранять ID пользователя</translation>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="92"/>
@@ -3110,117 +3165,97 @@ Language: %1</source>
<context>
<name>WeightModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="373"/>
+ <location filename="../qt-ui/models.cpp" line="387"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="373"/>
+ <location filename="../qt-ui/models.cpp" line="387"/>
<source>Weight</source>
<translation>Вес</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="433"/>
- <source>Clicking here will remove this weigthsystem.</source>
- <translation>Удалить эту грузовую систему.</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="458"/>
- <source>kg</source>
- <translation>кг</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="459"/>
- <source>lbs</source>
- <translation>фунт</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="483"/>
- <source>ft</source>
- <translation>фут</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="484"/>
- <source>m</source>
- <translation>м</translation>
+ <location filename="../qt-ui/models.cpp" line="447"/>
+ <source>Clicking here will remove this weight system.</source>
+ <translation>Нажмите здесь чтобы удалить эту грузовую систему.</translation>
</message>
</context>
<context>
<name>YearlyStatisticsModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1637"/>
+ <location filename="../qt-ui/models.cpp" line="1647"/>
<source>Year
&gt; Month / Trip</source>
<translation>Год
&gt; Месяц / Поездка</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1640"/>
+ <location filename="../qt-ui/models.cpp" line="1650"/>
<source>#</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1643"/>
+ <location filename="../qt-ui/models.cpp" line="1653"/>
<source>Duration
Total</source>
<translation>Длительность
Общее</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1646"/>
+ <location filename="../qt-ui/models.cpp" line="1656"/>
<source>
Average</source>
<translation>
Среднее</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1649"/>
+ <location filename="../qt-ui/models.cpp" line="1659"/>
<source>
Shortest</source>
<translation>
Кратчайшее</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1652"/>
+ <location filename="../qt-ui/models.cpp" line="1662"/>
<source>
Longest</source>
<translation>
Самое долгое</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1655"/>
+ <location filename="../qt-ui/models.cpp" line="1665"/>
<source>Depth (%1)
Average</source>
<translation>Глубина (%1)
Среднее</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1658"/>
- <location filename="../qt-ui/models.cpp" line="1667"/>
- <location filename="../qt-ui/models.cpp" line="1676"/>
+ <location filename="../qt-ui/models.cpp" line="1668"/>
+ <location filename="../qt-ui/models.cpp" line="1677"/>
+ <location filename="../qt-ui/models.cpp" line="1686"/>
<source>
Minimum</source>
<translation>
Минимум</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1661"/>
- <location filename="../qt-ui/models.cpp" line="1670"/>
- <location filename="../qt-ui/models.cpp" line="1679"/>
+ <location filename="../qt-ui/models.cpp" line="1671"/>
+ <location filename="../qt-ui/models.cpp" line="1680"/>
+ <location filename="../qt-ui/models.cpp" line="1689"/>
<source>
Maximum</source>
<translation>
Максимум</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1664"/>
+ <location filename="../qt-ui/models.cpp" line="1674"/>
<source>SAC (%1)
Average</source>
<translation>SAC (%1)
Среднее</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1673"/>
+ <location filename="../qt-ui/models.cpp" line="1683"/>
<source>Temp. (%1)
Average</source>
<translation>Темп. (%1)
@@ -3230,29 +3265,29 @@ Maximum</source>
<context>
<name>gettextFromC</name>
<message>
- <location filename="../dive.c" line="87"/>
+ <location filename="../dive.c" line="123"/>
<source>pascal</source>
<translation>Па</translation>
</message>
<message>
- <location filename="../dive.c" line="92"/>
+ <location filename="../dive.c" line="128"/>
<location filename="../qt-gui.cpp" line="323"/>
<source>bar</source>
- <translation>Бар</translation>
+ <translation>бар</translation>
</message>
<message>
- <location filename="../dive.c" line="96"/>
+ <location filename="../dive.c" line="132"/>
<location filename="../qt-gui.cpp" line="326"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
- <location filename="../dive.c" line="138"/>
+ <location filename="../dive.c" line="174"/>
<source>cuft</source>
<translation>куб. фут</translation>
</message>
<message>
- <location filename="../dive.c" line="167"/>
+ <location filename="../dive.c" line="203"/>
<location filename="../qt-gui.cpp" line="205"/>
<location filename="../qt-gui.cpp" line="220"/>
<location filename="../worldmap-save.c" line="44"/>
@@ -3260,36 +3295,56 @@ Maximum</source>
<translation>м</translation>
</message>
<message>
- <location filename="../dive.c" line="172"/>
+ <location filename="../dive.c" line="208"/>
<location filename="../qt-gui.cpp" line="208"/>
<location filename="../qt-gui.cpp" line="222"/>
<source>ft</source>
<translation>фут</translation>
</message>
<message>
- <location filename="../dive.c" line="217"/>
+ <location filename="../dive.c" line="231"/>
+ <source>m/min</source>
+ <translation>м/мин</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="233"/>
+ <source>m/s</source>
+ <translation>м/с</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="238"/>
+ <source>ft/min</source>
+ <translation>фут/мин</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="240"/>
+ <source>ft/s</source>
+ <translation>фут/с</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="259"/>
<location filename="../qt-gui.cpp" line="231"/>
<location filename="../qt-gui.cpp" line="241"/>
<source>lbs</source>
<translation>фунт</translation>
</message>
<message>
- <location filename="../dive.c" line="221"/>
+ <location filename="../dive.c" line="263"/>
<location filename="../qt-gui.cpp" line="229"/>
<location filename="../qt-gui.cpp" line="239"/>
<source>kg</source>
<translation>кг</translation>
</message>
<message>
- <location filename="../dive.c" line="1237"/>
+ <location filename="../dive.c" line="1279"/>
<source>(%s) or (%s)</source>
<translation>(%s) или (%s)</translation>
</message>
<message>
<location filename="../divelist.c" line="467"/>
<location filename="../equipment.c" line="104"/>
- <location filename="../planner.c" line="976"/>
- <location filename="../planner.c" line="979"/>
+ <location filename="../planner.c" line="986"/>
+ <location filename="../planner.c" line="989"/>
<location filename="../statistics.c" line="355"/>
<source>air</source>
<translation>воздух</translation>
@@ -3326,8 +3381,8 @@ Maximum</source>
<translation>Ошибка чтения &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../file.c" line="406"/>
- <location filename="../file.c" line="482"/>
+ <location filename="../file.c" line="409"/>
+ <location filename="../file.c" line="494"/>
<source>Maximum number of supported columns on CSV import is %d</source>
<translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
</message>
@@ -3559,26 +3614,26 @@ Maximum</source>
<translation>Невозможно открыть %s %s (%s)</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="466"/>
+ <location filename="../parse-xml.c" line="467"/>
<source>Strange percentage reading %s
</source>
<translation>Странное значение процентов %s
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1683"/>
+ <location filename="../parse-xml.c" line="1692"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Ошибка разбора &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1904"/>
+ <location filename="../parse-xml.c" line="1913"/>
<source>Database query get_events failed.
</source>
<translation>Ошибка запроса get_events в БД.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1911"/>
+ <location filename="../parse-xml.c" line="1920"/>
<source>Database query get_tags failed.
</source>
<translation>Запрос get_tags в базу не выполнился.
@@ -3592,36 +3647,36 @@ Maximum</source>
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1945"/>
- <location filename="../parse-xml.c" line="2092"/>
+ <location filename="../parse-xml.c" line="1954"/>
+ <location filename="../parse-xml.c" line="2101"/>
<source>Database query failed '%s'.
</source>
<translation>Ошибка запроса к БД &apos;%s&apos;.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2056"/>
+ <location filename="../parse-xml.c" line="2065"/>
<source>Database query get_cylinders failed.
</source>
<translation>Запрос get_cylinders в базу не выполнился.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2063"/>
+ <location filename="../parse-xml.c" line="2072"/>
<source>Database query get_changes failed.
</source>
<translation>Запрос get_changes в базу не выполнился.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2070"/>
+ <location filename="../parse-xml.c" line="2079"/>
<source>Database query get_profile_sample failed.
</source>
<translation>Запрос get_profile_sample в базу не выполнился.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2161"/>
+ <location filename="../parse-xml.c" line="2170"/>
<source>Can&apos;t open stylesheet %s</source>
<translation>Невозможно открыть файл преобразования %s</translation>
</message>
@@ -3632,9 +3687,9 @@ Maximum</source>
</message>
<message>
<location filename="../planner.c" line="159"/>
- <location filename="../planner.c" line="752"/>
+ <location filename="../planner.c" line="761"/>
<source>Can&apos;t find gas %s</source>
- <translation type="unfinished"/>
+ <translation>Невозможно найти газ %s</translation>
</message>
<message>
<location filename="../planner.c" line="345"/>
@@ -3649,98 +3704,108 @@ Maximum</source>
<message>
<location filename="../planner.c" line="535"/>
<source>based on GFlow = %d and GFhigh = %d</source>
- <translation type="unfinished"/>
+ <translation>на основе GFlow = %d и GFhigh = %d</translation>
</message>
<message>
<location filename="../planner.c" line="538"/>
<source>Subsurface dive plan</source>
- <translation type="unfinished"/>
+ <translation>План погружения Subsurface</translation>
</message>
<message>
<location filename="../planner.c" line="542"/>
<source>depth</source>
- <translation type="unfinished"/>
+ <translation>глубина</translation>
</message>
<message>
<location filename="../planner.c" line="545"/>
<source>runtime</source>
- <translation type="unfinished"/>
+ <translation>отсчет</translation>
</message>
<message>
<location filename="../planner.c" line="548"/>
<source>duration</source>
- <translation type="unfinished"/>
+ <translation>длительность</translation>
</message>
<message>
<location filename="../planner.c" line="551"/>
<source>gas</source>
- <translation type="unfinished"/>
+ <translation>смесь</translation>
</message>
<message>
<location filename="../planner.c" line="585"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
- <translation type="unfinished"/>
+ <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation>
</message>
<message>
<location filename="../planner.c" line="595"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
- <translation type="unfinished"/>
+ <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation>
</message>
<message>
<location filename="../planner.c" line="606"/>
<source>%3.0f%s</source>
- <translation type="unfinished"/>
+ <translation>%3.0f%s</translation>
</message>
<message>
<location filename="../planner.c" line="609"/>
<location filename="../planner.c" line="613"/>
<source>%3dmin</source>
- <translation type="unfinished"/>
+ <translation>%3dмин</translation>
</message>
<message>
<location filename="../planner.c" line="629"/>
<source>Switch gas to %s</source>
- <translation type="unfinished"/>
+ <translation>Переключение на %s</translation>
</message>
<message>
- <location filename="../planner.c" line="638"/>
+ <location filename="../planner.c" line="642"/>
+ <source>CNS</source>
+ <translation>CNS</translation>
+ </message>
+ <message>
+ <location filename="../planner.c" line="644"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
+ </message>
+ <message>
+ <location filename="../planner.c" line="647"/>
<source>Gas consumption:</source>
- <translation type="unfinished"/>
+ <translation>Расход газов:</translation>
</message>
<message>
- <location filename="../planner.c" line="658"/>
- <location filename="../planner.c" line="663"/>
- <location filename="../planner.c" line="686"/>
+ <location filename="../planner.c" line="667"/>
+ <location filename="../planner.c" line="672"/>
+ <location filename="../planner.c" line="695"/>
<source>Warning:</source>
- <translation type="unfinished"/>
+ <translation>Внимание:</translation>
</message>
<message>
- <location filename="../planner.c" line="659"/>
+ <location filename="../planner.c" line="668"/>
<source>this is more gas than available in the specified cylinder!</source>
- <translation type="unfinished"/>
+ <translation>расход выше чем запас газа в указанном баллоне!</translation>
</message>
<message>
- <location filename="../planner.c" line="664"/>
+ <location filename="../planner.c" line="673"/>
<source>not enough reserve for gas sharing on ascent!</source>
- <translation type="unfinished"/>
+ <translation>недостаточно газа для резерва при подъеме</translation>
</message>
<message>
- <location filename="../planner.c" line="666"/>
+ <location filename="../planner.c" line="675"/>
<source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
- <translation type="unfinished"/>
+ <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation>
</message>
<message>
- <location filename="../planner.c" line="668"/>
+ <location filename="../planner.c" line="677"/>
<source>%.0f%s (%.0f%s during planned ascent) of %s</source>
- <translation type="unfinished"/>
+ <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation>
</message>
<message>
- <location filename="../planner.c" line="683"/>
+ <location filename="../planner.c" line="692"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
- <translation type="unfinished"/>
+ <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation>
</message>
<message>
- <location filename="../planner.c" line="980"/>
+ <location filename="../planner.c" line="990"/>
<source>ean</source>
<translation>ean</translation>
</message>
@@ -3778,7 +3843,8 @@ D: %.1f%s
<location filename="../profile.c" line="1266"/>
<source>SAC: %.*f%s/min
</source>
- <translation type="unfinished"/>
+ <translation>SAC: %.*f%s/мин
+</translation>
</message>
<message>
<location filename="../profile.c" line="1268"/>
@@ -3851,14 +3917,14 @@ EADD: %d%s
<location filename="../profile.c" line="1308"/>
<source>Deco: %umin @ %.0f%s
</source>
- <translation>Деко: %uмин @ %.0f%с
+ <translation>Деко: %uмин @ %.0f%s
</translation>
</message>
<message>
<location filename="../profile.c" line="1311"/>
<source>Deco: unkn time @ %.0f%s
</source>
- <translation>Деко: неиз. время @ %.0f%с
+ <translation>Деко: неиз. время @ %.0f%s
</translation>
</message>
<message>
@@ -3876,93 +3942,100 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1321"/>
+ <location filename="../profile.c" line="1320"/>
+ <source>TTS: %umin
+</source>
+ <translation>TTS: %uмин
+</translation>
+ </message>
+ <message>
+ <location filename="../profile.c" line="1323"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
- <translation>Деко: %uмин @ %.0f%с (вычисл.)
+ <translation>Деко: %uмин @ %.0f%s (вычисл.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1329"/>
+ <location filename="../profile.c" line="1331"/>
<source>In deco (calc)
</source>
<translation>В деко (вычисл.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1331"/>
+ <location filename="../profile.c" line="1333"/>
<source>NDL: %umin (calc)
</source>
<translation>NDL: %uмин (вычисл.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1334"/>
+ <location filename="../profile.c" line="1336"/>
<source>TTS: %umin (calc)
</source>
<translation>TTS: %uмин (вычисл.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1337"/>
+ <location filename="../profile.c" line="1339"/>
<source>Calculated ceiling %.0f%s
</source>
<translation>Расчетный потолок %.0f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1343"/>
+ <location filename="../profile.c" line="1345"/>
<source>Tissue %.0fmin: %.0f%s
</source>
<translation>Ткань %.0fмин: %.0f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1349"/>
+ <location filename="../profile.c" line="1351"/>
<source>heartbeat: %d
</source>
<translation>пульс: %d
</translation>
</message>
<message>
- <location filename="../profile.c" line="1351"/>
+ <location filename="../profile.c" line="1353"/>
<source>bearing: %d
</source>
<translation>азимут: %d
</translation>
</message>
<message>
- <location filename="../profile.c" line="1443"/>
+ <location filename="../profile.c" line="1445"/>
<source>%sT: %d:%02d min</source>
<translation>%sT: %d:%02d min</translation>
</message>
<message>
- <location filename="../profile.c" line="1447"/>
- <location filename="../profile.c" line="1451"/>
- <location filename="../profile.c" line="1455"/>
+ <location filename="../profile.c" line="1449"/>
+ <location filename="../profile.c" line="1453"/>
+ <location filename="../profile.c" line="1457"/>
<source>%s %sD:%.1f%s</source>
<translation>%s %sГ:%.1f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1459"/>
+ <location filename="../profile.c" line="1461"/>
<source>%s %sD:%.1f%s
</source>
<translation>%s %sГ:%.1f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1463"/>
+ <location filename="../profile.c" line="1465"/>
<source>%s%sV:%.2f%s</source>
<translation>%s%sС:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1467"/>
- <location filename="../profile.c" line="1471"/>
+ <location filename="../profile.c" line="1469"/>
+ <location filename="../profile.c" line="1473"/>
<source>%s %sV:%.2f%s</source>
<translation>%s %sС:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1478"/>
+ <location filename="../profile.c" line="1480"/>
<source>%s %sP:%d %s</source>
<translation>%s %sД:%d %s</translation>
</message>
@@ -4082,9 +4155,9 @@ EADD: %d%s
<translation>деко стоп</translation>
</message>
<message>
- <location filename="../dive.c" line="133"/>
+ <location filename="../dive.c" line="169"/>
<source>ℓ</source>
- <translation type="unfinished"/>
+ <translation>л</translation>
</message>
<message>
<location filename="../statistics.c" line="214"/>
@@ -4132,97 +4205,97 @@ EADD: %d%s
<translation>(нет погружений)</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Sun</source>
<translation>Вск</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Mon</source>
<translation>Пнд</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Tue</source>
<translation>Втр</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Wed</source>
<translation>Срд</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Thu</source>
<translation>Чтв</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Fri</source>
<translation>Птн</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Sat</source>
<translation>Суб</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Jan</source>
<translation>Янв</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Feb</source>
<translation>Фев</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Mar</source>
<translation>Мар</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Apr</source>
<translation>Апр</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>May</source>
<translation>Май</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Jun</source>
<translation>Июн</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Jul</source>
<translation>Июл</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Aug</source>
<translation>Авг</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Sep</source>
<translation>Снт</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Oct</source>
<translation>Окт</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Nov</source>
<translation>Ноя</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Dec</source>
<translation>Дек</translation>
</message>
@@ -4364,17 +4437,17 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../uemis.c" line="203"/>
<source>pO₂ Green Warning</source>
- <translation type="unfinished"/>
+ <translation>Зеленое предупреждение pO₂</translation>
</message>
<message>
<location filename="../uemis.c" line="206"/>
<source>pO₂ Ascend Warning</source>
- <translation type="unfinished"/>
+ <translation>Предупреждение подъема pO₂</translation>
</message>
<message>
<location filename="../uemis.c" line="208"/>
<source>pO₂ Ascend Alarm</source>
- <translation type="unfinished"/>
+ <translation>Тревога подъема pO₂</translation>
</message>
<message>
<location filename="../uemis.c" line="212"/>
@@ -4437,10 +4510,10 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Тревога: заряд батареи</translation>
</message>
<message>
- <location filename="../save-html.c" line="272"/>
+ <location filename="../save-html.c" line="293"/>
<location filename="../worldmap-save.c" line="106"/>
<source>Can&apos;t open file %s</source>
- <translation type="unfinished"/>
+ <translation>Невозможно открыть файл %s</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="36"/>
@@ -4450,12 +4523,12 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../worldmap-save.c" line="38"/>
<source>Time:</source>
- <translation type="unfinished"/>
+ <translation>Время:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="40"/>
<source>Duration:</source>
- <translation type="unfinished"/>
+ <translation>Длительность:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="41"/>
@@ -4465,50 +4538,74 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../worldmap-save.c" line="43"/>
<source>Max Depth:</source>
- <translation type="unfinished"/>
+ <translation>Макс. глубина:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="46"/>
<source>Air Temp:</source>
- <translation type="unfinished"/>
+ <translation>Темп. воздуха:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="48"/>
<source>Water Temp:</source>
- <translation type="unfinished"/>
+ <translation>Темп. воды:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="50"/>
<source>Location:</source>
- <translation type="unfinished"/>
+ <translation>Место:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="54"/>
<source>Notes:</source>
<translation>Заметки:</translation>
</message>
+ <message>
+ <location filename="../qthelper.cpp" line="46"/>
+ <location filename="../qthelper.cpp" line="73"/>
+ <source>N</source>
+ <translation>С</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="46"/>
+ <location filename="../qthelper.cpp" line="74"/>
+ <source>S</source>
+ <translation>Ю</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="47"/>
+ <location filename="../qthelper.cpp" line="75"/>
+ <source>E</source>
+ <translation>В</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="47"/>
+ <location filename="../qthelper.cpp" line="76"/>
+ <source>W</source>
+ <translation>З</translation>
+ </message>
</context>
<context>
<name>plannerSettingsWidget</name>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="35"/>
<source>Rates</source>
- <translation type="unfinished"/>
+ <translation>Скорости</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="56"/>
<source>Ascent</source>
- <translation type="unfinished"/>
+ <translation>Подъем</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="77"/>
<source>below 75% avg. depth</source>
- <translation type="unfinished"/>
+ <translation>ниже 75% ср. глубины</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="84"/>
@@ -4517,133 +4614,133 @@ Is the Uemis Zurich plugged in correctly?</source>
<location filename="../qt-ui/plannerSettings.ui" line="135"/>
<location filename="../qt-ui/plannerSettings.ui" line="181"/>
<source>m/min</source>
- <translation type="unfinished"/>
+ <translation>м/мин</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="94"/>
<source>75%-50% avg. depth</source>
- <translation type="unfinished"/>
+ <translation>75%-50% ср. глубины</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="111"/>
<source>50% avg. depth - 6m/20ft</source>
- <translation type="unfinished"/>
+ <translation>50% ср. глубины - 6м/20фт</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="128"/>
<source>6m/20ft to surface</source>
- <translation type="unfinished"/>
+ <translation>6м/20фт до поверхности</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="148"/>
<source>Descent</source>
- <translation type="unfinished"/>
+ <translation>Спуск</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="200"/>
<source>surface to the bottom</source>
- <translation type="unfinished"/>
+ <translation>с поверхности на дно</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="226"/>
<source>Planning</source>
- <translation type="unfinished"/>
+ <translation>Планирование</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="247"/>
<source>GF low</source>
- <translation type="unfinished"/>
+ <translation>GF low</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="264"/>
<source>GF high</source>
- <translation type="unfinished"/>
+ <translation>GF high</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="281"/>
<source>Drop to first depth</source>
- <translation type="unfinished"/>
+ <translation>Падение к первой глубине</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="288"/>
<source>Last Stop at 6m/20ft</source>
- <translation type="unfinished"/>
+ <translation>Последняя остановка на 6м/20фт</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="295"/>
- <source>plan backgas breaks</source>
- <translation type="unfinished"/>
+ <source>Plan backgas breaks</source>
+ <translation>Перерывы на основной газ</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="318"/>
- <source>Gas Options</source>
- <translation type="unfinished"/>
+ <source>Gas options</source>
+ <translation>Газы</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="339"/>
- <source>bottom SAC</source>
- <translation type="unfinished"/>
+ <source>Bottom SAC</source>
+ <translation>SAC на дне</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="349"/>
- <source>deco SAC</source>
- <translation type="unfinished"/>
+ <source>Deco SAC</source>
+ <translation>SAC на деко</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="359"/>
- <source>bottom pO₂</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/plannerSettings.ui" line="366"/>
- <location filename="../qt-ui/plannerSettings.ui" line="389"/>
- <source>bar</source>
- <translation>Бар</translation>
+ <source>Bottom pO₂</source>
+ <translation>pO₂ на дне</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="382"/>
- <source>deco pO₂</source>
- <translation type="unfinished"/>
+ <source>Deco pO₂</source>
+ <translation>pO₂ на деко</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="421"/>
- <source>Dive Notes</source>
+ <source>Dive notes</source>
<translation>Погружение</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="442"/>
- <source>In dive plan, show runtime (absolute time) of stops</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+ <source>Display runtime</source>
+ <translation>Показать отсчет</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="445"/>
- <source>display runtime</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+ <source>Display segment duration</source>
+ <translation>Показать время сегмента</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="458"/>
- <source>In dive plan, show duration (relative time) of stops</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+ <source>Display transitions in deco</source>
+ <translation>Показать переходы в деко</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="461"/>
- <source>display segment duration</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+ <source>Verbatim diveplan</source>
+ <translation>Подробный план</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="471"/>
- <source>In diveplan, list transitions or treat them as implicit</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+ <source>bar</source>
+ <translation>бар</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="474"/>
- <source>display transitions in deco</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+ <source>In dive plan, show runtime (absolute time) of stops</source>
+ <translation>Показывать время отсчета для остановок (абсолютное время)</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="481"/>
- <source>verbatim diveplan</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+ <source>In dive plan, show duration (relative time) of stops</source>
+ <translation>Показывать длительность остановок (относительное время)</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+ <source>In diveplan, list transitions or treat them as implicit</source>
+ <translation>Показывать переходы в списке или неявно учитывать их</translation>
</message>
</context>
</TS> \ No newline at end of file