diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1917 |
1 files changed, 984 insertions, 933 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index db71e96fc..d36b50419 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -615,77 +615,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="399"/> + <location filename="../commands/command_divelist.cpp" line="400"/> <source>add dive</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="468"/> + <location filename="../commands/command_divelist.cpp" line="469"/> <source>import %n dive(s) from %1</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="549"/> + <location filename="../commands/command_divelist.cpp" line="550"/> <source>delete %n dive(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="585"/> + <location filename="../commands/command_divelist.cpp" line="586"/> <source>shift time of %n dives</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="633"/> + <location filename="../commands/command_divelist.cpp" line="634"/> <source>renumber %n dive(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="685"/> + <location filename="../commands/command_divelist.cpp" line="686"/> <source>remove %n dive(s) from trip</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_divelist.cpp" line="697"/> + <location filename="../commands/command_divelist.cpp" line="698"/> <source>remove autogenerated trips</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_divelist.cpp" line="709"/> + <location filename="../commands/command_divelist.cpp" line="710"/> <source>add %n dives to trip</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_divelist.cpp" line="716"/> + <location filename="../commands/command_divelist.cpp" line="717"/> <source>create trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="729"/> + <location filename="../commands/command_divelist.cpp" line="730"/> <source>autogroup dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="824"/> + <location filename="../commands/command_divelist.cpp" line="825"/> <source>split dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="842"/> + <location filename="../commands/command_divelist.cpp" line="843"/> <source>split dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="898"/> + <location filename="../commands/command_divelist.cpp" line="899"/> <source>move dive computer to front</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="904"/> + <location filename="../commands/command_divelist.cpp" line="905"/> <source>delete dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_divelist.cpp" line="909"/> + <location filename="../commands/command_divelist.cpp" line="910"/> <source>merge dive</source> <translation type="unfinished"/> </message> @@ -750,165 +750,165 @@ <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="95"/> - <location filename="../commands/command_edit.cpp" line="660"/> + <location filename="../commands/command_edit.cpp" line="133"/> + <location filename="../commands/command_edit.cpp" line="523"/> <location filename="../commands/command_edit_trip.cpp" line="18"/> <source>Edit %1</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="97"/> - <location filename="../commands/command_edit.cpp" line="662"/> + <location filename="../commands/command_edit.cpp" line="135"/> + <location filename="../commands/command_edit.cpp" line="525"/> <source>Edit %1 (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="166"/> + <location filename="../commands/command_edit.cpp" line="195"/> <source>notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="188"/> + <location filename="../commands/command_edit.cpp" line="201"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="209"/> + <location filename="../commands/command_edit.cpp" line="207"/> <source>rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="230"/> + <location filename="../commands/command_edit.cpp" line="213"/> <source>visibility</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="251"/> + <location filename="../commands/command_edit.cpp" line="219"/> <source>wavesize</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="272"/> + <location filename="../commands/command_edit.cpp" line="225"/> <source>current</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="293"/> + <location filename="../commands/command_edit.cpp" line="231"/> <source>surge</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="314"/> + <location filename="../commands/command_edit.cpp" line="237"/> <source>chill</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="335"/> + <location filename="../commands/command_edit.cpp" line="253"/> <source>air temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="359"/> + <location filename="../commands/command_edit.cpp" line="272"/> <source>water temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="380"/> + <location filename="../commands/command_edit.cpp" line="288"/> <source>salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="401"/> + <location filename="../commands/command_edit.cpp" line="304"/> <source>Atm. pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="425"/> + <location filename="../commands/command_edit.cpp" line="323"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="449"/> + <location filename="../commands/command_edit.cpp" line="342"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="471"/> + <location filename="../commands/command_edit.cpp" line="359"/> <source>dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="569"/> + <location filename="../commands/command_edit.cpp" line="452"/> <source>dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="590"/> + <location filename="../commands/command_edit.cpp" line="458"/> <source>invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="725"/> + <location filename="../commands/command_edit.cpp" line="588"/> <source>tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="748"/> + <location filename="../commands/command_edit.cpp" line="606"/> <source>buddies</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="771"/> + <location filename="../commands/command_edit.cpp" line="624"/> <source>dive master</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="870"/> + <location filename="../commands/command_edit.cpp" line="747"/> <source>Paste onto %n dive(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="946"/> + <location filename="../commands/command_edit.cpp" line="823"/> <source>Replan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="946"/> + <location filename="../commands/command_edit.cpp" line="823"/> <source>Edit profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="993"/> + <location filename="../commands/command_edit.cpp" line="870"/> <source>Add weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="995"/> + <location filename="../commands/command_edit.cpp" line="872"/> <source>Add weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1078"/> + <location filename="../commands/command_edit.cpp" line="956"/> <source>Remove weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="1080"/> + <location filename="../commands/command_edit.cpp" line="958"/> <source>Remove weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1108"/> + <location filename="../commands/command_edit.cpp" line="987"/> <source>Edit weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="1110"/> + <location filename="../commands/command_edit.cpp" line="989"/> <source>Edit weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1169"/> + <location filename="../commands/command_edit.cpp" line="1284"/> <source>Edit dive [%1]</source> <translation type="unfinished"/> </message> @@ -924,6 +924,85 @@ </message> </context> <context> + <name>Command::AddCylinder</name> + <message> + <location filename="../commands/command_edit.cpp" line="1042"/> + <source>Add cylinder</source> + <translation>Добавить баллон</translation> + </message> + <message numerus="yes"> + <location filename="../commands/command_edit.cpp" line="1044"/> + <source>Add cylinder (%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> + <name>Command::AddEventBookmark</name> + <message> + <location filename="../commands/command_event.cpp" line="66"/> + <source>Add bookmark</source> + <translation>Добавить закладку</translation> + </message> +</context> +<context> + <name>Command::AddEventDivemodeSwitch</name> + <message> + <location filename="../commands/command_event.cpp" line="72"/> + <source>Add dive mode switch to %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Command::AddEventSetpointChange</name> + <message> + <location filename="../commands/command_event.cpp" line="78"/> + <source>Add set point change</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Command::EditCylinder</name> + <message> + <location filename="../commands/command_edit.cpp" line="1209"/> + <source>Edit cylinder</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location filename="../commands/command_edit.cpp" line="1211"/> + <source>Edit cylinder (%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> + <name>Command::RemoveCylinder</name> + <message> + <location filename="../commands/command_edit.cpp" line="1161"/> + <source>Remove cylinder</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location filename="../commands/command_edit.cpp" line="1163"/> + <source>Remove cylinder (%n dive(s))</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> + <name>Command::RemoveEvent</name> + <message> + <location filename="../commands/command_event.cpp" line="113"/> + <source>Remove %1 event</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Command::RenameEvent</name> + <message> + <location filename="../commands/command_event.cpp" line="85"/> + <source>Rename bookmark to %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ConfigureDiveComputer</name> <message> <location filename="../core/configuredivecomputer.cpp" line="183"/> @@ -2522,93 +2601,93 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>Size</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>Work press.</source> <translation>Раб. давл.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> - <location filename="../qt-models/cylindermodel.cpp" line="28"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> + <location filename="../qt-models/cylindermodel.cpp" line="33"/> <source>Start press.</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>End press.</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>O₂%</source> <translation>O₂%</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="19"/> + <location filename="../qt-models/cylindermodel.cpp" line="21"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="20"/> + <location filename="../qt-models/cylindermodel.cpp" line="22"/> <source>Deco switch at</source> <translation>Переключение деко на</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="20"/> + <location filename="../qt-models/cylindermodel.cpp" line="22"/> <source>Bot. MOD</source> <translation>Донный MOD</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="20"/> + <location filename="../qt-models/cylindermodel.cpp" line="22"/> <source>MND</source> <translation>MND</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="20"/> + <location filename="../qt-models/cylindermodel.cpp" line="22"/> <source>Use</source> <translation>Назначение</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="53"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="52"/> + <location filename="../qt-models/cylindermodel.cpp" line="57"/> <source>ℓ</source> <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="261"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="263"/> + <location filename="../qt-models/cylindermodel.cpp" line="267"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="278"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Глубина переключения на деко-газ. Рассчитывается из настроек деко pO₂, если не указано вручную.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="276"/> + <location filename="../qt-models/cylindermodel.cpp" line="280"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Вычислено с учетом настройки донного pO₂. Ввод MOD меняет O₂%, установите '*' для лучшего O₂% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="282"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Вычислено с учетом настройки END лучшей смеси. Ввод MND меняет He%, установите '*' для лучшего He% на макс. глубине.</translation> </message> @@ -2616,54 +2695,54 @@ <context> <name>DiveComponentSelection</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="460"/> <source>Dive site: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="480"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="462"/> <source>Dive master: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="482"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="464"/> <source>Buddy: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="484"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="466"/> <source>Rating: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="468"/> <source>Visibility: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="470"/> <source>Notes: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="472"/> <source>Suit: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="474"/> <source>Tags: </source> <translation>Метки:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="484"/> <source>Cylinders: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/> <source>Weights: </source> <translation type="unfinished"/> @@ -2821,36 +2900,51 @@ </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> - <source>Undo</source> + <source>Create trip with dive</source> <translation type="unfinished"/> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="96"/> + <source>Mark dive as valid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="96"/> + <source>Mark dive as invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="101"/> + <source>Undo</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="107"/> <source>Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="193"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="221"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="201"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="229"/> <source>Cancel edit</source> <translation>Отмена редактирования</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="239"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="227"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="255"/> <source>Save edits</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="227"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="255"/> <source>Edit dive</source> <translation>Редактировать погружение</translation> </message> @@ -3000,67 +3094,62 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="61"/> - <source>Map it</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="115"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="104"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="152"/> <source>Visibility:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="352"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="341"/> <source>No profile to show</source> <translation>Нет профиля для отображения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="347"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="365"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="354"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="372"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="361"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="414"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="403"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="422"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="411"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="430"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="419"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="473"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="462"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="481"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="470"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="520"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="509"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -3137,117 +3226,117 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="336"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="337"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="183"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="184"/> <source><unnamed dive site></source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="251"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>Remove dive %1 from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="259"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="260"/> <source>Add dive %1 to trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="267"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="268"/> <source>Add dive %1 to trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="275"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> <source>Create trip with dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="285"/> <source>Mark dive as valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="285"/> <source>Mark dive as invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="290"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="291"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="296"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="297"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="306"/> <source>Edit trip details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="317"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="318"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="323"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="324"/> <source>Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="339"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="344"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="345"/> <source>Cloud credentials</source> <translation>Учетные данные в облаке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="352"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="354"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="352"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="354"/> <source>Please wait, updating the dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="395"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="400"/> <source>Fulltext</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="396"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="401"/> <source>People</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="397"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="402"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="457"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="460"/> <source>Download dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="467"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="470"/> <source>Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="477"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="480"/> <source>Filter dives</source> <translation type="unfinished"/> </message> @@ -3255,122 +3344,122 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="797"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="799"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="896"/> + <location filename="../desktop-widgets/divelistview.cpp" line="803"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="807"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="808"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="916"/> + <location filename="../desktop-widgets/divelistview.cpp" line="823"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="918"/> + <location filename="../desktop-widgets/divelistview.cpp" line="825"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <location filename="../desktop-widgets/divelistview.cpp" line="829"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="923"/> + <location filename="../desktop-widgets/divelistview.cpp" line="830"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="927"/> + <location filename="../desktop-widgets/divelistview.cpp" line="834"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> + <location filename="../desktop-widgets/divelistview.cpp" line="836"/> <source>Mark dive(s) valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="931"/> + <location filename="../desktop-widgets/divelistview.cpp" line="838"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="934"/> + <location filename="../desktop-widgets/divelistview.cpp" line="841"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="936"/> + <location filename="../desktop-widgets/divelistview.cpp" line="843"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="937"/> + <location filename="../desktop-widgets/divelistview.cpp" line="844"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="938"/> + <location filename="../desktop-widgets/divelistview.cpp" line="845"/> <source>Split selected dives</source> <translation>Разбить выделенные погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="939"/> + <location filename="../desktop-widgets/divelistview.cpp" line="846"/> <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="940"/> + <location filename="../desktop-widgets/divelistview.cpp" line="847"/> <source>Load media from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="966"/> + <location filename="../desktop-widgets/divelistview.cpp" line="872"/> <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="969"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="970"/> + <location filename="../desktop-widgets/divelistview.cpp" line="876"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="971"/> + <location filename="../desktop-widgets/divelistview.cpp" line="877"/> <source>Video files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="972"/> + <location filename="../desktop-widgets/divelistview.cpp" line="878"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="1021"/> + <location filename="../desktop-widgets/divelistview.cpp" line="927"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> @@ -3483,50 +3572,48 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="260"/> - <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="379"/> - <source>CSV dive profile</source> - <translation>Профиль в CSV</translation> + <source>CSV summary dive details</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="270"/> - <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="380"/> - <source>CSV dive details</source> - <translation>Погружение в CSV</translation> + <source>CSV Dive computer dive profile</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/> + <source>CSV Computed Profile Panel data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/> <source>Dive profile</source> <translation>Профиль погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/> + <location filename="../desktop-widgets/divelogexportdialog.ui" line="300"/> <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/> <source>Worldmap</source> <translation>Карта мира</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.ui" line="300"/> + <location filename="../desktop-widgets/divelogexportdialog.ui" line="310"/> <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="382"/> <source>TeX</source> <translation>TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.ui" line="310"/> + <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/> <source>LaTeX</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/> + <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/> <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="383"/> <source>I&mage depths</source> <translation>Глубины из фото</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/> - <source>Profile Data CSV</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="372"/> <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="415"/> <source>HTML</source> @@ -3654,8 +3741,8 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> - <source>Comma separated values describing the dive profile.</source> - <translation>Профиль погружения в виде значений, разделенных запятой.</translation> + <source>Comma separated values describing the dive profile as downloaded from dive computer.</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> @@ -3709,7 +3796,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="109"/> - <source>Write profile data to a CSV file.</source> + <source>Write the computed Profile Panel data to a CSV file.</source> <translation type="unfinished"/> </message> <message> @@ -3796,6 +3883,16 @@ GPS location:</source> <source>Please wait, exporting...</source> <translation>Ожидайте, идет экспорт...</translation> </message> + <message> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="379"/> + <source>CSV dive profile</source> + <translation>Профиль в CSV</translation> + </message> + <message> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="380"/> + <source>CSV dive details</source> + <translation>Погружение в CSV</translation> + </message> </context> <context> <name>DiveLogImportDialog</name> @@ -4191,62 +4288,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="180"/> + <location filename="../qt-models/diveplannermodel.cpp" line="181"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="280"/> + <location filename="../qt-models/diveplannermodel.cpp" line="281"/> <source>cyl.</source> <translation>балл.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="388"/> + <location filename="../qt-models/diveplannermodel.cpp" line="389"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="390"/> + <location filename="../qt-models/diveplannermodel.cpp" line="391"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="392"/> + <location filename="../qt-models/diveplannermodel.cpp" line="393"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="394"/> + <location filename="../qt-models/diveplannermodel.cpp" line="395"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="396"/> + <location filename="../qt-models/diveplannermodel.cpp" line="397"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1083"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1089"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1089"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1092"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1098"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1139"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1145"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -4864,253 +4961,273 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModelBase</name> <message numerus="yes"> - <location filename="../qt-models/divetripmodel.cpp" line="74"/> + <location filename="../qt-models/divetripmodel.cpp" line="75"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="76"/> + <location filename="../qt-models/divetripmodel.cpp" line="77"/> <source>(%L1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="124"/> + <location filename="../qt-models/divetripmodel.cpp" line="125"/> <source>(%1 shown)</source> <translation> (показано %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="315"/> - <location filename="../qt-models/divetripmodel.cpp" line="384"/> - <location filename="../qt-models/divetripmodel.cpp" line="424"/> + <location filename="../qt-models/divetripmodel.cpp" line="316"/> + <location filename="../qt-models/divetripmodel.cpp" line="385"/> + <location filename="../qt-models/divetripmodel.cpp" line="425"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="317"/> - <location filename="../qt-models/divetripmodel.cpp" line="386"/> - <location filename="../qt-models/divetripmodel.cpp" line="426"/> + <location filename="../qt-models/divetripmodel.cpp" line="318"/> + <location filename="../qt-models/divetripmodel.cpp" line="387"/> + <location filename="../qt-models/divetripmodel.cpp" line="427"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="319"/> - <location filename="../qt-models/divetripmodel.cpp" line="388"/> - <location filename="../qt-models/divetripmodel.cpp" line="428"/> + <location filename="../qt-models/divetripmodel.cpp" line="320"/> + <location filename="../qt-models/divetripmodel.cpp" line="389"/> + <location filename="../qt-models/divetripmodel.cpp" line="429"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="321"/> - <location filename="../qt-models/divetripmodel.cpp" line="430"/> + <location filename="../qt-models/divetripmodel.cpp" line="322"/> + <location filename="../qt-models/divetripmodel.cpp" line="431"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="321"/> - <location filename="../qt-models/divetripmodel.cpp" line="430"/> + <location filename="../qt-models/divetripmodel.cpp" line="322"/> + <location filename="../qt-models/divetripmodel.cpp" line="431"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="321"/> - <location filename="../qt-models/divetripmodel.cpp" line="430"/> + <location filename="../qt-models/divetripmodel.cpp" line="322"/> + <location filename="../qt-models/divetripmodel.cpp" line="431"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="323"/> - <location filename="../qt-models/divetripmodel.cpp" line="392"/> - <location filename="../qt-models/divetripmodel.cpp" line="432"/> + <location filename="../qt-models/divetripmodel.cpp" line="324"/> + <location filename="../qt-models/divetripmodel.cpp" line="393"/> + <location filename="../qt-models/divetripmodel.cpp" line="433"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="325"/> - <location filename="../qt-models/divetripmodel.cpp" line="434"/> + <location filename="../qt-models/divetripmodel.cpp" line="326"/> + <location filename="../qt-models/divetripmodel.cpp" line="435"/> <source>Temp.(°%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="327"/> - <location filename="../qt-models/divetripmodel.cpp" line="436"/> + <location filename="../qt-models/divetripmodel.cpp" line="328"/> + <location filename="../qt-models/divetripmodel.cpp" line="437"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="327"/> - <location filename="../qt-models/divetripmodel.cpp" line="436"/> + <location filename="../qt-models/divetripmodel.cpp" line="328"/> + <location filename="../qt-models/divetripmodel.cpp" line="437"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="327"/> - <location filename="../qt-models/divetripmodel.cpp" line="436"/> + <location filename="../qt-models/divetripmodel.cpp" line="328"/> + <location filename="../qt-models/divetripmodel.cpp" line="437"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="329"/> - <location filename="../qt-models/divetripmodel.cpp" line="398"/> - <location filename="../qt-models/divetripmodel.cpp" line="438"/> + <location filename="../qt-models/divetripmodel.cpp" line="330"/> + <location filename="../qt-models/divetripmodel.cpp" line="399"/> + <location filename="../qt-models/divetripmodel.cpp" line="439"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="331"/> - <location filename="../qt-models/divetripmodel.cpp" line="400"/> - <location filename="../qt-models/divetripmodel.cpp" line="440"/> + <location filename="../qt-models/divetripmodel.cpp" line="332"/> + <location filename="../qt-models/divetripmodel.cpp" line="401"/> + <location filename="../qt-models/divetripmodel.cpp" line="441"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="333"/> - <location filename="../qt-models/divetripmodel.cpp" line="402"/> - <location filename="../qt-models/divetripmodel.cpp" line="442"/> + <location filename="../qt-models/divetripmodel.cpp" line="334"/> + <location filename="../qt-models/divetripmodel.cpp" line="403"/> + <location filename="../qt-models/divetripmodel.cpp" line="443"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="337"/> - <location filename="../qt-models/divetripmodel.cpp" line="446"/> + <location filename="../qt-models/divetripmodel.cpp" line="338"/> + <location filename="../qt-models/divetripmodel.cpp" line="447"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="337"/> - <location filename="../qt-models/divetripmodel.cpp" line="446"/> + <location filename="../qt-models/divetripmodel.cpp" line="338"/> + <location filename="../qt-models/divetripmodel.cpp" line="447"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="339"/> - <location filename="../qt-models/divetripmodel.cpp" line="406"/> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <location filename="../qt-models/divetripmodel.cpp" line="340"/> + <location filename="../qt-models/divetripmodel.cpp" line="407"/> + <location filename="../qt-models/divetripmodel.cpp" line="449"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="341"/> + <location filename="../qt-models/divetripmodel.cpp" line="342"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="343"/> - <location filename="../qt-models/divetripmodel.cpp" line="410"/> - <location filename="../qt-models/divetripmodel.cpp" line="452"/> + <location filename="../qt-models/divetripmodel.cpp" line="344"/> + <location filename="../qt-models/divetripmodel.cpp" line="411"/> + <location filename="../qt-models/divetripmodel.cpp" line="453"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="345"/> - <location filename="../qt-models/divetripmodel.cpp" line="454"/> + <location filename="../qt-models/divetripmodel.cpp" line="346"/> + <location filename="../qt-models/divetripmodel.cpp" line="455"/> <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="347"/> - <location filename="../qt-models/divetripmodel.cpp" line="414"/> + <location filename="../qt-models/divetripmodel.cpp" line="348"/> + <location filename="../qt-models/divetripmodel.cpp" line="415"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="349"/> - <location filename="../qt-models/divetripmodel.cpp" line="416"/> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> + <location filename="../qt-models/divetripmodel.cpp" line="350"/> + <location filename="../qt-models/divetripmodel.cpp" line="417"/> + <location filename="../qt-models/divetripmodel.cpp" line="457"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="351"/> - <location filename="../qt-models/divetripmodel.cpp" line="418"/> - <location filename="../qt-models/divetripmodel.cpp" line="458"/> + <location filename="../qt-models/divetripmodel.cpp" line="352"/> + <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="390"/> + <location filename="../qt-models/divetripmodel.cpp" line="391"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="394"/> + <location filename="../qt-models/divetripmodel.cpp" line="395"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="396"/> + <location filename="../qt-models/divetripmodel.cpp" line="397"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="404"/> + <location filename="../qt-models/divetripmodel.cpp" line="405"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="408"/> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> + <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="412"/> + <location filename="../qt-models/divetripmodel.cpp" line="413"/> <source>Media</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <source>setting up dive sites</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="501"/> + <source>finish populating data store</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <source>setting up internal data structures</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> + <source>done setting up internal data structures</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="250"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="415"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="293"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="292"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="334"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="333"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="368"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="367"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="382"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="381"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="383"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="393"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="382"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="391"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="426"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="425"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="434"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -5331,7 +5448,7 @@ Existing Site</source> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="365"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="475"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="473"/> <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/> <source>Download</source> <translation>Загрузить</translation> @@ -5438,12 +5555,12 @@ Existing Site</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="489"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="486"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="498"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="495"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -5777,12 +5894,17 @@ Existing Site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/filterwidget2.cpp" line="284"/> + <location filename="../desktop-widgets/filterwidget2.ui" line="608"/> + <source>Dive mode</source> + <translation>Режим</translation> + </message> + <message> + <location filename="../desktop-widgets/filterwidget2.cpp" line="296"/> <source>%L1/%L2 shown</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/filterwidget2.cpp" line="286"/> + <location filename="../desktop-widgets/filterwidget2.cpp" line="298"/> <source>%L1 dives</source> <translation type="unfinished"/> </message> @@ -5825,38 +5947,38 @@ Existing Site</source> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="241"/> <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="161"/> <source>Select folder and scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="174"/> <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="180"/> <source>Stop scanning</source> <translation>Остановить сканирование</translation> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="251"/> <source>Scanning cancelled - results may be incomplete</source> <translation>Сканирование отменено; результаты могут быть неполными</translation> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="255"/> <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="267"/> <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> + <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="269"/> <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> @@ -6048,32 +6170,32 @@ Existing Site</source> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="476"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="422"/> <source> (same GPS fix)</source> <translation>(те же данные GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="481"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="427"/> <source> (~%1 away</source> <translation> (удаление ~%1</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="482"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="428"/> <source>, %n dive(s) here)</source> <translation><numerusform>, здесь %n дайв)</numerusform><numerusform>, здесь %n дайва)</numerusform><numerusform>, здесь %n дайвов)</numerusform><numerusform>, %n dive(s) here)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="487"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="433"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(нет данных GPS, скопировать из этого погружения)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="435"/> <source>(no GPS data)</source> <translation>(нет данных GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="491"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="437"/> <source>Pick site: </source> <translation>Выбрать: </translation> </message> @@ -6240,8 +6362,8 @@ Existing Site</source> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="426"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="436"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="467"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="411"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="437"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/> <source>Notes</source> @@ -6272,7 +6394,7 @@ Existing Site</source> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="231"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="466"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="436"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/> <source>Location</source> <translation>Местонахождение</translation> @@ -6315,89 +6437,84 @@ Existing Site</source> <translation>Оценка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/> <source>Equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/> <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/> <source>Extra Info</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="239"/> - <source>Multiple dives are being edited.</source> - <translation>Множественное редактирование.</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="241"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="220"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="395"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="426"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="373"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="401"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="420"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="395"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="590"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="531"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="591"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="532"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="629"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="562"/> <source>Warning: edited %1 dives</source> <translation type="unfinished"/> </message> @@ -6459,462 +6576,456 @@ Existing Site</source> <translation>Помощь</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="128"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="618"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="619"/> <source>&Edit</source> <translation>Редактирование</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="150"/> + <location filename="../desktop-widgets/mainwindow.ui" line="149"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="153"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="531"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="161"/> + <location filename="../desktop-widgets/mainwindow.ui" line="160"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="533"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="164"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="495"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="491"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="172"/> + <location filename="../desktop-widgets/mainwindow.ui" line="171"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="537"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="175"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="539"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="183"/> + <location filename="../desktop-widgets/mainwindow.ui" line="182"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="541"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="186"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="543"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="194"/> + <location filename="../desktop-widgets/mainwindow.ui" line="193"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="545"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="197"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="547"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="205"/> + <location filename="../desktop-widgets/mainwindow.ui" line="204"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="549"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="213"/> + <location filename="../desktop-widgets/mainwindow.ui" line="212"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="550"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="224"/> + <location filename="../desktop-widgets/mainwindow.ui" line="223"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="551"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="235"/> + <location filename="../desktop-widgets/mainwindow.ui" line="234"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="552"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="243"/> + <location filename="../desktop-widgets/mainwindow.ui" line="242"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="553"/> <source>Edit device &names</source> <translation>Названия дайвкомпьютеров</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="248"/> + <location filename="../desktop-widgets/mainwindow.ui" line="247"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="554"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="256"/> + <location filename="../desktop-widgets/mainwindow.ui" line="255"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="555"/> <source>&Copy dive components</source> <translation>Копировать параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="264"/> + <location filename="../desktop-widgets/mainwindow.ui" line="263"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="556"/> <source>&Paste dive components</source> <translation>Вставить параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="272"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="557"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="283"/> + <location filename="../desktop-widgets/mainwindow.ui" line="282"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="558"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="288"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="559"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="296"/> + <location filename="../desktop-widgets/mainwindow.ui" line="295"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="560"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="304"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="561"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="312"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="562"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="320"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="563"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="328"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="564"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="336"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="565"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="344"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="566"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="352"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="567"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="360"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="568"/> <source>&Map</source> <translation>&Карта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="368"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="569"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="376"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="570"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="379"/> + <location filename="../desktop-widgets/mainwindow.ui" line="378"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="572"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="387"/> + <location filename="../desktop-widgets/mainwindow.ui" line="386"/> <source>&Import dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="390"/> + <location filename="../desktop-widgets/mainwindow.ui" line="389"/> <source>Import dive sites from other users</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="398"/> + <location filename="../desktop-widgets/mainwindow.ui" line="397"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="574"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="406"/> + <location filename="../desktop-widgets/mainwindow.ui" line="405"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="575"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="409"/> + <location filename="../desktop-widgets/mainwindow.ui" line="408"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="577"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="417"/> + <location filename="../desktop-widgets/mainwindow.ui" line="416"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="579"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="422"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="580"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="425"/> + <location filename="../desktop-widgets/mainwindow.ui" line="424"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="582"/> <source>Export dive logs</source> <translation>Экспорт </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="433"/> + <location filename="../desktop-widgets/mainwindow.ui" line="432"/> <source>Change settings on &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="444"/> + <location filename="../desktop-widgets/mainwindow.ui" line="443"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="585"/> <source>Edit &dive in planner</source> <translation>Редактировать в планировщике</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="456"/> + <location filename="../desktop-widgets/mainwindow.ui" line="455"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="586"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="468"/> + <location filename="../desktop-widgets/mainwindow.ui" line="467"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="587"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="480"/> + <location filename="../desktop-widgets/mainwindow.ui" line="479"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="588"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="492"/> + <location filename="../desktop-widgets/mainwindow.ui" line="491"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="589"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="504"/> + <location filename="../desktop-widgets/mainwindow.ui" line="503"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="590"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="516"/> + <location filename="../desktop-widgets/mainwindow.ui" line="515"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="591"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="528"/> + <location filename="../desktop-widgets/mainwindow.ui" line="527"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="592"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="540"/> + <location filename="../desktop-widgets/mainwindow.ui" line="539"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="593"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="552"/> + <location filename="../desktop-widgets/mainwindow.ui" line="551"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="594"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="564"/> + <location filename="../desktop-widgets/mainwindow.ui" line="563"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="595"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="576"/> + <location filename="../desktop-widgets/mainwindow.ui" line="575"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="596"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="588"/> + <location filename="../desktop-widgets/mainwindow.ui" line="587"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="597"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="600"/> + <location filename="../desktop-widgets/mainwindow.ui" line="599"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="598"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="612"/> + <location filename="../desktop-widgets/mainwindow.ui" line="611"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="599"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="624"/> + <location filename="../desktop-widgets/mainwindow.ui" line="623"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="600"/> <source>Toggle media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="636"/> + <location filename="../desktop-widgets/mainwindow.ui" line="635"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/> <source>Toggle gas bar</source> <translation>Газы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="644"/> + <location filename="../desktop-widgets/mainwindow.ui" line="643"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="659"/> + <location filename="../desktop-widgets/mainwindow.ui" line="658"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="603"/> <source>Toggle tissue heat-map</source> <translation>Насыщение тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="664"/> - <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="604"/> - <source>User &survey</source> - <translation>Опрос пользователей</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="669"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="605"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="677"/> + <location filename="../desktop-widgets/mainwindow.ui" line="671"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="606"/> <source>&Redo</source> <translation>Повторить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="685"/> + <location filename="../desktop-widgets/mainwindow.ui" line="679"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/> <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="690"/> + <location filename="../desktop-widgets/mainwindow.ui" line="684"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/> <source>Open c&loud storage</source> <translation>Открыть облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="695"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="609"/> <source>Save to clo&ud storage</source> <translation>Сохранить в облаке</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="700"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="610"/> <source>&Manage dive sites</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="705"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="611"/> <source>Dive Site &Edit</source> <translation>Редактирование дайв-сайта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="713"/> + <location filename="../desktop-widgets/mainwindow.ui" line="707"/> <source>Cloud stora&ge online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="725"/> - <location filename="../desktop-widgets/mainwindow.ui" line="728"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="722"/> <source>Toggle deco information</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="680"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="606"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="640"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="792"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="902"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/> + <location filename="../desktop-widgets/divelistview.cpp" line="587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="602"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="636"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="788"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="898"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="681"/> + <location filename="../desktop-widgets/divelistview.cpp" line="588"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="264"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="260"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="265"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="261"/> <source>The following backup printing templates were created: %1 @@ -6928,248 +7039,248 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="486"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="482"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="529"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="492"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="488"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="496"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1915"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="492"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="606"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="602"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="618"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="619"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="615"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="625"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="682"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="792"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="788"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="846"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="842"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="902"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="898"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="997"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1233"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1182"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1223"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1548"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1202"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1473"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1254"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1203"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1245"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1255"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1204"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1256"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1205"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1248"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1257"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1300"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1206"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1249"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1258"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1301"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1207"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1250"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1302"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1208"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1260"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1303"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1209"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1210"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1211"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1254"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1212"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1255"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1213"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1256"/> <source>MkVI files</source> <translation>Файлы MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1214"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1257"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1215"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1258"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1216"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1260"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> <source>Dive site files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1282"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1547"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1472"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1636"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1561"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1776"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/> <source>multiple files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1702"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1727"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1652"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1754"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> <source>Open dive site file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1915"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -7179,6 +7290,11 @@ Subsurface попытался перенести уже существующие <translation>Настройки дайв-компьютера</translation> </message> <message> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="604"/> + <source>User &survey</source> + <translation>Опрос пользователей</translation> + </message> + <message> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/> <source>Facebook</source> <translation>Facebook</translation> @@ -7205,7 +7321,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidget</name> <message> - <location filename="../map-widget/qml/MapWidget.qml" line="255"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -7214,24 +7330,24 @@ Subsurface попытался перенести уже существующие <name>MapWidgetContextMenu</name> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> - <source>Open in Google Maps</source> - <translation>Открыть в картах Google</translation> - </message> - <message> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy coordinates to clipboard (decimal)</source> <translation>Копировать коорд. в буфер (десятичные)</translation> </message> <message> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy coordinates to clipboard (sexagesimal)</source> <translation>Копировать коорд. в буфер (мин/сек)</translation> </message> <message> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> + <message> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> + <source>Open in Google Maps</source> + <translation>Открыть в картах Google</translation> + </message> </context> <context> <name>MapWidgetError</name> @@ -8710,138 +8826,138 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="811"/> + <location filename="../profile-widget/profilewidget2.cpp" line="812"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="813"/> + <location filename="../profile-widget/profilewidget2.cpp" line="814"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="815"/> + <location filename="../profile-widget/profilewidget2.cpp" line="816"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="819"/> + <location filename="../profile-widget/profilewidget2.cpp" line="820"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="842"/> + <location filename="../profile-widget/profilewidget2.cpp" line="843"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1434"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1436"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> <source>Split this dive computer into own dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1446"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1453"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1458"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1451"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1460"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1453"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1458"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1493"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1497"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1473"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1542"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1549"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1506"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1564"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1528"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1592"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1552"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1592"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1552"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1627"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1603"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1604"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1760"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1693"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1761"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1694"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1766"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1699"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -8849,151 +8965,151 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="245"/> - <source>Starting...</source> - <translation>Запуск...</translation> - </message> - <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="321"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="342"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="366"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="362"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="384"/> + <source>Processing %1 dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Incorrect cloud credentials</source> <translation>Неверная облачная учетная запись</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="500"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="513"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="514"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="534"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="569"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="575"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="597"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="617"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="611"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="629"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="652"/> <source>Incorrect email / password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="657"/> <source>Cloud credentials require verification PIN</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="642"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Incorrect PIN, please try again</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="647"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="665"/> <source>PIN accepted, credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="674"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="718"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="764"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="770"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="785"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="955"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="956"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="970"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="971"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="955"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="956"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="957"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="970"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="971"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="972"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="955"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="970"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1059"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1074"/> <source>weight</source> <translation>вес</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1364"/> <source>Fatal error: cannot save data file. Please copy log file and report.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1565"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1778"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1790"/> <source>no default cylinder</source> <translation type="unfinished"/> </message> @@ -9001,10 +9117,32 @@ Please export this template to a different file.</source> <context> <name>QObject</name> <message> + <location filename="../core/fulltext.cpp" line="147"/> + <source>Create full text index</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/fulltext.cpp" line="148"/> + <location filename="../qt-models/divetripmodel.cpp" line="727"/> + <source>start processing</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/fulltext.cpp" line="153"/> + <location filename="../qt-models/divetripmodel.cpp" line="756"/> + <source>%1 dives processed</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divesummarymodel.cpp" line="197"/> <source>no dives in period</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="726"/> + <source>populate data model</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -9038,23 +9176,23 @@ Please export this template to a different file.</source> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="61"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/> <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/> <source>New starting number</source> <translation>Начать нумерацию с</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/> <source>New number</source> <translation>Новый номер</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/> <source>Renumber selected dives</source> <translation>Перенумеровать выбранные погружения</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/> <source>Renumber all dives</source> <translation>Перенумеровать все погружения</translation> </message> @@ -9503,38 +9641,38 @@ Not all media files have timestamps in the range between <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="275"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="257"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="277"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="259"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="358"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="340"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="360"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="342"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="361"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="343"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="363"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="345"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="355"/> <source>No Exif date/time found</source> <translation>Не найдены дата/время Exif</translation> </message> @@ -9726,37 +9864,37 @@ Files with inappropriate date/time</source> <translation>Костюм</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="50"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="58"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="54"/> <source>Add weight system</source> <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="61"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="65"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="61"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="275"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="188"/> <source>Warning: edited %1 dives</source> <translation type="unfinished"/> </message> @@ -9961,49 +10099,49 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="52"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="55"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="99"/> <source>Warning: edited %1 dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="151"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="148"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="155"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="173"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="155"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="173"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="155"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="173"/> <source>d</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="255"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="252"/> <source>unknown</source> <translation>неизвестно</translation> </message> @@ -10103,6 +10241,11 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveSite.ui" line="22"/> + <source>Filter</source> + <translation>Фильтр</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveSite.ui" line="49"/> <source>Purge unused dive sites</source> <translation type="unfinished"/> </message> @@ -10530,7 +10673,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="572"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -10683,172 +10826,75 @@ If you don't want Subsurface to continue checking, please click Decline.</s <context> <name>UserSurvey</name> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="14"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="192"/> <source>User survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="193"/> <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation><html><head/><body><p>Мы хотели бы узнать наших пользователей и их предпочтения. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface.</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="194"/> <source>What kind of diver are you?</source> <translation>Какой вы дайвер?</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="195"/> <source>Technical diver</source> <translation>Технический</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="196"/> <source>Recreational diver</source> <translation>Рекреационный</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="197"/> <source>Dive planner</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="198"/> <source>Where are you importing data from?</source> <translation>Откуда вы загружаете данные?</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="199"/> <source>Supported dive computer</source> <translation>Из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="200"/> <source>Other software/sources</source> <translation>Другие программы/источники</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="201"/> <source>Manually entering dives</source> <translation>Ручной ввод погружений</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="202"/> <source>Android/iPhone companion app</source> <translation>Вспомогательное приложение Android/iPhone</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="203"/> <source>Any suggestions? (in English)</source> <translation>Ваши предложения (на английском)</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="204"/> <source>The following information about your system will also be submitted.</source> <translation>Также будет отправлена следующая информация</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/> <source>Subsurface user survey</source> <translation>Анкета Subsurface</translation> </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="19"/> - <source>Send</source> - <translation>Отправить</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="44"/> - <source> -Operating system: %1</source> - <translation> -Операционная система: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="46"/> - <source> -CPU architecture: %1</source> - <translation> -Архитектура ЦПУ: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="48"/> - <source> -OS CPU architecture: %1</source> - <translation> -Архитектура ЦПУ ОС: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="49"/> - <source> -Language: %1</source> - <translation> -Язык: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="80"/> - <source>Should we ask you later?</source> - <translation>Предлагать заполнить опросник в будущем?</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="81"/> - <source>Don't ask me again</source> - <translation>Больше не спрашивать</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="82"/> - <source>Ask later</source> - <translation>Спросить позже</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="83"/> - <source>Ask again?</source> - <translation>Спрашивать снова?</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="102"/> - <source>Submit user survey.</source> - <translation>Отправить опросник.</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="103"/> - <source>Subsurface was unable to submit the user survey.</source> - <translation>Не удалось отправить опросник.</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="108"/> - <source>The following error occurred:</source> - <translation>Возникла ошибка:</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="109"/> - <source>Please check your internet connection.</source> - <translation>Проверьте Интернет-соединение.</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="118"/> - <source>Survey successfully submitted.</source> - <translation>Опросник успешно отправлен.</translation> - </message> - <message> - <location filename="../desktop-widgets/usersurvey.cpp" line="123"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Возникла ошибка во время проверки обновения.<br/><br/>%1</translation> - </message> </context> <context> <name>VideoFrameExtractor</name> @@ -10927,12 +10973,12 @@ Language: %1</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="80"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="79"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="101"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="100"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -11094,15 +11140,26 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../backend-shared/exportfuncs.cpp" line="227"/> - <location filename="../backend-shared/exportfuncs.cpp" line="265"/> - <location filename="../core/save-html.c" line="486"/> - <location filename="../core/save-html.c" line="575"/> + <location filename="../backend-shared/exportfuncs.cpp" line="228"/> + <location filename="../backend-shared/exportfuncs.cpp" line="266"/> + <location filename="../core/save-html.c" line="487"/> + <location filename="../core/save-html.c" line="576"/> <location filename="../core/worldmap-save.c" line="116"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> <message> + <location filename="../commands/command_event.cpp" line="70"/> + <source>modechange</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../commands/command_event.cpp" line="76"/> + <location filename="../core/planner.c" line="267"/> + <source>SP change</source> + <translation>изменение SP</translation> + </message> + <message> <location filename="../core/cochran.c" line="306"/> <location filename="../core/cochran.c" line="312"/> <location filename="../core/cochran.c" line="382"/> @@ -11370,30 +11427,30 @@ Maximum</source> <translation>Ошибка: погружение отсутствует</translation> </message> <message> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="32"/> <source>Open circuit</source> <translation>Открытый цикл</translation> </message> <message> - <location filename="../core/dive.c" line="31"/> + <location filename="../core/dive.c" line="33"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../core/dive.c" line="32"/> + <location filename="../core/dive.c" line="34"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../core/dive.c" line="33"/> + <location filename="../core/dive.c" line="35"/> <source>Freedive</source> <translation>Фридайв</translation> </message> <message> - <location filename="../core/divelist.c" line="619"/> - <location filename="../core/equipment.c" line="166"/> - <location filename="../core/planner.c" line="1174"/> - <location filename="../core/planner.c" line="1177"/> + <location filename="../core/divelist.c" line="620"/> + <location filename="../core/equipment.c" line="163"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>air</source> <translation>воздух</translation> </message> @@ -11402,9 +11459,9 @@ Maximum</source> <location filename="../core/divelogexportlogic.cpp" line="95"/> <location filename="../core/subsurface-qt/diveobjecthelper.cpp" line="266"/> <location filename="../desktop-widgets/templatelayout.h" line="101"/> - <location filename="../qt-models/divetripmodel.cpp" line="162"/> - <location filename="../qt-models/divetripmodel.cpp" line="212"/> - <location filename="../qt-models/divetripmodel.cpp" line="214"/> + <location filename="../qt-models/divetripmodel.cpp" line="163"/> + <location filename="../qt-models/divetripmodel.cpp" line="213"/> + <location filename="../qt-models/divetripmodel.cpp" line="215"/> <source>h</source> <translation>ч</translation> </message> @@ -11416,16 +11473,16 @@ Maximum</source> <location filename="../core/subsurface-qt/diveobjecthelper.cpp" line="266"/> <location filename="../core/worldmap-save.c" line="49"/> <location filename="../desktop-widgets/templatelayout.h" line="102"/> - <location filename="../qt-models/divetripmodel.cpp" line="162"/> - <location filename="../qt-models/divetripmodel.cpp" line="212"/> - <location filename="../qt-models/divetripmodel.cpp" line="214"/> + <location filename="../qt-models/divetripmodel.cpp" line="163"/> + <location filename="../qt-models/divetripmodel.cpp" line="213"/> + <location filename="../qt-models/divetripmodel.cpp" line="215"/> <source>min</source> <translation>мин</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="57"/> <location filename="../core/divelogexportlogic.cpp" line="95"/> - <location filename="../core/qthelper.h" line="73"/> + <location filename="../core/qthelper.h" line="71"/> <location filename="../desktop-widgets/templatelayout.h" line="102"/> <source>sec</source> <translation>с</translation> @@ -11442,7 +11499,7 @@ Maximum</source> </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="531"/> <source>Tags</source> <translation>Метки</translation> </message> @@ -11458,9 +11515,9 @@ Maximum</source> </message> <message> <location filename="../core/equipment.c" line="66"/> - <location filename="../core/equipment.c" line="170"/> - <location filename="../core/planner.c" line="1178"/> - <location filename="../core/planner.c" line="1181"/> + <location filename="../core/equipment.c" line="167"/> + <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1150"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -11470,48 +11527,48 @@ Maximum</source> <translation>не используется</translation> </message> <message> - <location filename="../core/equipment.c" line="168"/> + <location filename="../core/equipment.c" line="165"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="276"/> + <location filename="../core/equipment.c" line="273"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../core/equipment.c" line="277"/> + <location filename="../core/equipment.c" line="274"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../core/equipment.c" line="278"/> + <location filename="../core/equipment.c" line="275"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../core/equipment.c" line="279"/> + <location filename="../core/equipment.c" line="276"/> <source>backplate</source> <translation>спинка</translation> </message> <message> - <location filename="../core/equipment.c" line="280"/> + <location filename="../core/equipment.c" line="277"/> <source>clip-on</source> <translation>карабины</translation> </message> <message> - <location filename="../core/file.c" line="117"/> + <location filename="../core/file.c" line="116"/> <source>No dives in the input file '%s'</source> <translation>Нет погружений в файле '%s'</translation> </message> <message> - <location filename="../core/file.c" line="222"/> + <location filename="../core/file.c" line="221"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Невозможно открыть CSV-файл %s; воспользуйтесь функцией Импорт</translation> </message> <message> - <location filename="../core/file.c" line="335"/> + <location filename="../core/file.c" line="319"/> <location filename="../core/import-csv.c" line="118"/> <location filename="../core/import-csv.c" line="357"/> <location filename="../core/import-csv.c" line="519"/> @@ -11521,7 +11578,7 @@ Maximum</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../core/file.c" line="337"/> + <location filename="../core/file.c" line="321"/> <source>Empty file '%s'</source> <translation>Пустой файл '%s'</translation> </message> @@ -11557,92 +11614,92 @@ Maximum</source> <translation>Облачное хранилице поверждено</translation> </message> <message> - <location filename="../core/git-access.c" line="336"/> + <location filename="../core/git-access.c" line="330"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation> </message> <message> - <location filename="../core/git-access.c" line="396"/> + <location filename="../core/git-access.c" line="387"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="426"/> + <location filename="../core/git-access.c" line="417"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="454"/> <source>Remote storage and local data diverged</source> <translation>Данные в локальном и облачном хранилице отличаются</translation> </message> <message> - <location filename="../core/git-access.c" line="463"/> + <location filename="../core/git-access.c" line="458"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="472"/> + <location filename="../core/git-access.c" line="467"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Проблема с локальным кэшем облачного хранилища</translation> </message> <message> - <location filename="../core/git-access.c" line="473"/> + <location filename="../core/git-access.c" line="468"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation> </message> <message> - <location filename="../core/git-access.c" line="520"/> + <location filename="../core/git-access.c" line="515"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="528"/> + <location filename="../core/git-access.c" line="523"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="546"/> + <location filename="../core/git-access.c" line="541"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="588"/> + <location filename="../core/git-access.c" line="583"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="612"/> + <location filename="../core/git-access.c" line="658"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="639"/> + <location filename="../core/git-access.c" line="685"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="652"/> + <location filename="../core/git-access.c" line="698"/> <source>Successful cloud connection, fetch remote</source> <translation>Успешное соединение с облаком, получение данных</translation> </message> <message> - <location filename="../core/git-access.c" line="671"/> + <location filename="../core/git-access.c" line="717"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="806"/> + <location filename="../core/git-access.c" line="870"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="809"/> + <location filename="../core/git-access.c" line="873"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="835"/> + <location filename="../core/git-access.c" line="899"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -11915,28 +11972,28 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="173"/> - <location filename="../core/parse-xml.c" line="1229"/> + <location filename="../core/load-git.c" line="174"/> + <location filename="../core/parse-xml.c" line="1205"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s </translation> </message> <message> - <location filename="../core/load-git.c" line="198"/> - <location filename="../core/parse.c" line="436"/> + <location filename="../core/load-git.c" line="199"/> + <location filename="../core/parse.c" line="437"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1713"/> + <location filename="../core/load-git.c" line="1716"/> <source>Load dives from local cache</source> <translation>Загрузить погружения из локального кэша</translation> </message> <message> - <location filename="../core/load-git.c" line="1717"/> + <location filename="../core/load-git.c" line="1720"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -11952,35 +12009,29 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка %s в погружении %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="402"/> + <location filename="../core/parse-xml.c" line="403"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1703"/> + <location filename="../core/parse-xml.c" line="1679"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2299"/> + <location filename="../core/parse-xml.c" line="2275"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../core/planner.c" line="298"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/> - <source>SP change</source> - <translation>изменение SP</translation> - </message> - <message> - <location filename="../core/planner.c" line="901"/> + <location filename="../core/planner.c" line="870"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1182"/> + <location filename="../core/planner.c" line="1151"/> <source>ean</source> <translation>ean</translation> </message> @@ -12014,9 +12065,9 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="72"/> <location filename="../core/plannernotes.c" line="73"/> <location filename="../core/plannernotes.c" line="74"/> - <location filename="../core/qthelper.cpp" line="627"/> - <location filename="../core/qthelper.cpp" line="819"/> - <location filename="../core/qthelper.cpp" line="1282"/> + <location filename="../core/qthelper.cpp" line="617"/> + <location filename="../core/qthelper.cpp" line="809"/> + <location filename="../core/qthelper.cpp" line="1272"/> <location filename="../core/units.c" line="19"/> <source>bar</source> <translation>бар</translation> @@ -12277,7 +12328,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/profile.c" line="1446"/> + <location filename="../core/profile.c" line="1438"/> <source>@: %d:%02d D: %.1f%s </source> @@ -12286,74 +12337,74 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1445"/> <source>P: %d%s (%s) </source> <translation>Д: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1457"/> + <location filename="../core/profile.c" line="1449"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1463"/> + <location filename="../core/profile.c" line="1455"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1466"/> + <location filename="../core/profile.c" line="1458"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1468"/> + <location filename="../core/profile.c" line="1460"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1462"/> <source>pO₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1472"/> + <location filename="../core/profile.c" line="1464"/> <source>SCR ΔpO₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1475"/> + <location filename="../core/profile.c" line="1467"/> <source>pN₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1477"/> + <location filename="../core/profile.c" line="1469"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1480"/> + <location filename="../core/profile.c" line="1472"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1489"/> + <location filename="../core/profile.c" line="1481"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -12362,7 +12413,7 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1487"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -12371,210 +12422,210 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1500"/> + <location filename="../core/profile.c" line="1492"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1504"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1515"/> + <location filename="../core/profile.c" line="1507"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1520"/> + <location filename="../core/profile.c" line="1512"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1523"/> + <location filename="../core/profile.c" line="1515"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1527"/> + <location filename="../core/profile.c" line="1519"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1529"/> + <location filename="../core/profile.c" line="1521"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1532"/> + <location filename="../core/profile.c" line="1524"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1535"/> + <location filename="../core/profile.c" line="1527"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1543"/> + <location filename="../core/profile.c" line="1535"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1546"/> + <location filename="../core/profile.c" line="1538"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1540"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1544"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1554"/> + <location filename="../core/profile.c" line="1546"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1557"/> + <location filename="../core/profile.c" line="1549"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> + <location filename="../core/profile.c" line="1552"/> <source>GF %d%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1562"/> + <location filename="../core/profile.c" line="1554"/> <source>Surface GF %.0f%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1565"/> + <location filename="../core/profile.c" line="1557"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1563"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1578"/> + <location filename="../core/profile.c" line="1570"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1580"/> + <location filename="../core/profile.c" line="1572"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1582"/> + <location filename="../core/profile.c" line="1574"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1585"/> + <location filename="../core/profile.c" line="1577"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1681"/> + <location filename="../core/profile.c" line="1673"/> <source>ΔT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1685"/> + <location filename="../core/profile.c" line="1677"/> <source>%s ΔD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1689"/> + <location filename="../core/profile.c" line="1681"/> <source>%s ↓D:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1693"/> + <location filename="../core/profile.c" line="1685"/> <source>%s ↑D:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1697"/> + <location filename="../core/profile.c" line="1689"/> <source>%s øD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1701"/> + <location filename="../core/profile.c" line="1693"/> <source>%s ↓V:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1705"/> + <location filename="../core/profile.c" line="1697"/> <source>%s ↑V:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1709"/> + <location filename="../core/profile.c" line="1701"/> <source>%s øV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1716"/> + <location filename="../core/profile.c" line="1708"/> <source>%s ΔP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1741"/> + <location filename="../core/profile.c" line="1733"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/мин</translation> </message> @@ -12623,416 +12674,416 @@ EADD: %d%s / %.1fг/л <translation>З</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="543"/> - <location filename="../core/qthelper.cpp" line="558"/> - <location filename="../core/qthelper.cpp" line="737"/> - <location filename="../core/qthelper.cpp" line="1257"/> + <location filename="../core/qthelper.cpp" line="533"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="727"/> + <location filename="../core/qthelper.cpp" line="1247"/> <location filename="../core/units.c" line="106"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="546"/> - <location filename="../core/qthelper.cpp" line="560"/> - <location filename="../core/qthelper.cpp" line="739"/> - <location filename="../core/qthelper.cpp" line="1256"/> + <location filename="../core/qthelper.cpp" line="536"/> + <location filename="../core/qthelper.cpp" line="550"/> + <location filename="../core/qthelper.cpp" line="729"/> + <location filename="../core/qthelper.cpp" line="1246"/> <location filename="../core/units.c" line="111"/> <source>ft</source> <translation>фут</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="557"/> <location filename="../core/qthelper.cpp" line="567"/> - <location filename="../core/qthelper.cpp" line="577"/> - <location filename="../core/qthelper.cpp" line="792"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="782"/> + <location filename="../core/qthelper.cpp" line="1222"/> <location filename="../core/units.c" line="166"/> - <location filename="../qt-models/divetripmodel.cpp" line="188"/> + <location filename="../qt-models/divetripmodel.cpp" line="189"/> <source>kg</source> <translation>кг</translation> </message> <message> + <location filename="../core/qthelper.cpp" line="559"/> <location filename="../core/qthelper.cpp" line="569"/> - <location filename="../core/qthelper.cpp" line="579"/> - <location filename="../core/qthelper.cpp" line="794"/> - <location filename="../core/qthelper.cpp" line="1233"/> + <location filename="../core/qthelper.cpp" line="784"/> + <location filename="../core/qthelper.cpp" line="1223"/> <location filename="../core/units.c" line="162"/> - <location filename="../qt-models/divetripmodel.cpp" line="190"/> + <location filename="../qt-models/divetripmodel.cpp" line="191"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="765"/> + <location filename="../core/qthelper.cpp" line="578"/> + <location filename="../core/qthelper.cpp" line="755"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="591"/> - <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="757"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="630"/> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1281"/> + <location filename="../core/qthelper.cpp" line="620"/> + <location filename="../core/qthelper.cpp" line="811"/> + <location filename="../core/qthelper.cpp" line="1271"/> <location filename="../core/units.c" line="23"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="842"/> - <location filename="../core/qthelper.cpp" line="1201"/> + <location filename="../core/qthelper.cpp" line="832"/> + <location filename="../core/qthelper.cpp" line="1191"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="834"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="919"/> + <location filename="../core/qthelper.cpp" line="909"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="957"/> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="952"/> <source>no dives</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="982"/> + <location filename="../core/qthelper.cpp" line="972"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1201"/> + <location filename="../core/qthelper.cpp" line="1191"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="1294"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1305"/> + <location filename="../core/qthelper.cpp" line="1295"/> <location filename="../core/units.c" line="65"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../core/save-git.c" line="923"/> + <location filename="../core/save-git.c" line="924"/> <source>Start saving data</source> <translation>Начало сохранения данных</translation> </message> <message> - <location filename="../core/save-git.c" line="932"/> + <location filename="../core/save-git.c" line="933"/> <source>Start saving dives</source> <translation>Начало сохранения пошружений</translation> </message> <message> - <location filename="../core/save-git.c" line="965"/> + <location filename="../core/save-git.c" line="966"/> <source>Done creating local cache</source> <translation>Локальный кэш создан</translation> </message> <message> - <location filename="../core/save-git.c" line="1222"/> + <location filename="../core/save-git.c" line="1221"/> <source>Preparing to save data</source> <translation>Подготовка к сохранению данных</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="506"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="507"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="508"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="509"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="510"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="511"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="512"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> + <location filename="../core/save-html.c" line="513"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="514"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="515"/> <source>Trips</source> <translation>Поездки</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="516"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="517"/> <source>Advanced search</source> <translation>Расширенный поиск</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="521"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="522"/> <source>WaveSize</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="523"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="524"/> <source>Current</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="525"/> <source>Surge</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="526"/> <source>Chill</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="527"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="528"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="529"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="530"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="532"/> <location filename="../smtk-import/smartrak.c" line="257"/> <location filename="../smtk-import/smartrak.c" line="330"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="533"/> <source>Show more details</source> <translation>Подробнее</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="536"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="537"/> <source>Year</source> <translation>Год</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="538"/> <source>Total time</source> <translation>Общее время</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="539"/> <source>Average time</source> <translation>Среднее время</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="540"/> <source>Shortest time</source> <translation>Мин. время</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="541"/> <source>Longest time</source> <translation>Макс. время</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="542"/> <source>Average depth</source> <translation>Сред. глуб.</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="543"/> <source>Min. depth</source> <translation>Мин. глуб.</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="544"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="545"/> <source>Average SAC</source> <translation>Средний SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="546"/> <source>Min. SAC</source> <translation>Мин. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="547"/> <source>Max. SAC</source> <translation>Макс. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="548"/> <source>Average temp.</source> <translation>Сред. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="549"/> <source>Min. temp.</source> <translation>Мин. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="550"/> <source>Max. temp.</source> <translation>Макс. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="551"/> <source>Back to list</source> <translation>Вернуться к списку</translation> </message> <message> - <location filename="../core/save-html.c" line="553"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../core/save-html.c" line="554"/> + <location filename="../core/save-html.c" line="555"/> <source>Dive profile</source> <translation>Профиль погружения</translation> </message> <message> - <location filename="../core/save-html.c" line="555"/> + <location filename="../core/save-html.c" line="556"/> <source>Dive information</source> <translation>Информация о погружении</translation> </message> <message> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="557"/> <source>Dive equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../core/save-html.c" line="557"/> - <location filename="../core/save-html.c" line="564"/> + <location filename="../core/save-html.c" line="558"/> + <location filename="../core/save-html.c" line="565"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../core/save-html.c" line="558"/> + <location filename="../core/save-html.c" line="559"/> <source>Size</source> <translation>Объем</translation> </message> <message> - <location filename="../core/save-html.c" line="559"/> + <location filename="../core/save-html.c" line="560"/> <source>Work pressure</source> <translation>Раб. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="560"/> + <location filename="../core/save-html.c" line="561"/> <source>Start pressure</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="561"/> + <location filename="../core/save-html.c" line="562"/> <source>End pressure</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="562"/> + <location filename="../core/save-html.c" line="563"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../core/save-html.c" line="563"/> + <location filename="../core/save-html.c" line="564"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../core/save-html.c" line="565"/> + <location filename="../core/save-html.c" line="566"/> <source>Events</source> <translation>События</translation> </message> <message> - <location filename="../core/save-html.c" line="566"/> + <location filename="../core/save-html.c" line="567"/> <source>Name</source> <translation>Название</translation> </message> <message> - <location filename="../core/save-html.c" line="567"/> + <location filename="../core/save-html.c" line="568"/> <source>Value</source> <translation>Значение</translation> </message> <message> - <location filename="../core/save-html.c" line="568"/> + <location filename="../core/save-html.c" line="569"/> <source>Coordinates</source> <translation>Координаты</translation> </message> <message> - <location filename="../core/save-html.c" line="569"/> + <location filename="../core/save-html.c" line="570"/> <source>Dive status</source> <translation>Статистика погружения</translation> </message> <message> - <location filename="../core/save-xml.c" line="760"/> + <location filename="../core/save-xml.c" line="761"/> <source>Failed to save dives to %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-xml.c" line="876"/> + <location filename="../core/save-xml.c" line="877"/> <source>Failed to save divesites to %s (%s)</source> <translation type="unfinished"/> </message> @@ -13057,62 +13108,62 @@ EADD: %d%s / %.1fг/л <translation>Все (статистика по поездкам)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="121"/> + <location filename="../core/subsurfacestartup.c" line="120"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="122"/> + <location filename="../core/subsurfacestartup.c" line="121"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -13487,42 +13538,42 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Удалить эту точку</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/> <source>Average</source> <translation>Среднее</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/> <source>Maximum</source> <translation>Максимум</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="154"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="163"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="209"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="208"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="216"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="215"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> @@ -13532,12 +13583,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>путевая точка выше потолка</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1655"/> - <source>modechange</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="179"/> + <location filename="../qt-models/divetripmodel.cpp" line="180"/> <source>/min</source> <translation>/мин</translation> </message> @@ -13625,164 +13671,169 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Мобильный Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="242"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="245"/> + <location filename="../mobile-widgets/qml/main.qml" line="253"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> - <location filename="../mobile-widgets/qml/main.qml" line="359"/> - <location filename="../mobile-widgets/qml/main.qml" line="428"/> - <location filename="../mobile-widgets/qml/main.qml" line="486"/> + <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="367"/> + <location filename="../mobile-widgets/qml/main.qml" line="436"/> + <location filename="../mobile-widgets/qml/main.qml" line="494"/> <source>Back</source> <translation>Назад</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="257"/> + <location filename="../mobile-widgets/qml/main.qml" line="265"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="269"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="281"/> + <location filename="../mobile-widgets/qml/main.qml" line="289"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="301"/> + <location filename="../mobile-widgets/qml/main.qml" line="309"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="314"/> + <location filename="../mobile-widgets/qml/main.qml" line="322"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="314"/> + <location filename="../mobile-widgets/qml/main.qml" line="322"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="330"/> + <location filename="../mobile-widgets/qml/main.qml" line="338"/> <source>Dive summary</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="341"/> + <location filename="../mobile-widgets/qml/main.qml" line="349"/> <source>Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="353"/> + <location filename="../mobile-widgets/qml/main.qml" line="361"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="375"/> + <location filename="../mobile-widgets/qml/main.qml" line="383"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="396"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="407"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="407"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="410"/> + <location filename="../mobile-widgets/qml/main.qml" line="418"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="423"/> + <location filename="../mobile-widgets/qml/main.qml" line="431"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="435"/> + <location filename="../mobile-widgets/qml/main.qml" line="443"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="446"/> + <location filename="../mobile-widgets/qml/main.qml" line="454"/> <source>Show user manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="455"/> + <location filename="../mobile-widgets/qml/main.qml" line="463"/> <source>Ask for support</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="459"/> + <location filename="../mobile-widgets/qml/main.qml" line="467"/> <source>failed to open email client, please manually create support email to support@subsurface-divelog.org - the logs have been copied to the clipboard and can be pasted into that email.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="469"/> + <location filename="../mobile-widgets/qml/main.qml" line="477"/> <source>Reset forgotten Subsurface Cloud password</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="480"/> + <location filename="../mobile-widgets/qml/main.qml" line="488"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="490"/> + <location filename="../mobile-widgets/qml/main.qml" line="498"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="497"/> + <location filename="../mobile-widgets/qml/main.qml" line="505"/> <source>Test busy indicator (toggle)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="507"/> - <location filename="../mobile-widgets/qml/main.qml" line="509"/> + <location filename="../mobile-widgets/qml/main.qml" line="515"/> + <location filename="../mobile-widgets/qml/main.qml" line="517"/> <source>Test notification text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="513"/> + <location filename="../mobile-widgets/qml/main.qml" line="521"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="521"/> - <source>Enable verbose logging</source> + <location filename="../mobile-widgets/qml/main.qml" line="529"/> + <source>Enable verbose logging (currently: %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="523"/> + <location filename="../mobile-widgets/qml/main.qml" line="531"/> <source>Not persistent</source> <translation type="unfinished"/> </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="740"/> + <source>Subsurface-mobile starting up</source> + <translation type="unfinished"/> + </message> </context> <context> <name>plannerDetails</name> @@ -14277,4 +14328,4 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> </context> -</TS> +</TS>
\ No newline at end of file |