diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-08 13:11:26 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-10-08 13:11:26 +0100 |
| commit | 640c746a1faa77ea13c93582c59b391f7e2816de (patch) | |
| tree | 80fa00ea8394e29408295caa9e89c13bb8c188bf /translations/subsurface_ru_RU.ts | |
| parent | 4ed418dcc2072936d1629422be2190123fedce65 (diff) | |
| download | subsurface-640c746a1faa77ea13c93582c59b391f7e2816de.tar.gz | |
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1832 |
1 files changed, 943 insertions, 889 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index cd696658a..f4f73d3ee 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -8,37 +8,37 @@ </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="35"/> <source>Discovered devices</source> <translation>Найденные устройства</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="38"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="39"/> <source>Quit</source> <translation>Выход</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="36"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="37"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/> <source>Local Bluetooth device details</source> <translation>Локальное устройство Bluetooth:</translation> </message> @@ -49,208 +49,208 @@ </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/> <source>Address:</source> <translation>Адрес:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="33"/> <source>Bluetooth powered on</source> <translation>Bluetooth включен</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="34"/> <source>Turn on/off</source> <translation>Вкл/Выкл</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/> <source>Select device:</source> <translation>Выберите устройство:</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/> <source>Name:</source> <translation>Название:</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="135"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Включение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="138"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Выключение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="184"/> <source>Scanning for remote devices...</source> <translation>Сканирование устройств...</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="193"/> <source>Scanning finished successfully.</source> <translation>Сканирование завершено.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="333"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="340"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="360"/> <source>UNPAIRED</source> <translation>Не сопряжено</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="223"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="338"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="351"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="345"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="358"/> <source>PAIRED</source> <translation>Сопряжено</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="343"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="352"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="233"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="350"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="359"/> <source>AUTHORIZED_PAIRED</source> <translation>Авторизовано,Сопряжено</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="237"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Состояние: %3]</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="247"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="254"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для подключения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="256"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="369"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="263"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="376"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Чтобы использовать %1, оно должно быть сопряжено. Используйте контекстное меню для сопряжения.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="280"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="287"/> <source>The local device was changed.</source> <translation>Локальное устройство было изменено.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="300"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="307"/> <source>Pair</source> <translation>Сопряжение</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/> <source>Device %1 was paired and is authorized.</source> - <translation type="unfinished"/> + <translation>Устройство %1 авторизовано и сопряжено.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="57"/> <source>Could not initialize Winsock version 2.2</source> <translation>Ошибка инициализации Winsock 2.2</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="168"/> <source>Remote devices list was cleared.</source> <translation>Список удаленных устройств очищен.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="209"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Локальное устройство Bluetooth было %1.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/> <source>turned on</source> <translation>включено</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/> <source>turned off</source> <translation>выключено</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="308"/> <source>Remove pairing</source> <translation>Удалить сопряжение</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="324"/> <source>Trying to pair device %1</source> <translation>Попытка сопряжения с %1</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="328"/> <source>Trying to unpair device %1</source> <translation>Попытка удалить сопряжение с %1</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/> <source>Device %1 was unpaired.</source> <translation>Устройство %1 не сопряжено.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="348"/> <source>Device %1 was paired.</source> <translation>Устройство %1 сопряжено.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="379"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="391"/> <source>Local device error: %1.</source> <translation>Ошибка локального устройства: %1.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="392"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Ошибка сопряжения. Если устройство требует специальный PIN-код, попробуйте сопряжение средствами операционной системы.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="394"/> <source>Unknown error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="403"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Адаптер Bluetooth выключен, включите его перед выполнением поиска.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="406"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Ошибка по время чтения/записи устройства.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="405"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="412"/> <source>An unknown error has occurred.</source> <translation>Произошла неизвестная ошибка.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="417"/> <source>Device discovery error: %1.</source> <translation>Ошибка обнаружения устройства: %1.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/> <source>Not available</source> <translation>Недоступно</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="452"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ошибка доступа к локальному Bluetooth-адапетру.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="495"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="502"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Адрес %1 не соответствует ни одному адресу локального устройства Bluetooth. Обнаружение не будет выполнено.</translation> </message> @@ -258,12 +258,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="606"/> + <location filename="../qt-ui/simplewidgets.cpp" line="613"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="607"/> + <location filename="../qt-ui/simplewidgets.cpp" line="614"/> <source>Searches for buddies and divemasters</source> <translation>Поиск партнеров и инструкторов</translation> </message> @@ -556,8 +556,8 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="253"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1405"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1781"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1419"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1795"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/> @@ -566,8 +566,8 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="297"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1500"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1797"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1514"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1811"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/> @@ -576,8 +576,8 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="320"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1523"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1820"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1537"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1834"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/> @@ -585,9 +585,9 @@ <translation>Прошивка</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1557"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1837"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1571"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1851"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/> @@ -595,7 +595,7 @@ <translation>Свой текст</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="360"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/> <source>Language</source> <translation>Язык</translation> @@ -625,88 +625,88 @@ <translation>Итальянский</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="555"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="371"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/> <source>OC</source> <translation>Откр. цикл</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="571"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/> <source>CC</source> <translation>Закр. цикл</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="576"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2078"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/> <source>Gauge</source> <translation>Измеритель</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/> <source>Apnea</source> <translation>Апноэ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1965"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="385"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1979"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/> <source>Date format</source> <translation>Формат даты</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/> <source>MMDDYY</source> <translation>ММДДГГ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="353"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/> <source>DDMMYY</source> <translation>ДДММГГ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/> <source>YYMMDD</source> <translation>ГГММДД</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="912"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2185"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2199"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/> <source>Saturation</source> <translation>Насыщение</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="482"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="719"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="797"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="863"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="889"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="987"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1294"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2110"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2136"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2202"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2225"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="425"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="710"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="733"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="759"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="811"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="877"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="903"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="985"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1001"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1308"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2020"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2124"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2150"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2176"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2239"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/> @@ -725,78 +725,78 @@ <translation>%</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="735"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="749"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2003"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/> <source>Desaturation</source> <translation>Рассыщение</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="853"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2126"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="867"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2140"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/> <source>Last deco</source> <translation>Последнее деко</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="774"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2049"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/> <source> m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="395"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/> <source>Brightness</source> <translation>Яркость</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="434"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="367"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/> <source>Eco</source> <translation>Эко</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="372"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="444"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="377"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/> <source>High</source> <translation>Высокая</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="569"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="589"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1969"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/> <source>Sampling rate</source> <translation>Дискретизация</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="600"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/> <source>2s</source> <translation>2с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="498"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1613"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1627"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/> <source>10s</source> <translation>10с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1694"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1708"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/> <source>Units</source> @@ -815,51 +815,51 @@ <translation>фут/°F</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="610"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="613"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/> <source>Dive mode color</source> <translation>Цвет режима</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="624"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/> <source>Standard</source> <translation>Стандартный</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="585"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="629"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/> <source>Red</source> <translation>Красный</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="590"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="634"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/> <source>Green</source> <translation>Зеленый</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="595"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/> <source>Blue</source> <translation>Синий</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/> <source>Salinity (0-5%)</source> <translation>Соленость (0-5%)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="603"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1889"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1903"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1770"/> <source>Sync dive computer time with PC</source> <translation>Синхронизировать время с ПК</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="508"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/> <source>Compass gain</source> <translation>Поправка компаса</translation> @@ -883,70 +883,70 @@ <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="442"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/> <source>230LSB/Gauss</source> <translation>230LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="447"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/> <source>330LSB/Gauss</source> <translation>330LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="523"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/> <source>390LSB/Gauss</source> <translation>390LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="528"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="457"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/> <source>440LSB/Gauss</source> <translation>440LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/> <source>660LSB/Gauss</source> <translation>660LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="467"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/> <source>820LSB/Gauss</source> <translation>820LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="543"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/> <source>1090LSB/Gauss</source> <translation>1090LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="548"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="477"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/> <source>1370LSB/Gauss</source> <translation>1370LSB/Gauss</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="620"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1896"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1910"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/> <source>Show safety stop</source> <translation>Остановка безопасности</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="630"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/> <source>Reset device to default settings</source> <translation>Сбросить в заводские установки</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1982"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1996"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1782"/> <source>Alt GF can be selected underwater</source> @@ -959,68 +959,68 @@ <translation>Семейство Suunto Vyper</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="648"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1976"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1990"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/> <source>Advanced settings</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1999"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2013"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/> <source>Future TTS</source> <translation>Будущий TTS</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/> <source>Pressure sensor offset</source> <translation>Поправка датчика давления</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2218"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="703"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="712"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2195"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="726"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2209"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="787"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2062"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/> <source>Decotype</source> <translation>Алгоритм деко</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="813"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/> <source> mbar</source> <translation>мбар</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="843"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="857"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2111"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/> <source> min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="830"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2059"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="844"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2073"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/> <source>ZH-L16</source> @@ -1029,7 +1029,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/> <source>Connect via Bluetooth</source> - <translation type="unfinished"/> + <translation>Bluetooth</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="163"/> @@ -1038,79 +1038,79 @@ <translation>Сохранить журнал libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/> <source>Left button sensitivity</source> <translation>Чувствительность левой кнопки</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="661"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/> <source>Always show ppO2</source> <translation>Всегда показывать ppO2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="835"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="849"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/> <source>ZH-L16+GF</source> <translation>ZH-L16+GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="879"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/> <source>Alt GFLow</source> <translation>Альт. GFLow</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="905"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2178"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="919"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2192"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/> <source>Alt GFHigh</source> <translation>Альт. GFHigh</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/> <source>Flip screen</source> <translation>Повернуть экран</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="929"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/> <source>Right button sensitivity</source> <translation>Чувствительность правой кнопки</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2241"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2255"/> <source>Graphical speed indicator</source> <translation>Графический индикатор скорости</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2280"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2294"/> <source>Bottom gas consumption</source> <translation>Расход донного газа</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="978"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2301"/> <source>Deco gas consumption</source> <translation>Расход деко-газа</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2295"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/> <source>Gas settings</source> <translation>Газы</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1084"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1169"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2343"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2428"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1098"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1183"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2357"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2442"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/> @@ -1119,10 +1119,10 @@ <translation>%He</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1089"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1174"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2348"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2433"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1103"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1188"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2447"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/> @@ -1131,12 +1131,12 @@ <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1094"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1179"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1254"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2353"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2438"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2503"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1108"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1193"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1268"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2367"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2452"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2517"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/> @@ -1145,80 +1145,80 @@ <translation>Замена на</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1099"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2358"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1113"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2372"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/> <source>Gas 1</source> <translation>Газ 1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1104"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2363"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1118"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2377"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/> <source>Gas 2</source> <translation>Газ 2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1109"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2368"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1123"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2382"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/> <source>Gas 3</source> <translation>Газ 3</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1114"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2373"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1128"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2387"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/> <source>Gas 4</source> <translation>Газ 4</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1119"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2378"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1133"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2392"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/> <source>Gas 5</source> <translation>Газ 5</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2443"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1198"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2457"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/> <source>Dil 1</source> <translation>Дил 1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1189"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2448"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1203"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2462"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/> <source>Dil 2</source> <translation>Дил 2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1194"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2453"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1208"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2467"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/> <source>Dil 3</source> <translation>Дил 3</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1199"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2458"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1213"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2472"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/> <source>Dil 4</source> <translation>Дил 4</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1204"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2463"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1218"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2477"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/> <source>Dil 5</source> @@ -1237,64 +1237,64 @@ <translation>Замена на [м]</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1259"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2508"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1273"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2522"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/> <source>SP 1</source> <translation>SP 1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2513"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1278"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2527"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/> <source>SP 2</source> <translation>SP 2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1269"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2518"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1283"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2532"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/> <source>SP 3</source> <translation>SP 3</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1274"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1288"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/> <source>SP 4</source> <translation>SP 4</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1279"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1293"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/> <source>SP 5</source> <translation>SP 5</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1311"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1325"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/> <source>Fixed setpoint</source> <translation>Фикс. установка</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1316"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1330"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/> <source>Sensor</source> <translation>Сенсор</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1324"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1338"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/> <source>Setpoint fallback</source> <translation>Альтернативная установка</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1347"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1363"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2539"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2555"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1361"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2553"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2569"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/> @@ -1303,39 +1303,39 @@ <translation>сбар</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1592"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1606"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> <translation>P1 (средний)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1597"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1611"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> <translation>P2 (высокий)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1636"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/> <source>Total dive time</source> <translation>Общее время</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1874"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/> <source>kg/ℓ</source> <translation>кг/л</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2074"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2088"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/> <source>Apnoea</source> <translation>Апноэ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1427"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1441"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/> <source>Safety level</source> <translation>Уровень безопасности</translation> @@ -1356,28 +1356,28 @@ <translation>OSTC 3,Sport,Cr,2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/> <source>MOD warning</source> <translation>Предупреждение MOD</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/> <source>Dynamic ascent rate</source> <translation>Динамическая скорость подъема</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1003"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1019"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2248"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2264"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1017"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1033"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2262"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2278"/> <source> ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1079"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1164"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2338"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2423"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1093"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1178"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2352"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2437"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/> @@ -1386,283 +1386,284 @@ <translation>%O₂</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1249"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2498"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1263"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2512"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1301"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/> <source>O₂ in calibration gas</source> <translation>O₂ в калибровочном газе</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1379"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2571"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1393"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2585"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/> <source>pO₂ max</source> <translation>pO₂ макс</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1386"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2578"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1400"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2592"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/> <source>pO₂ min</source> <translation>pO₂ мин</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1453"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1467"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/> <source>Altitude range</source> <translation>Диапазон высот</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1474"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/> <source>Model</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1922"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/> <source>Number of dives</source> <translation>Кол-во погружений</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1540"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1554"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/> <source>Max depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1587"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1601"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> <translation>P0 (отсутствует)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1605"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1619"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/> <source>Sample rate</source> <translation>Дискретизация</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1632"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/> <source>20s</source> <translation>20с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1623"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1637"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/> <source>30s</source> <translation>30с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1628"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1642"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/> <source>60s</source> <translation>60с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1643"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="541"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/> <source>Computer model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1660"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1766"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1746"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1762"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1688"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/> <source>24h</source> <translation>24ч</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1679"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1693"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/> <source>12h</source> <translation>12ч</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1687"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1701"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/> <source>Time format</source> <translation>Формат времени</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1702"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1716"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1707"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1721"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1718"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1732"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/> <source>s</source> <translation>с</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1725"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1739"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/> <source>Light</source> <translation>Светлая</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1742"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1756"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/> <source>Depth alarm</source> <translation>Тревога: глубина</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1762"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1776"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/> <source>Time alarm</source> <translation>Тревога: время</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1787"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1801"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/> <source>Salinity</source> <translation>Соленость</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1904"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1918"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/> <source>MM/DD/YY</source> <translation>ММ/ДД/ГГ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1909"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1923"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/> <source>DD/MM/YY</source> <translation>ДД/ММ/ГГ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1914"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1928"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/> <source>YY/MM/DD</source> <translation>ГГ/ММ/ДД</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2069"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2083"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/> <source>ZH-L16 CC</source> <translation>ZH-L16 ЗЦ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2093"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/> <source>L16-GF OC</source> <translation>L16-GF ОЦ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2084"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2098"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/> <source>L16-GF CC</source> <translation>L16-GF ЗЦ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2089"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2103"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/> <source>PSCR-GF</source> <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1077"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/> <source>Backup files (*.xml)</source> <translation>Резервные копии (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1082"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ошибка при сохранении резервной копии. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1089"/> <source>Backup succeeded</source> <translation>Резервная копия создана</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1090"/> <source>Your settings have been saved to: %1</source> <translation>Ваши настройки сохранены в %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/> <source>Backup dive computer settings</source> <translation>Создать рез. копию настроек</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/> <source>XML backup error</source> <translation>XML-ошибка при создании рез. копии</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1097"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/> <source>Restore dive computer settings</source> <translation>Восстановить настройки дайвкомпьютера</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/> <source>XML restore error</source> <translation>XML-ошибка при восстановлении</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1108"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ошибка при восстановлении из рез. копии. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1106"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1112"/> <source>Restore succeeded</source> <translation>Восстановление успешно</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1113"/> <source>Your settings have been restored successfully.</source> <translation>Настройки были успешно восстановлены.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1117"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1123"/> <source>Select firmware file</source> <translation>Выберите файл прошивки</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1118"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1124"/> <source>All files (*.*)</source> <translation>Все файлы (*.*)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1174"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1180"/> <source>Choose file for divecomputer download logfile</source> <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1175"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1181"/> <source>Log files (*.log)</source> <translation>Файлы журналов (*.log)</translation> </message> @@ -1872,27 +1873,27 @@ <context> <name>DiveImportedModel</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="652"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="644"/> <source>Date/time</source> <translation>Дата/время</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="654"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="646"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="656"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="648"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/> <source>h:</source> <translation>ч:</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/> <source>min</source> <translation>мин</translation> </message> @@ -1998,97 +1999,115 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="837"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="839"/> + <location filename="../qt-ui/divelistview.cpp" line="847"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="843"/> + <location filename="../qt-ui/divelistview.cpp" line="851"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="847"/> + <location filename="../qt-ui/divelistview.cpp" line="855"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="848"/> + <location filename="../qt-ui/divelistview.cpp" line="856"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="862"/> + <location filename="../qt-ui/divelistview.cpp" line="870"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="864"/> + <location filename="../qt-ui/divelistview.cpp" line="872"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="868"/> + <location filename="../qt-ui/divelistview.cpp" line="876"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="869"/> + <location filename="../qt-ui/divelistview.cpp" line="877"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="873"/> + <location filename="../qt-ui/divelistview.cpp" line="881"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="875"/> + <location filename="../qt-ui/divelistview.cpp" line="883"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="879"/> + <location filename="../qt-ui/divelistview.cpp" line="887"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="881"/> + <location filename="../qt-ui/divelistview.cpp" line="889"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="882"/> + <location filename="../qt-ui/divelistview.cpp" line="890"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="883"/> + <location filename="../qt-ui/divelistview.cpp" line="891"/> + <source>Split selected dives</source> + <translation>Разбить выделенные погружения</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="892"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="884"/> + <location filename="../qt-ui/divelistview.cpp" line="893"/> <source>Load image(s) from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="907"/> + <location filename="../qt-ui/divelistview.cpp" line="916"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="907"/> + <location filename="../qt-ui/divelistview.cpp" line="916"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <context> + <name>DiveLocationModel</name> + <message> + <location filename="../qt-ui/locationinformation.cpp" line="323"/> + <source>Create a new dive site, copying relevant information from the current dive.</source> + <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> + </message> + <message> + <location filename="../qt-ui/locationinformation.cpp" line="324"/> + <source>Create a new dive site with this name</source> + <translation>Создать дайв-сайт с этим наванием</translation> + </message> +</context> +<context> <name>DiveLogExportDialog</name> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="103"/> @@ -2796,7 +2815,7 @@ <message> <location filename="../qt-models/diveplannermodel.cpp" line="309"/> <source>CC setpoint</source> - <translation type="unfinished"/> + <translation>Установка ребризера</translation> </message> </context> <context> @@ -3131,97 +3150,97 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="152"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/> <source>no dives were selected</source> <translation>не выбраны погружения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="182"/> <source>failed to create zip file for upload: %s</source> <translation>не удалось создать ZIP файл для загрузки: %s</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="224"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="235"/> <source>internal error</source> <translation>внутренняя ошибка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="711"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="901"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="722"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="912"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="744"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="776"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="877"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="875"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="886"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="887"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="915"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="926"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="918"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="929"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="921"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="932"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="924"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="946"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="902"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="913"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> @@ -3234,7 +3253,7 @@ p, li { white-space: pre-wrap; } <translation>Ошибка</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="444"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="436"/> <source>Retry</source> <translation>Повторить</translation> </message> @@ -3254,32 +3273,32 @@ p, li { white-space: pre-wrap; } <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="382"/> <source>Choose file for divecomputer download logfile</source> <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="383"/> <source>Log files (*.log)</source> <translation>Файлы журналов (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="406"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="398"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="407"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="399"/> <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="418"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="410"/> <source>Choose file for divecomputer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="419"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="411"/> <source>Dump files (*.bin)</source> <translation>Дамп-файлы (*.bin)</translation> </message> @@ -3307,7 +3326,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/> <source>Choose Bluetooth download mode</source> - <translation>Выберите режим загрузки по Bluetooth</translation> + <translation>Загрузка через Bluetooth</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/> @@ -3483,12 +3502,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1683"/> + <location filename="../configuredivecomputerthreads.cpp" line="1733"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1688"/> + <location filename="../configuredivecomputerthreads.cpp" line="1738"/> <source>Firmware update failed!</source> <translation>Обонвление прошивки не удалось!</translation> </message> @@ -3517,7 +3536,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="633"/> + <location filename="../qt-ui/simplewidgets.cpp" line="640"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -3532,12 +3551,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/modeldelegates.cpp" line="545"/> <source> (~%1 away</source> - <translation type="unfinished"/> + <translation> (удаление ~%1</translation> </message> - <message numerus="yes"> + <message> <location filename="../qt-ui/modeldelegates.cpp" line="546"/> - <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <source>, %1 dive(s) here)</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/modeldelegates.cpp" line="551"/> @@ -3597,18 +3616,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/locationInformation.ui" line="69"/> + <source>Reverse geo lookup</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/locationInformation.ui" line="72"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/locationInformation.ui" line="90"/> + <location filename="../qt-ui/locationInformation.ui" line="93"/> <source>Dive sites on same coordinates</source> - <translation>Дайв-сайты с такими координатами</translation> + <translation>Дайв-сайты с такими же координатами</translation> + </message> + <message> + <location filename="../qt-ui/locationInformation.ui" line="131"/> + <source>Tags</source> + <translation>Метки</translation> </message> <message> <location filename="../build/ui_locationInformation.h" line="112"/> <source>Dive Site</source> - <translation type="unfinished"/> + <translation>Дайв-сайт</translation> </message> </context> <context> @@ -3622,119 +3651,120 @@ p, li { white-space: pre-wrap; } <context> <name>LocationInformationWidget</name> <message> - <location filename="../qt-ui/locationinformation.cpp" line="22"/> + <location filename="../qt-ui/locationinformation.cpp" line="25"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="25"/> + <location filename="../qt-ui/locationinformation.cpp" line="28"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="28"/> - <location filename="../qt-ui/locationinformation.cpp" line="207"/> + <location filename="../qt-ui/locationinformation.cpp" line="31"/> + <location filename="../qt-ui/locationinformation.cpp" line="216"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="60"/> + <location filename="../qt-ui/locationinformation.cpp" line="63"/> <source>Merge into current site</source> <translation>Объеденить с текущим сайтом</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="68"/> + <location filename="../qt-ui/locationinformation.cpp" line="72"/> <source>Merging dive sites</source> - <translation type="unfinished"/> + <translation>Объединение дайв-сайтов</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="69"/> + <location filename="../qt-ui/locationinformation.cpp" line="73"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> - <translation type="unfinished"/> + <translation>Операция объединения дайв-сайтов необратима. +Вы желаете продолжить?</translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="214"/> + <location filename="../qt-ui/locationinformation.cpp" line="223"/> <source>You are editing a dive site</source> - <translation type="unfinished"/> + <translation>Редактирование дайв-сайта</translation> </message> </context> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="166"/> + <location filename="../qt-ui/maintab.ui" line="184"/> <location filename="../build/ui_maintab.h" line="951"/> - <location filename="../qt-ui/maintab.cpp" line="627"/> + <location filename="../qt-ui/maintab.cpp" line="567"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="231"/> + <location filename="../qt-ui/maintab.ui" line="252"/> <location filename="../build/ui_maintab.h" line="954"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="241"/> + <location filename="../qt-ui/maintab.ui" line="262"/> <location filename="../build/ui_maintab.h" line="955"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="366"/> + <location filename="../qt-ui/maintab.ui" line="387"/> <location filename="../build/ui_maintab.h" line="959"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="287"/> + <location filename="../qt-ui/maintab.ui" line="308"/> <location filename="../build/ui_maintab.h" line="956"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="300"/> + <location filename="../qt-ui/maintab.ui" line="321"/> <location filename="../build/ui_maintab.h" line="957"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="307"/> + <location filename="../qt-ui/maintab.ui" line="328"/> <location filename="../build/ui_maintab.h" line="958"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="376"/> + <location filename="../qt-ui/maintab.ui" line="397"/> <location filename="../build/ui_maintab.h" line="960"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="94"/> - <location filename="../qt-ui/maintab.ui" line="761"/> + <location filename="../qt-ui/maintab.ui" line="112"/> + <location filename="../qt-ui/maintab.ui" line="836"/> <location filename="../build/ui_maintab.h" line="949"/> <location filename="../build/ui_maintab.h" line="987"/> - <location filename="../qt-ui/maintab.cpp" line="350"/> + <location filename="../qt-ui/maintab.cpp" line="309"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="104"/> - <location filename="../qt-ui/maintab.ui" line="780"/> + <location filename="../qt-ui/maintab.ui" line="122"/> + <location filename="../qt-ui/maintab.ui" line="855"/> <location filename="../build/ui_maintab.h" line="950"/> <location filename="../build/ui_maintab.h" line="989"/> - <location filename="../qt-ui/maintab.cpp" line="351"/> + <location filename="../qt-ui/maintab.cpp" line="310"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.ui" line="418"/> + <location filename="../qt-ui/maintab.ui" line="439"/> <location filename="../build/ui_maintab.h" line="961"/> <location filename="../build/ui_maintab.h" line="963"/> - <location filename="../qt-ui/maintab.cpp" line="602"/> - <location filename="../qt-ui/maintab.cpp" line="628"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -3745,325 +3775,325 @@ p, li { white-space: pre-wrap; } <translation>Основная информация о выделенных погружениях</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="196"/> + <location filename="../qt-ui/maintab.ui" line="214"/> <source>Edit dive site</source> - <translation type="unfinished"/> + <translation>Редактирование сайта</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="199"/> + <location filename="../qt-ui/maintab.ui" line="217"/> <location filename="../build/ui_maintab.h" line="953"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="491"/> <location filename="../build/ui_maintab.h" line="965"/> <source>Equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="464"/> + <location filename="../qt-ui/maintab.ui" line="494"/> <location filename="../build/ui_maintab.h" line="966"/> <source>Used equipment in the current selection</source> <translation>Снаряжение для выделенных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="529"/> + <location filename="../qt-ui/maintab.ui" line="586"/> <location filename="../build/ui_maintab.h" line="994"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="532"/> + <location filename="../qt-ui/maintab.ui" line="589"/> <location filename="../build/ui_maintab.h" line="995"/> <source>Dive information</source> <translation>Информация о погружении</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="609"/> + <location filename="../qt-ui/maintab.ui" line="684"/> <location filename="../build/ui_maintab.h" line="971"/> <source>Gases used</source> <translation>Исп. газы</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="628"/> + <location filename="../qt-ui/maintab.ui" line="703"/> <location filename="../build/ui_maintab.h" line="973"/> <source>Gas consumed</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="666"/> + <location filename="../qt-ui/maintab.ui" line="741"/> <location filename="../build/ui_maintab.h" line="977"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="704"/> + <location filename="../qt-ui/maintab.ui" line="779"/> <location filename="../build/ui_maintab.h" line="981"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="742"/> + <location filename="../qt-ui/maintab.ui" line="817"/> <location filename="../build/ui_maintab.h" line="985"/> <source>Air pressure</source> <translation>Давл. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="799"/> + <location filename="../qt-ui/maintab.ui" line="874"/> <location filename="../build/ui_maintab.h" line="991"/> <source>Dive time</source> <translation>Время погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="858"/> + <location filename="../qt-ui/maintab.ui" line="933"/> <location filename="../build/ui_maintab.h" line="1007"/> <source>Simple statistics about the selection</source> <translation>Статистика выделенных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="946"/> + <location filename="../qt-ui/maintab.ui" line="1039"/> <location filename="../build/ui_maintab.h" line="999"/> <source>Total time</source> <translation>Общее время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1013"/> + <location filename="../qt-ui/maintab.ui" line="1106"/> <location filename="../build/ui_maintab.h" line="1004"/> <source>Gas consumption</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1058"/> + <location filename="../qt-ui/maintab.ui" line="1151"/> <location filename="../build/ui_maintab.h" line="1009"/> <source>All photos from the current selection</source> <translation>Все фото выделенных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1075"/> + <location filename="../qt-ui/maintab.ui" line="1177"/> <location filename="../build/ui_maintab.h" line="1010"/> <source>Extra data</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1078"/> + <location filename="../qt-ui/maintab.ui" line="1180"/> <location filename="../build/ui_maintab.h" line="1011"/> <source>Adittional data from the dive computer</source> <translation>Дополнительная информация из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="74"/> - <location filename="../qt-ui/maintab.ui" line="571"/> + <location filename="../qt-ui/maintab.ui" line="92"/> + <location filename="../qt-ui/maintab.ui" line="646"/> <location filename="../build/ui_maintab.h" line="947"/> <location filename="../build/ui_maintab.h" line="967"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="84"/> + <location filename="../qt-ui/maintab.ui" line="102"/> <location filename="../build/ui_maintab.h" line="948"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="590"/> + <location filename="../qt-ui/maintab.ui" line="665"/> <location filename="../build/ui_maintab.h" line="969"/> <source>Interval</source> <translation>Интервал</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="647"/> - <location filename="../qt-ui/maintab.ui" line="1001"/> + <location filename="../qt-ui/maintab.ui" line="722"/> + <location filename="../qt-ui/maintab.ui" line="1094"/> <location filename="../build/ui_maintab.h" line="975"/> <location filename="../build/ui_maintab.h" line="1003"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="723"/> + <location filename="../qt-ui/maintab.ui" line="798"/> <location filename="../build/ui_maintab.h" line="983"/> <source>Avg. depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="685"/> + <location filename="../qt-ui/maintab.ui" line="760"/> <location filename="../build/ui_maintab.h" line="979"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="818"/> + <location filename="../qt-ui/maintab.ui" line="893"/> <location filename="../build/ui_maintab.h" line="993"/> <source>Salinity</source> <translation>Соленость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="855"/> + <location filename="../qt-ui/maintab.ui" line="930"/> <location filename="../build/ui_maintab.h" line="1006"/> <source>Stats</source> <translation>Статистика</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="893"/> + <location filename="../qt-ui/maintab.ui" line="986"/> <location filename="../build/ui_maintab.h" line="996"/> <source>Depth</source> <translation>Глуб.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="934"/> + <location filename="../qt-ui/maintab.ui" line="1027"/> <location filename="../build/ui_maintab.h" line="998"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="905"/> + <location filename="../qt-ui/maintab.ui" line="998"/> <location filename="../build/ui_maintab.h" line="997"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="965"/> + <location filename="../qt-ui/maintab.ui" line="1058"/> <location filename="../build/ui_maintab.h" line="1001"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1055"/> + <location filename="../qt-ui/maintab.ui" line="1148"/> <location filename="../build/ui_maintab.h" line="1008"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="103"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="107"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="78"/> + <location filename="../qt-ui/maintab.cpp" line="64"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="82"/> + <location filename="../qt-ui/maintab.cpp" line="68"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="104"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="108"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add weight system</source> <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="347"/> + <location filename="../qt-ui/maintab.cpp" line="306"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="348"/> + <location filename="../qt-ui/maintab.cpp" line="307"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="385"/> + <location filename="../qt-ui/maintab.cpp" line="346"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="392"/> + <location filename="../qt-ui/maintab.cpp" line="353"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="394"/> + <location filename="../qt-ui/maintab.cpp" line="355"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="572"/> - <location filename="../qt-ui/maintab.cpp" line="597"/> + <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="534"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="594"/> + <location filename="../qt-ui/maintab.cpp" line="529"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="665"/> - <location filename="../qt-ui/maintab.cpp" line="697"/> - <location filename="../qt-ui/maintab.cpp" line="701"/> - <location filename="../qt-ui/maintab.cpp" line="705"/> + <location filename="../qt-ui/maintab.cpp" line="605"/> + <location filename="../qt-ui/maintab.cpp" line="637"/> + <location filename="../qt-ui/maintab.cpp" line="641"/> + <location filename="../qt-ui/maintab.cpp" line="645"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="694"/> + <location filename="../qt-ui/maintab.cpp" line="634"/> <source>Deepest dive</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="695"/> + <location filename="../qt-ui/maintab.cpp" line="635"/> <source>Shallowest dive</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="708"/> + <location filename="../qt-ui/maintab.cpp" line="648"/> <source>Highest total SAC of a dive</source> <translation>Наибольший SAC за погружение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="709"/> + <location filename="../qt-ui/maintab.cpp" line="649"/> <source>Lowest total SAC of a dive</source> <translation>Наименьший SAC за погружение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="710"/> + <location filename="../qt-ui/maintab.cpp" line="650"/> <source>Average total SAC of all selected dives</source> <translation>Общий средний SAC выбранных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="721"/> + <location filename="../qt-ui/maintab.cpp" line="661"/> <source>Highest temperature</source> <translation>Наивысшая температура</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="722"/> + <location filename="../qt-ui/maintab.cpp" line="662"/> <source>Lowest temperature</source> <translation>Наименьшая температура</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="723"/> + <location filename="../qt-ui/maintab.cpp" line="663"/> <source>Average temperature of all selected dives</source> <translation>Средняя температура выбранных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="733"/> + <location filename="../qt-ui/maintab.cpp" line="673"/> <source>Longest dive</source> <translation>Максимальное время погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="734"/> + <location filename="../qt-ui/maintab.cpp" line="674"/> <source>Shortest dive</source> <translation>Минимальное время погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="735"/> + <location filename="../qt-ui/maintab.cpp" line="675"/> <source>Average length of all selected dives</source> <translation>Средня длительность выбранных погружений</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="759"/> + <location filename="../qt-ui/maintab.cpp" line="699"/> <source>These gases could be mixed from Air and using: </source> @@ -4072,17 +4102,22 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="763"/> + <location filename="../qt-ui/maintab.cpp" line="703"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1217"/> + <location filename="../qt-ui/maintab.cpp" line="833"/> + <source>New dive site</source> + <translation>Новый дайв-сайт</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="1127"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1218"/> + <location filename="../qt-ui/maintab.cpp" line="1128"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4206,7 +4241,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="142"/> <source>Share on</source> - <translation type="unfinished"/> + <translation>Поделиться</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="157"/> @@ -4536,7 +4571,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="734"/> <source>Dive Site &Edit</source> - <translation type="unfinished"/> + <translation>Редактирование дайв-сайта</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="739"/> @@ -4743,14 +4778,14 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.cpp" line="363"/> <location filename="../qt-ui/mainwindow.cpp" line="468"/> - <location filename="../qt-ui/mainwindow.cpp" line="1814"/> + <location filename="../qt-ui/mainwindow.cpp" line="1851"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="464"/> <source>Traverse image directories</source> - <translation type="unfinished"/> + <translation>Сканировать директории с фото</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="467"/> @@ -4768,112 +4803,112 @@ mixed from Air and using: <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="645"/> + <location filename="../qt-ui/mainwindow.cpp" line="646"/> <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="692"/> + <location filename="../qt-ui/mainwindow.cpp" line="697"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="797"/> + <location filename="../qt-ui/mainwindow.cpp" line="802"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Попытка редактирования погружения, созданного не вручную.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1055"/> + <location filename="../qt-ui/mainwindow.cpp" line="1060"/> <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="1058"/> + <location filename="../qt-ui/mainwindow.cpp" line="1063"/> <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="1063"/> + <location filename="../qt-ui/mainwindow.cpp" line="1068"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1418"/> + <location filename="../qt-ui/mainwindow.cpp" line="1433"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1496"/> + <location filename="../qt-ui/mainwindow.cpp" line="1528"/> <source>[cloud storage for] %1</source> - <translation type="unfinished"/> + <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1593"/> + <location filename="../qt-ui/mainwindow.cpp" line="1628"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1594"/> + <location filename="../qt-ui/mainwindow.cpp" line="1629"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1605"/> + <location filename="../qt-ui/mainwindow.cpp" line="1640"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1606"/> + <location filename="../qt-ui/mainwindow.cpp" line="1641"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source> <translation>Файлы журналов (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Файлы Cochran (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;Все файлы (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1814"/> + <location filename="../qt-ui/mainwindow.cpp" line="1851"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1064"/> + <location filename="../qt-ui/mainwindow.cpp" line="1069"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="503"/> - <location filename="../qt-ui/mainwindow.cpp" line="645"/> - <location filename="../qt-ui/mainwindow.cpp" line="720"/> - <location filename="../qt-ui/mainwindow.cpp" line="791"/> - <location filename="../qt-ui/mainwindow.cpp" line="797"/> - <location filename="../qt-ui/mainwindow.cpp" line="1651"/> + <location filename="../qt-ui/mainwindow.cpp" line="646"/> + <location filename="../qt-ui/mainwindow.cpp" line="725"/> + <location filename="../qt-ui/mainwindow.cpp" line="796"/> + <location filename="../qt-ui/mainwindow.cpp" line="802"/> + <location filename="../qt-ui/mainwindow.cpp" line="1686"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="353"/> <location filename="../qt-ui/mainwindow.cpp" line="398"/> - <location filename="../qt-ui/mainwindow.cpp" line="1400"/> + <location filename="../qt-ui/mainwindow.cpp" line="1406"/> <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="720"/> + <location filename="../qt-ui/mainwindow.cpp" line="725"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="844"/> + <location filename="../qt-ui/mainwindow.cpp" line="849"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1419"/> + <location filename="../qt-ui/mainwindow.cpp" line="1434"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="791"/> - <location filename="../qt-ui/mainwindow.cpp" line="1651"/> + <location filename="../qt-ui/mainwindow.cpp" line="796"/> + <location filename="../qt-ui/mainwindow.cpp" line="1686"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> @@ -4891,7 +4926,7 @@ Subsurface попытался перенести уже существующие <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="718"/> + <location filename="../qt-ui/simplewidgets.cpp" line="725"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> @@ -4899,12 +4934,12 @@ Subsurface попытался перенести уже существующие <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="260"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="261"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Вам следует обновить прошивку дайвкомпьютера: текущая версия %1, а последняя стабильная версия %2</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="264"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/> <source> Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source> @@ -4913,27 +4948,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a Включите Bluetooth на OSTC Sport и выполните такие же приготовления, что и для загрузки журнала, прежде чем продолжать обновление.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/> <source>Not now</source> <translation>Не сейчас</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="267"/> <source>Update firmware</source> <translation>Обновить прошивку</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> <source>Firmware upgrade notice</source> <translation>Примечание по обновлению прошивки</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="286"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/> <source>Save the downloaded firmware as</source> <translation>Сохранить загруженную прошивку как</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="288"/> <source>HEX files (*.hex)</source> <translation>Файлы HEX (*.hex)</translation> </message> @@ -5053,298 +5088,294 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Геопривязка</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="190"/> + <location filename="../qt-ui/preferences.ui" line="195"/> <location filename="../build/ui_preferences.h" line="1304"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="200"/> + <location filename="../qt-ui/preferences.ui" line="205"/> <location filename="../build/ui_preferences.h" line="1305"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="213"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <location filename="../build/ui_preferences.h" line="1306"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="237"/> + <location filename="../qt-ui/preferences.ui" line="242"/> <location filename="../build/ui_preferences.h" line="1308"/> <source>No default file</source> <translation>Отсутствует</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="252"/> <location filename="../build/ui_preferences.h" line="1309"/> <source>&Local default file</source> <translation>Локальный файл</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="257"/> + <location filename="../qt-ui/preferences.ui" line="262"/> <location filename="../build/ui_preferences.h" line="1310"/> <source>Clo&ud storage default file</source> <translation>Файл в облаке</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="269"/> + <location filename="../qt-ui/preferences.ui" line="274"/> <location filename="../build/ui_preferences.h" line="1311"/> <source>Local dive log file</source> - <translation type="unfinished"/> + <translation>Локальный файл журнала</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="281"/> + <location filename="../qt-ui/preferences.ui" line="286"/> <location filename="../build/ui_preferences.h" line="1312"/> <source>Use default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="291"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <location filename="../build/ui_preferences.h" line="1313"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="354"/> <location filename="../build/ui_preferences.h" line="1318"/> <source>Animations</source> <translation>Анимация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="363"/> <location filename="../build/ui_preferences.h" line="1319"/> <source>Speed</source> <translation>Скорость</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="385"/> + <location filename="../qt-ui/preferences.ui" line="390"/> <location filename="../build/ui_preferences.h" line="1320"/> <source>Clear all settings</source> <translation>Очистить все натройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="397"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <location filename="../build/ui_preferences.h" line="1321"/> <source>Reset all settings to their default value</source> <translation>Сбросить все настройки в значение по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="441"/> <location filename="../build/ui_preferences.h" line="1322"/> <source>Unit system</source> <translation>Единицы измерения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="442"/> + <location filename="../qt-ui/preferences.ui" line="447"/> <location filename="../build/ui_preferences.h" line="1323"/> <source>System</source> <translation>Система мер</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1395"/> + <location filename="../qt-ui/preferences.ui" line="1408"/> <source>Connect to facebook text placeholder</source> - <translation type="unfinished"/> + <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1407"/> + <location filename="../qt-ui/preferences.ui" line="1420"/> <source>Disconnect</source> <translation>Отключить</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1433"/> <location filename="../build/ui_preferences.h" line="1401"/> <source>Dive site geo lookup</source> <translation>Геопоиск дайв-сайтов</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1439"/> <location filename="../build/ui_preferences.h" line="1402"/> <source>Enable geocoding for dive site management</source> <translation>Включить геокодирование для управления сайтами</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1446"/> <location filename="../build/ui_preferences.h" line="1403"/> <source>Parse site without GPS data</source> <translation>Искать сайты без координат GPS</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1453"/> <location filename="../build/ui_preferences.h" line="1404"/> <source>Same format for existing dives</source> <translation>Один формат для существующих погружений</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1463"/> + <location filename="../qt-ui/preferences.ui" line="1446"/> <location filename="../build/ui_preferences.h" line="1405"/> <source>Dive Site Layout</source> <translation>Формат дайв-сайта</translation> </message> <message> + <location filename="../qt-ui/preferences.ui" line="1468"/> <location filename="../qt-ui/preferences.ui" line="1485"/> - <location filename="../qt-ui/preferences.ui" line="1502"/> <location filename="../build/ui_preferences.h" line="1406"/> <location filename="../build/ui_preferences.h" line="1407"/> <source>/</source> <translation>/</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="459"/> + <location filename="../qt-ui/preferences.ui" line="464"/> <location filename="../build/ui_preferences.h" line="1325"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="494"/> + <location filename="../qt-ui/preferences.ui" line="499"/> <location filename="../build/ui_preferences.h" line="1328"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="501"/> + <location filename="../qt-ui/preferences.ui" line="506"/> <location filename="../build/ui_preferences.h" line="1329"/> <source>meter</source> <translation>метр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="511"/> + <location filename="../qt-ui/preferences.ui" line="516"/> <location filename="../build/ui_preferences.h" line="1330"/> <source>feet</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="528"/> - <location filename="../qt-ui/preferences.ui" line="946"/> + <location filename="../qt-ui/preferences.ui" line="533"/> + <location filename="../qt-ui/preferences.ui" line="951"/> <location filename="../build/ui_preferences.h" line="1332"/> <location filename="../build/ui_preferences.h" line="1366"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="543"/> <location filename="../build/ui_preferences.h" line="1333"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="565"/> + <location filename="../qt-ui/preferences.ui" line="570"/> <location filename="../build/ui_preferences.h" line="1336"/> <source>cu ft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="582"/> + <location filename="../qt-ui/preferences.ui" line="587"/> <location filename="../build/ui_preferences.h" line="1338"/> <source>celsius</source> <translation>цельсий</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="592"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <location filename="../build/ui_preferences.h" line="1339"/> <source>fahrenheit</source> <translation>фаренгейт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="609"/> + <location filename="../qt-ui/preferences.ui" line="614"/> <location filename="../build/ui_preferences.h" line="1341"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="930"/> <location filename="../build/ui_preferences.h" line="1363"/> <source>CCR: show setpoints when viewing pO₂</source> <translation>CCR: показывать установки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="932"/> + <location filename="../qt-ui/preferences.ui" line="937"/> <location filename="../build/ui_preferences.h" line="1364"/> <source>CCR: show individual O₂ sensor values when viewing pO₂</source> <translation>CCR: индивидуальные значения сенсоров O₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="939"/> + <location filename="../qt-ui/preferences.ui" line="944"/> <location filename="../build/ui_preferences.h" line="1365"/> <source>Default CCR set-point for dive planning</source> <translation>Установка CCR по умолчанию для планировщика</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="962"/> + <location filename="../qt-ui/preferences.ui" line="967"/> <location filename="../build/ui_preferences.h" line="1367"/> <source>pSCR O₂ metabolism rate</source> <translation>pSCR метаболизм O₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="969"/> + <location filename="../qt-ui/preferences.ui" line="974"/> <location filename="../build/ui_preferences.h" line="1368"/> <source>pSCR ratio</source> <translation>pSCR отношение сброса</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="976"/> + <location filename="../qt-ui/preferences.ui" line="981"/> <location filename="../build/ui_preferences.h" line="1369"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="989"/> + <location filename="../qt-ui/preferences.ui" line="994"/> <location filename="../build/ui_preferences.h" line="1371"/> <source>1:</source> <translation>1:</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1037"/> + <location filename="../qt-ui/preferences.ui" line="1042"/> <location filename="../build/ui_preferences.h" line="1372"/> <source>UI language</source> <translation>Язык интерфейса</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1043"/> + <location filename="../qt-ui/preferences.ui" line="1048"/> <location filename="../build/ui_preferences.h" line="1373"/> <source>System default</source> <translation>Системные настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1115"/> + <location filename="../qt-ui/preferences.ui" line="1120"/> <location filename="../build/ui_preferences.h" line="1375"/> <source>Proxy</source> <translation>Прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1154"/> + <location filename="../qt-ui/preferences.ui" line="1159"/> <location filename="../build/ui_preferences.h" line="1379"/> <source>Proxy type</source> <translation>Тип прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1137"/> + <location filename="../qt-ui/preferences.ui" line="1142"/> <location filename="../build/ui_preferences.h" line="1377"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1127"/> + <location filename="../qt-ui/preferences.ui" line="1132"/> <location filename="../build/ui_preferences.h" line="1376"/> <source>Port</source> <translation>Порт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1147"/> + <location filename="../qt-ui/preferences.ui" line="1152"/> <location filename="../build/ui_preferences.h" line="1378"/> <source>Requires authentication</source> <translation>Требуется авторизация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1164"/> + <location filename="../qt-ui/preferences.ui" line="1169"/> <location filename="../build/ui_preferences.h" line="1380"/> <source>Username</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1213"/> - <location filename="../qt-ui/preferences.ui" line="1267"/> + <location filename="../qt-ui/preferences.ui" line="1218"/> + <location filename="../qt-ui/preferences.ui" line="1272"/> <location filename="../build/ui_preferences.h" line="1381"/> <location filename="../build/ui_preferences.h" line="1387"/> <source>Password</source> @@ -5356,157 +5387,157 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Отключиться от Facebook</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1063"/> + <location filename="../qt-ui/preferences.ui" line="1068"/> <location filename="../build/ui_preferences.h" line="1374"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="521"/> + <location filename="../qt-ui/preferences.ui" line="526"/> <location filename="../build/ui_preferences.h" line="1331"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="181"/> + <location filename="../qt-ui/preferences.ui" line="186"/> <location filename="../build/ui_preferences.h" line="1303"/> <source>Lists and tables</source> <translation>Списки и таблицы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="228"/> + <location filename="../qt-ui/preferences.ui" line="233"/> <location filename="../build/ui_preferences.h" line="1307"/> <source>Default dive log file</source> <translation>Журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="300"/> + <location filename="../qt-ui/preferences.ui" line="305"/> <location filename="../build/ui_preferences.h" line="1314"/> <source>Display invalid</source> <translation>Показывать ошибочные</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="317"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <location filename="../build/ui_preferences.h" line="1316"/> <source>Default cylinder</source> <translation>Баллон по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="332"/> + <location filename="../qt-ui/preferences.ui" line="337"/> <location filename="../build/ui_preferences.h" line="1317"/> <source>Use default cylinder</source> <translation>Использовать по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1251"/> + <location filename="../qt-ui/preferences.ui" line="1256"/> <location filename="../build/ui_preferences.h" line="1382"/> <location filename="../qt-ui/preferences.cpp" line="123"/> <source>Subsurface cloud storage</source> <translation>Облачное хранилище Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1260"/> + <location filename="../qt-ui/preferences.ui" line="1265"/> <location filename="../build/ui_preferences.h" line="1386"/> <source>Email address</source> <translation>Эл.почта</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1274"/> + <location filename="../qt-ui/preferences.ui" line="1279"/> <location filename="../build/ui_preferences.h" line="1388"/> <source>Verification PIN</source> <translation>Контрольный PIN</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1281"/> + <location filename="../qt-ui/preferences.ui" line="1286"/> <source>New password</source> <translation>Новый пароль</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1308"/> + <location filename="../qt-ui/preferences.ui" line="1321"/> <location filename="../build/ui_preferences.h" line="1395"/> <source>Sync to cloud in the background?</source> <translation>Фоновая синхронизация в облако?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1315"/> + <location filename="../qt-ui/preferences.ui" line="1328"/> <location filename="../build/ui_preferences.h" line="1396"/> <source>Save Password locally?</source> <translation>Хранить пароль локально?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1325"/> + <location filename="../qt-ui/preferences.ui" line="1338"/> <location filename="../build/ui_preferences.h" line="1397"/> <source>Subsurface web service</source> <translation>Веб-сервис Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1337"/> + <location filename="../qt-ui/preferences.ui" line="1350"/> <location filename="../build/ui_preferences.h" line="1398"/> <source>Default user ID</source> <translation>ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1347"/> + <location filename="../qt-ui/preferences.ui" line="1360"/> <location filename="../build/ui_preferences.h" line="1399"/> <source>Save user ID locally?</source> <translation>Сохранять ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="548"/> + <location filename="../qt-ui/preferences.ui" line="553"/> <location filename="../build/ui_preferences.h" line="1334"/> <source>Volume</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="575"/> + <location filename="../qt-ui/preferences.ui" line="580"/> <location filename="../build/ui_preferences.h" line="1337"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="602"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <location filename="../build/ui_preferences.h" line="1340"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="624"/> <location filename="../build/ui_preferences.h" line="1342"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="634"/> + <location filename="../qt-ui/preferences.ui" line="639"/> <location filename="../build/ui_preferences.h" line="1343"/> <source>Time units</source> <translation>Единицы времени</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="647"/> + <location filename="../qt-ui/preferences.ui" line="652"/> <location filename="../build/ui_preferences.h" line="1345"/> <source>Minutes</source> <translation>Минуты</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="657"/> + <location filename="../qt-ui/preferences.ui" line="662"/> <location filename="../build/ui_preferences.h" line="1346"/> <source>Seconds</source> <translation>Секунды</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="737"/> + <location filename="../qt-ui/preferences.ui" line="742"/> <location filename="../build/ui_preferences.h" line="1351"/> <source>Show</source> <translation>Показывать</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="918"/> + <location filename="../qt-ui/preferences.ui" line="923"/> <location filename="../build/ui_preferences.h" line="1362"/> <source>GFLow at max depth</source> <translation>GFLow на макс. грубине</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="878"/> + <location filename="../qt-ui/preferences.ui" line="883"/> <location filename="../build/ui_preferences.h" line="1359"/> <source>Misc</source> <translation>Разное</translation> @@ -5518,109 +5549,109 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="449"/> + <location filename="../qt-ui/preferences.ui" line="454"/> <location filename="../build/ui_preferences.h" line="1324"/> <source>&Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="469"/> + <location filename="../qt-ui/preferences.ui" line="474"/> <location filename="../build/ui_preferences.h" line="1326"/> <source>Personali&ze</source> <translation>Персональная</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="482"/> + <location filename="../qt-ui/preferences.ui" line="487"/> <location filename="../build/ui_preferences.h" line="1327"/> <source>Individual settings</source> <translation>Индивидуальные настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="560"/> <location filename="../build/ui_preferences.h" line="1335"/> <source>&liter</source> <translation>литр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="645"/> <location filename="../build/ui_preferences.h" line="1344"/> <source>Ascent/descent speed denominator</source> <translation>Делитель скорости спуска/подъема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="672"/> + <location filename="../qt-ui/preferences.ui" line="677"/> <location filename="../build/ui_preferences.h" line="1347"/> <source>GPS coordinates</source> <translation>Координаты GPS</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="683"/> <location filename="../build/ui_preferences.h" line="1348"/> <source>Location Display</source> <translation>Отображение координат</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="685"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <location filename="../build/ui_preferences.h" line="1349"/> <source>traditional (dms)</source> <translation>обычное (гмс)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="695"/> + <location filename="../qt-ui/preferences.ui" line="700"/> <location filename="../build/ui_preferences.h" line="1350"/> <source>decimal</source> <translation>десятичное</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="748"/> + <location filename="../qt-ui/preferences.ui" line="753"/> <location filename="../build/ui_preferences.h" line="1352"/> <source>Threshold when showing pO₂</source> <translation>Предельное значение pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="777"/> <location filename="../build/ui_preferences.h" line="1353"/> <source>Threshold when showing pN₂</source> <translation>Предельное значение pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="796"/> + <location filename="../qt-ui/preferences.ui" line="801"/> <location filename="../build/ui_preferences.h" line="1354"/> <source>Threshold when showing pHe</source> <translation>Предельное значение pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="820"/> + <location filename="../qt-ui/preferences.ui" line="825"/> <location filename="../build/ui_preferences.h" line="1355"/> <source>Max pO₂ when showing MOD</source> <translation>Макс. pO₂ при отображении MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="844"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <location filename="../build/ui_preferences.h" line="1356"/> <source>Draw dive computer reported ceiling red</source> <translation>Показывать потолок дайвкомпьютера красным</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="855"/> + <location filename="../qt-ui/preferences.ui" line="860"/> <location filename="../build/ui_preferences.h" line="1357"/> <source>Show unused cylinders in Equipment tab</source> <translation>Показывать неиспользуемые баллоны</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="866"/> + <location filename="../qt-ui/preferences.ui" line="871"/> <location filename="../build/ui_preferences.h" line="1358"/> <source>Show average depth</source> <translation>Показывать среднюю глубину</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="884"/> + <location filename="../qt-ui/preferences.ui" line="889"/> <location filename="../build/ui_preferences.h" line="1360"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="901"/> + <location filename="../qt-ui/preferences.ui" line="906"/> <location filename="../build/ui_preferences.h" line="1361"/> <source>GFHigh</source> <translation>GFHigh</translation> @@ -5661,39 +5692,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Облачное хранилище Subsurface (данные подтверждены)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="329"/> + <location filename="../qt-ui/preferences.cpp" line="332"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="330"/> + <location filename="../qt-ui/preferences.cpp" line="333"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="360"/> - <location filename="../qt-ui/preferences.cpp" line="382"/> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="363"/> + <location filename="../qt-ui/preferences.cpp" line="385"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="487"/> + <location filename="../qt-ui/preferences.cpp" line="492"/> <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="473"/> + <location filename="../qt-ui/preferences.cpp" line="478"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="473"/> + <location filename="../qt-ui/preferences.cpp" line="478"/> <source>Open default log file</source> <translation>Выберите журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="486"/> + <location filename="../qt-ui/preferences.cpp" line="491"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -5726,12 +5757,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <message> <location filename="../build/ui_printoptions.h" line="158"/> <source>One dive per page</source> - <translation type="unfinished"/> + <translation>Одно погружение на странице</translation> </message> <message> <location filename="../build/ui_printoptions.h" line="159"/> <source>Two dives per page</source> - <translation type="unfinished"/> + <translation>Одно погружения на странице</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="41"/> @@ -5812,6 +5843,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <source>Export template files as</source> <translation>Экспорт шаблона печати</translation> </message> + <message> + <location filename="../qt-ui/printoptions.cpp" line="174"/> + <source>This action cannot be undone!</source> + <translation>Это действие не может быть отменено!</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.cpp" line="175"/> + <source>Delete template: %1?</source> + <translation>Удалить шаблон: %1?</translation> + </message> </context> <context> <name>ProfilePrintModel</name> @@ -5889,113 +5930,113 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="658"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="660"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="663"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="677"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1224"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1227"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1226"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1229"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1240"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1246"/> <source> (Tank %1)</source> <translation> (Баллон %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1251"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1254"/> <source>Add set-point change</source> <translation>Добавить замену установки</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1253"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1256"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1257"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1260"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1266"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1273"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1276"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1302"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1309"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1305"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1312"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1324"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1327"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1393"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1396"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1394"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1397"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1498"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1501"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1499"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1502"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1504"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1507"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6003,12 +6044,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>QObject</name> <message> - <location filename="../qthelper.cpp" line="1226"/> + <location filename="../qthelper.cpp" line="1255"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../qthelper.cpp" line="1226"/> + <location filename="../qthelper.cpp" line="1255"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> @@ -6033,7 +6074,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="322"/> + <location filename="../qt-ui/globe.cpp" line="327"/> <source>Move the map and double-click to set the dive location</source> <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> @@ -6048,62 +6089,62 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>мин</translation> </message> <message> - <location filename="../qthelper.cpp" line="1240"/> + <location filename="../qthelper.cpp" line="1269"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qthelper.cpp" line="1241"/> + <location filename="../qthelper.cpp" line="1270"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qthelper.cpp" line="1264"/> + <location filename="../qthelper.cpp" line="1293"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qthelper.cpp" line="1265"/> + <location filename="../qthelper.cpp" line="1294"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qthelper.cpp" line="1287"/> + <location filename="../qthelper.cpp" line="1316"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qthelper.cpp" line="1288"/> + <location filename="../qthelper.cpp" line="1317"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../qthelper.cpp" line="1310"/> + <location filename="../qthelper.cpp" line="1339"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../qthelper.cpp" line="1311"/> + <location filename="../qthelper.cpp" line="1340"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="593"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="604"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="601"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="612"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="658"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="654"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="665"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> @@ -6111,8 +6152,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1584"/> - <location filename="../configuredivecomputerthreads.cpp" line="1609"/> + <location filename="../configuredivecomputerthreads.cpp" line="1634"/> + <location filename="../configuredivecomputerthreads.cpp" line="1659"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation> </message> @@ -6141,9 +6182,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1708"/> + <location filename="../configuredivecomputerthreads.cpp" line="1758"/> <source>Reset settings failed!</source> - <translation type="unfinished"/> + <translation>Сброс настроек не удался!</translation> </message> </context> <context> @@ -6214,12 +6255,14 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <source>Warning! Not all images have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation type="unfinished"/> + <translation>Внимание! +Не у всех фото время попадает в интервал 30 минут +до или 30 минут после времени выбранного погружения.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="137"/> <source>Load images even if the time does not match the dive time</source> - <translation type="unfinished"/> + <translation>Загрузить фото даже если время погружения не совпадает</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="180"/> @@ -6339,7 +6382,7 @@ Not all images have timestamps in the range between <message> <location filename="../build/ui_simpledivesiteedit.h" line="104"/> <source>Dive site quick edit. Hit ESC or click outside to close</source> - <translation type="unfinished"/> + <translation>Быстрое редактирование дайв-сайта. Нажмите ESC, чтобы закрыть</translation> </message> </context> <context> @@ -6509,47 +6552,47 @@ Not all images have timestamps in the range between <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="387"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Webservice</source> <translation>Вебсервис</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="473"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="484"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="492"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="503"/> <source>Download finished</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="517"/> <source>Download error: %1</source> <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="516"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/> <source>Connection error: </source> <translation>Ошибка соединения:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="536"/> <source>Download successful</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="519"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="530"/> <source>Invalid user identifier!</source> <translation>Неверный идентификатор пользователя!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="366"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="377"/> <source>Enter User ID and click Download</source> <translation>Укажите КЛЮЧ и нажмите Загрузить</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="522"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="533"/> <source>Cannot parse response!</source> <translation>Невозможно разобрать ответ!</translation> </message> @@ -6557,7 +6600,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="659"/> + <location filename="../qt-ui/simplewidgets.cpp" line="666"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -6584,7 +6627,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="580"/> + <location filename="../qt-ui/simplewidgets.cpp" line="587"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -6780,13 +6823,14 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.cpp" line="135"/> <source>Do you want to save your changes?</source> - <translation type="unfinished"/> + <translation>Сохранить изменения?</translation> </message> <message> <location filename="../qt-ui/templateedit.cpp" line="140"/> <source>You are about to modify a template bundled with Subsurface. </source> - <translation type="unfinished"/> + <translation>Вы собираетесь изменить шаблон из штатной поставки Subsurface. +</translation> </message> </context> <context> @@ -6865,15 +6909,15 @@ Not all images have timestamps in the range between <message> <location filename="../qt-mobile/TopBar.qml" line="59"/> <source>Subsurface mobile</source> - <translation type="unfinished"/> + <translation>Subsurface для мобильных</translation> </message> </context> <context> <name>TripItem</name> <message> <location filename="../qt-models/divetripmodel.cpp" line="65"/> - <source> (%1 shown)</source> - <translation> (показано %1)</translation> + <source>(%1 shown)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7212,12 +7256,12 @@ Language: %1</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="322"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="333"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -7243,24 +7287,24 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="518"/> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="549"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="525"/> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="556"/> <source>No error</source> - <translation type="unfinished"/> + <translation>Без ошибок</translation> </message> </context> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1635"/> - <location filename="../configuredivecomputerthreads.cpp" line="1642"/> - <location filename="../configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../configuredivecomputerthreads.cpp" line="1685"/> + <location filename="../configuredivecomputerthreads.cpp" line="1692"/> + <location filename="../configuredivecomputerthreads.cpp" line="1701"/> <source>Failed!</source> <translation>Ошибка!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1633"/> - <location filename="../configuredivecomputerthreads.cpp" line="1654"/> + <location filename="../configuredivecomputerthreads.cpp" line="1683"/> + <location filename="../configuredivecomputerthreads.cpp" line="1704"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation> </message> @@ -7388,7 +7432,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="641"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -7402,13 +7446,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="199"/> - <location filename="../qthelper.cpp" line="895"/> + <location filename="../qthelper.cpp" line="905"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qthelper.cpp" line="898"/> + <location filename="../qthelper.cpp" line="908"/> <source>psi</source> <translation>psi</translation> </message> @@ -7419,16 +7463,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="282"/> - <location filename="../qthelper.cpp" line="777"/> - <location filename="../qthelper.cpp" line="792"/> + <location filename="../qthelper.cpp" line="787"/> + <location filename="../qthelper.cpp" line="802"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../dive.c" line="287"/> - <location filename="../qthelper.cpp" line="780"/> - <location filename="../qthelper.cpp" line="794"/> + <location filename="../qthelper.cpp" line="790"/> + <location filename="../qthelper.cpp" line="804"/> <source>ft</source> <translation>фут</translation> </message> @@ -7454,28 +7498,28 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="338"/> - <location filename="../qthelper.cpp" line="803"/> <location filename="../qthelper.cpp" line="813"/> + <location filename="../qthelper.cpp" line="823"/> <source>lbs</source> <translation>фунт</translation> </message> <message> <location filename="../dive.c" line="342"/> - <location filename="../qthelper.cpp" line="801"/> <location filename="../qthelper.cpp" line="811"/> + <location filename="../qthelper.cpp" line="821"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1559"/> + <location filename="../dive.c" line="1579"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="482"/> <location filename="../equipment.c" line="81"/> - <location filename="../planner.c" line="1398"/> - <location filename="../planner.c" line="1401"/> + <location filename="../planner.c" line="1397"/> + <location filename="../planner.c" line="1400"/> <source>air</source> <translation>воздух</translation> </message> @@ -7508,7 +7552,7 @@ Maximum</source> <location filename="../file.c" line="117"/> <location filename="../file.c" line="456"/> <location filename="../file.c" line="541"/> - <location filename="../file.c" line="938"/> + <location filename="../file.c" line="936"/> <location filename="../ostctools.c" line="80"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> @@ -7733,12 +7777,12 @@ Maximum</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../libdivecomputer.c" line="627"/> + <location filename="../libdivecomputer.c" line="625"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="633"/> + <location filename="../libdivecomputer.c" line="631"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> @@ -7793,52 +7837,52 @@ Maximum</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="653"/> + <location filename="../libdivecomputer.c" line="651"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="790"/> + <location filename="../libdivecomputer.c" line="788"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="798"/> + <location filename="../libdivecomputer.c" line="796"/> <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="862"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="865"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="888"/> + <location filename="../libdivecomputer.c" line="886"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="927"/> + <location filename="../libdivecomputer.c" line="925"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="934"/> + <location filename="../libdivecomputer.c" line="932"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="958"/> + <location filename="../libdivecomputer.c" line="956"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="522"/> + <location filename="../parse-xml.c" line="514"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s @@ -7846,19 +7890,19 @@ Maximum</source> </message> <message> <location filename="../load-git.c" line="189"/> - <location filename="../parse-xml.c" line="1240"/> + <location filename="../parse-xml.c" line="1232"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s </translation> </message> <message> - <location filename="../parse-xml.c" line="2026"/> + <location filename="../parse-xml.c" line="2022"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="3619"/> + <location filename="../parse-xml.c" line="3631"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -7869,7 +7913,7 @@ Maximum</source> </message> <message> <location filename="../planner.c" line="1021"/> - <location filename="../planner.c" line="1172"/> + <location filename="../planner.c" line="1170"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> @@ -7992,7 +8036,7 @@ Maximum</source> <message> <location filename="../planner.c" line="583"/> <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation type="unfinished"/> + <translation>на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation> </message> <message> <location filename="../planner.c" line="587"/> @@ -8007,7 +8051,7 @@ Maximum</source> <message> <location filename="../planner.c" line="591"/> <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation type="unfinished"/> + <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation> </message> <message> <location filename="../planner.c" line="812"/> @@ -8040,12 +8084,12 @@ Maximum</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1406"/> + <location filename="../planner.c" line="1405"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1122"/> <source>@: %d:%02d D: %.1f%s </source> @@ -8054,70 +8098,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1116"/> + <location filename="../profile.c" line="1125"/> <source>P: %d%s </source> <translation>Д: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1120"/> + <location filename="../profile.c" line="1129"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1126"/> + <location filename="../profile.c" line="1135"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1138"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1140"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1142"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1135"/> + <location filename="../profile.c" line="1144"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1146"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1140"/> + <location filename="../profile.c" line="1149"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1156"/> <source>EAD: %d%s EADD: %d%s </source> @@ -8126,7 +8170,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1151"/> + <location filename="../profile.c" line="1160"/> <source>END: %d%s EADD: %d%s </source> @@ -8135,98 +8179,98 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1172"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ост. безопасности: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1166"/> + <location filename="../profile.c" line="1175"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ост. безопасности: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1171"/> + <location filename="../profile.c" line="1180"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1183"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1178"/> + <location filename="../profile.c" line="1187"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1189"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1183"/> + <location filename="../profile.c" line="1192"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1195"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1203"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1196"/> + <location filename="../profile.c" line="1205"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1199"/> + <location filename="../profile.c" line="1208"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1201"/> + <location filename="../profile.c" line="1210"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1204"/> + <location filename="../profile.c" line="1213"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1210"/> + <location filename="../profile.c" line="1219"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s @@ -8234,58 +8278,58 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1216"/> + <location filename="../profile.c" line="1225"/> <source>heartbeat: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../profile.c" line="1218"/> + <location filename="../profile.c" line="1227"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../profile.c" line="1221"/> + <location filename="../profile.c" line="1230"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1316"/> + <location filename="../profile.c" line="1325"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1320"/> - <location filename="../profile.c" line="1324"/> - <location filename="../profile.c" line="1328"/> + <location filename="../profile.c" line="1329"/> + <location filename="../profile.c" line="1333"/> + <location filename="../profile.c" line="1337"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1332"/> + <location filename="../profile.c" line="1341"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1336"/> + <location filename="../profile.c" line="1345"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1340"/> - <location filename="../profile.c" line="1344"/> + <location filename="../profile.c" line="1349"/> + <location filename="../profile.c" line="1353"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1351"/> + <location filename="../profile.c" line="1360"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> @@ -8310,22 +8354,22 @@ EADD: %d%s <translation>%1ярд</translation> </message> <message> - <location filename="../qthelper.cpp" line="853"/> + <location filename="../qthelper.cpp" line="863"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qthelper.cpp" line="856"/> + <location filename="../qthelper.cpp" line="866"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qthelper.cpp" line="1009"/> + <location filename="../qthelper.cpp" line="1019"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 погружений)</translation> </message> <message> - <location filename="../qthelper.cpp" line="1014"/> + <location filename="../qthelper.cpp" line="1024"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 погружение)</translation> </message> @@ -8340,7 +8384,7 @@ EADD: %d%s <translation>с берега</translation> </message> <message> - <location filename="../datatrak.c" line="450"/> + <location filename="../datatrak.c" line="456"/> <location filename="../dive.c" line="23"/> <source>drift</source> <translation>течение</translation> @@ -8356,24 +8400,24 @@ EADD: %d%s <translation>каверна</translation> </message> <message> - <location filename="../datatrak.c" line="434"/> + <location filename="../datatrak.c" line="440"/> <location filename="../dive.c" line="24"/> <source>ice</source> <translation>подледное</translation> </message> <message> - <location filename="../datatrak.c" line="436"/> + <location filename="../datatrak.c" line="442"/> <source>search</source> <translation>поиск</translation> </message> <message> - <location filename="../datatrak.c" line="446"/> + <location filename="../datatrak.c" line="452"/> <location filename="../dive.c" line="25"/> <source>wreck</source> <translation>рэк</translation> </message> <message> - <location filename="../datatrak.c" line="432"/> + <location filename="../datatrak.c" line="438"/> <location filename="../dive.c" line="25"/> <source>cave</source> <translation>пещера</translation> @@ -8394,155 +8438,155 @@ EADD: %d%s <translation>в озере</translation> </message> <message> - <location filename="../datatrak.c" line="448"/> + <location filename="../datatrak.c" line="454"/> <location filename="../dive.c" line="26"/> <source>river</source> <translation>в реке</translation> </message> <message> - <location filename="../datatrak.c" line="430"/> + <location filename="../datatrak.c" line="436"/> <location filename="../dive.c" line="27"/> <source>night</source> <translation>ночное</translation> </message> <message> - <location filename="../datatrak.c" line="145"/> + <location filename="../datatrak.c" line="150"/> <source>Error: the file does not appear to be a DATATRAK divelog</source> <translation>Ошибка: файл не является журналом DATATRAK.</translation> </message> <message> - <location filename="../datatrak.c" line="277"/> + <location filename="../datatrak.c" line="283"/> <source>clear</source> - <translation type="unfinished"/> + <translation>ясно</translation> </message> <message> - <location filename="../datatrak.c" line="280"/> + <location filename="../datatrak.c" line="286"/> <source>misty</source> - <translation type="unfinished"/> + <translation>туман</translation> </message> <message> - <location filename="../datatrak.c" line="283"/> + <location filename="../datatrak.c" line="289"/> <source>fog</source> - <translation type="unfinished"/> + <translation>туман</translation> </message> <message> - <location filename="../datatrak.c" line="286"/> + <location filename="../datatrak.c" line="292"/> <source>rain</source> - <translation type="unfinished"/> + <translation>дождь</translation> </message> <message> - <location filename="../datatrak.c" line="289"/> + <location filename="../datatrak.c" line="295"/> <source>storm</source> - <translation type="unfinished"/> + <translation>шторм</translation> </message> <message> - <location filename="../datatrak.c" line="292"/> + <location filename="../datatrak.c" line="298"/> <source>snow</source> - <translation type="unfinished"/> + <translation>снег</translation> </message> <message> - <location filename="../datatrak.c" line="312"/> + <location filename="../datatrak.c" line="318"/> <source>No suit</source> - <translation type="unfinished"/> + <translation>Без костюма</translation> </message> <message> - <location filename="../datatrak.c" line="315"/> + <location filename="../datatrak.c" line="321"/> <source>Shorty</source> - <translation type="unfinished"/> + <translation>Шорты</translation> </message> <message> - <location filename="../datatrak.c" line="318"/> + <location filename="../datatrak.c" line="324"/> <source>Combi</source> - <translation type="unfinished"/> + <translation>Комбинезон</translation> </message> <message> - <location filename="../datatrak.c" line="321"/> + <location filename="../datatrak.c" line="327"/> <source>Wet suit</source> - <translation type="unfinished"/> + <translation>Мокрый костюм</translation> </message> <message> - <location filename="../datatrak.c" line="324"/> + <location filename="../datatrak.c" line="330"/> <source>Semidry suit</source> - <translation type="unfinished"/> + <translation>Полусухой костюм</translation> </message> <message> - <location filename="../datatrak.c" line="327"/> + <location filename="../datatrak.c" line="333"/> <source>Dry suit</source> - <translation type="unfinished"/> + <translation>Сухой костюм</translation> </message> <message> - <location filename="../datatrak.c" line="387"/> + <location filename="../datatrak.c" line="393"/> <source>no stop</source> - <translation type="unfinished"/> + <translation>без остановки</translation> </message> <message> - <location filename="../datatrak.c" line="391"/> + <location filename="../datatrak.c" line="397"/> <source>single ascent</source> - <translation type="unfinished"/> + <translation>единичный подъем</translation> </message> <message> - <location filename="../datatrak.c" line="393"/> + <location filename="../datatrak.c" line="399"/> <source>multiple ascent</source> - <translation type="unfinished"/> + <translation>множественный подъем</translation> </message> <message> - <location filename="../datatrak.c" line="395"/> + <location filename="../datatrak.c" line="401"/> <location filename="../dive.c" line="27"/> <source>fresh</source> <translation>пресная</translation> </message> <message> - <location filename="../datatrak.c" line="397"/> + <location filename="../datatrak.c" line="403"/> <source>salt water</source> - <translation type="unfinished"/> + <translation>соленая вода</translation> </message> <message> - <location filename="../datatrak.c" line="422"/> + <location filename="../datatrak.c" line="428"/> <source>sight seeing</source> - <translation type="unfinished"/> + <translation>обзорная прогулка</translation> </message> <message> - <location filename="../datatrak.c" line="424"/> + <location filename="../datatrak.c" line="430"/> <source>club dive</source> - <translation type="unfinished"/> + <translation>погружение с клубом</translation> </message> <message> - <location filename="../datatrak.c" line="428"/> + <location filename="../datatrak.c" line="434"/> <source>instruction</source> - <translation type="unfinished"/> + <translation>обучение</translation> </message> <message> - <location filename="../datatrak.c" line="454"/> + <location filename="../datatrak.c" line="460"/> <source>other</source> - <translation type="unfinished"/> + <translation>прочее</translation> </message> <message> - <location filename="../datatrak.c" line="465"/> + <location filename="../datatrak.c" line="471"/> <source>Other activities</source> - <translation type="unfinished"/> + <translation>Прочие активности</translation> </message> <message> - <location filename="../datatrak.c" line="489"/> + <location filename="../datatrak.c" line="495"/> <source>Datatrak/Wlog notes</source> - <translation type="unfinished"/> + <translation>Datatrak/Wlog notes</translation> </message> <message> - <location filename="../datatrak.c" line="528"/> + <location filename="../datatrak.c" line="534"/> <source>Manually entered dive</source> <translation>Вручную введенное погружение</translation> </message> <message> - <location filename="../datatrak.c" line="579"/> + <location filename="../datatrak.c" line="585"/> <source>Unknown</source> <translation>Неизвестно</translation> </message> <message> - <location filename="../datatrak.c" line="661"/> + <location filename="../datatrak.c" line="671"/> <source>Error: couldn't open the file %s</source> <translation>Ошибка: невозможно открыть файл %s</translation> </message> <message> - <location filename="../datatrak.c" line="674"/> + <location filename="../datatrak.c" line="684"/> <source>Error: no dive</source> <translation>Ошибка: погружение отсутствует</translation> </message> @@ -8552,7 +8596,7 @@ EADD: %d%s <translation>ученик</translation> </message> <message> - <location filename="../datatrak.c" line="452"/> + <location filename="../datatrak.c" line="458"/> <location filename="../dive.c" line="28"/> <source>photo</source> <translation>фото</translation> @@ -8563,13 +8607,13 @@ EADD: %d%s <translation>видео</translation> </message> <message> - <location filename="../datatrak.c" line="426"/> + <location filename="../datatrak.c" line="432"/> <location filename="../dive.c" line="28"/> <source>instructor</source> <translation>инструктор</translation> </message> <message> - <location filename="../datatrak.c" line="389"/> + <location filename="../datatrak.c" line="395"/> <location filename="../dive.c" line="29"/> <source>deco</source> <translation>деко стоп</translation> @@ -8587,8 +8631,8 @@ EADD: %d%s <message> <location filename="../dive.c" line="33"/> <location filename="../equipment.c" line="85"/> - <location filename="../planner.c" line="1402"/> - <location filename="../planner.c" line="1405"/> + <location filename="../planner.c" line="1401"/> + <location filename="../planner.c" line="1404"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8643,114 +8687,114 @@ EADD: %d%s <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="111"/> + <location filename="../subsurfacestartup.c" line="114"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="120"/> + <location filename="../subsurfacestartup.c" line="123"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="121"/> + <location filename="../subsurfacestartup.c" line="124"/> <source>Dec</source> <translation>Дек</translation> </message> <message> <location filename="../libdivecomputer.c" line="154"/> - <location filename="../parse-xml.c" line="3182"/> - <location filename="../uemis-downloader.c" line="131"/> + <location filename="../parse-xml.c" line="3177"/> + <location filename="../uemis-downloader.c" line="133"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../uemis-downloader.c" line="462"/> + <location filename="../uemis-downloader.c" line="464"/> <source>data</source> <translation>данные</translation> </message> <message> - <location filename="../uemis-downloader.c" line="442"/> + <location filename="../uemis-downloader.c" line="444"/> <source>%s %s</source> <translation>%s %s</translation> </message> @@ -8768,7 +8812,9 @@ and click 'Retry'</source> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: Файловая система заполнена. +Отсоедините и подключите дайв-компьютер +и нажмите "Повторить"</translation> </message> <message> <location filename="../uemis-downloader.c" line="29"/> @@ -8778,172 +8824,177 @@ Is the Uemis Zurich plugged in correctly?</source> Проверьте подключен ли Uemis Zurich.</translation> </message> <message> - <location filename="../uemis-downloader.c" line="490"/> + <location filename="../uemis-downloader.c" line="30"/> + <source>No dives to download.</source> + <translation>Не погружений для загрузки.</translation> + </message> + <message> + <location filename="../uemis-downloader.c" line="492"/> <source>divelog #</source> <translation>журнала №</translation> </message> <message> - <location filename="../uemis-downloader.c" line="492"/> + <location filename="../uemis-downloader.c" line="494"/> <source>divespot #</source> <translation>место №</translation> </message> <message> - <location filename="../uemis-downloader.c" line="494"/> + <location filename="../uemis-downloader.c" line="496"/> <source>details for #</source> <translation>детали для №</translation> </message> <message> - <location filename="../uemis-downloader.c" line="695"/> + <location filename="../uemis-downloader.c" line="697"/> <source>wetsuit</source> <translation>мокрый</translation> </message> <message> - <location filename="../uemis-downloader.c" line="695"/> + <location filename="../uemis-downloader.c" line="697"/> <source>semidry</source> <translation>полусухой</translation> </message> <message> - <location filename="../uemis-downloader.c" line="695"/> + <location filename="../uemis-downloader.c" line="697"/> <source>drysuit</source> <translation>сухой</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>shorty</source> <translation>короткий</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>vest</source> <translation>жилет</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>long john</source> <translation>комбинезон</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>jacket</source> <translation>куртка</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>full suit</source> <translation>полный</translation> </message> <message> - <location filename="../uemis-downloader.c" line="696"/> + <location filename="../uemis-downloader.c" line="698"/> <source>2 pcs full suit</source> <translation>полный из 2-х</translation> </message> <message> - <location filename="../uemis-downloader.c" line="697"/> + <location filename="../uemis-downloader.c" line="699"/> <source>membrane</source> <translation>мембрана</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1193"/> + <location filename="../uemis-downloader.c" line="1211"/> <source>Initialise communication</source> <translation>Инициализация соединения</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1196"/> + <location filename="../uemis-downloader.c" line="1214"/> <source>Uemis init failed</source> <translation>Ошибка инициализации Uemis</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1208"/> + <location filename="../uemis-downloader.c" line="1226"/> <source>Start download</source> <translation>Начать загрузку</translation> </message> <message> - <location filename="../uemis.c" line="203"/> + <location filename="../uemis.c" line="201"/> <source>Safety stop violation</source> <translation>Нарушение остановки безопасности</translation> </message> <message> - <location filename="../uemis.c" line="205"/> + <location filename="../uemis.c" line="203"/> <source>Speed alarm</source> <translation>Тревога: скорость</translation> </message> <message> - <location filename="../uemis.c" line="208"/> + <location filename="../uemis.c" line="206"/> <source>Speed warning</source> <translation>Внимание: скорость</translation> </message> <message> - <location filename="../uemis.c" line="210"/> + <location filename="../uemis.c" line="208"/> <source>pO₂ green warning</source> <translation>ВНИМАНИЕ: pO₂ зеленый</translation> </message> <message> - <location filename="../uemis.c" line="213"/> + <location filename="../uemis.c" line="211"/> <source>pO₂ ascend warning</source> <translation>ВНИМАНИЕ: pO₂ при подъеме</translation> </message> <message> - <location filename="../uemis.c" line="215"/> + <location filename="../uemis.c" line="213"/> <source>pO₂ ascend alarm</source> <translation>ТРЕВОГА: pO₂ при подъеме</translation> </message> <message> - <location filename="../uemis.c" line="219"/> + <location filename="../uemis.c" line="217"/> <source>Tank pressure info</source> <translation>Информация о давлении в баллоне</translation> </message> <message> - <location filename="../uemis.c" line="221"/> + <location filename="../uemis.c" line="219"/> <source>RGT warning</source> <translation>Внимание: RGT</translation> </message> <message> - <location filename="../uemis.c" line="223"/> + <location filename="../uemis.c" line="221"/> <source>RGT alert</source> <translation>Тревога: RGT</translation> </message> <message> - <location filename="../uemis.c" line="225"/> + <location filename="../uemis.c" line="223"/> <source>Tank change suggested</source> <translation>Рекомендуется замена баллона</translation> </message> <message> - <location filename="../uemis.c" line="227"/> + <location filename="../uemis.c" line="225"/> <source>Depth limit exceeded</source> <translation>Превышен предел глубины</translation> </message> <message> - <location filename="../uemis.c" line="229"/> + <location filename="../uemis.c" line="227"/> <source>Max deco time warning</source> <translation>Предупреждение о макс. времени деко</translation> </message> <message> - <location filename="../uemis.c" line="231"/> + <location filename="../uemis.c" line="229"/> <source>Dive time info</source> <translation>Информация о времени погружения</translation> </message> <message> - <location filename="../uemis.c" line="233"/> + <location filename="../uemis.c" line="231"/> <source>Dive time alert</source> <translation>Тревога о времени погружения</translation> </message> <message> - <location filename="../uemis.c" line="235"/> + <location filename="../uemis.c" line="233"/> <source>Marker</source> <translation>Метка</translation> </message> <message> - <location filename="../uemis.c" line="237"/> + <location filename="../uemis.c" line="235"/> <source>No tank data</source> <translation>Нет информации о баллонах</translation> </message> <message> - <location filename="../uemis.c" line="239"/> + <location filename="../uemis.c" line="237"/> <source>Low battery warning</source> <translation>Внимание: заряд батареи</translation> </message> <message> - <location filename="../uemis.c" line="241"/> + <location filename="../uemis.c" line="239"/> <source>Low battery alert</source> <translation>Тревога: заряд батареи</translation> </message> @@ -9267,93 +9318,96 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../qthelper.cpp" line="333"/> - <location filename="../qthelper.cpp" line="461"/> + <location filename="../qthelper.cpp" line="468"/> <source>N</source> <translation>С</translation> </message> <message> <location filename="../qthelper.cpp" line="333"/> - <location filename="../qthelper.cpp" line="462"/> + <location filename="../qthelper.cpp" line="469"/> <source>S</source> <translation>Ю</translation> </message> <message> <location filename="../qthelper.cpp" line="334"/> - <location filename="../qthelper.cpp" line="463"/> + <location filename="../qthelper.cpp" line="470"/> <source>E</source> <translation>В</translation> </message> <message> <location filename="../qthelper.cpp" line="334"/> - <location filename="../qthelper.cpp" line="464"/> + <location filename="../qthelper.cpp" line="471"/> <source>W</source> <translation>З</translation> </message> <message> - <location filename="../git-access.c" line="294"/> + <location filename="../git-access.c" line="311"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> - <translation type="unfinished"/> + <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation> </message> <message> - <location filename="../git-access.c" line="119"/> + <location filename="../git-access.c" line="130"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> - <translation type="unfinished"/> + <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation> </message> <message> - <location filename="../git-access.c" line="139"/> - <location filename="../git-access.c" line="159"/> + <location filename="../git-access.c" line="153"/> + <location filename="../git-access.c" line="173"/> <source>Could not update local cache to newer remote data</source> - <translation type="unfinished"/> + <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation> </message> <message> - <location filename="../git-access.c" line="152"/> + <location filename="../git-access.c" line="166"/> <source>Subsurface cloud storage corrupted</source> - <translation type="unfinished"/> + <translation>Облачное хранилице поверждено</translation> </message> <message> - <location filename="../git-access.c" line="235"/> + <location filename="../git-access.c" line="252"/> <source>Could not update Subsurface cloud storage, try again later</source> - <translation type="unfinished"/> + <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation> </message> <message> - <location filename="../git-access.c" line="324"/> + <location filename="../git-access.c" line="341"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> - <translation type="unfinished"/> + <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation> </message> <message> - <location filename="../git-access.c" line="357"/> + <location filename="../git-access.c" line="374"/> <source>Remote storage and local data diverged</source> - <translation type="unfinished"/> + <translation>Данные в локальном и облачном хранилице отличаются</translation> </message> <message> - <location filename="../git-access.c" line="360"/> + <location filename="../git-access.c" line="377"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> - <translation type="unfinished"/> + <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation> </message> <message> - <location filename="../git-access.c" line="420"/> - <location filename="../git-access.c" line="432"/> - <location filename="../git-access.c" line="526"/> - <location filename="../git-access.c" line="645"/> + <location filename="../git-access.c" line="386"/> <source>Problems with local cache of Subsurface cloud data</source> - <translation type="unfinished"/> + <translation>Проблема с локальным кэшем облачного хранилища</translation> + </message> + <message> + <location filename="../git-access.c" line="387"/> + <source>Moved cache data to %s. Please try the operation again.</source> + <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation> </message> <message> - <location filename="../git-access.c" line="618"/> + <location filename="../git-access.c" line="686"/> <source>Error connecting to Subsurface cloud storage</source> - <translation type="unfinished"/> + <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../git-access.c" line="621"/> + <location filename="../git-access.c" line="689"/> <source>git clone of %s failed (%s)</source> - <translation type="unfinished"/> + <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> <location filename="../load-git.c" line="216"/> - <location filename="../parse-xml.c" line="1302"/> + <location filename="../parse-xml.c" line="1294"/> <source>additional name for site: %s </source> - <translation type="unfinished"/> + <translation>другое название дайв-сайта: %s +</translation> </message> <message> <location filename="../ostctools.c" line="120"/> @@ -9364,7 +9418,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../ostctools.c" line="165"/> <source>Error - %s - parsing dive %d</source> - <translation type="unfinished"/> + <translation>Ошибка %s в погружении %d</translation> </message> </context> <context> @@ -9373,7 +9427,7 @@ Is the Uemis Zurich plugged in correctly?</source> <location filename="../qt-mobile/main.qml" line="11"/> <location filename="../qt-mobile/main.qml" line="96"/> <source>Subsurface mobile</source> - <translation type="unfinished"/> + <translation>Subsurface для мобильных</translation> </message> </context> <context> @@ -9484,7 +9538,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/plannerSettings.ui" line="320"/> <location filename="../build/ui_plannerSettings.h" line="449"/> <source>Postpone gas change if a stop is not required</source> - <translation type="unfinished"/> + <translation>Отложить замену гаща если остановка не требуется</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="323"/> @@ -9623,7 +9677,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/plannerSettings.ui" line="268"/> <source>Bühlmann deco</source> - <translation type="unfinished"/> + <translation>Алгоритм Бюльмана</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="370"/> |