diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1925 |
1 files changed, 1148 insertions, 777 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 2181b128c..d24bac80f 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Название</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation> </message> @@ -1092,18 +1092,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Переход на Откр. Цикл</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -1112,97 +1112,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1210,87 +1210,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Загрузить фото</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Формат экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Карта мира</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Выбор</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Выделенные погружения</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Все погружения</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ <translation>Обычный</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Общие настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Нумерация Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Только список</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Настройки стиля</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Светлая</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Песочная</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV файлы (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Значения, разделенные запятой. Включает наиболее важную информацию о профиле погружения.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Отправить данные погружения на сайт divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <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="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Собственный XML-формат Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Файл для экспорта карты</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML файлы (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML файлы (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> @@ -1580,7 +1607,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Время</translation> </message> @@ -1606,25 +1633,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Разделитель</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Единицы</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Имперская</translation> </message> @@ -1639,100 +1666,160 @@ <translation>Погружения введённые вручную</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Формат даты</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Макс. глубина</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Порядок полей</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Вес</translation> </message> @@ -1844,77 +1931,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Индекс баллона</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Файлы журналов (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Дамп-файлы (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Редактировать местоположение выбранных погружений</translation> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -2400,330 +2527,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Координаты</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Погружение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Исп. газы</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Давл. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Время погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Общее время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Интервал</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Соленость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Статистика</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Глуб.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2732,17 +2859,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -2750,92 +2877,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Настройки дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Перепланировать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Детальный план погружения</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2848,486 +2975,491 @@ p, li { white-space: pre-wrap; } <p style="-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:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Импорт координат из веб-сервиса Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Копировать параметры дайва</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Вставить параметры дайва</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Карта</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Мои дайв-компьютеры</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Влево</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Вправо</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> @@ -3335,12 +3467,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3398,387 +3570,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Общие</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Единицы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Язык</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Анимация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Скорость</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Очистить все натройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Сбросить все настройки в значение по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Система мер</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Настроить</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>метр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>литр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>цельсий</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>фаренгейт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Системные настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Тип прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Порт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Требуется авторизация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Списки и таблицы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Показывать ошибочные</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Баллон по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Использовать по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Веб-сервис Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Сохранять ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Единицы времени</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Минуты</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Секунды</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Показывать</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow на макс. грубине</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Разное</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Делитель скорости спуска/подъема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Предельное значение pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Предельное значение pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Предельное значение pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Макс. pO₂ при отображении MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Показывать потолок дайвкомпьютера красным</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Показывать неиспользуемые баллоны</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Показывать среднюю глубину</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Без прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Системный прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <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="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Выберите журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -3905,72 +4092,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Исп. газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Метки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -3978,103 +4165,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -4102,22 +4289,22 @@ p, li { white-space: pre-wrap; } <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Среднее</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> @@ -4185,12 +4372,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4204,12 +4391,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Начать нумерацию с</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Новый номер</translation> </message> @@ -4217,12 +4404,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4301,12 +4488,12 @@ p, li { white-space: pre-wrap; } <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4356,6 +4543,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4379,8 +4680,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Мультиплатформенный журнал погружений<br><span style='font-size: 8pt'>Линус Торвальдс, Дирк Хондел, Томас Канабрава и другие, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4434,7 +4735,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -4450,11 +4751,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Добавить баллон</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4464,7 +4760,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -4514,54 +4810,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Проверить обновления.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Не получилось проверить наличие обновлений.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Возникла ошибка:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Проверьте Интернет-соединение.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Возникла ошибка во время проверки обновения.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4581,64 +4897,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <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="14"/> <source>User Survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Опрос пользователей Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Рекреационный дайвер</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Технический дайвер</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Заинтересован в планировщике</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Я загружаю погружения из дайвкомпьютера</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Я загружаю погружения из других программ/источников</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Я ввожу погружения вручную</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Я использую приложения Android для привязки координат</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Оставьте ваши пожелания (на английском) в следующем поле</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Также будет отправлена информация о вашем компьютере</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4811,12 +5137,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4824,79 +5157,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -4912,13 +5245,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4929,16 +5262,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>фут</translation> </message> @@ -4964,120 +5297,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>фунт</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>воздух</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>груз на пластину</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>карабины</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> @@ -5096,7 +5429,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5110,7 +5443,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>подъем</translation> @@ -5157,7 +5490,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5313,42 +5646,42 @@ Maximum</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5367,222 +5700,254 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Ошибка запроса get_events в БД. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Запрос get_tags в базу не выполнился. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Ошибка соединения с БД '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Ошибка запроса к БД '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Запрос get_cylinders в базу не выполнился. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Запрос get_changes в базу не выполнился. + <translation>Ошибка соединения с БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Запрос get_profile_sample в базу не выполнился. + <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Расчет деко прекращен из-за большой длительности</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>на основе GFlow = %d и GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>План погружения Subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Расход газов:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5591,70 +5956,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>Д: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5663,7 +6028,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5672,162 +6037,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ост. безопасности: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ост. безопасности: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Ткань %.0fмин: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 погружений)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 погружение)</translation> </message> @@ -5992,97 +6363,97 @@ EADD: %d%s <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Дек</translation> </message> |