diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-12 14:48:01 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-11-12 14:48:01 -0800 |
| commit | 5a329ff26295717181dd99b22dab5b6b1e80d821 (patch) | |
| tree | 75629ac5faa90cb16e9edf36fbb31db9e264baf4 /translations | |
| parent | a06befc0075c19afbec31130b6d1e0f4447a2498 (diff) | |
| download | subsurface-5a329ff26295717181dd99b22dab5b6b1e80d821.tar.gz | |
Update translations strings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
29 files changed, 2818 insertions, 2381 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index a9d535281..21e3a4fe1 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Няма партньори</translation> </message> @@ -1207,87 +1207,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Измести времена</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Зареди изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Височина</translation> </message> @@ -1710,20 +1710,30 @@ <translation>Планирано гмуркаческо време</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>АТМ налягане</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>м.бара</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>м</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC поставена точка</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Изтрий плана?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Вие ще изтриете плана.</translation> </message> @@ -1786,7 +1796,7 @@ <translation>Добави точка в гмуркането</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Запиши нов</translation> </message> @@ -2324,7 +2334,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Няма зададено местонахождение</translation> </message> @@ -2451,7 +2461,7 @@ <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Допълнителни данни от леководолазен комютър</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Последен стоп на 20фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% средна дълбочина до 20фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20фута то повърхността</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Последен стоп на 6 метра</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% средна дълбочина до 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6м до повърхността</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>кб.фута/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> @@ -4807,8 +4817,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>въздух</translation> </message> @@ -5122,6 +5132,11 @@ Maximum</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5194,136 +5209,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Твърде много газови смеси</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>базирано на GFlow = %d и GFHigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface гмуркачески план</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>дълбочина</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>времетраене</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>продължителност</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>газ</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Превключи газ на %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Консумация на газ (CCR крака включени):</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Консумация на газ:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index d9935be5b..9a7c434ad 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Ingen makkere</translation> </message> @@ -1206,87 +1206,87 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Opret ny tur over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Tilføj dyk umiddelbart over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Tilføj dyk umiddelbart under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Flet tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Flet tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marker dyk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Flet valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Gen-Numerer dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Skift tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Indlæs billeder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Åben billed filer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1699,7 +1699,7 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Høje</translation> </message> @@ -1709,20 +1709,30 @@ fjerne den valgte dykkercomputer?</translation> <translation>Planlagt dykker tid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>ATM tryk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1732,37 +1742,37 @@ fjerne den valgte dykkercomputer?</translation> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Slut dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Drop planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Du er ved at droppe din plan.</translation> </message> @@ -1785,7 +1795,7 @@ fjerne den valgte dykkercomputer?</translation> <translation>Tilføj punkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2323,7 +2333,7 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3228,54 +3238,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Sidste stop på 20f</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Sidste stop på 6 meter</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4806,8 +4816,8 @@ Gennemsnit</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>luft</translation> </message> @@ -5121,6 +5131,11 @@ Gennemsnit</translation> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5193,136 +5208,136 @@ Gennemsnit</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>For mange gas blandinger</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseret på GFlow = %d og GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface dykker plan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>varighed</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stop på %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Skift gas til %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gas forbrug:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det er mere gas end der er tilrådighed i flasken!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Ikke ekstra gas nok til deling ved opstigning</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s i planlagt opstigning)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index a47dee3ca..c094cfa6b 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> @@ -1707,20 +1707,30 @@ <translation>Geplante Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Oberflächendruck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Diese Planung verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -1783,7 +1793,7 @@ <translation>Datenpunkt hinzufügen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2321,7 +2331,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3226,54 +3236,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuss</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4801,8 +4811,8 @@ Mittel</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>Luft</translation> </message> @@ -5116,6 +5126,11 @@ Mittel</translation> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5188,136 +5203,136 @@ Mittel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basierend auf GFlow = %d und GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg nach %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Beib auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserver für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 1238ed190..36a9a18fa 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Keine Tauchpartner</translation> </message> @@ -1206,87 +1206,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1699,7 +1699,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> @@ -1709,20 +1709,30 @@ <translation>Geplante Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Oberflächendruck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1732,37 +1742,37 @@ <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Diese Planung verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -1785,7 +1795,7 @@ <translation>Datenpunkt hinzufügen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Neue speichern</translation> </message> @@ -2323,7 +2333,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Kein Ort festgelegt</translation> </message> @@ -3228,54 +3238,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuß</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4806,8 +4816,8 @@ Durchschnitt</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>Luft</translation> </message> @@ -5121,6 +5131,11 @@ Durchschnitt</translation> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5193,136 +5208,136 @@ Durchschnitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basierend auf GFlow = %d und GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CND</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 5ef397245..05acecd0a 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1698,7 +1698,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1708,20 +1708,30 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation> </message> @@ -1784,7 +1794,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3221,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4795,8 +4805,8 @@ SAC (%1)</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>αέρας</translation> </message> @@ -5110,6 +5120,11 @@ SAC (%1)</translation> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5178,136 +5193,136 @@ SAC (%1)</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Πάρα πολλά μείγματα αερίων</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index e9711abfe..a4de207ab 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>No buddies</translation> </message> @@ -1207,87 +1207,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitude</translation> </message> @@ -1710,20 +1710,30 @@ <translation>Planned dive time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>ATM pressure</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Discard the plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>You are about to discard your plan.</translation> </message> @@ -1786,7 +1796,7 @@ <translation>Add dive data point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Save new</translation> </message> @@ -2324,7 +2334,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>No location set</translation> </message> @@ -2451,7 +2461,7 @@ <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Additional data from dive computer</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4807,8 +4817,8 @@ Maximum</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>air</translation> </message> @@ -5122,6 +5132,11 @@ Maximum</translation> <translation>Unable to open %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5194,136 +5209,136 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Too many gas mixes</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompression calculation aborted due to excessive time</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>based on GFlow = %d and GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface dive plan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index f1a5653aa..ac21db60d 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Sin compañeros</translation> </message> @@ -1208,87 +1208,87 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Contraer otras</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Crear nuevo viaje por encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Añadir inmersión(es) al viaje de debajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Combinar viaje con el viaje de encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Combinar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marcar inmersión(es) como no válida(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renumerar inmersiones</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Desplazar horas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Cargar imágenes</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Abrir archivos de imagen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1701,7 +1701,7 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitud</translation> </message> @@ -1711,20 +1711,30 @@ el ordenador de buceo seleccionado?</translation> <translation>Fecha/Hora de la inmersión planeada</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Presión atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1734,37 +1744,37 @@ el ordenador de buceo seleccionado?</translation> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Tiempo de ejecución</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>¿Descartar el plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Está a punto de descartar su plan.</translation> </message> @@ -1787,7 +1797,7 @@ el ordenador de buceo seleccionado?</translation> <translation>Añadir punto de datos de inmersión.</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Guardar nueva</translation> </message> @@ -2325,7 +2335,7 @@ el ordenador de buceo seleccionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Sin localización</translation> </message> @@ -3230,54 +3240,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Última parada a 20pies</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>De 50% de prof. media a 20 pies</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>De 20 pies a superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Última parada a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>De 50% prof. media a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>De 6m a superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>pies3/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4808,8 +4818,8 @@ Media</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>aire</translation> </message> @@ -5123,6 +5133,11 @@ Media</translation> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5195,136 +5210,136 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>No puedo encontrar el gas %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Demasiadas mezclas de gas</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Cálculo de descompresión abortado por exceso de tiempo</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basado en GFbajo = %d y GFalto = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Plan de buceo de Subsurface</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>Tiempo de ejecución</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>Duración</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Cambio de cota a %.*f %s en %d:%02d min - tiempo de ejecución %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo de ejecución %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Cambiar gas a %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gas (excluidos segmentos con CCR)</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Consumo de gas:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>!Esto es más gas del disponible en la botella especificada¡</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en el ascenso planeado)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 24d4e6bf3..0abbb5ead 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Ahenda teised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Loo uus väljasõit üles</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Ühenda valitud sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Nummerda sukeldumine/sukeldumised ümber</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Nihuta ajad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Lae pildid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Ava pildifailid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Kõrgus</translation> </message> @@ -1708,20 +1708,30 @@ <translation>Plaanitud sukeldumise aeg</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>ATM rõhk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Töö aeg</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC seadepunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Loobu plaanist?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Oled plaanist loobumas.</translation> </message> @@ -1784,7 +1794,7 @@ <translation>Lisa sukeldumise andmepunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3226,54 +3236,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Viimane peatus 20 jala peal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% keskmine sügavus 20 jalani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20 jalga pinnani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Viimane peatus 6m peal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% keskmine sügavus 6m-i</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m pinnani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4805,8 +4815,8 @@ Max</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>õhk</translation> </message> @@ -5120,6 +5130,11 @@ Max</translation> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5192,136 +5207,136 @@ Max</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Liiga palju gaasisegusid</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>põhineb väärtustel GFlow = %d ja GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface sukeldumise plaan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>sügavus</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>jooksev aeg</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>kestus</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gaas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u %s peal</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Vaheta gaasiks %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gaasi tarbimine:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 11d31736a..b70b4b0eb 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Tiivistä muut</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Erota sukellukset retkestä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Liitä uuteen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisää sukellukset alapuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Poista sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Uhdistä valitut sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Muuta aikoja</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Lataa kuvat</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Avaa kuvatiedostot</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Korkeus</translation> </message> @@ -1708,20 +1708,30 @@ poistaa valitun sukellustietokoneen?</translation> <translation>Suunniteltu sukelluksen kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Ilmanpaine</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ poistaa valitun sukellustietokoneen?</translation> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CCR-asetuspiste</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Hylätäänkö suunnitelma?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Olet hylkäämässä suunnitelmasi.</translation> </message> @@ -1784,7 +1794,7 @@ poistaa valitun sukellustietokoneen?</translation> <translation>Lisää sukellusetappi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3227,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Viimeinen pysähdys 20 jalassa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% keskisyvyydestä - 20 jalkaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20 jalasta pintaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Viimeinen pysähdys kuudessa metrissä</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% keskisyvyydestä - 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m:stä pintaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4805,8 +4815,8 @@ Keski</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>ilma</translation> </message> @@ -5120,6 +5130,11 @@ Keski</translation> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5192,138 +5207,138 @@ Keski</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Liian monta kaasuseosta</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>perustuu arvoihin GFlow = %d ja GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurfacen sukellussuunnitelma</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>syvyys</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>kesto</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>kaasu</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Kaasun kulutus: </translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index f5cf371a7..f653f2a92 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1206,87 +1206,87 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Replier les autres</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Supprimer la (les) plongée(s) du voyage</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Créer un nouveau groupe au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Fusionner le groupe avec le groupe au dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Fusionner le groupe avec le groupe en dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Effacer la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Invalider la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renuméroter les plongées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Heure de changement</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Charger les images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Ouvrir les fichiers images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitude</translation> </message> @@ -1710,20 +1710,30 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>Durée de plongée planifiée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Pression atmosphérique</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Profondeur finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Temps de fonctionnement</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gaz utilisé</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC (recycleur) Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Abandonner le plan ?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Vous allez annuler la planification.</translation> </message> @@ -1786,7 +1796,7 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>Ajouter un point de donnée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2324,7 +2334,7 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft à la surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>de 50% de la profondeur moyenne à 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m à la surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4808,8 +4818,8 @@ Moyenne</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>air</translation> </message> @@ -5123,6 +5133,11 @@ Moyenne</translation> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5195,136 +5210,136 @@ Moyenne</translation> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Ne peut pas trouver le gaz %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Trop de gaz différents</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Calcule de la décompression annulé a cause d'un temps excessif</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Basé sur GFbas = %d et GFhaut = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Planification de plongée Subsurface </translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>profondeur</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>durée</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Restez à %.*f %s durant %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Consommation de gaz:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Avertissement:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que ce qui est disponible dans le bloc spécifié!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pas assez de gaz en réserve pour un échange lors de la remontée</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 2e00356aa..a391fa13c 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1707,20 +1707,30 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>מטר</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation> </message> @@ -1783,7 +1793,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2321,7 +2331,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3220,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4794,8 +4804,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>אוויר</translation> </message> @@ -5109,6 +5119,11 @@ Maximum</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5176,136 +5191,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index ee63cc87b..15daeddcb 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1707,20 +1707,30 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1783,7 +1793,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2320,7 +2330,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3219,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4783,8 +4793,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>zrak</translation> </message> @@ -5098,6 +5108,11 @@ Maximum</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5166,136 +5181,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Previše mješavina plinova</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index fea16c96f..1db31b805 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Túra létrehozása fentebb</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Túra egyesítése a fentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Túra egyesítése a lentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1707,20 +1707,30 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1783,7 +1793,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2320,7 +2330,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3219,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4783,8 +4793,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation type="unfinished"/> </message> @@ -5098,6 +5108,11 @@ Maximum</source> <translation type="unfinished"/> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5162,136 +5177,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 588c7d495..f41c7ea41 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1707,20 +1707,30 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Kamu hendak mengabaikan Rencana</translation> </message> @@ -1783,7 +1793,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2320,7 +2330,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3219,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4791,8 +4801,8 @@ Rata-rata</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>udara</translation> </message> @@ -5106,6 +5116,11 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5170,136 +5185,136 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 8391212f0..07dbc25f0 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Nessun compagno di immersione</translation> </message> @@ -1207,87 +1207,87 @@ il computer selezionato?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Collassa altri</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Rimuove immersione(i) dal viaggio</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Aggiungi l'immersione(i) al viaggio subito sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Aggiungi l'immersione(i) al viaggio subito sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Raggruppa il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Raggruppa il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Cancella immersione(i)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marca l'immersione(i) come non valide</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Fondi le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Rinumera le immersioni</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Cambia gli orari</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Carica immagini</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Apri files di immagine</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ il computer selezionato?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitudine</translation> </message> @@ -1710,20 +1710,30 @@ il computer selezionato?</translation> <translation>Tempo di immersione pianificato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Pressione atmosferica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ il computer selezionato?</translation> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Run Time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gas utilizzato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Eliminare il piano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Stai cancellando il piano</translation> </message> @@ -1786,7 +1796,7 @@ il computer selezionato?</translation> <translation>Aggiungi punto del profilo di immersione</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Salva nuovo</translation> </message> @@ -2324,7 +2334,7 @@ il computer selezionato?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Nessun luogo impostato</translation> </message> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Ultima sosta a 20 piedi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>Dal 50% della prof. media a 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20 piedi alla superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Ultima sosta a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>Dal 50% della prof. media a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m alla superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4807,8 +4817,8 @@ Media</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>aria</translation> </message> @@ -5122,6 +5132,11 @@ Media</translation> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5196,136 +5211,136 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Troppe miscele gas</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Calcolo della decompressione annullato per tempo eccessivo</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basato su GFlow = %d e GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Piano di immersione di Subsurface </translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>profondità</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>durata</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Passa al gas %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo del gas (CCR legs escluse):</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Consumo gas:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Avviso</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL'ALGORITMO DI BUHLMANN E DELL'IMPLEMENTAZIONE DEL PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA' DI TEST. E' ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>il gas necessario è superiore a quello disponibile nella bombola</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>riserva di gas non sufficiente per la condivisione in risalita</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 3c896c5b6..5085b55f4 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Savērst pārējus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Izveidot jaunu ceļojumu augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Saplūdināt ceļojumu ar augšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Saplūdināt ceļojumu ar apakšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Izdzēst niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Atzīmēt niršanu(-as) kā nepareizus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Saplūdināt izvēlētas niršanas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Pārnumurēt niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Nobīdīt laikus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Ielādēt attēlus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Augstums</translation> </message> @@ -1708,20 +1708,30 @@ likvidēt izvēlētus datorus?</translation> <translation>Plānots dive laiks</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Atmosfēras spiediens</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ likvidēt izvēlētus datorus?</translation> <translation>nezināms</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Gala dziļums</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Izpildes laiks</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Izm. gāze</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC regulēšana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Atcelt plānu?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Jūs taisāties atcelt plānu.</translation> </message> @@ -1784,7 +1794,7 @@ likvidēt izvēlētus datorus?</translation> <translation>Pievienot niršanas vietu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ likvidēt izvēlētus datorus?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3225,54 +3235,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Pēdējā pietura pie 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Pēdējā pietura pie 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4803,8 +4813,8 @@ Vidējais</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>gaiss</translation> </message> @@ -5118,6 +5128,11 @@ Vidējais</translation> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5190,136 +5205,136 @@ Vidējais</translation> <translation>EAN</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Parāk daudz gāzes maisījumu</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Pamatots uz GFlow = %d un GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface niršanas plāns</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>dziļums</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>izpildlaiks</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>ilgums</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gāze</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Pārslēgt gāzi uz %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gāzes patēriņš:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Brīdinājums:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 9f99336a3..1dfdb99d9 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -1204,87 +1204,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Flytt tidspunkter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Last inn bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,7 +1697,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Høyde over havet</translation> </message> @@ -1707,20 +1707,30 @@ <translation>Planlagt dykketid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>ATM-trykk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1730,37 +1740,37 @@ <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Slett planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Du er i ferd med å forkaste planen.</translation> </message> @@ -1783,7 +1793,7 @@ <translation>Legg til punkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2321,7 +2331,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3226,54 +3236,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4801,8 +4811,8 @@ Snitt</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>luft</translation> </message> @@ -5116,6 +5126,11 @@ Snitt</translation> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5188,136 +5203,136 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>For mange gassmikser</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basert på GFlow = %d og GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface dykkeplan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 8add15e9f..0e7a500dd 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Geen buddies</translation> </message> @@ -1207,87 +1207,87 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>andere samenklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Nieuwe trip hierboven invoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Voeg duik(en) toe aan de trip hieronder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Trip met bovenstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Trip met onderstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>duik(en) verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>markeer duik(en) als ongeldig</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>geselecteerde duiken samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Duik(en) opnieuw nummeren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>tijdstippen verschuiven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>afbeeldingen laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Hoogte</translation> </message> @@ -1710,20 +1710,30 @@ duikcomputer wilt verwijderen?</translation> <translation>Geplande Duiktijd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Druk (atm)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ duikcomputer wilt verwijderen?</translation> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Verbruikt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC Instelpunt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Plan verwijderen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>U staat op het punt het plan te verwijderen</translation> </message> @@ -1786,7 +1796,7 @@ duikcomputer wilt verwijderen?</translation> <translation>Duik punt toevoegen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Bewaar als nieuw bestand</translation> </message> @@ -2324,7 +2334,7 @@ duikcomputer wilt verwijderen?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Locatie niet ingesteld</translation> </message> @@ -2451,7 +2461,7 @@ duikcomputer wilt verwijderen?</translation> <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Bijkomende gegevens van duikcomputer</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Laatste stop op 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% gem. diepte tot 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft tot oppervlakte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Laatste stop op 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% gem. diepte tot 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m tot oppervlakte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4807,8 +4817,8 @@ Maximum</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>lucht</translation> </message> @@ -5122,6 +5132,11 @@ Maximum</translation> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5194,136 +5209,136 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Teveel gasmengsels</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompressieberekeningen gestopt omdat ze te lang duren</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>gebaseerd op GFlow = %d en GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface duikplan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>diepte</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>duur</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Gaswissel naar %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Waarschuwing:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>EAN</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 5ac83c660..abc46e7f3 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -5,20 +5,20 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Osoba:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Wyszukiwanie partnerów i divemasterów</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Brak partnerów</translation> </message> </context> <context> @@ -26,27 +26,27 @@ <message> <location filename="../configuredivecomputer.cpp" line="227"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation type="unfinished"/> + <translation>Nie można zapisać kopii pliku %1. Komunikat błędu: %2</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="243"/> <source>Could not open backup file: %1</source> - <translation type="unfinished"/> + <translation>Nie można otworzyć kopii zapasowej pliku : %1</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="567"/> <source>Setting successfully written to device</source> - <translation type="unfinished"/> + <translation>Pomyślnie zapisano ustawienia w urządzeniu</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Oprogramowanie urządzenia pomyślnie zaktualizowane</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Ustawienie urządzenia pomyślnie zresetowane </translation> </message> </context> <context> @@ -54,7 +54,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/> <source>Configure dive computer</source> - <translation type="unfinished"/> + <translation>Konfiguracja komputera nurkowego </translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/> @@ -69,27 +69,27 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> <source>Retrieve available details</source> - <translation type="unfinished"/> + <translation>Pobierz ustawienia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> <source>Save changes to device</source> - <translation type="unfinished"/> + <translation>Zapisz zmiany do urządzenia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> <source>Backup</source> - <translation type="unfinished"/> + <translation>Kopia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/> <source>Restore backup</source> - <translation type="unfinished"/> + <translation>Przywróć z kopii</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/> <source>Update firmware</source> - <translation type="unfinished"/> + <translation>Aktualizacja oprogramowania</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/> @@ -99,35 +99,35 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="171"/> <source>OSTC 3</source> - <translation type="unfinished"/> + <translation>OSTC 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="210"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1242"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/> <source>Basic settings</source> - <translation type="unfinished"/> + <translation>Podstawowe</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/> <source>Serial No.</source> - <translation type="unfinished"/> + <translation>Nr seryjny</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/> <source>Firmware version</source> - <translation type="unfinished"/> + <translation>Wersja oprogramowania</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="256"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1394"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> <source>Custom text</source> - <translation type="unfinished"/> + <translation>Własny tekst</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/> @@ -137,75 +137,75 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/> <source>English</source> - <translation type="unfinished"/> + <translation>Angielski</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/> <source>German</source> - <translation type="unfinished"/> + <translation>Niemiecki</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/> <source>French</source> - <translation type="unfinished"/> + <translation>Francuski</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/> <source>Italian</source> - <translation type="unfinished"/> + <translation>Włoski</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/> <source>Dive mode</source> - <translation type="unfinished"/> + <translation>Tryb pracy</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="324"/> <source>OC</source> - <translation type="unfinished"/> + <translation>OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="329"/> <source>CC</source> - <translation type="unfinished"/> + <translation>CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1930"/> <source>Gauge</source> - <translation type="unfinished"/> + <translation>Gauge</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="339"/> <source>Apnea</source> - <translation type="unfinished"/> + <translation>Apnea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1802"/> <source>Date format</source> - <translation type="unfinished"/> + <translation>Format daty</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/> <source>MMDDYY</source> - <translation type="unfinished"/> + <translation>MMDDYY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/> <source>DDMMYY</source> - <translation type="unfinished"/> + <translation>DDMMYY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/> <source>YYMMDD</source> - <translation type="unfinished"/> + <translation>YYMMDD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="841"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2022"/> <source>Saturation</source> - <translation type="unfinished"/> + <translation>Nasycenie</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/> @@ -229,13 +229,13 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="678"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1833"/> <source>Desaturation</source> - <translation type="unfinished"/> + <translation>Odsycanie</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/> <source>Last deco</source> - <translation type="unfinished"/> + <translation>Ostatni przystanek</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/> @@ -246,39 +246,39 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> <source>Brightness</source> - <translation type="unfinished"/> + <translation>Jasność</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/> <source>Eco</source> - <translation type="unfinished"/> + <translation>Eco</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/> <source>Medium</source> - <translation type="unfinished"/> + <translation>Średnia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/> <source>High</source> - <translation type="unfinished"/> + <translation>Wysoka</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/> <source>Sampling rate</source> - <translation type="unfinished"/> + <translation>Próbkowanie co</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> <source>2s</source> - <translation type="unfinished"/> + <translation>2s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/> <source>10s</source> - <translation type="unfinished"/> + <translation>10s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> @@ -289,147 +289,147 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="416"/> <source>m/°C</source> - <translation type="unfinished"/> + <translation>m/°C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/> <source>ft/°F</source> - <translation type="unfinished"/> + <translation>ft/°F</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="546"/> <source>Dive mode color</source> - <translation type="unfinished"/> + <translation>Kolorystyka</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/> <source>Standard</source> - <translation type="unfinished"/> + <translation>Standardowa</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/> <source>Red</source> - <translation type="unfinished"/> + <translation>Czerwona</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/> <source>Green</source> - <translation type="unfinished"/> + <translation>Zielona</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/> <source>Blue</source> - <translation type="unfinished"/> + <translation>Niebieska</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/> <source>Salinity (0-5%)</source> - <translation type="unfinished"/> + <translation>Zasolenie (0-5%)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1726"/> <source>Sync dive computer time with PC</source> - <translation type="unfinished"/> + <translation>Synchronizuj czas z PC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/> <source>Compass gain</source> - <translation type="unfinished"/> + <translation>Wzmocnienie kompasu</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do urzadzęnia </translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> + <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do pliku kopii zapasowej </translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> <source>230LSB/Gauss</source> - <translation type="unfinished"/> + <translation>230LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/> <source>330LSB/Gauss</source> - <translation type="unfinished"/> + <translation>330LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/> <source>390LSB/Gauss</source> - <translation type="unfinished"/> + <translation>390LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/> <source>440LSB/Gauss</source> - <translation type="unfinished"/> + <translation>440LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/> <source>660LSB/Gauss</source> - <translation type="unfinished"/> + <translation>660LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/> <source>820LSB/Gauss</source> - <translation type="unfinished"/> + <translation>820LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/> <source>1090LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1090LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/> <source>1370LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1370LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> <source>Show safety stop</source> - <translation type="unfinished"/> + <translation>Pokazuj przystanek bezpieczeństwa</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> <source>Reset device to default settings</source> - <translation type="unfinished"/> + <translation>Przywróć ustawienia fabryczne</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> - <translation type="unfinished"/> + <translation>Alt GF może być wybrany pod wodą</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>rodzina Suunto Vyper</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced settings</source> - <translation type="unfinished"/> + <translation>Zaawansowane</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>Przyszły TTS</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Przesunięcie czujnika ciśnienia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -447,52 +447,52 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Model dekompresji</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation> mbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation> min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <source>Alt GFLow</source> - <translation type="unfinished"/> + <translation>Alt GFLow</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/> <source>Alt GFHigh</source> - <translation type="unfinished"/> + <translation>Alt GFHigh</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Odwócenie ekranu</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/> <source>Gas settings</source> - <translation type="unfinished"/> + <translation>Gazy</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/> @@ -500,7 +500,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/> <source>%O2</source> - <translation type="unfinished"/> + <translation>%O2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/> @@ -508,7 +508,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/> <source>%He</source> - <translation type="unfinished"/> + <translation>%He</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/> @@ -524,127 +524,127 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2137"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2222"/> <source>Change depth</source> - <translation type="unfinished"/> + <translation>Głębokość przełączenia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/> <source>Gas 1</source> - <translation type="unfinished"/> + <translation>Gaz 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/> <source>Gas 2</source> - <translation type="unfinished"/> + <translation>Gaz 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/> <source>Gas 3</source> - <translation type="unfinished"/> + <translation>Gaz 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/> <source>Gas 4</source> - <translation type="unfinished"/> + <translation>Gaz 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/> <source>Gas 5</source> - <translation type="unfinished"/> + <translation>Gaz 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/> <source>Dil 1</source> - <translation type="unfinished"/> + <translation>Dil 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/> <source>Dil 2</source> - <translation type="unfinished"/> + <translation>Dil 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/> <source>Dil 3</source> - <translation type="unfinished"/> + <translation>Dil 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/> <source>Dil 4</source> - <translation type="unfinished"/> + <translation>Dil 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/> <source>Dil 5</source> - <translation type="unfinished"/> + <translation>Dil 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2282"/> <source>Set point [cbar]</source> - <translation type="unfinished"/> + <translation>Set point [cbar]</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1091"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/> <source>Change depth [m]</source> - <translation type="unfinished"/> + <translation>Głębokość zmiany [m] </translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/> <source>SP 1</source> - <translation type="unfinished"/> + <translation>SP 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/> <source>SP 2</source> - <translation type="unfinished"/> + <translation>SP 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/> <source>SP 3</source> - <translation type="unfinished"/> + <translation>SP 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/> <source>SP 4</source> - <translation type="unfinished"/> + <translation>SP 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/> <source>SP 5</source> - <translation type="unfinished"/> + <translation>SP 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O2 w gazie kalibrującym</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Stały setpoint</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Czujnik</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Awaryjny setpoint</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -652,56 +652,56 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation> cbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> - <translation type="unfinished"/> + <translation>ppO₂ min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P1 (średnie)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P2 (wysokie)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Całkowity czas nurkowania</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/ℓ</source> - <translation type="unfinished"/> + <translation>kg/ℓ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoea</source> - <translation type="unfinished"/> + <translation>Apnoea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> <source>Safety level</source> - <translation type="unfinished"/> + <translation>Konserwatyzm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Zakres wysokości</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -712,7 +712,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/> <source>Number of dives</source> - <translation type="unfinished"/> + <translation>Liczba nurkowań</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> @@ -723,32 +723,32 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (brak)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> - <translation type="unfinished"/> + <translation>Próbkowanie co</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> + <translation>60s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Model</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -759,17 +759,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Tryb zegara</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -784,7 +784,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -794,12 +794,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Alarm głębokości</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Alarm czasu</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -809,110 +809,112 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>YY/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> <source>Dive computer details read successfully.</source> - <translation type="unfinished"/> + <translation>Konfiguracja komputera odczytana poprawnie.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="947"/> <source>Backup files (*.xml)</source> - <translation type="unfinished"/> + <translation>Pliki kopii zapasowych (*.xml)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="929"/> <source>An error occurred while saving the backup file. %1</source> - <translation type="unfinished"/> + <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="933"/> <source>Backup succeeded</source> - <translation type="unfinished"/> + <translation>Pomyślnie utworzono kopię zapasową.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="934"/> <source>Your settings have been saved to: %1</source> - <translation type="unfinished"/> + <translation>Twoje ustawienia zostały zapisane do: %1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="921"/> <source>Backup dive computer settings</source> - <translation type="unfinished"/> + <translation>Tworzy kopię ustawień komputera nurkowego</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> <source>XML backup error</source> - <translation type="unfinished"/> + <translation>Błąd kopii zapasowej XML</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> <source>Restore dive computer settings</source> - <translation type="unfinished"/> + <translation>Przywraca ustawienia komputera nurkowego</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="951"/> <source>XML restore error</source> - <translation type="unfinished"/> + <translation>Błąd przywracania XML</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="952"/> <source>An error occurred while restoring the backup file. %1</source> - <translation type="unfinished"/> + <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="959"/> <source>Restore succeeded</source> - <translation type="unfinished"/> + <translation>Pomyślnie przywrócono ustawienia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="960"/> <source>Your settings have been restored successfully.</source> - <translation type="unfinished"/> + <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="971"/> <source>Select firmware file</source> - <translation type="unfinished"/> + <translation>Wybierz plik z aktualizacją</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="972"/> <source>All files (*.*)</source> - <translation type="unfinished"/> + <translation>Wszystkie pliki (*.*)</translation> </message> </context> <context> @@ -978,12 +980,12 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="23"/> <source>Component selection</source> - <translation type="unfinished"/> + <translation>Wybór parametrów</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="40"/> <source>Which components would you like to copy</source> - <translation type="unfinished"/> + <translation>Które parametry chcesz skopiować?</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="46"/> @@ -998,7 +1000,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="60"/> <source>GPS coordinates</source> - <translation type="unfinished"/> + <translation>Współrzędne GPS</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="67"/> @@ -1124,7 +1126,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Głębokość(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1230"/> @@ -1144,12 +1146,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Temperatura(%1%2)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Balast(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1239"/> @@ -1174,12 +1176,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Gaz</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1253"/> @@ -1205,87 +1207,87 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Dodaj nurkowanie(a) do grupy poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Zmień czas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Dodaj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Dodawanie zdjęć</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1357,12 +1359,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> <source>DiveShare</source> - <translation type="unfinished"/> + <translation>DiveShare</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>Image depths</source> - <translation type="unfinished"/> + <translation>Głębokości zdjęć</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> @@ -1377,7 +1379,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export yearly statistics</source> - <translation type="unfinished"/> + <translation>Eksport statystyk rocznych</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> @@ -1477,7 +1479,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Wysyła dane do strony dive-share.appspot.com</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> @@ -1492,7 +1494,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Zapisuje głębokości zdjęć do pliku.</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> @@ -1528,7 +1530,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Zapisz głębokości zdjeć</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> @@ -1698,7 +1700,7 @@ wybrany komputer nurkowy?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Wysokość</translation> </message> @@ -1708,20 +1710,30 @@ wybrany komputer nurkowy?</translation> <translation>Planowany czas zanurzenia</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Ciśnienie atmosferyczne</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1743,37 @@ wybrany komputer nurkowy?</translation> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Porzucić plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Masz zamiar porzucić plan</translation> </message> @@ -1784,9 +1796,9 @@ wybrany komputer nurkowy?</translation> <translation>dodaj punkt do profilu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> - <translation type="unfinished"/> + <translation>Zapisz nowy</translation> </message> </context> <context> @@ -1839,7 +1851,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>Ambient pressure</source> - <translation type="unfinished"/> + <translation>Cisnienie otoczenia</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> @@ -1872,7 +1884,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished"/> + <translation>Dialog</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/> @@ -1882,32 +1894,32 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Pobierz ID użytkownika</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> <source><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Nie korzystanie z USerID oznacza, że będziesz musiał(a) zapisał linka do swoich nurkowań, by móc znaleźć je ponownie.</p></body></html></translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> - <translation type="unfinished"/> + <translation>Prywatne nurkowania nie są widoczne na liście "nurkowań powiązanych" i będą dostępne tylko w przypadku, gdy znasz ich adres URL.</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> <source>Keep dives private</source> - <translation type="unfinished"/> + <translation>Zachowaj nurkowania jako prywatne</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> <source>Upload dive data</source> - <translation type="unfinished"/> + <translation>Wyślij nurkowania</translation> </message> </context> <context> @@ -1963,7 +1975,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Balast(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1437"/> @@ -1981,12 +1993,12 @@ wybrany komputer nurkowy?</translation> <location filename="../qt-ui/models.cpp" line="1443"/> <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Gaz</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1494"/> @@ -2013,7 +2025,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Głębokość(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1428"/> @@ -2024,7 +2036,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Temperatura(%1%2)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1480"/> @@ -2251,7 +2263,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/> <source>Download into new trip</source> - <translation type="unfinished"/> + <translation>Dodaj do nowej grupy</translation> </message> </context> <context> @@ -2259,12 +2271,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Klucz</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Wartość</translation> </message> </context> <context> @@ -2290,17 +2302,17 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../configuredivecomputerthreads.cpp" line="1384"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>Aktualizacja oprogramowania nieudana!</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1391"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> </context> <context> @@ -2316,15 +2328,15 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Miejsce:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>brak podanego miejsca</translation> </message> </context> <context> @@ -2445,12 +2457,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Dodatkowe</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Dodatkowe dane z komputera nurkowego</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -2673,12 +2685,12 @@ z powietrza przy użyciu: <message> <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>Configure &dive computer</source> - <translation type="unfinished"/> + <translation>Konfiguruj komputer nurkowy</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="643"/> <source>Re-plan &dive</source> - <translation type="unfinished"/> + <translation>Zaplanuj nurkowanie ponownie</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="655"/> @@ -2846,22 +2858,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="449"/> <source>&Copy dive components</source> - <translation type="unfinished"/> + <translation>Kopiuj parametry nurkowania</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>Ctrl+C</source> - <translation type="unfinished"/> + <translation>Ctrl+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>&Paste dive components</source> - <translation type="unfinished"/> + <translation>Wklej parametry nurkowania</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Ctrl+V</source> - <translation type="unfinished"/> + <translation>Ctrl+V</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="497"/> @@ -2936,22 +2948,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> <source>Scale graph</source> - <translation type="unfinished"/> + <translation>Skalowanie wykresu</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="823"/> <source>Toggle pictures</source> - <translation type="unfinished"/> + <translation>Pokazuj zdjęcia</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="835"/> <source>Toggle tank bar</source> - <translation type="unfinished"/> + <translation>Pokazuj pasek gazu</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> @@ -3176,7 +3188,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.cpp" line="1258"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> - <translation type="unfinished"/> + <translation>Logi nurkowe (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Pliki Cochran (*.can);;Pliki CSV (*.csv);;Pliki DiveLog.de (*.dld);;Pliki JDiveLog (*.jlb);;Pliki Liquivision (*.lvd);;Pliki MkVI (*.txt);;Pliki Suunto (*.sde *.db);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki XML (*.xml);;Wszystkie pliki (*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3212,12 +3224,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="554"/> <source>Clear the filters</source> - <translation type="unfinished"/> + <translation>Wyczyśc filtr</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="558"/> <source>Close this window and reset the filters</source> - <translation type="unfinished"/> + <translation>Zamyka to okno i czyści filtr</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="562"/> @@ -3228,56 +3240,56 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Ostatni przystanek na gł. 20 stóp</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% śr. głębokości do 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft do powierzchni</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Ostatni przystanek na 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% śr. głębokości do 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m do powierzchni</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> - <translation type="unfinished"/> + <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> - <translation type="unfinished"/> + <translation>ℓ/min</translation> </message> </context> <context> @@ -3726,7 +3738,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printlayout.cpp" line="71"/> <source>Subsurface cannot find a usable printer on this system!</source> - <translation type="unfinished"/> + <translation>Subsurface nie może znaleźć drukarki!</translation> </message> </context> <context> @@ -3885,7 +3897,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation> (Butla %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -4368,7 +4380,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/updatemanager.cpp" line="68"/> <source>A new version of subsurface is available.</source> - <translation type="unfinished"/> + <translation>Nowsza wersja Subsurface jest dostępna.</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="69"/> @@ -4801,8 +4813,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>powietrze</translation> </message> @@ -5116,6 +5128,11 @@ Maximum</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5188,136 +5205,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Zbyt wiele rodzajów gazu</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>w oparciu o GFlow = %d i GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Plan nurkowania Subsurface </translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>głębokość</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>czas trwania</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Zmiana gazu na %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Zużycie gazu:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to więcej gazu niż masz w dostępnych butlach!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 69bf57392..751450343 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Esconder outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulhos de viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Criar viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulhos para a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulhos para viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Juntar viagem com viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Juntar viagem com viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Apagar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marcar megulho(s) como inválidos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Juntar mergulhos selecionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Deslocar tempo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Abrir imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ o computador de mergulho selecionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitude</translation> </message> @@ -1708,20 +1708,30 @@ o computador de mergulho selecionado?</translation> <translation>Tempo do mergulho planejado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>pressão atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ o computador de mergulho selecionado?</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>ponto CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Descartar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Você está prestes a eliminar seu planejamento.</translation> </message> @@ -1784,7 +1794,7 @@ o computador de mergulho selecionado?</translation> <translation>Adicionar ponto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ o computador de mergulho selecionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3227,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Ultima parada em 20 pés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Ultima parada em 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4804,8 +4814,8 @@ Médio</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>ar</translation> </message> @@ -5119,6 +5129,11 @@ Médio</translation> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5192,136 +5207,136 @@ Médio</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Misturas de gás em excesso</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseado em GF baixo = %d e GF alto = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Plano de mergulho do subsurface</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>tempo</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição pra %.*f %s em %d:%02d min - tempo %d:%02u em %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Fique em %.*f %s por %d:%02d min - durante %d:%02u em %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Trocar o gás por %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Consumo de gás</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Isso é mais gás que a capacidade do cilindro especificado</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Sem reserva para compartilhar ar na subida</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 044d7d0a0..a4bd78cad 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation>Sem companheiros</translation> </message> @@ -1207,87 +1207,87 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Alterar tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Abrir ficheiros de imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Altitude</translation> </message> @@ -1710,20 +1710,30 @@ remover o computador de mergulho seleccionado?</translation> <translation>Data e hora </translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Pressão atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ remover o computador de mergulho seleccionado?</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Eliminar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Está prestes a eliminar o plano.</translation> </message> @@ -1786,7 +1796,7 @@ remover o computador de mergulho seleccionado?</translation> <translation>Adicionar ponto ao mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation>Gravar novo</translation> </message> @@ -2324,7 +2334,7 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation>Não foi definido um local</translation> </message> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% da profundidade média para 6 m/20 ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>6 m/20 ft para a superfície</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% da profundidade média para 6 m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6 m para a superfície</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4807,8 +4817,8 @@ Média</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>ar</translation> </message> @@ -5122,6 +5132,11 @@ Média</translation> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5195,137 +5210,137 @@ Média</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseado num GFlow = %d e GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Plano de mergulho Subsurface</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Mudar para %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gás (excluídas as fases c/CCR):</translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Consumo de gás:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>Aviso: o planeamento de mergulhos através desta ferramenta baseia-se no algoritmo de Buehlmann. No entanto, esta implementação é recente e foi alvo de testes limitados. Recomenda-se aos utilizadores que não se baseiem apenas nesta ferramenta para planear os seus mergulhos.</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index 8f714a85d..b005a8533 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ computerul de scufundări selectat?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1698,7 +1698,7 @@ computerul de scufundări selectat?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1708,20 +1708,30 @@ computerul de scufundări selectat?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ computerul de scufundări selectat?</translation> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Sunteți pe cale de a șterge planul.</translation> </message> @@ -1784,7 +1794,7 @@ computerul de scufundări selectat?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ computerul de scufundări selectat?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3221,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4795,8 +4805,8 @@ Medie</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>aer</translation> </message> @@ -5110,6 +5120,11 @@ Medie</translation> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5178,136 +5193,136 @@ Medie</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Prea multe amestecuri de gaz</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 750f6436b..1aeb425d2 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Загрузить фото</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Высота</translation> </message> @@ -1708,20 +1708,30 @@ <translation>Планируемое время погружения</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Атм. давление</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>мбар</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>м</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Время отсчета</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>Установка CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Отменить план?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Вы собираетесь отказаться от плана.</translation> </message> @@ -1784,7 +1794,7 @@ <translation>Добавить путевую точку</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3227,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4805,8 +4815,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>воздух</translation> </message> @@ -5120,6 +5130,11 @@ Maximum</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5192,136 +5207,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Расчет деко прекращен из-за большой длительности</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>на основе GFlow = %d и GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>План погружения Subsurface</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Расход газов:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 08ab3ab1a..b8c456216 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1207,87 +1207,87 @@ vybraný počítač?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Zbaliť ostatné</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Vymazať ponor(y) z akcie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Vytvoriť novú akciu nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Pridať ponor(y) do akcie hneď nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Pridať ponor(y) do akcie hneď pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Spoj akciu s akciou nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Spoj akciu s akciou pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Zmazať ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Neplatný ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Spojiť vybraté ponory</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Prečíslovanie ponorov</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Posun času</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Nahrať obrázky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,7 +1700,7 @@ vybraný počítač?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Výška</translation> </message> @@ -1710,20 +1710,30 @@ vybraný počítač?</translation> <translation>Plánovaný čas ponoru</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>ATM tlak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1733,37 +1743,37 @@ vybraný počítač?</translation> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Cieľová hĺbka</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Aktuálny čas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Použitá zmes</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC SetPoint</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Vymazať plán?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Chystáš sa vymazať svoj plán.</translation> </message> @@ -1786,7 +1796,7 @@ vybraný počítač?</translation> <translation>Pridať data point ponoru</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2324,7 +2334,7 @@ vybraný počítač?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Posledná zastávka v 20 stopách</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% priemernej hĺbky do 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft na hladinu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Posledná zastávka v 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% priemernej hĺbky do 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m na povrch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -4803,8 +4813,8 @@ Maximum</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>vzduch</translation> </message> @@ -5118,6 +5128,11 @@ Maximum</translation> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5190,140 +5205,140 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Príliš veľa zmesí</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Výpočet dekompresie zrušený z dôvodu píliš dlhého času</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>na základe GFlow = %d a GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface plán ponoru</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>hĺbka</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>trvanie</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>plyn</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Spotreba plynu: </translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index a48ea77a2..055293957 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -18,7 +18,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"></translation> </message> @@ -1206,87 +1206,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"></translation> </message> @@ -1699,7 +1699,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"></translation> </message> @@ -1709,20 +1709,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1732,37 +1742,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation type="unfinished"></translation> </message> @@ -1785,7 +1795,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"></translation> </message> @@ -2322,7 +2332,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"></translation> </message> @@ -3221,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"></translation> </message> @@ -4785,8 +4795,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation type="unfinished"></translation> </message> @@ -5100,6 +5110,11 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5164,136 +5179,136 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 98a8e35ae..d8890747e 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ radera den valda dykdatorn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Ny resa ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Lägg till dyk(en) till resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Lägg till dyk(en) till resan nedanför</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med resan under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Radera dyk(en)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Förskjut tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Ladda bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ radera den valda dykdatorn?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>Höjd</translation> </message> @@ -1708,20 +1708,30 @@ radera den valda dykdatorn?</translation> <translation>Planerad dyktid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Atmosfärstryck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ radera den valda dykdatorn?</translation> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>Kassera plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>Du kommer kassera din plan</translation> </message> @@ -1784,7 +1794,7 @@ radera den valda dykdatorn?</translation> <translation>lägg till dykdatapunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ radera den valda dykdatorn?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3227,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>Sista stoppet på 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdjup till 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>20ft till ytan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Sista stoppet på 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdjup till 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>6m till ytan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4799,8 +4809,8 @@ Medel</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>luft</translation> </message> @@ -5114,6 +5124,11 @@ Medel</translation> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5186,136 +5201,136 @@ Medel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>För många gasblandningar</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>baserad på GFlow = %d och GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface dykplan</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>djup</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>körtid</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>varaktighet</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stanna vid %.*f %s för %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>Byt gas till %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gasförbrukning:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Varning:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 25d10b7fa..27cb9497b 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Geziden dalış kaldır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Dalış sil</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Seçili dalışları birleştir</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Dalışları yeniden numaralandır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Görüntüleri yükle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Görüntü dosyalarını aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>İrtifa</translation> </message> @@ -1708,20 +1708,30 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation>Planlanan dalış zamanı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>Atmosfer basıncı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>Final derinlik</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>Çalışma süresi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>Gaz kullanımı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>KD set noktası</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1784,7 +1794,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation>Dalış veri noktası ekle</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3221,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>20 fit son durak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>Yüzeye 20 fit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>6m son durak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>yüzeye 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4797,8 +4807,8 @@ Ortalama</translation> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>hava</translation> </message> @@ -5112,6 +5122,11 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5178,136 +5193,136 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Çok fazla gaz karışımı</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface dalış planı</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>derinlik</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>çalışma süresi</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>süre</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3ddak</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>MSS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>Gaz tüketimi:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>Uyarı:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index d8c6e0654..a4e68a388 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>Tạo một chuyến đi mới phía trước</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>Gập chuyến đi với chuyến đi trước</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>Gộp chuyến đi với chuyến đi bên dưới</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>Đánh dấu (các)lần lặn không hợp lệ</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>Chuyển thời gian</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>Tải hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>Mở tập tin hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation type="unfinished"/> </message> @@ -1708,20 +1708,30 @@ bỏ các máy lặn đã được chọn?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ bỏ các máy lặn đã được chọn?</translation> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1784,7 +1794,7 @@ bỏ các máy lặn đã được chọn?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2321,7 +2331,7 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3220,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4784,8 +4794,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>không khí</translation> </message> @@ -5099,6 +5109,11 @@ Maximum</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5167,136 +5182,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>Quá nhiều dưỡng khí được trộn</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 59f9b9937..a1d6c71b5 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2454"/> + <location filename="../qt-ui/models.cpp" line="2456"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1205,87 +1205,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="784"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Collapse others</source> <translation>摺疊其它</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> <translation>從旅程中移除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Create new trip above</source> <translation>設定為新的旅程</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="800"/> + <location filename="../qt-ui/divelistview.cpp" line="803"/> <source>Add dive(s) to trip immediately above</source> <translation>於上方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="802"/> + <location filename="../qt-ui/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately below</source> <translation>於下方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="809"/> <source>Merge trip with trip above</source> <translation>與上方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="807"/> + <location filename="../qt-ui/divelistview.cpp" line="810"/> <source>Merge trip with trip below</source> <translation>與下方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>Delete dive(s)</source> <translation>刪除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="813"/> + <location filename="../qt-ui/divelistview.cpp" line="816"/> <source>Mark dive(s) invalid</source> <translation>標示為無效的潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Merge selected dives</source> <translation>合併所選擇的潛水記錄</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="819"/> + <location filename="../qt-ui/divelistview.cpp" line="822"/> <source>Renumber dive(s)</source> <translation>為潛水記錄(多支)重新編號</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="820"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Shift times</source> <translation>移動時間</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="824"/> <source>Load images</source> <translation>載入影像</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Open image files</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="842"/> + <location filename="../qt-ui/divelistview.cpp" line="845"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,7 +1698,7 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="156"/> + <location filename="../qt-ui/diveplanner.ui" line="152"/> <source>Altitude</source> <translation>海拔</translation> </message> @@ -1708,20 +1708,30 @@ <translation>計畫潛水時間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="163"/> + <location filename="../qt-ui/diveplanner.ui" line="159"/> <source>ATM pressure</source> <translation>大氣壓力</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="170"/> + <location filename="../qt-ui/diveplanner.ui" line="166"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="179"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="183"/> + <location filename="../qt-ui/diveplanner.ui" line="198"/> <source>m</source> <translation>m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.ui" line="220"/> + <source> kg/ℓ</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerPointsModel</name> @@ -1731,37 +1741,37 @@ <translation>未知</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="690"/> + <location filename="../qt-ui/diveplanner.cpp" line="697"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="692"/> + <location filename="../qt-ui/diveplanner.cpp" line="699"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="694"/> + <location filename="../qt-ui/diveplanner.cpp" line="701"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="696"/> + <location filename="../qt-ui/diveplanner.cpp" line="703"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="698"/> + <location filename="../qt-ui/diveplanner.cpp" line="705"/> <source>CC set point</source> <translation>密閉式循環設定點</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1031"/> + <location filename="../qt-ui/diveplanner.cpp" line="1044"/> <source>Discard the plan?</source> <translation>取消這次計畫?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1032"/> + <location filename="../qt-ui/diveplanner.cpp" line="1045"/> <source>You are about to discard your plan.</source> <translation>您將要放棄你的計劃.</translation> </message> @@ -1784,7 +1794,7 @@ <translation>新增潛水資料點</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -2322,7 +2332,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2580"/> + <location filename="../qt-ui/models.cpp" line="2582"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3227,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>Last stop at 20ft</source> <translation>上一次在20英呎停留</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="481"/> + <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="482"/> + <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> <translation>水面下 20 英尺</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="485"/> + <location filename="../qt-ui/diveplanner.cpp" line="492"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="486"/> + <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="487"/> + <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> <translation>水面下 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="490"/> - <location filename="../qt-ui/diveplanner.cpp" line="491"/> + <location filename="../qt-ui/diveplanner.cpp" line="497"/> + <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="499"/> - <location filename="../qt-ui/diveplanner.cpp" line="500"/> + <location filename="../qt-ui/diveplanner.cpp" line="506"/> + <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -4805,8 +4815,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1003"/> - <location filename="../planner.c" line="1006"/> + <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>air</source> <translation>air</translation> </message> @@ -5120,6 +5130,11 @@ Maximum</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> + <location filename="../libdivecomputer.c" line="853"/> + <source>Insufficient privileges to open the device %s %s (%s)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> @@ -5191,136 +5206,136 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="769"/> + <location filename="../planner.c" line="770"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../planner.c" line="354"/> + <location filename="../planner.c" line="355"/> <source>Too many gas mixes</source> <translation>太多氣體混合</translation> </message> <message> - <location filename="../planner.c" line="531"/> + <location filename="../planner.c" line="532"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="539"/> + <location filename="../planner.c" line="540"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>以 GFlow = %d 與 GFhigh = %d 為基礎</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="543"/> <source>Subsurface dive plan</source> <translation>Subsurface 潛水計畫</translation> </message> <message> - <location filename="../planner.c" line="546"/> + <location filename="../planner.c" line="547"/> <source>depth</source> <translation>深度</translation> </message> <message> - <location filename="../planner.c" line="549"/> + <location filename="../planner.c" line="550"/> <source>runtime</source> <translation>作業時間</translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="553"/> <source>duration</source> <translation>時間</translation> </message> <message> - <location filename="../planner.c" line="555"/> + <location filename="../planner.c" line="556"/> <source>gas</source> <translation>氣體</translation> </message> <message> - <location filename="../planner.c" line="589"/> + <location filename="../planner.c" line="590"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s</translation> </message> <message> - <location filename="../planner.c" line="599"/> + <location filename="../planner.c" line="600"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation> </message> <message> - <location filename="../planner.c" line="610"/> + <location filename="../planner.c" line="611"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="613"/> - <location filename="../planner.c" line="617"/> + <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="618"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="633"/> + <location filename="../planner.c" line="634"/> <source>Switch gas to %s</source> <translation>更換氣體至 %s</translation> </message> <message> - <location filename="../planner.c" line="646"/> + <location filename="../planner.c" line="647"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="649"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../planner.c" line="652"/> + <location filename="../planner.c" line="653"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="654"/> + <location filename="../planner.c" line="655"/> <source>Gas consumption:</source> <translation>氣體消耗:</translation> </message> <message> - <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="674"/> - <location filename="../planner.c" line="679"/> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="703"/> <source>Warning:</source> <translation>提醒:</translation> </message> <message> - <location filename="../planner.c" line="521"/> + <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量！</translation> </message> <message> - <location filename="../planner.c" line="680"/> + <location filename="../planner.c" line="681"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用！</translation> </message> <message> - <location filename="../planner.c" line="682"/> + <location filename="../planner.c" line="683"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation> </message> <message> - <location filename="../planner.c" line="684"/> + <location filename="../planner.c" line="685"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation> </message> <message> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="700"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1008"/> <source>ean</source> <translation>ean</translation> </message> |