diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 6867ca069..e94dc88d8 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -285,7 +285,7 @@ - Last Stop at 6m + Last stop at 6m diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index aabb8d6b8..817028743 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -105,18 +105,18 @@ DiveEventItem - + Bailing out to OC - + begin Starts with space! - + end Starts with space! @@ -138,87 +138,87 @@ - + Expand all - + Collapse all - + Collapse others - + Remove dive(s) from trip - + Create new trip above - + Add dive(s) to trip immediately above - + Add dive(s) to trip immediately below - + Merge trip with trip above - + Merge trip with trip below - + Delete dive(s) - + Mark dive(s) invalid - + Merge selected dives - + Renumber dive(s) - + Shift times - + Load images - + Open image files - + Image files (*.jpg *.jpeg *.pnm *.tif *.tiff) @@ -226,59 +226,59 @@ DiveLogExportDialog - + Export format - + Subsurface XML - + UDDF - + divelogs.de - + CSV - + Worldmap - + Selection - - + + Selected dives - - + + All dives - + HTML - + Minimum Javascript @@ -288,87 +288,87 @@ - + General export - + General settings - + Subsurface numbers - + Export list only - + Style options - + Font - + Font size - + 8 - + 10 - + 12 - + 14 - + 16 - + 18 - + 20 - + Theme - + Light - + Sand @@ -629,42 +629,42 @@ DivePlannerPointsModel - + unknown - + Final depth - + Run time - + Duration - + Used gas - + CC set point - + Discard the plan? - + You are about to discard your plan. @@ -672,17 +672,17 @@ DivePlannerWidget - + Dive planner points - + Available gases - + Add dive data point @@ -1050,7 +1050,7 @@ MainTab - + Location @@ -1091,27 +1091,27 @@ - + Dive notes - + Air temp. - + Water temp. - + Notes @@ -1228,114 +1228,114 @@ - + Cylinders - + Add Cylinder - + Weights - + Add Weight System - + Save - + Cancel - + Air temp. [%1] - + Water temp. [%1] - + This trip is being edited. - + Multiple dives are being edited. - + This dive is being edited. - - + + Trip notes - + Trip location - - - - - + + + + + /min - + unknown - + Deepest dive - + Shallowest dive - + These gases could be mixed from Air and using: - + and - + Discard the changes? - + You are about to discard your changes. @@ -1811,70 +1811,70 @@ p, li { white-space: pre-wrap; } - + Print runtime table - + Yearly statistics - + Do you want to save the changes that you made in the file %1? - + Do you want to save the changes that you made in the data file? - + Save changes? - + Save file as - + Open dive log file - + Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*) - + Changes will be lost if you don't save them. - + Warning - + Please save or cancel the current dive edit before opening a new file. - + Subsurface XML files (*.ssrf *.xml *.XML) - + Please, first finish the current edition before trying to do another. @@ -1882,15 +1882,45 @@ p, li { white-space: pre-wrap; } PlannerSettingsWidget - + + ft/min + + + + Last stop at 20ft - + + 50% avg. depth to 20ft + + + + + 20ft to surface + + + + + m/min + + + + Last stop at 6m + + + 50% avg. depth to 6m + + + + + 6m to surface + + PreferencesDialog @@ -1936,146 +1966,151 @@ p, li { white-space: pre-wrap; } + Use default + + + + ... - + Animations - + Speed - + Clear all settings - + Reset all settings to their default value - + System - + Metric - + Imperial - + Personalize - + Depth - + meter - + feet - + bar - + psi - + liter - + cu ft - + celsius - + fahrenheit - + kg - + System default - + Proxy - + Proxy type - + Host - + Port - + Requires authentication - + Username - + Password - + Filter - + Pressure @@ -2090,82 +2125,82 @@ p, li { white-space: pre-wrap; } - + Display invalid - + Default cylinder - + Use default cylinder - + Subsurface web service - + Default user ID - + Save user ID locally? - + Volume - + Temperature - + Weight - + lbs - + Time units - + Minutes - + Seconds - + Show - + GFLow at max depth - + Misc @@ -2175,52 +2210,52 @@ p, li { white-space: pre-wrap; } - + Ascent/descent speed denominator - + Threshold when showing pO₂ - + Threshold when showing pN₂ - + Threshold when showing pHe - + Max pO₂ when showing MOD - + Draw dive computer reported ceiling red - + Show unused cylinders in Equipment tab - + Show average depth - + GFLow - + GFHigh @@ -2245,32 +2280,32 @@ p, li { white-space: pre-wrap; } - + Restart required - + To correctly load a new language you must restart Subsurface. - + If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately. - + Subsurface XML files (*.ssrf *.xml *.XML) - + Open default log file - + Warning @@ -2383,33 +2418,6 @@ p, li { white-space: pre-wrap; } Notes on top - - - Sizing heights (% of layout) - - - - - Profile height (43% - 85%) - - - - - Other data height (8% - 17%) - - - - - Notes height (0% - 52%) - - - - - - - 0 - - ProfilePrintModel @@ -2487,77 +2495,77 @@ p, li { white-space: pre-wrap; } ProfileWidget2 - + (#%1 of %2) - + Make first divecomputer - + Delete this divecomputer - + Add gas change - + Add bookmark - + Remove event - + Hide similar events - + Edit name - + Unhide all events - + Hide events - + Hide all %1 events? - + Remove the selected event? - + %1 @ %2:%3 - + Edit name of bookmark - + Custom name: @@ -2570,7 +2578,7 @@ p, li { white-space: pre-wrap; } - + Remove this point @@ -2897,42 +2905,42 @@ p, li { white-space: pre-wrap; } UpdateManager - + Check for updates. - + Subsurface was unable to check for updates. - + The following error occurred: - + Please check your internet connection. - + You are using the latest version of subsurface. - + A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it. - + <b>A new version of subsurface is available.</b><br/><br/>%1 - + There was an error while trying to check for updates.<br/><br/>%1 @@ -2945,8 +2953,8 @@ p, li { white-space: pre-wrap; } - - + + Cannot find the Subsurface manual @@ -3032,27 +3040,27 @@ Language: %1 - + Should we ask you later? - + Don't ask me again - + Ask later - + Submit user survey. - + Ask again? @@ -3063,27 +3071,27 @@ OS CPU Architecture: %1 - + Subsurface was unable to submit the user survey. - + The following error occurred: - + Please check your internet connection. - + Survey successfully submitted. - + There was an error while trying to check for updates.<br/><br/>%1 @@ -3253,13 +3261,13 @@ Maximum - + bar - + psi @@ -3270,16 +3278,16 @@ Maximum - - + + m - - + + ft @@ -3305,15 +3313,15 @@ Maximum - - + + lbs - - + + kg @@ -3323,36 +3331,36 @@ Maximum - - - - + + + + air - + integrated - + belt - + ankle - + backplate weight - + clip-on @@ -3655,131 +3663,130 @@ Maximum - + EAN%d - - + Can't find gas %s - + Too many gas mixes - + DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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. - + based on GFlow = %d and GFhigh = %d - + Subsurface dive plan - + depth - + runtime - + duration - + gas - + Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s - + Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s - + %3.0f%s - - + + %3dmin - + Switch gas to %s - + CNS - + OTU - + Gas consumption: - - - + + + Warning: - + this is more gas than available in the specified cylinder! - + not enough reserve for gas sharing on ascent! - + %.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent) - + %.0f%s (%.0f%s during planned ascent) of %s - + high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s - + ean @@ -3983,22 +3990,22 @@ EADD: %d%s - + C - + F - + %1 %2 (%3 dives) - + %1 %2 (1 dive) @@ -4148,97 +4155,97 @@ EADD: %d%s - + Sun - + Mon - + Tue - + Wed - + Thu - + Fri - + Sat - + Jan - + Feb - + Mar - + Apr - + May - + Jun - + Jul - + Aug - + Sep - + Oct - + Nov - + Dec @@ -4554,21 +4561,6 @@ Is the Uemis Zurich plugged in correctly? m/min - - - 75%-50% avg. depth - - - - - 50% avg. depth - 6m/20ft - - - - - 6m/20ft to surface - - Descent @@ -4601,7 +4593,7 @@ Is the Uemis Zurich plugged in correctly? - Last Stop at 6m/20ft + Last stop at 6m @@ -4665,6 +4657,21 @@ Is the Uemis Zurich plugged in correctly? bar + + + 75% to 50% avg. depth + + + + + 50% avg. depth to 6m + + + + + 6m to surface + + In dive plan, show runtime (absolute time) of stops