diff --git a/rtdata/languages/default b/rtdata/languages/default index 6ca934fe9..ec83bb7bb 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -11,10 +11,10 @@ ADJUSTER_RESET_TO_DEFAULT;Reset to default BATCHQUEUE_AUTOSTART;Auto-start BATCHQUEUE_DESTFILENAME;Path and file name BATCH_PROCESSING;Batch Processing -CURVEEDITOR_AXIS_LEFT_TAN;LT: -CURVEEDITOR_AXIS_RIGHT_TAN;RT: CURVEEDITOR_AXIS_IN;I: +CURVEEDITOR_AXIS_LEFT_TAN;LT: CURVEEDITOR_AXIS_OUT;O: +CURVEEDITOR_AXIS_RIGHT_TAN;RT: CURVEEDITOR_CURVES;Curves CURVEEDITOR_CURVE;Curve CURVEEDITOR_CUSTOM;Custom @@ -343,7 +343,7 @@ HISTORY_MSG_109;Resize - Bounding box HISTORY_MSG_110;Resize - Applies to HISTORY_MSG_111;L*a*b* - Avoid color shift HISTORY_MSG_112;--unused-- -HISTORY_MSG_113;L*a*b* - Protection +HISTORY_MSG_113;L*a*b* - Red/skin prot. HISTORY_MSG_114;DCB iterations HISTORY_MSG_115;False color suppression HISTORY_MSG_116;DCB enhancement @@ -380,7 +380,7 @@ HISTORY_MSG_146;Edge sharpening HISTORY_MSG_147;ES - Luminance only HISTORY_MSG_148;Microcontrast HISTORY_MSG_149;Microcontrast - 3x3 matrix -HISTORY_MSG_150;Post-demosaic artifact/noise reduction +HISTORY_MSG_150;Post-demosaic artifact/noise red. HISTORY_MSG_151;Vibrance HISTORY_MSG_152;Vib - Pastel tones HISTORY_MSG_153;Vib - Saturated tones @@ -481,7 +481,7 @@ HISTORY_MSG_248;L*a*b* - HH curve HISTORY_MSG_249;CbDL - Threshold HISTORY_MSG_250;NR - Enhanced HISTORY_MSG_251;B&W - Algorithm -HISTORY_MSG_252;CbDL - Skin-tones +HISTORY_MSG_252;CbDL - Skin tar/prot HISTORY_MSG_253;CbDL - Reduce artifacts HISTORY_MSG_254;CbDL - Skin hue HISTORY_MSG_255;NR - Median filter @@ -538,21 +538,21 @@ HISTORY_MSG_305;Wavelet Levels HISTORY_MSG_306;W - Preview HISTORY_MSG_307;W - Preview HISTORY_MSG_308;W - Preview direction -HISTORY_MSG_309;W - Edge sharpness - Detail -HISTORY_MSG_310;W - Residual - Hue tar/prot +HISTORY_MSG_309;W - ES - Detail +HISTORY_MSG_310;W - Residual - Sky tar/prot HISTORY_MSG_311;W - Wavelet levels HISTORY_MSG_312;W - Residual - Shadows threshold HISTORY_MSG_313;W - Chroma - Sat/past HISTORY_MSG_314;W - Gamut - Reduce artifacts HISTORY_MSG_315;W - Residual - Contrast -HISTORY_MSG_316;W - Gamut - Hue tar/prot -HISTORY_MSG_317;W - Gamut - Hue +HISTORY_MSG_316;W - Gamut - Skin tar/prot +HISTORY_MSG_317;W - Gamut - Skin hue HISTORY_MSG_318;W - Contrast - Highlight levels HISTORY_MSG_319;W - Contrast - Highlight range HISTORY_MSG_320;W - Contrast - Shadow range HISTORY_MSG_321;W - Contrast - Shadow levels HISTORY_MSG_322;W - Gamut - Avoid color shift -HISTORY_MSG_323;W - Edge sharpness - Local contrast curve +HISTORY_MSG_323;W - ES - Local contrast HISTORY_MSG_324;W - Chroma - Pastel HISTORY_MSG_325;W - Chroma - Saturated HISTORY_MSG_326;W - Chroma - Method @@ -566,27 +566,27 @@ HISTORY_MSG_333;W - Residual - Shadows HISTORY_MSG_334;W - Residual - Chroma HISTORY_MSG_335;W - Residual - Highlights HISTORY_MSG_336;W - Residual - Highlights threshold -HISTORY_MSG_337;W - Residual - Hue -HISTORY_MSG_338;W - Edge sharpness - Radius -HISTORY_MSG_339;W - Edge - Strength +HISTORY_MSG_337;W - Residual - Sky hue +HISTORY_MSG_338;W - ES - Radius +HISTORY_MSG_339;W - ES - Strength HISTORY_MSG_340;W - Strength HISTORY_MSG_341;W - Edge performance -HISTORY_MSG_342;W - Edge Sharpness - First level +HISTORY_MSG_342;W - ES - First level HISTORY_MSG_343;W - Chroma levels HISTORY_MSG_344;W - Meth chroma sl/cur -HISTORY_MSG_345;W - Edge sharpness - Local contrast -HISTORY_MSG_346;W - Edge sharpness - Local contrast method -HISTORY_MSG_347;W - Denoise and refine - Level 0 -HISTORY_MSG_348;W - Denoise and refine - Level 1 -HISTORY_MSG_349;W - Denoise and refine - Level 2 -HISTORY_MSG_350;W - Edge sharpness - Edge detection +HISTORY_MSG_345;W - ES - Local contrast +HISTORY_MSG_346;W - ES - Local contrast method +HISTORY_MSG_347;W - Denoise - Level 0 +HISTORY_MSG_348;W - Denoise - Level 1 +HISTORY_MSG_349;W - Denoise - Level 2 +HISTORY_MSG_350;W - ES - Edge detection HISTORY_MSG_351;W - Residual - HH curve HISTORY_MSG_352;W - Background -HISTORY_MSG_353;W - Edge sharpness - Gradient sensitivity -HISTORY_MSG_354;W - Edge sharpness - Enhance -HISTORY_MSG_355;W - Edge sharpness - Threshold low -HISTORY_MSG_356;W - Edge sharpness - Threshold high -HISTORY_MSG_357;W - Denoise and refine - Link with edge sharpness +HISTORY_MSG_353;W - ES - Gradient sensitivity +HISTORY_MSG_354;W - ES - Enhance +HISTORY_MSG_355;W - ES - Threshold low +HISTORY_MSG_356;W - ES - Threshold high +HISTORY_MSG_357;W - Denoise - Link with ES HISTORY_MSG_358;W - Gamut - CH HISTORY_MSG_359;Hot/Dead - Threshold HISTORY_MSG_360;TM Gamma @@ -594,10 +594,10 @@ HISTORY_MSG_361;W - Final - Chroma balance HISTORY_MSG_362;W - Residual - Compression method HISTORY_MSG_363;W - Residual - Compression strength HISTORY_MSG_364;W - Final - Contrast balance -HISTORY_MSG_365;W - Finals - Delta balance +HISTORY_MSG_365;W - Final - Delta balance HISTORY_MSG_366;W - Residual - Compression gamma -HISTORY_MSG_367;W - Edge sharpness - Local contrast curve -HISTORY_MSG_368;W - Final - Balance curve +HISTORY_MSG_367;W - ES - Local contrast curve +HISTORY_MSG_368;W - Final - Contrast balance HISTORY_MSG_369;W - Final - Balance method HISTORY_MSG_370;W - Final - Local contrast curve HISTORY_NEWSNAPSHOT;Add @@ -913,8 +913,8 @@ PREFERENCES_LANGAUTODETECT;Use system language PREFERENCES_LEVAUTDN;Denoising level PREFERENCES_LEVDN;Cell size PREFERENCES_LISS;Auto multi-zone smoothing -PREFERENCES_MAX;Maxi (Tile) PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders +PREFERENCES_MAX;Maxi (Tile) PREFERENCES_MED;Medium (Tile/2) PREFERENCES_MENUGROUPEXTPROGS;Group "Open with" PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations" @@ -1187,7 +1187,7 @@ TP_COLORAPP_LIGHT_TOOLTIP;Lightness in CIECAM02 differs from L*a*b* and RGB ligh TP_COLORAPP_MODEL;WP Model TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\nWB [RT] + [output]: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Preferences > Color Management.\n\nWB [RT+CAT02] + [output]: RT's white balance settings are used by CAT02 and the output device's white balance is set in Preferences - Color Management. TP_COLORAPP_RSTPRO;Red & skin-tones protection -TP_COLORAPP_RSTPRO_TOOLTIP;Red and skin-tones protection (sliders and curves). +TP_COLORAPP_RSTPRO_TOOLTIP;Red and skin-tones protection affects both sliders and curves. TP_COLORAPP_SHARPCIE;--unused-- TP_COLORAPP_SHARPCIE_TOOLTIP;--unused-- TP_COLORAPP_SURROUND;Surround @@ -1345,7 +1345,7 @@ TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast - TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast + TP_DIRPYREQUALIZER_LUMAFINEST;Finest TP_DIRPYREQUALIZER_LUMANEUTRAL;Neutral -TP_DIRPYREQUALIZER_SKIN;Skin-tones targetting/protection +TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected. TP_DIRPYREQUALIZER_THRESHOLD;Threshold TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image. @@ -1647,6 +1647,14 @@ TP_WAVELET_AVOID;Avoid color shift TP_WAVELET_B0;Black TP_WAVELET_B1;Grey TP_WAVELET_B2;Residual +TP_WAVELET_BACUR;Curve +TP_WAVELET_BALANCE;Contrast balance d/v-h +TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chromaticity or residual tone mapping are activated, the effect due to balance is amplified. +TP_WAVELET_BALCHRO;Chroma balance +TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chromaticity balance. +TP_WAVELET_BANONE;None +TP_WAVELET_BASLI;Slider +TP_WAVELET_BATYPE;Contrast balance method TP_WAVELET_CCURVE;Local contrast TP_WAVELET_CH1;Whole chromaticity range TP_WAVELET_CH2;Saturated/pastel @@ -1663,27 +1671,27 @@ TP_WAVELET_COMBOTH;Both TP_WAVELET_COMPCONT;Contrast TP_WAVELET_COMPGAMMA;Compression gamma TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allow you to equilibrate the data and histogram. +TP_WAVELET_COMPGAMMA_TOOLTIP;Adjust gamma for residual image and compression.\nAllow to equilibrate data and histogram TP_WAVELET_COMPTM;Tone mapping +TP_WAVELET_CONTEDIT;'After' Contrast curve TP_WAVELET_CONTEDIT;'After' contrast curve TP_WAVELET_CONTRAST_MINUS;Contrast - TP_WAVELET_CONTRAST_PLUS;Contrast + TP_WAVELET_CONTRA;Contrast -TP_WAVELET_CTYPE;Chrominance control TP_WAVELET_CONTRA_TOOLTIP;Changes contrast of the residual image. TP_WAVELET_CONTR;Gamut +TP_WAVELET_CTYPE;Chrominance control TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifies local contrast as a function of the original local contrast (absciss)\nLow absciss represents small local contrast (real values about 10..20)\n50% absciss represents average of local contrast (real value about 100..300)\n66% absciss represents standard deviation of local contrast (real value about 300..800)\n100% represents maximum (real value about 3000..8000) TP_WAVELET_CURVEEDITOR_CH;Contrast levels=f(Hue) TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifies each level's contrast as a function oh hue.\nTake care not to overwrite changes made with the Gamut Hue controls.\nThe curve will only have an effect when wavelet contrast level sliders are non-zero. TP_WAVELET_CURVEEDITOR_CL;L TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applies a final contrast luminance curve at the end of the wavelet treatment. -TP_WAVELET_CONTEDIT;'After' Contrast curve -TP_WAVELET_CURVEEDITOR_CL;L TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Apply a contrast luminance curve at the end of wavelet level threatment TP_WAVELET_CURVEEDITOR_HH;HH TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifies the residual image's hue as a function of hue. TP_WAVELET_DALL;All directions TP_WAVELET_DAUB;Edge performance -TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels.\nHowever the quality is not strictly related to this coefficient and can vary with images and uses +TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses. TP_WAVELET_DISP;Preview Settings TP_WAVELET_DONE;Vertical TP_WAVELET_DTHR;Diagonal @@ -1705,15 +1713,18 @@ TP_WAVELET_EDRAD_TOOLTIP;This radius adjustment is very different from those in TP_WAVELET_EDSL;Threshold Sliders TP_WAVELET_EDTYPE;Local contrast method TP_WAVELET_EDVAL;Strength +TP_WAVELET_FINAL;Final Touchup TP_WAVELET_FINEST;Finest TP_WAVELET_HIGHLIGHT;Highlight luminance range TP_WAVELET_HS1;Whole luminance range TP_WAVELET_HS2;Shadows/Highlights -TP_WAVELET_HUESKIN;Hue range (skin) +TP_WAVELET_HUESKIN;Skin hue TP_WAVELET_HUESKIN_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the white balance is incorrect. -TP_WAVELET_HUESKY;Hue range (sky) +TP_WAVELET_HUESKY;Sky hue TP_WAVELET_HUESKY_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the white balance is incorrect. TP_WAVELET_INF;Below or equal the level +TP_WAVELET_ITER;Delta balance levels +TP_WAVELET_ITER_TOOLTIP;Left: increase low levels and reduce high levels,\nRight: reduce low levels and increase high levels. TP_WAVELET_LABEL;Wavelet levels TP_WAVELET_LARGEST;Coarsest TP_WAVELET_LEVCH;Chromaticity @@ -1736,6 +1747,7 @@ TP_WAVELET_NOISE;Denoise and Refine TP_WAVELET_NOIS;Denoise TP_WAVELET_ONE;One level TP_WAVELET_OPACITYWL;Final local contrast +TP_WAVELET_OPACITYWL_TOOLTIP;Modify final local contrast in function of last local contrast (absciss) for all levels decomposition\nTake into account: \na)contrast levels \nb)edge sharpness \nc)contrast balance\nd)decomposition-recomposition\nLow absciss represents small local contrast (real values about 10..20)\n50% absciss represents average of local contrast (real value about 200..1000)\n66% absciss represents standard deviation of local contrast (real value about 1000..2000)\n100% represents maximum (real value about 5000..13000) TP_WAVELET_OPACITYWL_TOOLTIP;Modify the final local contrast at the end of the wavelet treatment.\n\nThe left side represents the smallest local contrast, progressing to the largest local contrast on the right. TP_WAVELET_OPACITYW;Contrast balance d/v-h curve TP_WAVELET_OPACITY;Opacity Blue-Yellow @@ -1749,36 +1761,11 @@ TP_WAVELET_RESCHRO;Chromaticity TP_WAVELET_RESCONH;Highlights TP_WAVELET_RESCON;Shadows TP_WAVELET_RESID;Residual image -TP_WAVELET_TMTYPE;Compression method -TP_WAVELET_COMPCONT;Contrast -TP_WAVELET_COMPTM;Tone mapping -TP_WAVELET_COMBOTH;Both -TP_WAVELET_BATYPE;Balance method -TP_WAVELET_BANONE;None -TP_WAVELET_BASLI;Slider -TP_WAVELET_BACUR;Curve -TP_WAVELET_BALANCE;Contrast balance diagonal / vertical-horizontal -TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chromaticity or residual tone mapping are activated, the effect due to balance is amplified. -TP_WAVELET_BALCHRO;Chroma balance -TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chromaticity balance. -TP_WAVELET_BANONE;None -TP_WAVELET_BASLI;Slider -TP_WAVELET_BATYPE;Balance method -TP_WAVELET_OPACITYW;Contrast balance d/v-h curve -TP_WAVELET_ITER;Delta balance levels -TP_WAVELET_ITER_TOOLTIP;Left: increase low levels and reduce high levels,\nRight: reduce low levels and increase high levels. -TP_WAVELET_OPACITYWL;Final local contrast -TP_WAVELET_OPACITYWL_TOOLTIP;Modify final local contrast in function of last local contrast (absciss) for all levels decomposition\nTake into account: \na)contrast levels \nb)edge sharpness \nc)contrast balance\nd)decomposition-recomposition\nLow absciss represents small local contrast (real values about 10..20)\n50% absciss represents average of local contrast (real value about 200..1000)\n66% absciss represents standard deviation of local contrast (real value about 1000..2000)\n100% represents maximum (real value about 5000..13000) -TP_WAVELET_COMPGAMMA;Gamma -TP_WAVELET_COMPGAMMA_TOOLTIP;Adjust gamma for residual image and compression.\nAllow to equilibrate data and histogram -TP_WAVELET_TMHIGH;High -TP_WAVELET_TMLOWHIGH;Low+High TP_WAVELET_SAT;Saturated chromaticity TP_WAVELET_SETTINGS;Wavelet Settings -TP_WAVELET_FINAL;Final Touchup -TP_WAVELET_SKIN;Hue-tones (skin) targetting/protection +TP_WAVELET_SKIN;Skin targetting/protection TP_WAVELET_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected. -TP_WAVELET_SKY;Hue-tones (sky) targetting/protection +TP_WAVELET_SKY;Sky targetting/protection TP_WAVELET_SKY_TOOLTIP;At -100 sky-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 sky-tones are protected while all other tones are affected. TP_WAVELET_STRENGTH;Strength TP_WAVELET_STREN;Strength diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc index 0e8bdb10d..0b1b98b64 100644 --- a/rtgui/dirpyrequalizer.cc +++ b/rtgui/dirpyrequalizer.cc @@ -98,17 +98,17 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer", // pack_start(*algoHBox); algoconn = algo->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrEqualizer::algoChanged) ); */ - skinprotect = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_SKIN"), -100, 100, 1, 0.) ); - skinprotect->setAdjusterListener(this); - pack_start(*skinprotect); - skinprotect->set_tooltip_markup (M("TP_DIRPYREQUALIZER_SKIN_TOOLTIP")); - hueskin = Gtk::manage (new ThresholdAdjuster (M("TP_DIRPYREQUALIZER_HUESKIN"), -40., 210., -5., 25., 170., 120., 0, false)); //default (b_l 0, t_l 30, b_r 170, t_r 120); hueskin->set_tooltip_markup (M("TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP")); hueskin->setBgGradient(milestones); pack_start(*hueskin); + skinprotect = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_SKIN"), -100, 100, 1, 0.) ); + skinprotect->setAdjusterListener(this); + pack_start(*skinprotect); + skinprotect->set_tooltip_markup (M("TP_DIRPYREQUALIZER_SKIN_TOOLTIP")); + gamutlab = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYREQUALIZER_ARTIF"))); gamutlab->set_active (true); pack_start(*gamutlab); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index a67233f59..94f97ebce 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -598,18 +598,18 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"), medianConn = median->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::medianToggled) ); conBox->pack_start(*median); - skinprotect = Gtk::manage ( new Adjuster (M("TP_WAVELET_SKIN"), -100, 100, 1, 0.) ); - skinprotect->setAdjusterListener(this); - conBox->pack_start(*skinprotect); - skinprotect->set_tooltip_markup (M("TP_WAVELET_SKIN_TOOLTIP")); - - hueskin = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKIN"), -314., 314., -5., 25., 170., 120., 0, false)); + hueskin = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKIN"), -314., 314., -5., 25., 170., 120., 0, false)); hueskin->set_tooltip_markup (M("TP_WAVELET_HUESKIN_TOOLTIP")); hueskin->setBgGradient(milestones); conBox->pack_start(*hueskin); hueskin->setAdjusterListener (this); + skinprotect = Gtk::manage ( new Adjuster (M("TP_WAVELET_SKIN"), -100, 100, 1, 0.) ); + skinprotect->setAdjusterListener(this); + conBox->pack_start(*skinprotect); + skinprotect->set_tooltip_markup (M("TP_WAVELET_SKIN_TOOLTIP")); + curveEditorGAM = new CurveEditorGroup (options.lastWaveletCurvesDir); curveEditorGAM->setCurveListener (this); @@ -696,7 +696,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"), Gtk::HSeparator *separatorR1 = Gtk::manage (new Gtk::HSeparator()); resBox->pack_start(*separatorR1, Gtk::PACK_SHRINK, 2); - hueskin2 = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKY"), -314., 314., -260., -250, -130., -140., 0, false)); + hueskin2 = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKY"), -314., 314., -260., -250, -130., -140., 0, false)); hueskin2->set_tooltip_markup (M("TP_WAVELET_HUESKY_TOOLTIP")); hueskin2->setBgGradient(milestones); resBox->pack_start(*hueskin2);