Merge branch 'dev' into boxblur_cleanup

AUTHORS.txt

@@ -39,6 +39,7 @@ Development contributors, in last name alphabetical order:
 Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order:
 
   Marcin Bajor
+  Javier Bartol
   Thorsten Bartolomäus
   Patrik Brunner
   Fernando Carello

rtdata/languages/Catala

@@ -1293,6 +1293,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1310,6 +1311,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1330,6 +1332,13 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1340,6 +1349,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1786,6 +1796,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1856,9 +1867,9 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1935,6 +1946,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
 !TP_PCVIGNETTE_STRENGTH;Strength
 !TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filter strength in stops (reached in corners).
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PFCURVE_CURVEEDITOR_CH;Hue
 !TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controls defringe strength by color.\nHigher = more,\nLower = less.
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
@@ -2110,6 +2122,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_SAVEDIALOG_OK_TIP;Shortcut: <b>Ctrl-Enter</b>
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Chinese (Simplified)

@@ -1340,6 +1340,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1357,6 +1358,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1377,6 +1379,13 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1387,6 +1396,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1732,6 +1742,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_DEFRINGE_THRESHOLD;Threshold
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1803,9 +1814,9 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1896,6 +1907,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_NEUTRAL_TIP;Resets exposure sliders to neutral values.\nApplies to the same controls that Auto Levels applies to, regardless of whether you used Auto Levels or not.
 !TP_PCVIGNETTE_FEATHER_TOOLTIP;Feathering:\n0 = corners only,\n50 = halfway to center,\n100 = to center.
 !TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PFCURVE_CURVEEDITOR_CH;Hue
 !TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controls defringe strength by color.\nHigher = more,\nLower = less.
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
@@ -2078,6 +2090,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5

rtdata/languages/Czech

@@ -961,8 +961,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Barva pozadí náhledu: <b>bílá</b>\nZkratka: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR3;Barva pozadí náhledu: <b>středně šedá</b>\nZkratka: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Zamknout</b> / <b>Odemknout</b> pohled <b>Před</b>\n\n<b>Zamknout</b>: ponechá pohled <b>Před</b> nezměněn.\nUžitečné pro posouzení výsledného efektu po použití více nástrojů.\nNavíc může být porovnání provedeno proti kterémukoli stavu v historii.\n\n<b>Odemknout</b>: pohled <b>Před</b> bude následovat pohled <b>Poté</b>, vždy jen o jeden krok zpět, představí vliv právě použitého nástroje.
 MAIN_TOOLTIP_HIDEHP;Zobrazit či schovat levý panel (obsahující historii).\nZkratka: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Zvýraznit oříznutá světla.\nZkratka: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Zvýraznit oříznutá světla.\nZkratka: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Zvýraznit oříznuté stíny.\nZkratka: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Zvýraznit oříznuté stíny.\nZkratka: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Náhled <b>modrého kanálu</b>.\nZkratka: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Náhled <b>masky zaostření</b>.\nZkratka: <b>Shift-f</b>\n\nVíce přesné u snímků s nízkou hloubkou ostrosti, nízkým šumem a na vyšších úrovních zvětšení.\n\nPoužijte přiblížení v rozsahu 10 až 30% pro zlepšení přesnosti detekce u zašuměných snímků.
 MAIN_TOOLTIP_PREVIEWG;Náhled <b>zeleného kanálu</b>.\nZkratka: <b>g</b>
@@ -2323,13 +2323,27 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
 !FILEBROWSER_POPUPREMOVE;Delete permanently
 !FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
 !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
+!HISTORY_MSG_494;Capture Sharpening
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 !HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !PARTIALPASTE_FILMNEGATIVE;Film Negative
 !PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
+!TP_PDSHARPENING_LABEL;Capture Sharpening
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Deutsch

@@ -82,6 +82,7 @@
 #81 15.04.2019 Erweiterung (TooWaBoo) RT 5.6
 #82 25.05.2019 Erweiterung (TooWaBoo) RT 5.6
 #83 06.07.2019 Erweiterung (TooWaBoo) RT 5.6
+#84 06.10.2019 Erweiterung (TooWaBoo) RT 5.7
 #84 18.07.2019 Erweiterung (TooWaBoo) RT 5.6
 
 ABOUT_TAB_BUILD;Version
@@ -808,6 +809,7 @@ HISTORY_MSG_490;(Dynamikkompression)\nIntensität
 HISTORY_MSG_491;(Weißabgleich)
 HISTORY_MSG_492;(RGB-Kurven)
 HISTORY_MSG_493;(L*a*b*)
+HISTORY_MSG_494;(Eingangsschärfung)
 HISTORY_MSG_CLAMPOOG;(Belichtung) - Farben\nauf Farbraum beschränken
 HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b*-Farbkorrektur
 HISTORY_MSG_COLORTONING_LABREGION_AB;(Farbanpassungen)\nL*a*b*-Farbkorrektur\nBereich
@@ -825,6 +827,7 @@ HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;(Farbanpassungen)\nL*a*b*-Farbkorrekt
 HISTORY_MSG_COLORTONING_LABREGION_SLOPE;(Farbanpassungen)\nL*a*b*-Farbkorrektur\nBereich - Steigung
 HISTORY_MSG_DEHAZE_DEPTH;(Bildschleier entfernen)\nTiefe
 HISTORY_MSG_DEHAZE_ENABLED;(Bildschleier entfernen)
+HISTORY_MSG_DEHAZE_LUMINANCE;(Bildschleier entfernen)\nNur Luminanz
 HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;(Bildschleier entfernen)\nMaske anzeigen
 HISTORY_MSG_DEHAZE_STRENGTH;(Bildschleier entfernen)\nIntensität
 HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;(Sensor—Matrix)\nFarbinterpolation\nAuto-Kontrastschwelle
@@ -845,6 +848,13 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;(Lokaler Kontrast)\nHelle Bereiche
 HISTORY_MSG_LOCALCONTRAST_RADIUS;(Lokaler Kontrast)\nRadius
 HISTORY_MSG_METADATA_MODE;(Metadaten)\nKopiermodus
 HISTORY_MSG_MICROCONTRAST_CONTRAST;(Mikrokontrast)\nKontrastschwelle
+HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;(Eingangsschärfung)\nAuto-Schwelle
+HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;(Eingangsschärfung)\nAuto-Radius
+HISTORY_MSG_PDSHARPEN_CONTRAST;(Eingangsschärfung)\nKontrastschwelle
+HISTORY_MSG_PDSHARPEN_GAMMA;(Eingangsschärfung)\nGamma
+HISTORY_MSG_PDSHARPEN_ITERATIONS;(Eingangsschärfung)\nIterationen
+HISTORY_MSG_PDSHARPEN_RADIUS;(Eingangsschärfung)\nRadius
+HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;(Eingangsschärfung)\nRandschärfe erhöhen
 HISTORY_MSG_PIXELSHIFT_DEMOSAIC;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungsmethode
 HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nRichtung
 HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter
@@ -855,6 +865,7 @@ HISTORY_MSG_RAW_BORDER;(Sensor-Matrix)\nFarbinterpolation\nBildrand
 HISTORY_MSG_RESIZE_ALLOWUPSCALING;(Skalieren)\nHochskalieren zulassen
 HISTORY_MSG_SHARPENING_BLUR;(Schärfung)\nWeichzeichnerradius
 HISTORY_MSG_SHARPENING_CONTRAST;(Schärfung)\nKontrastschwelle
+HISTORY_MSG_SHARPENING_GAMMA;(Schärfung) - Gamma
 HISTORY_MSG_SH_COLORSPACE;Farbraum
 HISTORY_MSG_SOFTLIGHT_ENABLED;(Weiches Licht)
 HISTORY_MSG_SOFTLIGHT_STRENGTH;(Weiches Licht)\nIntensität
@@ -1011,8 +1022,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Hintergrundfarbe der Vorschau: <b>Weiß</b>\nTaste: <b>9
 MAIN_TOOLTIP_BACKCOLOR3;Hintergrundfarbe der Vorschau: <b>Mittleres Grau</b>\nTaste: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Vorher-Ansicht:</b> Sperren / Entsperren\n\n<b>Gesperrt</b>: Friert die Vorher-Ansicht ein, so\ndass sich die Gesamtwirkung mehrerer\nBearbeitungsschritte beurteilen lässt.\n\n<b>Entsperrt</b>: Die Vorher-Ansicht hinkt dem\naktuellen Bild immer einen Bearbeitungs-\nschritt hinterher.
 MAIN_TOOLTIP_HIDEHP;Linkes Bedienfeld ein-/ausblenden.\nTaste: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten.\nTaste: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten.\nTaste: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Anzeige zu dunkler Bereiche ein-/ausschalten.\nTaste: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Anzeige zu dunkler Bereiche ein-/ausschalten.\nTaste: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Vorschau Blau-Kanal\nTaste: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Vorschau Fokusmaske\nTaste: <b>Umschalt</b> + <b>f</b>\n\nPräziser bei Bildern mit geringer Tiefenschärfe,\nniedrigem Rauschen und bei hoher Vergrößerung.
 MAIN_TOOLTIP_PREVIEWG;Vorschau Grün-Kanal\nTaste: <b>g</b>
@@ -1613,6 +1624,7 @@ TP_DEFRINGE_RADIUS;Radius
 TP_DEFRINGE_THRESHOLD;Schwelle
 TP_DEHAZE_DEPTH;Tiefe
 TP_DEHAZE_LABEL;Bildschleier entfernen
+TP_DEHAZE_LUMINANCE;Nur Luminanz
 TP_DEHAZE_SHOW_DEPTH_MAP;Maske anzeigen
 TP_DEHAZE_STRENGTH;Intensität
 TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto-Multizonen
@@ -1723,9 +1735,9 @@ TP_EXPOS_BLACKPOINT_LABEL;Schwarzpunkt
 TP_EXPOS_WHITEPOINT_LABEL;Weißpunkt
 TP_FILMNEGATIVE_BLUE;Blauverhältnis
 TP_FILMNEGATIVE_GREEN;Bezugsexponent (Kontrast)
-TP_FILMNEGATIVE_GUESS_TOOLTIP;Berechnet die Exponenten durch Auswahl zweier neutraler\nReferenzpunkte im Bild. Weiß (Hellgrau) und Schwarz (Dunkelgrau).\nDie Reihenfolge spielt keine Rolle. Die Exponenten werden aktualisiert,\nnachdem der zweite Punkt ausgewählt wurde.
+TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 TP_FILMNEGATIVE_LABEL;Filmnegativ
-TP_FILMNEGATIVE_PICK;Weißen und schwarzen Bereich auswählen
+TP_FILMNEGATIVE_PICK;Pick neutral spots
 TP_FILMNEGATIVE_RED;Rotverhältnis
 TP_FILMSIMULATION_LABEL;Filmsimulation
 TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee sucht nach Hald-CLUT-Bildern, die für die Filmsimulation benötigt werden, in einem Ordner, der viel Zeit benötigt.\nGehen Sie zu\n< Einstellungen > Bildbearbeitung > Filmsimulation >\nund prüfen Sie welcher Order benutzt wird. Wählen Sie den Ordner aus, der nur die Hald-CLUT-Bilder beinhaltet, oder einen leeren Ordner, wenn Sie die Filsimulation nicht verwenden möchten.\n\nWeitere Informationen über die Filmsimulation finden Sie auf RawPedia.\n\nMöchten Sie die Suche beenden?
@@ -1875,6 +1887,7 @@ TP_PCVIGNETTE_ROUNDNESS;Form
 TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Form:\n0 = Rechteck\n50 = Ellipse\n100 = Kreis
 TP_PCVIGNETTE_STRENGTH;Intensität
 TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen (bezogen auf die Bildecken).
+TP_PDSHARPENING_LABEL;Eingangsschärfung
 TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspektive
 TP_PERSPECTIVE_VERTICAL;Vertikal
@@ -2104,12 +2117,14 @@ TP_SHARPENING_BLUR;Weichzeichnerradius
 TP_SHARPENING_CONTRAST;Kontrastschwelle
 TP_SHARPENING_EDRADIUS;Radius
 TP_SHARPENING_EDTOLERANCE;Kantentoleranz
+TP_SHARPENING_GAMMA;Gamma
 TP_SHARPENING_HALOCONTROL;Halokontrolle
 TP_SHARPENING_HCAMOUNT;Intensität
 TP_SHARPENING_LABEL;Schärfung
 TP_SHARPENING_METHOD;Methode
 TP_SHARPENING_ONLYEDGES;Nur Kanten schärfen
 TP_SHARPENING_RADIUS;Radius
+TP_SHARPENING_RADIUS_BOOST;Randschärfe erhöhen
 TP_SHARPENING_RLD;RL-Dekonvolution
 TP_SHARPENING_RLD_AMOUNT;Intensität
 TP_SHARPENING_RLD_DAMPING;Dämpfung

rtdata/languages/English (UK)

@@ -88,6 +88,7 @@ TP_DIRPYREQUALIZER_ALGO;Skin Colour Range
 TP_DIRPYREQUALIZER_ALGO_TOOLTIP;Fine: closer to the colours of the skin, minimizing the action on other colours\nLarge: avoid more artifacts.
 TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colours (hue, chroma, luma) and the rest of the image.
 TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colours
+TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no colour) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Clip control avoids clipped highlights caused by applying the flat field. If there are already clipped highlights before applying the flat field, clip control can lead to colour cast.
 TP_GRADIENT_CENTER;Centre
 TP_GRADIENT_CENTER_X;Centre X
@@ -820,6 +821,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel
 !HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;CT - region C mask
 !HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;CT - H mask
@@ -834,6 +836,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -854,6 +857,13 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -863,6 +873,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
 !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
@@ -1012,8 +1023,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !MAIN_TAB_TRANSFORM_TOOLTIP;Shortcut: <b>Alt-t</b>
 !MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Lock</b> / <b>Unlock</b> the <b>Before</b> view\n\n<b>Lock</b>: keep the <b>Before</b> view unchanged.\nUseful to evaluate the cumulative effect of multiple tools.\nAdditionally, comparisons can be made to any state in the History.\n\n<b>Unlock</b>: the <b>Before</b> view will follow the <b>After</b> view one step behind, showing the image before the effect of the currently used tool.
 !MAIN_TOOLTIP_HIDEHP;Show/Hide the left panel (including the history).\nShortcut: <b>l</b>
-!MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&lt;</b>
+!MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&gt;</b>
-!MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&gt;</b>
+!MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&lt;</b>
 !MAIN_TOOLTIP_PREVIEWB;Preview the <b>blue channel</b>.\nShortcut: <b>b</b>
 !MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the <b>focus mask</b>.\nShortcut: <b>Shift-f</b>\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\nZoom out to 10-30% to improve detection accuracy on noisy images.
 !MAIN_TOOLTIP_PREVIEWG;Preview the <b>green channel</b>.\nShortcut: <b>g</b>
@@ -1568,6 +1579,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_DEFRINGE_THRESHOLD;Threshold
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1670,9 +1682,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1808,6 +1819,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
 !TP_PCVIGNETTE_STRENGTH;Strength
 !TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filter strength in stops (reached in corners).
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PERSPECTIVE_HORIZONTAL;Horizontal
 !TP_PERSPECTIVE_LABEL;Perspective
 !TP_PERSPECTIVE_VERTICAL;Vertical
@@ -2031,12 +2043,14 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_SHARPENING_CONTRAST;Contrast threshold
 !TP_SHARPENING_EDRADIUS;Radius
 !TP_SHARPENING_EDTOLERANCE;Edge tolerance
+!TP_SHARPENING_GAMMA;Gamma
 !TP_SHARPENING_HALOCONTROL;Halo control
 !TP_SHARPENING_HCAMOUNT;Amount
 !TP_SHARPENING_LABEL;Sharpening
 !TP_SHARPENING_METHOD;Method
 !TP_SHARPENING_ONLYEDGES;Sharpen only edges
 !TP_SHARPENING_RADIUS;Radius
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENING_RLD;RL Deconvolution
 !TP_SHARPENING_RLD_AMOUNT;Amount
 !TP_SHARPENING_RLD_DAMPING;Damping

rtdata/languages/English (US)

@@ -727,6 +727,7 @@
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -744,6 +745,7 @@
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -764,6 +766,13 @@
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -774,6 +783,7 @@
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -929,8 +939,8 @@
 !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>middle grey</b>\nShortcut: <b>9</b>
 !MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Lock</b> / <b>Unlock</b> the <b>Before</b> view\n\n<b>Lock</b>: keep the <b>Before</b> view unchanged.\nUseful to evaluate the cumulative effect of multiple tools.\nAdditionally, comparisons can be made to any state in the History.\n\n<b>Unlock</b>: the <b>Before</b> view will follow the <b>After</b> view one step behind, showing the image before the effect of the currently used tool.
 !MAIN_TOOLTIP_HIDEHP;Show/Hide the left panel (including the history).\nShortcut: <b>l</b>
-!MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&lt;</b>
+!MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&gt;</b>
-!MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&gt;</b>
+!MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&lt;</b>
 !MAIN_TOOLTIP_PREVIEWB;Preview the <b>blue channel</b>.\nShortcut: <b>b</b>
 !MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the <b>focus mask</b>.\nShortcut: <b>Shift-f</b>\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\nZoom out to 10-30% to improve detection accuracy on noisy images.
 !MAIN_TOOLTIP_PREVIEWG;Preview the <b>green channel</b>.\nShortcut: <b>g</b>
@@ -1531,6 +1541,7 @@
 !TP_DEFRINGE_THRESHOLD;Threshold
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1641,9 +1652,9 @@
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1793,6 +1804,7 @@
 !TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
 !TP_PCVIGNETTE_STRENGTH;Strength
 !TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filter strength in stops (reached in corners).
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PERSPECTIVE_HORIZONTAL;Horizontal
 !TP_PERSPECTIVE_LABEL;Perspective
 !TP_PERSPECTIVE_VERTICAL;Vertical
@@ -2021,12 +2033,14 @@
 !TP_SHARPENING_CONTRAST;Contrast threshold
 !TP_SHARPENING_EDRADIUS;Radius
 !TP_SHARPENING_EDTOLERANCE;Edge tolerance
+!TP_SHARPENING_GAMMA;Gamma
 !TP_SHARPENING_HALOCONTROL;Halo control
 !TP_SHARPENING_HCAMOUNT;Amount
 !TP_SHARPENING_LABEL;Sharpening
 !TP_SHARPENING_METHOD;Method
 !TP_SHARPENING_ONLYEDGES;Sharpen only edges
 !TP_SHARPENING_RADIUS;Radius
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENING_RLD;RL Deconvolution
 !TP_SHARPENING_RLD_AMOUNT;Amount
 !TP_SHARPENING_RLD_DAMPING;Damping

rtdata/languages/Espanol

@@ -979,8 +979,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Color de fondo de la previsualización: <b>Blanco</b>\nT
 MAIN_TOOLTIP_BACKCOLOR3;Color de fondo de la vista previa: <b> Medio gris </b> \nMétodo rápido: <b> 9 </b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Bloquear</b> / <b>Desbloquear</b> la vista <b>Antes</b>\n\n<b>Bloquear</b>: la vista <b>Antes</b> permanece inalterada - \nútil para evaluar el efecto acumulativo de varias herramientas.\nAdemás, se puede hacer una comparación con cualquier estado en el Historial\n\n<b>Desbloquear</b>: la vista <b>Antes</b> seguirá a la vista <b>Después</b> un paso por detrás, mostrando la imagen antes del efecto de la herramienta que se está usando
 MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar panel izquierdo (incluyendo historial).\nTecla de Atajo: <b>i</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas.\nTecla de Atajo: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas.\nTecla de Atajo: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Indicación de sombras recortadas.\nTecla de Atajo: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Indicación de sombras recortadas.\nTecla de Atajo: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Previsualización <b>Canal azul</b>.\nTecla de Atajo: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Previsualización <b>Máscara de Foco</b>.\nTecla de Atajo: <b>Shift-F</b>\n\nMás preciso en imágenes con poca profundidad de campo, bajo ruido y a mayores niveles de aumento\n\nPara mejorar la precisión en imágenes con ruido evalúe usando menor aumento (10%-30%)\n\nLa vista previa es realizada más lentamente cuando la Máscara de Foco esta activa.
 MAIN_TOOLTIP_PREVIEWG;Previsualización <b>Canal verde</b>.\nTecla de Atajo: <b>g</b>
@@ -2321,9 +2321,19 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: <b>-</b>
 !FILEBROWSER_POPUPREMOVE;Delete permanently
 !FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
 !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
+!HISTORY_MSG_494;Capture Sharpening
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 !HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !MAIN_FRAME_PLACES_DEL;Remove
 !MAIN_TAB_FAVORITES;Favorites
 !MAIN_TAB_FAVORITES_TOOLTIP;Shortcut: <b>Alt-u</b>
@@ -2345,18 +2355,22 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: <b>-</b>
 !PROGRESSBAR_RAWCACORR;Raw CA correction...
 !QUEUE_LOCATION_TITLE;Output Location
 !TP_CROP_PPI;PPI
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically selected
 !TP_LENSPROFILE_CORRECTION_MANUAL;Manually selected
 !TP_LENSPROFILE_MODE_HEADER;Lens Profile
 !TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
 !TP_LENSPROFILE_USE_HEADER;Correct
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_RAW_IMAGENUM_SN;SN mode
 !TP_RAW_XTRANS;X-Trans
 !TP_RAW_XTRANSFAST;Fast X-Trans
 !TP_SHARPENING_BLUR;Blur radius
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Francais

@@ -916,8 +916,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Couleur de fond de l'aperçu: <b>Blanc</b>\nRaccourci: <
 MAIN_TOOLTIP_BACKCOLOR3;Couleur de fond de l'aperçu: <b>Gris moyen</b>\nRaccourci : <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Vérouille</b> / <b>déverouille</b> la vue <b>Avant</b>\n\n<b>Vérouille</b>: garde la vue <b>Avant</b> inchangée - \nutile pour évaluer l'effet cumulatif de plusieurs outils.\nDe plus, une comparaison peut être faite à partir de n'importe quelle étape de l'historique\n\n<b>Déverouille</b>: la vue <b>Avant</b> représentera l'étape précédant la vue <b>Après</b>, montrant l'effet qui vient d'être modifié
 MAIN_TOOLTIP_HIDEHP;Montrer/cacher le panneau gauche (incluant l'historique)\nRaccourci: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Indication hautes lumières hors domaine\nRaccourci: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Indication hautes lumières hors domaine\nRaccourci: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Indication ombres hors domaine\nRaccourci: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Indication ombres hors domaine\nRaccourci: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Affichage du <b>canal Bleu</b>\nRaccourci: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Affichage du <b>Masque du focus</b>\nRaccourci: <b>Shift-f</b>\n\nPlus précis sur les images avec une faible profondeur de champ, à faible bruit et à des niveaux de zoom élevé\n\nPour améliorer la précision de détection des images bruitées, évaluez les à un facteur de zoom de 10-30%\n\nLa prévisualisation met plus de temps à se calculer lorsque cet outil est actif.
 MAIN_TOOLTIP_PREVIEWG;Affichage du <b>canal Vert</b>\nRaccourci: <b>g</b>
@@ -2266,8 +2266,18 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 !FILEBROWSER_POPUPREMOVE;Delete permanently
 !FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
 !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
+!HISTORY_MSG_494;Capture Sharpening
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 !HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !MAIN_FRAME_PLACES_DEL;Remove
 !PARTIALPASTE_FILMNEGATIVE;Film Negative
 !PROGRESSBAR_DECODING;Decoding...
@@ -2278,16 +2288,20 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 !PROGRESSBAR_RAWCACORR;Raw CA correction...
 !QUEUE_LOCATION_TITLE;Output Location
 !TP_CROP_PPI;PPI
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically selected
 !TP_LENSPROFILE_CORRECTION_MANUAL;Manually selected
 !TP_LENSPROFILE_MODE_HEADER;Lens Profile
 !TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
 !TP_LENSPROFILE_USE_HEADER;Correct
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_RAW_XTRANS;X-Trans
 !TP_RAW_XTRANSFAST;Fast X-Trans
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Italiano

@@ -519,8 +519,8 @@ MAIN_TOOLTIP_BACKCOLOR1;Colore di sfondo dell'anteprima: <b>Nero</b>\nScorciatoi
 MAIN_TOOLTIP_BACKCOLOR2;Colore di sfondo dell'anteprima: <b>Bianco</b>\nScorciatoia: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Blocca</b>/<b>Sblocca</b> la vista <b>Prima</b>\n\n<b>Blocca</b>: Conserva la vista <b>Prima</b>.\nUtile per valutare l'effetto cumulativo di diversi strumenti.\nIn più, possono essere confrontati diversi passi della cronologia.\n\n<b>Sblocca</b>: la vista <b>Prima</b> segue di un passo la vista <b>Dopo</b>, mostrando l'immagine prima dell'effetto dello strumento corrente.
 MAIN_TOOLTIP_HIDEHP;Mostra/Nascondi il pannello sinistro (inclusa la cronologia)\nScorciatoia: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Indicazione delle alteluci tosate.\nScorciatoia: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Indicazione delle alteluci tosate.\nScorciatoia: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Indicazione delle ombre tosate.\nScorciatoia: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Indicazione delle ombre tosate.\nScorciatoia: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Anteprima del <b>Canale Blu</b>.\nScorciatoia: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Anteprima della <b>Focus Mask</b>.\nScorciatoia: <b>Maiuscolo-F</b>\n\nPiù accurato su immagini con bassa profondità di campo, poco rumore e ad elevati livelli di zoom.\n\nPer aumentare l'accuratezza della rilevazione su immagini con molto rumore, riduci le dimensioni del 10-30%.
 MAIN_TOOLTIP_PREVIEWG;Anteprima del <b>Canale Verde</b>.\nScorciatoia: <b>g</b>
@@ -1518,6 +1518,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1535,6 +1536,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1555,6 +1557,13 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1565,6 +1574,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1852,6 +1862,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1908,9 +1919,9 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1954,6 +1965,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_METADATA_STRIP;Strip all metadata
 !TP_METADATA_TUNNEL;Copy unchanged
 !TP_NEUTRAL;Reset
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
 !TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tries to suppress dead pixels.
 !TP_PREPROCESS_HOTPIXFILT;Hot pixel filter
@@ -2119,6 +2131,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Japanese

@@ -960,8 +960,8 @@ MAIN_TOOLTIP_BACKCOLOR2;プレビューの背景色を指定します: <b>白</b
 MAIN_TOOLTIP_BACKCOLOR3;プレビューの背景色を指定します: <b>中間のグレー</b>\nショートカット: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>固定</b> / <b>固定解除</b> - <b>補正前</b> の表示設定\n\n<b>固定</b>: <b>補正前</b>をそのまま表示し変更されません\n複数のツールの累積効果を評価するのに役立ちます\nさらに、比較は履歴上のどこからでも行うことができます\n\n<b>固定解除</b>: 現在使用のツールの効果が <b>補正後</b> に表示され、その1段階前が <b>補正前</b> に表示されます
 MAIN_TOOLTIP_HIDEHP;左パネル 表示/非表示 (履歴含む)\nショートカット:  <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;ハイライト・クリッピング領域の表示\nショートカット: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;ハイライト・クリッピング領域の表示\nショートカット: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;シャドウ・クリッピング領域の表示\nショートカット: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;シャドウ・クリッピング領域の表示\nショートカット: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;<b>ブルー チャンネル</b>表示\nショートカット: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;<b>フォーカス・マスク</b>表示\nショートカット: <b>Shift-f</b>\n\n浅い被写界深度、低ノイズ、高ズームの画像の場合は、より正確に\n\nノイズの多い画像に対しては、検出精度を向上させるため10から30%縮小して評価します\n\nフォーカス・マスクをオンにすると表示に時間が掛かります
 MAIN_TOOLTIP_PREVIEWG;<b>グリーン チャンネル</b>表示\nショートカット: <b>g</b>
@@ -1672,9 +1672,9 @@ TP_EXPOS_BLACKPOINT_LABEL;raw ブラック・ポイント
 TP_EXPOS_WHITEPOINT_LABEL;raw ホワイト・ポイント
 TP_FILMNEGATIVE_BLUE;ブルーの比率
 TP_FILMNEGATIVE_GREEN;参考指数(コントラスト)
-TP_FILMNEGATIVE_GUESS_TOOLTIP;画像の中でニュートラルな参考ポイントを2点選んで指数を計算します;白い(明るいグレー)1点と黒い(暗いグレー)1点を選びます。順番は関係ありません。2つ目のポイントが選択されると指数が更新されます。
+TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 TP_FILMNEGATIVE_LABEL;ネガフィルム
-TP_FILMNEGATIVE_PICK;白と黒のポイントをピックアップする
+TP_FILMNEGATIVE_PICK;Pick neutral spots
 TP_FILMNEGATIVE_RED;レッドの比率
 TP_FILMSIMULATION_LABEL;フィルムシミュレーション
 TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapeeはフィルムシミュレーション機能に使う画像をHald CLUTフォルダーの中から探すよう設計されています（プログラムに組み込むにはフォルダーが大き過ぎるため）。\n変更するには、環境設定 > 画像処理 > フィルムシミュレーションと進み\nどのフォルダーが使われているか確認します。機能を利用する場合は、Hald CLUTだけが入っているフォルダーを指定するか、 この機能を使わない場合はそのフォルダーを空にしておきます。\n\n詳しくはRawPediaを参照して下さい。\n\nフィルム画像のスキャンを止めますか？
@@ -2319,3 +2319,21 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ
 ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: <b>+</b>
 ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!HISTORY_MSG_494;Capture Sharpening
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
+!TP_DEHAZE_LUMINANCE;Luminance only
+!TP_PDSHARPENING_LABEL;Capture Sharpening
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Magyar

@@ -1227,6 +1227,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1244,6 +1245,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1264,6 +1266,13 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1274,6 +1283,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1741,6 +1751,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1821,9 +1832,9 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1928,6 +1939,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
 !TP_PCVIGNETTE_STRENGTH;Strength
 !TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filter strength in stops (reached in corners).
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PFCURVE_CURVEEDITOR_CH;Hue
 !TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controls defringe strength by color.\nHigher = more,\nLower = less.
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
@@ -2103,6 +2115,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_SAVEDIALOG_OK_TIP;Shortcut: <b>Ctrl-Enter</b>
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Nederlands

@@ -788,8 +788,8 @@ MAIN_TOOLTIP_BACKCOLOR1;Achtergrond kleur van het voorbeeld: <b>Zwart</b>\nSnelt
 MAIN_TOOLTIP_BACKCOLOR2;Achtergrond kleur van het voorbeeld: <b>Wit</b>\nSneltoets: <b>0</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Vergrendel</b> / <b>Ontgrendel</b> de <b>Voor</b>afbeelding.\n\n<b>Vergrendel</b>: hou de <b>Voor</b>afbeelding ongewijzigd.\nDit is handig om het cumulatieve effect van meerdere gereedschappen te beoordelen.\nBovendien kan er worden vergeleken met elke stap in de geschiedenislijst.\n\n<b>Ontgrendel</b>: de <b>Voor</b>afbeelding volgt een stap achter de <b>Na</b>afbeelding en laat de afbeelding zien zonder het effect van het huidige gereedschap.
 MAIN_TOOLTIP_HIDEHP;Toon/verberg linkerpaneel (geschiedenis).\nSneltoets: <b>H</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Overbelichtingsindicatie.\nSneltoets: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Overbelichtingsindicatie.\nSneltoets: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Onderbelichtingsindicatie.\nSneltoets: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Onderbelichtingsindicatie.\nSneltoets: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Bekijk het <b>Blauwe kanaal</b>.\nSneltoets: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Bekijk het <b>Focus Masker</b>.\nSneltoets: <b>Shift-F</b>\n\nAccurater bij afbeeldingen met geringe scherptediepte, weinig ruis en hogere zoomniveaus.\n\nBekijk de afbeelding op lagere zoomniveaus (10-30%) om de accuratesse te vergroten bij afbeeldingen met veel ruis.\n\nHet voorbeeld wordt langzamer aangemaakt als Focus Masker aanstaat.
 MAIN_TOOLTIP_PREVIEWG;Bekijk het <b>Groene kanaal</b>.\nSneltoets: <b>g</b>
@@ -2015,6 +2015,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -2032,6 +2033,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -2052,6 +2054,13 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -2062,6 +2071,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -2226,6 +2236,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_CURVE_TOOLTIP;Increase (multiply) the value of all chrominance sliders.\nThis curve lets you adjust the strength of chromatic noise reduction as a function of chromaticity, for instance to increase the action in areas of low saturation and to decrease it in those of high saturation.
@@ -2235,9 +2246,9 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail.
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_ICM_WORKING_TRC;Tone response curve:
 !TP_ICM_WORKING_TRC_CUSTOM;Custom
@@ -2263,6 +2274,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_METADATA_MODE;Metadata copy mode
 !TP_METADATA_STRIP;Strip all metadata
 !TP_METADATA_TUNNEL;Copy unchanged
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
@@ -2300,6 +2312,8 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_RETINEX_MAP;Method
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Polish

@@ -563,8 +563,8 @@ MAIN_TOOLTIP_BACKCOLOR1;Kolor tła podglądu: <b>Czarny</b>\nSkrót: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR2;Kolor tła podglądu: <b>Biały</b>\nSkrót: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Zablokuj</b> / <b>Odblokuj</b> widok <b>Przed</b>\n\n<b>Zablokuj</b>: nie zmieniaj widoku <b>Przed</b> - \nPrzydatne w porównywaniu zablokowanego obrazu z obrazem na ktorym wykonano wiele zmian.\n\n<b>Odblokuj</b>: widok <b>Przed</b> będzie śledził widok <b>Po</b> o jeden krok do tyłu, pokazując obraz przed efektem aktualnie użytego narzędzia.
 MAIN_TOOLTIP_HIDEHP;Pokaż/ukryj lewy panel (razem z historią).\nSkrót: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Pokaż obcięte prześwietlenia.\nSkrót: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Pokaż obcięte prześwietlenia.\nSkrót: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Pokaż obcięte niedoświetlenia.\nSkrót: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Pokaż obcięte niedoświetlenia.\nSkrót: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Podgląd <b>kanału niebieskiego</b>.\nSkrót: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Podgląd <b>maski ostrości</b>.\nSkrót: <b>Shift-f</b>\n\nDokładniejsze w przypadku zdjęc o płytkiej głębi ostrości, niskim pozimie szumów i o większym przybliżeniu. W przypadku zdjęć o wyższym poziomie szumów maska ostrości będzie dokładniejsza przy mniejszym zoomie (10-30%).
 MAIN_TOOLTIP_PREVIEWG;Podgląd <b>kanału zielonego</b>.\nSkrót: <b>g</b>
@@ -1600,6 +1600,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1617,6 +1618,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1637,6 +1639,13 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1647,6 +1656,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1892,6 +1902,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1934,9 +1945,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
 !TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Baseline exposure
@@ -1975,6 +1986,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_METADATA_STRIP;Strip all metadata
 !TP_METADATA_TUNNEL;Copy unchanged
 !TP_NEUTRAL;Reset
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
@@ -2125,6 +2137,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Portugues

@@ -916,8 +916,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Cor de fundo da pré-visualização: <b>branco</b>\nAtal
 MAIN_TOOLTIP_BACKCOLOR3;Cor de fundo da pré-visualização: <b>cinza médio</b>\nAtalho: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Bloquear</b> / <b>desbloquear</b> a visualização <b>antes</b>\n\n<b>Bloquear</b>: manter a visualização <b>antes</b> inalterada.\nÚtil para avaliar o efeito cumulativo de várias ferramentas.\nAlém disso, podem ser feitas comparações a qualquer momento no histórico.\n\n<b>Desbloquear</b>: a visualização <b>antes</b> seguirá a visualização <b>depois</b> um passo antes, mostrando a imagem antes do efeito da ferramenta atualmente utilizada.
 MAIN_TOOLTIP_HIDEHP;Mostrar o painel esquerdo (incluindo o histórico).\nAtalho: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Ver altas luzes cortadas.\nAtalho: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Ver altas luzes cortadas.\nAtalho: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Ver sombras cortadas.\nAtalho: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Ver sombras cortadas.\nAtalho: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Pré-visualizar o <b>canal azul</b>.\nAtalho: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Pré-visualizar a <b>máscara de foco</b>.\nAtalho: <b>Shift-f</b>\n\nMais preciso em imagens com pouca profundidade de campo, baixo ruído e níveis de zoom mais altos.\n\nUtilize um zoom menor entre 10-30% para melhorar a precisão da deteção de imagens com muito ruído.
 MAIN_TOOLTIP_PREVIEWG;Pré-visualizar o <b>canal verde</b>.\nAtalho: <b>g</b>
@@ -2264,8 +2264,18 @@ ZOOMPANEL_ZOOMOUT;Afastar\nAtalho: <b>-</b>
 !FILEBROWSER_POPUPREMOVE;Delete permanently
 !FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
 !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
+!HISTORY_MSG_494;Capture Sharpening
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 !HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !MAIN_FRAME_PLACES_DEL;Remove
 !PARTIALPASTE_FILMNEGATIVE;Film Negative
 !PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
@@ -2277,16 +2287,20 @@ ZOOMPANEL_ZOOMOUT;Afastar\nAtalho: <b>-</b>
 !PROGRESSBAR_RAWCACORR;Raw CA correction...
 !QUEUE_LOCATION_TITLE;Output Location
 !TP_CROP_PPI;PPI
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically selected
 !TP_LENSPROFILE_CORRECTION_MANUAL;Manually selected
 !TP_LENSPROFILE_MODE_HEADER;Lens Profile
 !TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
 !TP_LENSPROFILE_USE_HEADER;Correct
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_RAW_XTRANS;X-Trans
 !TP_RAW_XTRANSFAST;Fast X-Trans
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Portugues (Brasil)

@@ -119,8 +119,12 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Etiqueta de cor.\n\nUse o menu suspenso ou atalho
 FILEBROWSER_COPYPROFILE;Copiar perfil
 FILEBROWSER_CURRENT_NAME;Nome atual:
 FILEBROWSER_DARKFRAME;Quadro escuro
+FILEBROWSER_DELETEDIALOG_ALL;Você tem certeza que quer deletas <b>permanentemente</b> todos os <b>%1</b> arquivos na lixeira?
 FILEBROWSER_DELETEDIALOG_HEADER;Confirmação de exclusão de arquivo
+FILEBROWSER_DELETEDIALOG_SELECTED;Você tem certeza que quer deletar <b>permanentemente</b> os <b>%1</b> arquivos selecionados?
+FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Você tem certeza que quer deletar <b>permanentemente</b> os <b>%1</b> arquivos selecionados, <b>incluindo</b> a versão processada em fila?
 FILEBROWSER_EMPTYTRASH;Esvaziar lixeira
+FILEBROWSER_EMPTYTRASHHINT;Deletar <b>permanentemente</b> todos os arquivos na lixeira.
 FILEBROWSER_EXTPROGMENU;Abrir com
 FILEBROWSER_FLATFIELD;Flat-Field
 FILEBROWSER_MOVETODARKFDIR;Mover para o diretório de quadros escuros
@@ -154,6 +158,8 @@ FILEBROWSER_POPUPRANK2;Classificação 2 **
 FILEBROWSER_POPUPRANK3;Classificação 3 ***
 FILEBROWSER_POPUPRANK4;Classificação 4 ****
 FILEBROWSER_POPUPRANK5;Classificação 5 *****
+FILEBROWSER_POPUPREMOVE;Deletar permanentemente
+FILEBROWSER_POPUPREMOVEINCLPROC;Excluir permanentemente, incluindo a versão processada em fila
 FILEBROWSER_POPUPRENAME;Renomear
 FILEBROWSER_POPUPSELECTALL;Selecionar tudo
 FILEBROWSER_POPUPTRASH;Mover para a lixeira
@@ -180,6 +186,7 @@ FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b>
 FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>7</b>
 FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>6</b>
 FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt-i</b> - Modo de Guia de Editor Único.
+FILEBROWSER_SHOWNOTTRASHHINT;Mostrar apenas imagens que não estão no lixo.
 FILEBROWSER_SHOWORIGINALHINT;Mostre somente imagens originais.\n\nQuando existem várias imagens com o mesmo nome de arquivo, mas extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de Arquivos > Extensões Analisadas.
 FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>1</b>
 FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>2</b>
@@ -870,6 +877,7 @@ MAIN_FRAME_FILEBROWSER;Navegador de Arquivos
 MAIN_FRAME_FILEBROWSER_TOOLTIP;Navegador de arquivos.\nAtalho: <b>Ctrl-F2</b>
 MAIN_FRAME_PLACES;Locais
 MAIN_FRAME_PLACES_ADD;Adicionar
+MAIN_FRAME_PLACES_DEL;Remover
 MAIN_FRAME_QUEUE;Fila
 MAIN_FRAME_QUEUE_TOOLTIP;Processando fila.\nAtalho: <b>Ctrl-F3</b>
 MAIN_FRAME_RECENT;Pastas Recentes
@@ -915,8 +923,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Cor de fundo da pré-visualização: <b>Branco</b>\nAtal
 MAIN_TOOLTIP_BACKCOLOR3;Cor de fundo da pré-visualização: <b>Cinza médio</b>\nAtalho: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Travar</b> / <b>Destravar</b> a <b>Antes</b> visualização\n\n<b>Travar</b>: mantenha o <b>Antes</b> visualização inalterada.\nÚtil para avaliar o efeito cumulativo de várias ferramentas.\nAlém disso, comparações podem ser feitas a qualquer momento.\n\n<b>Destravar</b>: o <b>Antes</b> visualização seguinte <b>Depois</b> visualização anterior, mostrando a imagem antes do efeito da ferramenta atualmente utilizada.
 MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar o painel esquerdo (incluindo o histórico).\nAtalho: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Indicação de realce recortado.\nAtalho: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Indicação de realce recortado.\nAtalho: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Indicação de sombra recortada.\nAtalho: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Indicação de sombra recortada.\nAtalho: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Pré-visualize o <b>Canal Azul</b>.\nAtalho: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Pré-visualize a <b>Máscara de Foco</b>.\nAtalho: <b>Shift-f</b>\n\nMais preciso em imagens com pouca profundidade de campo, baixo ruído e níveis de zoom mais altos.\n\nPara melhorar a precisão da detecção de imagens ruidosas, avalie com zoom menor, cerca de 10-30%.
 MAIN_TOOLTIP_PREVIEWG;Pré-visualize o <b>Canal verde</b>.\nAtalho: <b>g</b>
@@ -1029,6 +1037,7 @@ PREFERENCES_APPEARANCE_COLORPICKERFONT;Fonte do seletor de cor
 PREFERENCES_APPEARANCE_CROPMASKCOLOR;Cor da máscara de corte
 PREFERENCES_APPEARANCE_MAINFONT;Fonte principal
 PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Cor do guia do navegador
+PREFERENCES_APPEARANCE_PSEUDOHIDPI;Modo pseudo-HiDPI
 PREFERENCES_APPEARANCE_THEME;Tema
 PREFERENCES_APPLNEXTSTARTUP;é necessário reiniciar
 PREFERENCES_AUTOMONPROFILE;Usar o perfil de cores do monitor principal do sistema operacional
@@ -1215,6 +1224,9 @@ PROFILEPANEL_TOOLTIPCOPY;Copie o perfil de processamento atual para a área de t
 PROFILEPANEL_TOOLTIPLOAD;Carregue um perfil do arquivo.\n<b>Ctrl-click</b> para selecionar os parâmetros a serem carregados.
 PROFILEPANEL_TOOLTIPPASTE;Cole o perfil da área de transferência.\n<b>Ctrl-click</b> para selecionar os parâmetros a serem colados.
 PROFILEPANEL_TOOLTIPSAVE;Salvar o perfil atual.\n<b>Ctrl-click</b> para selecionar os parâmetros a serem salvos.
+PROGRESSBAR_GREENEQUIL;Equilíbrio de verde...
+PROGRESSBAR_HLREC;Reconstrução de realces...
+PROGRESSBAR_LINEDENOISE;Filtro de ruído de linha...
 PROGRESSBAR_LOADING;Carregando imagem...
 PROGRESSBAR_LOADINGTHUMBS;Carregando miniaturas...
 PROGRESSBAR_LOADJPEG;Carregando arquivo JPEG...
@@ -1241,6 +1253,7 @@ QUEUE_FORMAT_TITLE;Formato de arquivo
 QUEUE_LOCATION_FOLDER;Salvar na pasta
 QUEUE_LOCATION_TEMPLATE;Use modelo
 QUEUE_LOCATION_TEMPLATE_TOOLTIP;Podes usar as seguintes sequências de formatação:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ..., <b>%r</b>, <b>%s1</b>, <b>%s2</b>, ...\n\nEssas cadeias de formatação referem-se às diferentes partes do endereço do nome da foto, alguns atributos da foto ou um índice de sequência arbitrário no processamento em lote.\n\nPor exemplo, se a foto que está sendo processada tiver o seguinte endereço do nome:\n<b><i>/inicio/rodrigo/fotos/2010-10-31/dsc0042.nef</i></b>\no significado das cadeias de formatação são:\n<b>%d4</b> = <i>inicio</i>\n<b>%d3</b> = <i>rodrigo</i>\n<b>%d2</b> = <i>fotos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/inicio/rodrigo/fotos/2010-10-31/</i>\n<b>%p2</b> = <i>/inicio/rodrigo/fotos/</i>\n<b>%p3</b> = <i>/inicio/rodrigo/</i>\n<b>%p4</b> = <i>/inicio/</i>\n\n<b>%r</b> será substituído pela classificação da foto. Se a foto não tiver classificação, %r será substituído por '0'. Se a foto estiver na lixeira, %r será substituído por 'x'.\n\n<b>%s1</b>, <b>%s2</b>, etc. será substituído por um índice de sequência que é preenchido entre 1 e 9 dígitos. O índice de sequência iniciará em 1 sempre que o processamento da fila for iniciado e será incrementado em 1 para cada imagem processada.\n\nSe quiseres salvar a imagem de saída no local onde se encontra a original, escreva:\n<b>%p1/%f</b>\n\nSe quiseres salvar a imagem de saída num diretório chamado "<i>convertido</i>" localizado no diretório da imagem aberta, escreva:\n<b>%p1/convertido/%f</b>\n\nSe quiseres salvar a imagem de saída num diretório chamado\n"<i>/inicio/rodrigo/fotos/convertido/2010-10-31</i>", escreva:\n<b>%p2/convertido/%d1/%f</b>
+QUEUE_LOCATION_TITLE;Local da Saída 
 QUEUE_STARTSTOP_TOOLTIP;Inicia ou para o processamento das imagens na fila.\n\nAtalho: <b>Ctrl</b>+<b>s</b>
 SAMPLEFORMAT_0;Formato de dados desconhecido
 SAMPLEFORMAT_1;8 bits sem assinatura
@@ -1612,6 +1625,9 @@ TP_EXPOSURE_TCMODE_STANDARD;Padrão
 TP_EXPOSURE_TCMODE_WEIGHTEDSTD;Padrão Ponderado
 TP_EXPOS_BLACKPOINT_LABEL;Pontos Pretos Raw
 TP_EXPOS_WHITEPOINT_LABEL;Pontos Brancos Raw
+TP_FILMNEGATIVE_BLUE;Relação de azul
+TP_FILMNEGATIVE_PICK;Pick neutral spots
+TP_FILMNEGATIVE_RED;Relação de vermelho
 TP_FILMSIMULATION_LABEL;Simulação de Filme
 TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee está configurado para procurar por imagens Hald CLUT, que são usadas para a ferramenta Simulação de Filme, numa pasta que está demorando para carregar.\nVá para Preferências > Processamento de Imagem > Simulação de Filme\npara ver qual pasta está sendo usada. Deves apontar RawTherapee para uma pasta que contenha apenas imagens Hald CLUT e nada mais, ou para uma pasta vazia, se não quiseres usar a ferramenta Simulação de Filme.\n\nLeia o artigo sobre Simulação de Filme na RawPedia para mais informações.\n\nDesejas cancelar a verificação agora?
 TP_FILMSIMULATION_STRENGTH;Intensidade
@@ -1732,9 +1748,13 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Funciona no controle deslizante de cromaticidade e na
 TP_LENSGEOM_AUTOCROP;Corte automático
 TP_LENSGEOM_FILL;Preenchimento automático
 TP_LENSGEOM_LABEL;Lente / Geometria
+TP_LENSPROFILE_CORRECTION_AUTOMATCH;Selecionado automaticamente
 TP_LENSPROFILE_CORRECTION_LCPFILE;Ficheiro LCP
+TP_LENSPROFILE_CORRECTION_MANUAL;Selecionado manualmente
 TP_LENSPROFILE_LABEL;Correção de lente perfilada
+TP_LENSPROFILE_MODE_HEADER;Perfil da Lente
 TP_LENSPROFILE_USE_CA;Aberração cromática
+TP_LENSPROFILE_USE_GEOMETRIC;Distorção geométrica
 TP_LENSPROFILE_USE_VIGNETTING;Vinhetagem
 TP_LOCALCONTRAST_AMOUNT;Montante
 TP_LOCALCONTRAST_DARKNESS;Nível de escuridão
@@ -2249,45 +2269,39 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: <b>-</b>
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
 !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
-!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
+!HISTORY_MSG_494;Capture Sharpening
-!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
-!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
-!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
-!FILEBROWSER_POPUPREMOVE;Delete permanently
-!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
-!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
 !HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset
 !HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 !HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
-!MAIN_FRAME_PLACES_DEL;Remove
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !PARTIALPASTE_FILMNEGATIVE;Film Negative
-!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
 !PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched.
 !PROGRESSBAR_DECODING;Decoding...
-!PROGRESSBAR_GREENEQUIL;Green equilibration...
-!PROGRESSBAR_HLREC;Highlight reconstruction...
 !PROGRESSBAR_HOTDEADPIXELFILTER;Hot/dead pixel filter...
-!PROGRESSBAR_LINEDENOISE;Line noise filter...
 !PROGRESSBAR_RAWCACORR;Raw CA correction...
-!QUEUE_LOCATION_TITLE;Output Location
 !TP_COLORTONING_LABREGION_OFFSET;Offset
 !TP_COLORTONING_LABREGION_POWER;Power
 !TP_CROP_PPI;PPI
-!TP_FILMNEGATIVE_BLUE;Blue ratio
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
-!TP_FILMNEGATIVE_RED;Red ratio
-!TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically selected
-!TP_LENSPROFILE_CORRECTION_MANUAL;Manually selected
 !TP_LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
-!TP_LENSPROFILE_MODE_HEADER;Lens Profile
-!TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
 !TP_LENSPROFILE_USE_HEADER;Correct
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is checked.\nAuto-correction is conservative, meaning that it often does not correct all chromatic aberration.\nTo correct the remaining chromatic aberration, you can use up to five iterations of automatic chromatic aberration correction.\nEach iteration will reduce the remaining chromatic aberration from the last iteration at the cost of additional processing time.
 !TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;If the checkbox is checked (recommended), RawTherapee calculates an optimum value based on flat regions in the image.\nIf there is no flat region in the image or the image is too noisy, the value will be set to 0.\nTo set the value manually, uncheck the checkbox first (reasonable values depend on the image).
 !TP_RAW_XTRANS;X-Trans
 !TP_RAW_XTRANSFAST;Fast X-Trans
 !TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain.
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost

rtdata/languages/Russian

@@ -613,8 +613,8 @@ MAIN_TOOLTIP_BACKCOLOR1;Фоновый цвет предпросмотра: <b>
 MAIN_TOOLTIP_BACKCOLOR2;Фоновый цвет предпросмотра: <b>Белый</b>\nГорячая клавиша: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Заблокировать</b> / <b>Разблокировать</b> <b>предыдущий</b> вид\n\n<b>Заблокировать</b>: сохраняет <b>предыдущий</b> вид неизменным.\nПолезно для оценки общего эффекта от применения нескольких инструментов.\nК тому же, сравнения могут быть произведены на любом состоянии истории\n\n<b>Разблокировать</b>: <b>предыдущий</b> вид будет следовать сразу за <b>следующим</b>, показывая состояние изображения до применения текущего инструмента.
 MAIN_TOOLTIP_HIDEHP;Показать/скрыть левую панель (включая историю).\nГорячая клавиша <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Индикатор пересветов.\nГорячая клавиша: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Индикатор пересветов.\nГорячая клавиша: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Индикатор затемнений.\nГорячая клавиша: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Индикатор затемнений.\nГорячая клавиша: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Просмотреть <b>канал синего</b>.\nГорячая клавиша: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Просмотреть <b>Маску резкости</b>.\nГорячая клавиша: <b>Shift-F</b>\n\nБолее точна на изображениях с небольшой глубиной резкости, малым шумом и при большем приближении изображения\n\nДля улучшения определения на шумных изображениях используйте на маленьком зуме 10-30%
 MAIN_TOOLTIP_PREVIEWG;Просмотреть <b>канал зеленого</b>.\nГорячая клавиша: <b>g</b>
@@ -1690,6 +1690,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !HISTORY_MSG_483;CAM02 - Yb scene
 !HISTORY_MSG_484;CAM02 - Auto Yb scene
 !HISTORY_MSG_489;DRC - Detail
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel
@@ -1704,6 +1705,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SATURATION;CT - Saturation
 !HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;CT - region show mask
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
 !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Dual demosaic - Contrast threshold
 !HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
@@ -1715,6 +1717,13 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
 !HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1725,6 +1734,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !ICCPROFCREATOR_COPYRIGHT;Copyright:
 !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
@@ -1947,6 +1957,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !TP_COLORTONING_TWOCOLOR_TOOLTIP;Standard chroma:\nLinear response, a* = b*.\n\nSpecial chroma:\nLinear response, a* = b*, but unbound - try under the diagonal.\n\nSpecial a* and b*:\nLinear response unbound with separate curves for a* and b*. Intended for special effects.\n\nSpecial chroma 2 colors:\nMore predictable.
 !TP_COLORTONING_TWOSTD;Standard chroma
 !TP_CROP_PPI;PPI
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
 !TP_DIRPYRDENOISE_CHROMINANCE_CURVE_TOOLTIP;Increase (multiply) the value of all chrominance sliders.\nThis curve lets you adjust the strength of chromatic noise reduction as a function of chromaticity, for instance to increase the action in areas of low saturation and to decrease it in those of high saturation.
 !TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings.
@@ -1979,9 +1990,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
 !TP_FLATFIELD_CLIPCONTROL;Clip control
@@ -2008,6 +2019,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !TP_LENSPROFILE_MODE_HEADER;Lens Profile
 !TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
 !TP_LENSPROFILE_USE_HEADER;Correct
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
@@ -2135,6 +2147,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !TP_RETINEX_VIEW_TRAN2;Transmission - Fixed
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_SHARPENING_BLUR;Blur radius
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_WAVELET_1;Level 1
 !TP_WAVELET_2;Level 2
 !TP_WAVELET_3;Level 3

rtdata/languages/Serbian (Cyrilic Characters)

@@ -1493,6 +1493,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1510,6 +1511,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1530,6 +1532,13 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1540,6 +1549,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -1843,6 +1853,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -1907,9 +1918,9 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FILMSIMULATION_LABEL;Film Simulation
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
@@ -1954,6 +1965,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_METADATA_MODE;Metadata copy mode
 !TP_METADATA_STRIP;Strip all metadata
 !TP_METADATA_TUNNEL;Copy unchanged
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
 !TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tries to suppress dead pixels.
 !TP_PREPROCESS_HOTPIXFILT;Hot pixel filter
@@ -2119,6 +2131,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/Swedish

@@ -698,8 +698,8 @@ MAIN_TOOLTIP_BACKCOLOR1;Bakgrundsfärg: <b>Svart</b>\nKortkommando: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR2;Bakgrundsfärg: <b>Vit</b>\nKortkommando: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Lås</b> / <b>Lås upp</b> <b>före-vyn</b>\n\n<b>Lås</b>: behåll <b>före-vyn</b> oförändrad.\nAnvändbart för att utvärdera den sammanlagda effekten av flera stegs redigering. Dessutom kan jämförelser göras gentemot varje annat steg i historiken.\n\n<b>Lås upp</b>: <b>Före-vyn</b> kommer hela tiden visa ett tidigare steg jämfört med <b>efter-vyn</b>, och visar därmed effekten av det verktyg som användes senast.
 MAIN_TOOLTIP_HIDEHP;Visa/göm den vänstra panelen. Kortkommando: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Markera högdagerindikation.\nKortkommando: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Markera högdagerindikation.\nKortkommando: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Markera skuggindikation.\nKortkommando: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Markera skuggindikation.\nKortkommando: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Förhandsgranska den <b>blå kanalen</b>.\nGenväg: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Förhandsgranska <b>fokusmasken</b>.\nKortkommando: <b>Shift-f</b>\n\nNoggrannare på bilder med kort skärpedjup, lågt brus och där en hög zoom-grad är vald.\n\nFör att förbättra detekteringen för brusiga bilder, utvärdera vid en zoom-grad om 10-30%\n\nFörhandsvisningen görs långsammare med fokusmasken påslagen.
 MAIN_TOOLTIP_PREVIEWG;Förhandsgranska den <b>gröna kanalen</b>.\nGenväg: <b>g</b>
@@ -1842,6 +1842,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_491;White Balance
 !HISTORY_MSG_492;RGB Curves
 !HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_494;Capture Sharpening
 !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@@ -1859,6 +1860,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
 !HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 !HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
+!HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
 !HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 !HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 !HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
@@ -1879,6 +1881,13 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 !HISTORY_MSG_METADATA_MODE;Metadata copy mode
 !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
+!HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
+!HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
+!HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
+!HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
+!HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
+!HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -1889,6 +1898,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SHARPENING_GAMMA;Sharpening - Gamma
 !HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
 !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
@@ -2100,6 +2110,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_CROP_SELECTCROP;Select
 !TP_DEHAZE_DEPTH;Depth
 !TP_DEHAZE_LABEL;Haze Removal
+!TP_DEHAZE_LUMINANCE;Luminance only
 !TP_DEHAZE_SHOW_DEPTH_MAP;Show depth map
 !TP_DEHAZE_STRENGTH;Strength
 !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones
@@ -2122,9 +2133,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail.
 !TP_FILMNEGATIVE_BLUE;Blue ratio
 !TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-!TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+!TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 !TP_FILMNEGATIVE_LABEL;Film Negative
-!TP_FILMNEGATIVE_PICK;Pick white and black spots
+!TP_FILMNEGATIVE_PICK;Pick neutral spots
 !TP_FILMNEGATIVE_RED;Red ratio
 !TP_FLATFIELD_CLIPCONTROL;Clip control
 !TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Clip control avoids clipped highlights caused by applying the flat field. If there are already clipped highlights before applying the flat field, clip control can lead to color cast.
@@ -2157,6 +2168,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_METADATA_MODE;Metadata copy mode
 !TP_METADATA_STRIP;Strip all metadata
 !TP_METADATA_TUNNEL;Copy unchanged
+!TP_PDSHARPENING_LABEL;Capture Sharpening
 !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
 !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
@@ -2246,6 +2258,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normal display.\nMask -  Displays the mask.\nUnsharp mask - Displays the image with a high radius unsharp mask.\nTransmission - Auto/Fixed - Displays the file transmission-map, before any action on contrast and brightness.\n\nAttention: the mask does not correspond to reality, but is amplified to make it more visible.
 !TP_SHARPENING_BLUR;Blur radius
 !TP_SHARPENING_CONTRAST;Contrast threshold
+!TP_SHARPENING_GAMMA;Gamma
+!TP_SHARPENING_RADIUS_BOOST;Corner radius boost
 !TP_SHARPENMICRO_CONTRAST;Contrast threshold
 !TP_SOFTLIGHT_LABEL;Soft Light
 !TP_SOFTLIGHT_STRENGTH;Strength

rtdata/languages/default

@@ -765,13 +765,13 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Local Contrast - Lightness
 HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
 HISTORY_MSG_METADATA_MODE;Metadata copy mode
 HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
-HISTORY_MSG_PDSHARPEN_CONTRAST;CAS - Contrast threshold
+HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CS - Auto threshold
-HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST;CAS - Auto threshold
+HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CS - Auto radius
-HISTORY_MSG_PDSHARPEN_AUTO_RADIUS;CAS - Auto radius
+HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
-HISTORY_MSG_PDSHARPEN_GAMMA;CAS - Gamma
+HISTORY_MSG_PDSHARPEN_GAMMA;CS - Gamma
-HISTORY_MSG_PDSHARPEN_ITERATIONS;CAS - Iterations
+HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
-HISTORY_MSG_PDSHARPEN_RADIUS;CAS - Radius
+HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
-HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CAS - Corner radius boost
+HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
 HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
 HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
 HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -938,8 +938,8 @@ MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: <b>white</b>\nShortcut:
 MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>middle grey</b>\nShortcut: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Lock</b> / <b>Unlock</b> the <b>Before</b> view\n\n<b>Lock</b>: keep the <b>Before</b> view unchanged.\nUseful to evaluate the cumulative effect of multiple tools.\nAdditionally, comparisons can be made to any state in the History.\n\n<b>Unlock</b>: the <b>Before</b> view will follow the <b>After</b> view one step behind, showing the image before the effect of the currently used tool.
 MAIN_TOOLTIP_HIDEHP;Show/Hide the left panel (including the history).\nShortcut: <b>l</b>
-MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&lt;</b>
+MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&gt;</b>
-MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&gt;</b>
+MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&lt;</b>
 MAIN_TOOLTIP_PREVIEWB;Preview the <b>blue channel</b>.\nShortcut: <b>b</b>
 MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the <b>focus mask</b>.\nShortcut: <b>Shift-f</b>\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\nZoom out to 10-30% to improve detection accuracy on noisy images.
 MAIN_TOOLTIP_PREVIEWG;Preview the <b>green channel</b>.\nShortcut: <b>g</b>
@@ -1651,9 +1651,9 @@ TP_EXPOS_BLACKPOINT_LABEL;Raw Black Points
 TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
 TP_FILMNEGATIVE_BLUE;Blue ratio
 TP_FILMNEGATIVE_GREEN;Reference exponent (contrast)
-TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking two neutral reference spots in the image; one white (light gray) and one black (dark gray). The order does not matter. The exponents will be updated after the second spot is picked.
+TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picking two patches which had a neutral hue (no color) in the original scene. The patches should differ in brightness. Set the white balance afterwards.
 TP_FILMNEGATIVE_LABEL;Film Negative
-TP_FILMNEGATIVE_PICK;Pick white and black spots
+TP_FILMNEGATIVE_PICK;Pick neutral spots
 TP_FILMNEGATIVE_RED;Red ratio
 TP_FILMSIMULATION_LABEL;Film Simulation
 TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?

rtdata/rawtherapee.desktop.in

@@ -17,4 +17,5 @@ Terminal=false
 MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-hasselblad-3fr;image/x-hasselblad-fff;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-leaf-mos;image/x-leica-rwl;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-phaseone-iiq;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sigma-x3f;image/x-sony-arq;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif;
 Categories=Graphics;Photography;2DGraphics;RasterGraphics;GTK;
 Keywords=raw;photo;photography;develop;pp3;graphics;
+StartupNotify=true
 StartupWMClass=rawtherapee

rtdata/themes/RawTherapee-GTK3-20_.css

@@ -640,11 +640,11 @@ spinbutton entry {
 }
 spinbutton button {
     margin: 0;
-	padding: 0;
+    padding: 0;
-	border-radius: 0;
+    border-radius: 0;
 }
 spinbutton button.up {
-	border-radius: 0 0.16666666666666666666em 0.16666666666666666666em 0;
+    border-radius: 0 0.16666666666666666666em 0.16666666666666666666em 0;
 }
 
 entry:disabled, spinbutton:disabled {
@@ -841,7 +841,7 @@ flowboxchild:selected {
     color: #CCCCCC;
     padding: 0;
     margin: 0 0.25em 0 0.25em;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 #MyExpanderTitle:hover {
     background-color: #202020;
@@ -955,7 +955,7 @@ fontchooser scrolledwindow,
 }
 
 #PlacesPaned {
-	margin: 0;
+    margin: 0;
     padding: 0 0.4166666666666666em 0 0;
 }
 #PlacesPaned > box:nth-child(1) scrolledwindow + grid {
@@ -1050,7 +1050,7 @@ dialog frame > label:not(.dummy) {
 #LabelRightNotebook {
     padding: 0.4166666666666666em;
     margin: 0.1666666666666666em;
-	font-size: 1.25em;
+    font-size: 1.25em;
 }
 
 #ToolPanelNotebook {

rtdata/themes/RawTherapee-GTK3-_19.css

@@ -46,7 +46,7 @@ GtkBox {
     border-style: none;
     border-radius: 0;
     margin: 0;
-	padding: 0;
+    padding: 0;
 }
 
 GtkGrid {

rtengine/CMakeLists.txt

@@ -11,7 +11,7 @@ include_directories(${EXTRA_INCDIR}
     ${LCMS_INCLUDE_DIRS}
     ${LENSFUN_INCLUDE_DIRS}
     ${RSVG_INCLUDE_DIRS}
-    )
+)
 
 link_directories("${PROJECT_SOURCE_DIR}/rtexif"
     ${EXPAT_LIBRARY_DIRS}
@@ -25,26 +25,23 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
     ${LCMS_LIBRARY_DIRS}
     ${LENSFUN_LIBRARY_DIRS}
     ${RSVG_LIBRARY_DIRS}
-    )
+)
 
 set(CAMCONSTSFILE "camconst.json")
 
 set(RTENGINESOURCEFILES
+    ahd_demosaic_RT.cc
+    amaze_demosaic_RT.cc
     badpixels.cc
     boxblur.cc
     CA_correct_RT.cc
-    capturesharpening.cc
-    EdgePreservingDecomposition.cc
-    FTblockDN.cc
-    PF_correct_RT.cc
-    ahd_demosaic_RT.cc
-    amaze_demosaic_RT.cc
-    cJSON.c
     calc_distort.cc
     camconst.cc
+    capturesharpening.cc
     cfa_linedn_RT.cc
     ciecam02.cc
     cieimage.cc
+    cJSON.c
     clutstore.cc
     color.cc
     colortemp.cc
@@ -61,14 +58,19 @@ set(RTENGINESOURCEFILES
     dual_demosaic_RT.cc
     dynamicprofile.cc
     eahd_demosaic.cc
+    EdgePreservingDecomposition.cc
     fast_demo.cc
     ffmanager.cc
     filmnegativeproc.cc
     filmnegativethumb.cc
     flatcurves.cc
+    FTblockDN.cc
+    gamutwarning.cc
     gauss.cc
     green_equil_RT.cc
+    guidedfilter.cc
     hilite_recon.cc
+    histmatching.cc
     hphd_demosaic_RT.cc
     iccjpeg.cc
     iccstore.cc
@@ -83,29 +85,27 @@ set(RTENGINESOURCEFILES
     improcfun.cc
     impulse_denoise.cc
     init.cc
+    ipdehaze.cc
     iplab2rgb.cc
+    iplabregions.cc
+    iplocalcontrast.cc
     ipresize.cc
     ipretinex.cc
+    ipshadowshighlights.cc
     ipsharpen.cc
+    ipsoftlight.cc
     iptransform.cc
     ipvibrance.cc
     ipwavelet.cc
     jdatasrc.cc
     jpeg_ijg/jpeg_memsrc.cc
-    klt/convolve.cc
-    klt/error.cc
-    klt/klt.cc
-    klt/klt_util.cc
-    klt/pnmio.cc
-    klt/pyramid.cc
-    klt/selectGoodFeatures.cc
-    klt/storeFeatures.cc
-    klt/trackFeatures.cc
-    klt/writeFeatures.cc
     labimage.cc
     lcp.cc
+    lj92.c
     loadinitial.cc
     myfile.cc
+    pdaflinesfilter.cc
+    PF_correct_RT.cc
     pipettebuffer.cc
     pixelshift.cc
     previewimage.cc
@@ -117,27 +117,17 @@ set(RTENGINESOURCEFILES
     rcd_demosaic.cc
     refreshmap.cc
     rt_algo.cc
+    rtlensfun.cc
     rtthumbnail.cc
     shmap.cc
     simpleprocess.cc
     slicer.cc
     stdimagesource.cc
-    utils.cc
-    rtlensfun.cc
     tmo_fattal02.cc
-    iplocalcontrast.cc
+    utils.cc
-    histmatching.cc
-    pdaflinesfilter.cc
-    gamutwarning.cc
-    ipshadowshighlights.cc
-    xtrans_demosaic.cc
     vng4_demosaic_RT.cc
-    ipsoftlight.cc
+    xtrans_demosaic.cc
-    guidedfilter.cc
+)
-    ipdehaze.cc
-    iplabregions.cc
-    lj92.c
-    )
 
 if(LENSFUN_HAS_LOAD_DIRECTORY)
     set_source_files_properties(rtlensfun.cc PROPERTIES COMPILE_DEFINITIONS RT_LENSFUN_HAS_LOAD_DIRECTORY)
@@ -151,21 +141,22 @@ if(NOT WITH_SYSTEM_KLT)
     set(RTENGINESOURCEFILES ${RTENGINESOURCEFILES}
         klt/convolve.cc
         klt/error.cc
-        klt/klt.cc
         klt/klt_util.cc
+        klt/klt.cc
         klt/pnmio.cc
         klt/pyramid.cc
         klt/selectGoodFeatures.cc
         klt/storeFeatures.cc
         klt/trackFeatures.cc
         klt/writeFeatures.cc
-        )
+    )
     set(KLT_LIBRARIES)
 endif()
 
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_library(rtengine ${RTENGINESOURCEFILES})
+add_library(rtengine STATIC ${RTENGINESOURCEFILES})
+
 add_dependencies(rtengine UpdateInfo)
 
 # It may be nice to store library version too
@@ -191,6 +182,6 @@ target_link_libraries(rtengine rtexif
     ${ZLIB_LIBRARIES}
     ${LENSFUN_LIBRARIES}
     ${RSVG_LIBRARIES}
-    )
+)
 
 install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

rtengine/camconst.json

@@ -1481,6 +1481,12 @@ Camera constants:
         }
     },
 
+    { // Quality B
+        "make_model": "NIKON COOLPIX P1000",
+        "dcraw_matrix": [ 14294, -6116, -1333, -1628, 10219, 1637, -14, 1158, 5022 ], // ColorMatrix2 from Adobe DNG Converter 11.4
+        "ranges": { "black": 200, "white": 4093 }
+    },
+
     { // Quality B, no LENR samples
         "make_model": "Nikon D5",
         "dcraw_matrix": [ 9200,-3522,-992,-5755,13803,2117,-753,1486,6338 ], // adobe dng_v9.5 d65

rtengine/capturesharpening.cc

@@ -668,7 +668,7 @@ BENCHFUN
         buildClipMaskBayer(rawData, W, H, clipMask, whites);
         const unsigned int fc[2] = {FC(0,0), FC(1,0)};
         if (sharpeningParams.autoRadius) {
-            radius = calcRadiusBayer(rawData, W, H, 1000.f, clipVal, fc);
+            radius = std::min(calcRadiusBayer(rawData, W, H, 1000.f, clipVal, fc), 1.15f);
         }
     } else if (ri->getSensorType() == ST_FUJI_XTRANS) {
         float whites[6][6];
@@ -696,14 +696,14 @@ BENCHFUN
             }
         }
         if (sharpeningParams.autoRadius) {
-            radius = calcRadiusXtrans(rawData, W, H, 1000.f, clipVal, i, j);
+            radius = std::min(calcRadiusXtrans(rawData, W, H, 1000.f, clipVal, i, j), 1.15f);
         }
 
     } else if (ri->get_colors() == 1) {
         buildClipMaskMono(rawData, W, H, clipMask, (ri->get_white(0) - c_black[0]) * scale_mul[0] * clipLimit);
         if (sharpeningParams.autoRadius) {
             const unsigned int fc[2] = {0, 0};
-            radius = calcRadiusBayer(rawData, W, H, 1000.f, clipVal, fc);
+            radius = std::min(calcRadiusBayer(rawData, W, H, 1000.f, clipVal, fc), 1.15f);
         }
     }
 
@@ -810,6 +810,7 @@ BENCHFUN
     if (plistener) {
         plistener->setProgress(1.0);
     }
+    rgbSourceModified = false;
 }
 
 } /* namespace */

rtengine/ciecam02.cc

@@ -145,8 +145,8 @@ void Ciecam02::curveJfloat (float br, float contr, const LUTu & histogram, LUTf
     }
 
     outCurve *= 32767.f;
-	//printf("out500=%f out15000=%f\n", outCurve[500], outCurve[15000]);
+    //printf("out500=%f out15000=%f\n", outCurve[500], outCurve[15000]);
-	//outCurve.dump("brig");
+    //outCurve.dump("brig");
 }
 
 /**

rtengine/color.h

@@ -1070,12 +1070,11 @@ public:
     */
     static inline double gamma2     (double x)      //  g3                  1+g4
     {
-      //  return x <= 0.003041 ? x * 12.92310 : 1.055 * exp(log(x) / 2.39990) - 0.055;//calculate with calcgamma
+        //  return x <= 0.003041 ? x * 12.92310 : 1.055 * exp(log(x) / 2.39990) - 0.055;//calculate with calcgamma
         //return x <= 0.0031308 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//standard discontinuous
-		//very small differences between the 2
+        //very small differences between the 2
         return x <= 0.003040 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//continuous
-      //  return x <= 0.003041 ? x * 12.92310 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;//continuous
+        //  return x <= 0.003041 ? x * 12.92310 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;//continuous
-
     }
 
 
@@ -1087,12 +1086,11 @@ public:
     */
     static inline double igamma2    (double x)      //g2
     {
-       // return x <= 0.039289 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * 2.39990);//calculate with calcgamma
+        // return x <= 0.039289 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * 2.39990);//calculate with calcgamma
-       // return x <= 0.04045 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//standard discontinuous
+        // return x <= 0.04045 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//standard discontinuous
-		//very small differences between the 4
+        //very small differences between the 4
         return x <= 0.039286 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//continuous
-      //  return x <= 0.039293 ? x / 12.92310 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);//continuous
+        //  return x <= 0.039293 ? x / 12.92310 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);//continuous
-
     }
 
 

rtengine/dcraw.cc

@@ -2418,7 +2418,7 @@ void CLASS hasselblad_correct()
 void CLASS hasselblad_load_raw()
 {
     struct jhead jh;
-    int *back[5], diff[12];
+    int diff[12];
 
     if (!ljpeg_start (&jh, 0)) {
         return;
@@ -2426,18 +2426,10 @@ void CLASS hasselblad_load_raw()
     order = 0x4949;
     ph1_bithuff_t ph1_bithuff(this, ifp, order);
     hb_bits(-1);
-    back[4] = (int *) calloc(raw_width, 3 * sizeof **back);
-    merror(back[4], "hasselblad_load_raw()");
-    for (int c = 0; c < 3; ++c) {
-        back[c] = back[4] + c * raw_width;
-    }
-    const int sh = tiff_samples > 1;
-    cblack[6] >>= sh;
     const int shot = LIM(shot_select, 1, tiff_samples) - 1;
+    const int predictor_init = static_cast<int>(0x8000 + load_flags);
     for (int row = 0; row < raw_height; ++row) {
-        for (int c = 0; c < 4; ++c) {
+        int stashed_predictors[2] = {predictor_init, predictor_init};
-            back[(c + 3) & 3] = back[c];
-        }
         for (int col = 0; col < raw_width; col += 2) {
             for (int s = 0; s < tiff_samples * 2; s += 2) {
                 const int len[2]= {
@@ -2455,18 +2447,10 @@ void CLASS hasselblad_load_raw()
                 }
             }
             for (int s = col; s < col + 2; ++s) {
-                int pred;
+                int pred = stashed_predictors[s & 1];
-                if (col) {
-                    pred = back[2][s - 2];
-                    if (row > 1 && jh.psv == 11) {
-                        pred += back[0][s] / 2 - back[0][s - 2] / 2;
-                    }
-                } else {
-                     pred = 0x8000 + load_flags;
-                }
                 for (int c = 0; c < tiff_samples; ++c) {
                     pred += diff[(s & 1) * tiff_samples + c];
-                    const unsigned upix = pred >> sh & 0xffff;
+                    const unsigned upix = pred & 0xffff;
                     if (raw_image && c == shot) {
                         RAW(row, s) = upix;
                     }
@@ -2479,12 +2463,13 @@ void CLASS hasselblad_load_raw()
                             *ip = c < 4 ? upix : (*ip + upix) >> 1;
                         }
                     }
+                    if (c == (tiff_samples-1)) {
+                      stashed_predictors[s & 1] = pred;
+                    }
                 }
-                back[2][s] = pred;
             }
         }
     }
-    free(back[4]);
     ljpeg_end(&jh);
     if (image) {
         mix_green = 1;

rtengine/improcfun.h

@@ -67,14 +67,14 @@ class ImProcFunctions
     void transformGeneral(bool highQuality, Imagefloat *original, Imagefloat *transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const LensCorrection *pLCPMap);
     void transformLCPCAOnly(Imagefloat *original, Imagefloat *transformed, int cx, int cy, const LensCorrection *pLCPMap);
 
-    bool needsCA();
+    bool needsCA() const;
-    bool needsDistortion();
+    bool needsDistortion() const;
-    bool needsRotation();
+    bool needsRotation() const;
-    bool needsPerspective();
+    bool needsPerspective() const;
-    bool needsGradient();
+    bool needsGradient() const;
-    bool needsVignetting();
+    bool needsVignetting() const;
-    bool needsLCP();
+    bool needsLCP() const;
-    bool needsLensfun();
+    bool needsLensfun() const;
 //   static cmsUInt8Number* Mempro = NULL;
 
 
@@ -99,8 +99,8 @@ public:
     }
     void setScale(double iscale);
 
-    bool needsTransform();
+    bool needsTransform() const;
-    bool needsPCVignetting();
+    bool needsPCVignetting() const;
 
     void firstAnalysis(const Imagefloat* const working, const procparams::ProcParams &params, LUTu & vhist16);
     void updateColorProfiles(const Glib::ustring& monitorProfile, RenderingIntent monitorIntent, bool softProof, bool gamutCheck);
@@ -247,11 +247,11 @@ public:
     // CieImage *ciec;
     void workingtrc(const Imagefloat* src, Imagefloat* dst, int cw, int ch, int mul, const Glib::ustring &profile, double gampos, double slpos, cmsHTRANSFORM &transform, bool normalizeIn = true, bool normalizeOut = true, bool keepTransForm = false) const;
 
-    bool transCoord(int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr);
+    bool transCoord(int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr) const;
-    bool transCoord(int W, int H, const std::vector<Coord2D> &src, std::vector<Coord2D> &red,  std::vector<Coord2D> &green, std::vector<Coord2D> &blue, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr);
+    bool transCoord(int W, int H, const std::vector<Coord2D> &src, std::vector<Coord2D> &red,  std::vector<Coord2D> &green, std::vector<Coord2D> &blue, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr) const;
     static void getAutoExp(const LUTu & histogram, int histcompr, double clip, double& expcomp, int& bright, int& contr, int& black, int& hlcompr, int& hlcomprthresh);
     static double getAutoDistor(const Glib::ustring& fname, int thumb_size);
-    double getTransformAutoFill(int oW, int oH, const LensCorrection *pLCPMap = nullptr);
+    double getTransformAutoFill(int oW, int oH, const LensCorrection *pLCPMap = nullptr) const;
     void rgb2lab(const Imagefloat &src, LabImage &dst, const Glib::ustring &workingSpace);
     void lab2rgb(const LabImage &src, Imagefloat &dst, const Glib::ustring &workingSpace);
 };

rtengine/iptransform.cc

@@ -208,7 +208,7 @@ namespace rtengine
 #define CLIPTOC(a,b,c,d) ((a)>=(b)?((a)<=(c)?(a):(d=true,(c))):(d=true,(b)))
 
 bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src, std::vector<Coord2D> &red,  std::vector<Coord2D> &green, std::vector<Coord2D> &blue, double ascaleDef,
-                                  const LensCorrection *pLCPMap)
+                                  const LensCorrection *pLCPMap) const
 {
 
     bool clipped = false;
@@ -310,7 +310,7 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
 }
 
 // Transform all corners and critical sidelines of an image
-bool ImProcFunctions::transCoord (int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef, const LensCorrection *pLCPMap)
+bool ImProcFunctions::transCoord (int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef, const LensCorrection *pLCPMap) const
 {
     const int DivisionsPerBorder = 32;
 
@@ -1113,7 +1113,7 @@ void ImProcFunctions::transformLCPCAOnly(Imagefloat *original, Imagefloat *trans
 }
 
 
-double ImProcFunctions::getTransformAutoFill (int oW, int oH, const LensCorrection *pLCPMap)
+double ImProcFunctions::getTransformAutoFill (int oW, int oH, const LensCorrection *pLCPMap) const
 {
     if (!needsCA() && !needsDistortion() && !needsRotation() && !needsPerspective() && (!params->lensProf.useDist || pLCPMap == nullptr)) {
         return 1;
@@ -1137,52 +1137,52 @@ double ImProcFunctions::getTransformAutoFill (int oW, int oH, const LensCorrecti
     return scaleL;
 }
 
-bool ImProcFunctions::needsCA ()
+bool ImProcFunctions::needsCA () const
 {
     return fabs (params->cacorrection.red) > 1e-15 || fabs (params->cacorrection.blue) > 1e-15;
 }
 
-bool ImProcFunctions::needsDistortion ()
+bool ImProcFunctions::needsDistortion () const
 {
     return fabs (params->distortion.amount) > 1e-15;
 }
 
-bool ImProcFunctions::needsRotation ()
+bool ImProcFunctions::needsRotation () const
 {
     return fabs (params->rotate.degree) > 1e-15;
 }
 
-bool ImProcFunctions::needsPerspective ()
+bool ImProcFunctions::needsPerspective () const
 {
     return params->perspective.horizontal || params->perspective.vertical;
 }
 
-bool ImProcFunctions::needsGradient ()
+bool ImProcFunctions::needsGradient () const
 {
     return params->gradient.enabled && fabs (params->gradient.strength) > 1e-15;
 }
 
-bool ImProcFunctions::needsPCVignetting ()
+bool ImProcFunctions::needsPCVignetting () const
 {
     return params->pcvignette.enabled && fabs (params->pcvignette.strength) > 1e-15;
 }
 
-bool ImProcFunctions::needsVignetting ()
+bool ImProcFunctions::needsVignetting () const
 {
     return params->vignetting.amount;
 }
 
-bool ImProcFunctions::needsLCP ()
+bool ImProcFunctions::needsLCP () const
 {
     return params->lensProf.useLcp();
 }
 
-bool ImProcFunctions::needsLensfun()
+bool ImProcFunctions::needsLensfun() const
 {
     return params->lensProf.useLensfun();
 }
 
-bool ImProcFunctions::needsTransform ()
+bool ImProcFunctions::needsTransform () const
 {
     return needsCA () || needsDistortion () || needsRotation () || needsPerspective () || needsGradient () || needsPCVignetting () || needsVignetting () || needsLCP() || needsLensfun();
 }

rtengine/rt_algo.cc

@@ -352,7 +352,7 @@ void buildBlendMask(const float* const * luminance, float **blend, int W, int H,
                     contrastThreshold = calcContrastThreshold(luminance, minY, minX, tilesize);
                     break;
                 } else {
-                    // in second pass we allow a variance of 4
+                    // in second pass we allow a variance of 8
                     // we additionally scan the tiles +-skip pixels around the best tile from pass 2
                     // Means we scan (2 * skip + 1)^2 tiles in this step to get a better hit rate
                     // fortunately the scan is quite fast, so we use only one core and don't parallelize

rtexif/CMakeLists.txt

@@ -1,4 +1,16 @@
-add_library(rtexif rtexif.cc stdattribs.cc nikonattribs.cc canonattribs.cc pentaxattribs.cc fujiattribs.cc sonyminoltaattribs.cc olympusattribs.cc kodakattribs.cc panasonicattribs.cc)
+add_library(rtexif STATIC
+    canonattribs.cc
+    fujiattribs.cc
+    kodakattribs.cc
+    nikonattribs.cc
+    olympusattribs.cc
+    panasonicattribs.cc
+    pentaxattribs.cc
+    rtexif.cc
+    sonyminoltaattribs.cc
+    stdattribs.cc
+)
+
 add_dependencies(rtexif UpdateInfo)
 
 if(WIN32)

rtgui/coloredbar.cc

@@ -142,7 +142,7 @@ void ColoredBar::updateBackBuffer(Gtk::DrawingArea &drawingArea)
                 case (RTO_Left2Right):
                     for (int py = 0; py < h; ++py) {
                         for (int px = 0; px < w; ++px) {
-                        	unsigned char *pixel = surfaceData + (py * w + px) * 4;
+                            unsigned char *pixel = surfaceData + (py * w + px) * 4;
                             double x_ = double(      px);
                             //double y_ = double((h-1)-py);  unused
                             double x01 = x_        / double(w - 1);
@@ -158,7 +158,7 @@ void ColoredBar::updateBackBuffer(Gtk::DrawingArea &drawingArea)
                 case (RTO_Right2Left):
                     for (int py = 0; py < h; ++py) {
                         for (int px = 0; px < w; ++px) {
-                        	unsigned char *pixel = surfaceData + (py * w + px) * 4;
+                            unsigned char *pixel = surfaceData + (py * w + px) * 4;
                             //double x_ = double((w-1)-px);  unused
                             //double y_ = double((h-1)-py);  unused
                             double x01 = double(px) / double(w - 1);
@@ -174,7 +174,7 @@ void ColoredBar::updateBackBuffer(Gtk::DrawingArea &drawingArea)
                 case (RTO_Bottom2Top):
                     for (int py = 0; py < h; ++py) {
                         for (int px = 0; px < w; ++px) {
-                        	unsigned char *pixel = surfaceData + (py * w + px) * 4;
+                            unsigned char *pixel = surfaceData + (py * w + px) * 4;
                             //double x_ = double((w-1)-px);  unused
                             //double y_ = double((h-1)-py);  unused
                             double x01 = double(px) / double(w - 1);
@@ -191,7 +191,7 @@ void ColoredBar::updateBackBuffer(Gtk::DrawingArea &drawingArea)
                 default:
                     for (int py = 0; py < h; ++py) {
                         for (int px = 0; px < w; ++px) {
-                        	unsigned char *pixel = surfaceData + (py * w + px) * 4;
+                            unsigned char *pixel = surfaceData + (py * w + px) * 4;
                             double x_ = double(      px);
                             double y_ = double(      py);
                             double x01 = x_ / double(w - 1);

rtgui/extprog.cc

@@ -334,7 +334,7 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName)
 
 #else
 
-    const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + "\" " + Glib::shell_quote(fileName);
+    const auto cmdLine = options.customEditorProg + Glib::ustring(" ") + Glib::shell_quote(fileName);
     return spawnCommandAsync (cmdLine);
 
 #endif

rtgui/main.cc

@@ -529,13 +529,13 @@ int main (int argc, char **argv)
     int ret = 0;
 
     if (options.pseudoHiDPISupport) {
-		// Reading/updating GDK_SCALE early if it exists
+        // Reading/updating GDK_SCALE early if it exists
-		const gchar *gscale = g_getenv("GDK_SCALE");
+        const gchar *gscale = g_getenv("GDK_SCALE");
-		if (gscale && gscale[0] == '2') {
+        if (gscale && gscale[0] == '2') {
-			initialGdkScale = 2;
+            initialGdkScale = 2;
-		}
+        }
-		// HOMBRE: On Windows, if resolution is set to 200%, Gtk internal variables are SCALE=2 and DPI=96
+        // HOMBRE: On Windows, if resolution is set to 200%, Gtk internal variables are SCALE=2 and DPI=96
-		g_setenv("GDK_SCALE", "1", true);
+        g_setenv("GDK_SCALE", "1", true);
     }
 
     gdk_threads_set_lock_functions (G_CALLBACK (myGdkLockEnter), (G_CALLBACK (myGdkLockLeave)));

rtgui/options.cc

@@ -1258,7 +1258,7 @@ void Options::readFromFile(Glib::ustring fname)
                 }
 
                 if (keyFile.has_key("GUI", "PseudoHiDPISupport")) {
-                	pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
+                    pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
                 }
 
                 if (keyFile.has_key("GUI", "LastPreviewScale")) {

rtgui/profilepanel.cc

@@ -275,9 +275,27 @@ void ProfilePanel::save_clicked (GdkEventButton* event)
         return;
     }
 
-    Gtk::FileChooserDialog dialog (getToplevelWindow (this), M("PROFILEPANEL_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
+    // If it's a partial profile, it's more intuitive to first allow the user
-    bindCurrentFolder (dialog, options.loadSaveProfilePath);
+    // to choose which parameters to save before showing the Save As dialog
-    dialog.set_current_name (lastFilename);
+    // #5491
+    const auto isPartial = event->state & Gdk::CONTROL_MASK;
+    if (isPartial) {
+        if (!partialProfileDlg) {
+            partialProfileDlg = new PartialPasteDlg(Glib::ustring(), parent);
+        }
+
+        partialProfileDlg->set_title(M("PROFILEPANEL_SAVEPPASTE"));
+        const auto response = partialProfileDlg->run();
+        partialProfileDlg->hide();
+
+        if (response != Gtk::RESPONSE_OK) {
+            return;
+        }
+    }
+
+    Gtk::FileChooserDialog dialog(getToplevelWindow(this), M("PROFILEPANEL_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
+    bindCurrentFolder(dialog, options.loadSaveProfilePath);
+    dialog.set_current_name(lastFilename);
 
     //Add the user's default (or global if multiuser=false) profile path to the Shortcut list
     try {
@@ -294,36 +312,32 @@ void ProfilePanel::save_clicked (GdkEventButton* event)
     dialog.add_button(M("GENERAL_SAVE"), Gtk::RESPONSE_OK);
 
     //Add filters, so that only certain file types can be selected:
-
+    auto filter_pp = Gtk::FileFilter::create();
-    Glib::RefPtr<Gtk::FileFilter> filter_pp = Gtk::FileFilter::create();
     filter_pp->set_name(M("FILECHOOSER_FILTER_PP"));
     filter_pp->add_pattern("*" + paramFileExtension);
     dialog.add_filter(filter_pp);
 
-    Glib::RefPtr<Gtk::FileFilter> filter_any = Gtk::FileFilter::create();
+    auto filter_any = Gtk::FileFilter::create();
     filter_any->set_name(M("FILECHOOSER_FILTER_ANY"));
     filter_any->add_pattern("*");
     dialog.add_filter(filter_any);
 
-//    dialog.set_do_overwrite_confirmation (true);
+    bool done = true;
-
-    bool done = false;
 
     do {
         if (dialog.run() == Gtk::RESPONSE_OK) {
 
             std::string fname = dialog.get_filename();
-            Glib::ustring ext = getExtension (fname);
 
-            if (("." + ext) != paramFileExtension) {
+            if (("." + getExtension(fname)) != paramFileExtension) {
                 fname += paramFileExtension;
             }
 
-            if (!confirmOverwrite (dialog, fname)) {
+            if (!confirmOverwrite(dialog, fname)) {
                 continue;
             }
 
-            lastFilename = Glib::path_get_basename (fname);
+            lastFilename = Glib::path_get_basename(fname);
 
             const PartialProfile* toSave;
 
@@ -332,60 +346,36 @@ void ProfilePanel::save_clicked (GdkEventButton* event)
             } else if (isLastSavedSelected()) {
                 toSave = lastsaved;
             } else {
-                const ProfileStoreEntry* entry = profiles->getSelectedEntry();
+                const auto entry = profiles->getSelectedEntry();
-                toSave = entry ? ProfileStore::getInstance()->getProfile (profiles->getSelectedEntry()) : nullptr;
+                toSave = entry ? ProfileStore::getInstance()->getProfile(entry) : nullptr;
             }
 
             if (toSave) {
-                if (event->state & Gdk::CONTROL_MASK) {
+                int retCode;
-                    // opening the partial paste dialog window
+                if (isPartial) {
-                    if(!partialProfileDlg) {
+                    // Build partial profile
-                        partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
-                    }
-                    partialProfileDlg->set_title(M("PROFILEPANEL_SAVEPPASTE"));
-                    int i = partialProfileDlg->run();
-                    partialProfileDlg->hide();
-
-                    if (i != Gtk::RESPONSE_OK) {
-                        return;
-                    }
-
-                    // saving the partial profile
                     PartialProfile ppTemp(true);
-                    partialProfileDlg->applyPaste (ppTemp.pparams, ppTemp.pedited, toSave->pparams, toSave->pedited);
+                    partialProfileDlg->applyPaste(ppTemp.pparams, ppTemp.pedited, toSave->pparams, toSave->pedited);
-                    int retCode = ppTemp.pparams->save (fname, "", true, ppTemp.pedited);
+                    // Save partial profile
+                    retCode = ppTemp.pparams->save(fname, "", true, ppTemp.pedited);
+                    // Cleanup
                     ppTemp.deleteInstance();
-
-                    if (retCode) {
-                        writeFailed(dialog, fname);
-                    } else {
-                        done = true;
-                        bool ccPrevState = changeconn.block(true);
-                        ProfileStore::getInstance()->parseProfiles();
-                        changeconn.block (ccPrevState);
-                    }
                 } else {
-                    // saving a full profile
+                    // Save full profile
-                    int retCode = toSave->pparams->save (fname);
+                    retCode = toSave->pparams->save(fname);
-
+                }
-                    if (retCode) {
+
-                        writeFailed(dialog, fname);
+                if (!retCode) {
-                    } else {
+                    const auto ccPrevState = changeconn.block(true);
-                        done = true;
+                    ProfileStore::getInstance()->parseProfiles();
-                        bool ccPrevState = changeconn.block(true);
+                    changeconn.block(ccPrevState);
-                        ProfileStore::getInstance()->parseProfiles();
+                } else {
-                        changeconn.block (ccPrevState);
+                    done = false;
-                    }
+                    writeFailed(dialog, fname);
                 }
-            } else {
-                done = true;
             }
-        } else {
-            done = true;
         }
     } while (!done);
-
-    return;
 }
 
 /*
@@ -465,7 +455,6 @@ void ProfilePanel::load_clicked (GdkEventButton* event)
     dialog.add_button(M("GENERAL_OPEN"), Gtk::RESPONSE_OK);
 
     //Add filters, so that only certain file types can be selected:
-
     Glib::RefPtr<Gtk::FileFilter> filter_pp = Gtk::FileFilter::create();
     filter_pp->set_name(M("FILECHOOSER_FILTER_PP"));
     filter_pp->add_pattern("*" + paramFileExtension);

rtgui/rtscalable.cc

@@ -37,9 +37,9 @@ Gtk::TextDirection RTScalable::direction = Gtk::TextDirection::TEXT_DIR_NONE;
 void RTScalable::setDPInScale (const double newDPI, const int newScale)
 {
     if (!options.pseudoHiDPISupport) {
-    	scale = 1;
+        scale = 1;
-    	dpi = baseDPI;
+        dpi = baseDPI;
-    	return;
+        return;
     }
 
     if (scale != newScale || (scale == 1 && dpi != newDPI)) {

rtgui/rtwindow.cc

@@ -168,7 +168,7 @@ RTWindow::RTWindow ()
             #endif
             //GTK318
             if (options.pseudoHiDPISupport) {
-            	fontScale = options.fontSize / (float)RTScalable::baseFontSize;
+                fontScale = options.fontSize / (float)RTScalable::baseFontSize;
             }
             if (options.rtSettings.verbose) {
                 printf("\"Non-Default\" font size(%d) * scale(%d) / fontScale(%.3f)\n", options.fontSize, (int)initialGdkScale, fontScale);
@@ -196,7 +196,7 @@ RTWindow::RTWindow ()
                     pt = fontSize / Pango::SCALE;
                 }
                 if (options.pseudoHiDPISupport) {
-                	fontScale = (float)pt / (float)RTScalable::baseFontSize;
+                    fontScale = (float)pt / (float)RTScalable::baseFontSize;
                 }
                 if ((int)initialGdkScale > 1 || pt != RTScalable::baseFontSize) {
                     css = Glib::ustring::compose ("* { font-size: %1pt}", pt * (int)initialGdkScale);

rtgui/toolpanelcoord.cc

@@ -178,7 +178,6 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
     transformPanelSW   = Gtk::manage (new MyScrolledWindow ());
     rawPanelSW         = Gtk::manage (new MyScrolledWindow ());
     advancedPanelSW    = Gtk::manage (new MyScrolledWindow ());
-    updateVScrollbars (options.hideTPVScrollbar);
 
     // load panel endings
     for (int i = 0; i < 7; i++) {
@@ -195,6 +194,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
         favoritePanel->pack_start(*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
         favoritePanel->pack_start(*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
     }
+    updateVScrollbars(options.hideTPVScrollbar);
 
     exposurePanelSW->add  (*exposurePanel);
     exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);

tools/RTProfileBuilderSample.cs

@@ -1,293 +1,293 @@
-#region Usings
+#region Usings
-using System;
+using System;
-using System.Text;
+using System.Text;
-using System.IO;
+using System.IO;
-using System.Globalization;
+using System.Globalization;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.Configuration;
+using System.Configuration;
-using System.Collections;
+using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
-#endregion
+#endregion
-
+
-// *** Raw Therapee sample Custom Profile builder (version 2013-08-12) ***
+// *** Raw Therapee sample Custom Profile builder (version 2013-08-12) ***
-//
+//
-//
+//
-// WARNING: The command line parameters has changed since this file has been created by Oduis. The new mechanism involves a
+// WARNING: The command line parameters has changed since this file has been created by Oduis. The new mechanism involves a
-// temporary communication file (.ini style) to provide system parameters and metadata read by RawTherapee. This script has
+// temporary communication file (.ini style) to provide system parameters and metadata read by RawTherapee. This script has
-// to be updated by some C# developer in order to work.
+// to be updated by some C# developer in order to work.
-//
+//
-//
+//
-// WARNING: PP3 format may change in the future versions! If this happens there will probably be no automatic migration path,
+// WARNING: PP3 format may change in the future versions! If this happens there will probably be no automatic migration path,
-// you'll have to adjust on your own. This is a sample, and therefore not supported by the RT team (just by oduis)
+// you'll have to adjust on your own. This is a sample, and therefore not supported by the RT team (just by oduis)
-//
+//
-//
+//
-// How to use:
+// How to use:
-// 1. Modify the GetCorrectedSettings function below according to your needs.
+// 1. Modify the GetCorrectedSettings function below according to your needs.
-// 2. Download and install Microsoft .Net Runtime (latest version is 4.0 as of writing), if it's not already on your machine.
+// 2. Download and install Microsoft .Net Runtime (latest version is 4.0 as of writing), if it's not already on your machine.
-//    You can get it for free via Windows Update or from microsoft.com. No need for Visual Studio etc.
+//    You can get it for free via Windows Update or from microsoft.com. No need for Visual Studio etc.
-// 3. Open a command line and compile this CS-File using the C# 32bit compiler. It is usually installed somewhere here:
+// 3. Open a command line and compile this CS-File using the C# 32bit compiler. It is usually installed somewhere here:
-//    C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe
+//    C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe
-//    Call csc.exe (C#-Compiler) with your .CS file as parameter like this (one big line):
+//    Call csc.exe (C#-Compiler) with your .CS file as parameter like this (one big line):
-//
+//
-//    C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc 
+//    C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc 
-//             /r:C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.dll 
+//             /r:C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.dll 
-//             /r:C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Configuration.dll 
+//             /r:C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Configuration.dll 
-//             RTProfileBuilderSample.cs
+//             RTProfileBuilderSample.cs
-//
+//
-//    (On most machines it already works with "C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc RTProfileBuilderSample.cs")
+//    (On most machines it already works with "C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc RTProfileBuilderSample.cs")
-//    CSC will compile it and emit an EXE.
+//    CSC will compile it and emit an EXE.
-// 4. Open your RT options files and find the entry [Profiles]/CustomProfileBuilder
+// 4. Open your RT options files and find the entry [Profiles]/CustomProfileBuilder
-// 5. Enter the path to your newly built exe here. On Windows, don't forget double slashes (e.g. "C:\\MyDir\\Mybuilder.exe")
+// 5. Enter the path to your newly built exe here. On Windows, don't forget double slashes (e.g. "C:\\MyDir\\Mybuilder.exe")
-// And you're done! The EXE is only called on opening the image editor and there is no PP3 already
+// And you're done! The EXE is only called on opening the image editor and there is no PP3 already
-// 
+//
-// If you want to use EXIFTOOL to gather more details information to build queries:
+// If you want to use EXIFTOOL to gather more details information to build queries:
-// 1. Download exiftool.exe from http://www.sno.phy.queensu.ca/~phil/exiftool/
+// 1. Download exiftool.exe from http://www.sno.phy.queensu.ca/~phil/exiftool/
-// 2. Rename it to exiftool.exe (NOT exiftool(-k).. or something!)
+// 2. Rename it to exiftool.exe (NOT exiftool(-k).. or something!)
-// 3. Copy the RTProfilerBuilder.exe.config next to your own EXE. If you renamed it, rename config to "(Yourname).exe.config"
+// 3. Copy the RTProfilerBuilder.exe.config next to your own EXE. If you renamed it, rename config to "(Yourname).exe.config"
-// 4. Open the config with notepad (it's an XML file). Set ExifToolPath to your downloaded and renamed exe
+// 4. Open the config with notepad (it's an XML file). Set ExifToolPath to your downloaded and renamed exe
-//
+//
-// If you want to know what parameters are available, call "exiftool.exe <raw file name> -tab -short"
+// If you want to know what parameters are available, call "exiftool.exe <raw file name> -tab -short"
-//
+//
-// This description is for Windows. The C# code does not use anything fancy, will probably work with MONO on Linux/OSX, too
+// This description is for Windows. The C# code does not use anything fancy, will probably work with MONO on Linux/OSX, too
-
+
-namespace RTProfilerBuilder {
+namespace RTProfilerBuilder {
-	/// <summary>Main class. Mostly change GetCorrectedSettings.</summary>
+    /// <summary>Main class. Mostly change GetCorrectedSettings.</summary>
-	class RTProfileBuilder {
+    class RTProfileBuilder {
-
+
-		/// <summary>Adds the Nikkor zoom distortion correction profile.
+        /// <summary>Adds the Nikkor zoom distortion correction profile.
-		/// First array is list of focal lengths, second array is the RT setting that should correct the
+        /// First array is list of focal lengths, second array is the RT setting that should correct the
-		/// distortion for the corresponding focal length. Values between these values are automatically interpolated.
+        /// distortion for the corresponding focal length. Values between these values are automatically interpolated.
-		/// The focal length values must already be ordered. The number of sample points is not limited.</summary>
+        /// The focal length values must already be ordered. The number of sample points is not limited.</summary>
-		static DistortionCorrectProf distNikkor24120f4 = new DistortionCorrectProf(
+        static DistortionCorrectProf distNikkor24120f4 = new DistortionCorrectProf(
-			new double[] { 24, 28, 35, 50, 70, 85, 120 },
+                new double[] { 24, 28, 35, 50, 70, 85, 120 },
-			new double[] { -0.1, -0.063, -0.012, 0.018, 0.034, 0.04, 0.048 }
+                new double[] { -0.1, -0.063, -0.012, 0.018, 0.034, 0.04, 0.048 }
-			);
+                );
-
+
-
+
-		/// <summary>This is your personalisation function</summary>
+        /// <summary>This is your personalisation function</summary>
-		/// <param name="exif">Full EXIF from EXIFTOOL (if configured).</param>
+        /// <param name="exif">Full EXIF from EXIFTOOL (if configured).</param>
-		/// <param name="sectionEntry">Entry, like "Sharpening/Radius"</param>
+        /// <param name="sectionEntry">Entry, like "Sharpening/Radius"</param>
-		/// <param name="value">Current value (from default file)</param>
+        /// <param name="value">Current value (from default file)</param>
-		/// <param name="fNumber">FNumber</param><param name="exposureSecs">Exposure in seconds</param>
+        /// <param name="fNumber">FNumber</param><param name="exposureSecs">Exposure in seconds</param>
-		/// <param name="focalLength">Focal length in MM</param><param name="iso">ISO value</param>
+        /// <param name="focalLength">Focal length in MM</param><param name="iso">ISO value</param>
-		/// <param name="lens">Lens from EXIF</param><param name="camera">Camera from EXIF</param>
+        /// <param name="lens">Lens from EXIF</param><param name="camera">Camera from EXIF</param>
-		/// <returns>The value to be written. Simply take the current value if you have nothing to touch.</returns>
+        /// <returns>The value to be written. Simply take the current value if you have nothing to touch.</returns>
-		static string GetCorrectedSetting(NameValueCollection exif, string sectionEntry, string value,
+        static string GetCorrectedSetting(NameValueCollection exif, string sectionEntry, string value,
-			double fNumber, double exposureSecs, double focalLength, long iso, string lens, string camera) {
+                double fNumber, double exposureSecs, double focalLength, long iso, string lens, string camera) {
-
+
-			string s;
+            string s;
-
+
-			// We don't do anything to the value if it's not our camera
+            // We don't do anything to the value if it's not our camera
-			if (camera.EndsWith("NIKON D700", StringComparison.InvariantCultureIgnoreCase) && lens.Contains("24.0-120.0 mm f/4.0")) {
+            if (camera.EndsWith("NIKON D700", StringComparison.InvariantCultureIgnoreCase) && lens.Contains("24.0-120.0 mm f/4.0")) {
-				switch (sectionEntry) {
+                switch (sectionEntry) {
-					// Here is the place to adjust your settings
+                    // Here is the place to adjust your settings
-					// Pretty simple: "SectionName/EntryName" in options file
+                    // Pretty simple: "SectionName/EntryName" in options file
-
+
-					case "Vignetting Correction/Amount":
+                    case "Vignetting Correction/Amount":
-						value = (fNumber < 8 && focalLength < 30) ? "30" : "0";
+                        value = (fNumber < 8 && focalLength < 30) ? "30" : "0";
-						break;
+                        break;
-
+
-					case "RAW/CA":
+                    case "RAW/CA":
-						value = ToBool(fNumber < 11);  // Means "Enabled if fnumber<11, otherwise disabled"
+                        value = ToBool(fNumber < 11);  // Means "Enabled if fnumber<11, otherwise disabled"
-						break;
+                        break;
-
+
-					case "Impulse Denoising/Enabled":
+                    case "Impulse Denoising/Enabled":
-						value = ToBool(iso >= 3200);
+                        value = ToBool(iso >= 3200);
-						break;
+                        break;
-
+
-					case "HLRecovery/Enabled":
+                    case "HLRecovery/Enabled":
-						value = ToBool(iso >= 1600);  // Dynamic range decreases, so we'll probably need it
+                        value = ToBool(iso >= 1600);  // Dynamic range decreases, so we'll probably need it
-						break;
+                        break;
-
+
-					case "Color Boost/Amount":
+                    case "Color Boost/Amount":
-						if (iso >= 6400) value = "0";  // Colors will get poppy anyway...
+                        if (iso >= 6400) value = "0";  // Colors will get poppy anyway...
-						break;
+                        break;
-
+
-					case "Distortion/Amount":
+                    case "Distortion/Amount":
-						// we already checked in the IF upstairs that this is "our" lens
+                        // we already checked in the IF upstairs that this is "our" lens
-						value = distNikkor24120f4.GetDistortionAmount(focalLength);
+                        value = distNikkor24120f4.GetDistortionAmount(focalLength);
-						break;
+                        break;
-
+
-					// Add other parameters here. Mention this is case sensitive!
+                        // Add other parameters here. Mention this is case sensitive!
-
+
-					default: break;  // we don't touch values we don't care about
+                    default: break;  // we don't touch values we don't care about
-				}
+                }
-			}  // end if camera=xxx
+            }  // end if camera=xxx
-
+
-
+
-			// This is for camera independent settings
+            // This is for camera independent settings
-			switch (sectionEntry) {
+            switch (sectionEntry) {
-				// These are parsed from EXIFTOOL and XMP in DNG (see http://en.wikipedia.org/wiki/Extensible_Metadata_Platform)
+                // These are parsed from EXIFTOOL and XMP in DNG (see http://en.wikipedia.org/wiki/Extensible_Metadata_Platform)
-				case "IPTC/City":
+                case "IPTC/City":
-					s = exif.Get("City");
+                    s = exif.Get("City");
-					if (!String.IsNullOrEmpty(s)) value = s;
+                    if (!String.IsNullOrEmpty(s)) value = s;
-					break;
+                    break;
-
+
-				case "IPTC/Country":
+                case "IPTC/Country":
-					s = exif.Get("Country");
+                    s = exif.Get("Country");
-					if (!String.IsNullOrEmpty(s)) value = s;
+                    if (!String.IsNullOrEmpty(s)) value = s;
-					break;
+                    break;
-
+
-				case "IPTC/Caption":
+                case "IPTC/Caption":
-				case "IPTC/Title":
+                case "IPTC/Title":
-					s = exif.Get("Headline");
+                    s = exif.Get("Headline");
-					if (!String.IsNullOrEmpty(s)) value = s;
+                    if (!String.IsNullOrEmpty(s)) value = s;
-					break;
+                    break;
-
+
-				// Add other parameters here. Mention this is case sensitive!
+                    // Add other parameters here. Mention this is case sensitive!
-
+
-				default: break;  // we don't touch values we don't care about
+                default: break;  // we don't touch values we don't care about
-			}
+            }
-			return value;
+            return value;
-		}
+        }
-
+
-		#region * Main and Helpers
+#region * Main and Helpers
-		static string ToBool(bool condition) { return condition ? "true" : "false"; }
+        static string ToBool(bool condition) { return condition ? "true" : "false"; }
-		static string ToFloat(float f) { return f.ToString(CultureInfo.InvariantCulture); }
+        static string ToFloat(float f) { return f.ToString(CultureInfo.InvariantCulture); }
-
+
-		/// <summary>Reads default file and parses it. No need to touch it for your personal settings.</summary>
+        /// <summary>Reads default file and parses it. No need to touch it for your personal settings.</summary>
-		/// <param name="args">Command line args</param>
+        /// <param name="args">Command line args</param>
-		/// <return>0 on all OK.</return>
+        /// <return>0 on all OK.</return>
-		static int Main(string[] args) {
+        static int Main(string[] args) {
-			int exitCode = 0;
+            int exitCode = 0;
-
+
-			try {
+            try {
-				#region Parse input parameters
+#region Parse input parameters
-				int argNo = 0;
+                int argNo = 0;
-
+
-				// Name of raw/JPG to process
+                // Name of raw/JPG to process
-				string sourceFile = args[argNo++];
+                string sourceFile = args[argNo++];
-
+
-				// What the user selected as his base profile
+                // What the user selected as his base profile
-				string defaultProfileFilePath = args[argNo++];
+                string defaultProfileFilePath = args[argNo++];
-
+
-				// Cache directory, for any logging file
+                // Cache directory, for any logging file
-				string cachePath = args[argNo++];
+                string cachePath = args[argNo++];
-
+
-
+
-				// True if the image is only being flagged as inTrash, rank or colorLabel but still need valid PP3 - actually not used by this script
+                // True if the image is only being flagged as inTrash, rank or colorLabel but still need valid PP3 - actually not used by this script
-				bool forFlaggingPurpose = bool.Parse(args[argNo++], CultureInfo.InvariantCulture);
+                bool forFlaggingPurpose = bool.Parse(args[argNo++], CultureInfo.InvariantCulture);
-
+
-				// Note that old C++ has no automatic number globalization
+                // Note that old C++ has no automatic number globalization
-				double fNumber = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
+                double fNumber = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
-				double exposureSecs = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
+                double exposureSecs = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
-				double focalLength = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
+                double focalLength = double.Parse(args[argNo++], CultureInfo.InvariantCulture);
-				long iso = long.Parse(args[argNo++], CultureInfo.InvariantCulture);
+                long iso = long.Parse(args[argNo++], CultureInfo.InvariantCulture);
-
+
-				string lens = args[argNo++];
+                string lens = args[argNo++];
-				string cameraMake  = args[argNo++];
+                string cameraMake  = args[argNo++];
-				string cameraModel = args[argNo++];
+                string cameraModel = args[argNo++];
-				string camera = cameraMake + " " + cameraModel;
+                string camera = cameraMake + " " + cameraModel;
-				#endregion
+#endregion
-
+
-				// Read default file as basis
+                // Read default file as basis
-				string[] lines = File.ReadAllLines(defaultProfileFilePath);
+                string[] lines = File.ReadAllLines(defaultProfileFilePath);
-
+
-				NameValueCollection nvEXIF = ParseFullExifData(sourceFile);
+                NameValueCollection nvEXIF = ParseFullExifData(sourceFile);
-
+
-				// File should be Windows ANSI
+                // File should be Windows ANSI
-				using (TextWriter tw = new StreamWriter(sourceFile + ".pp3", false, new UTF8Encoding(false))) {
+                using (TextWriter tw = new StreamWriter(sourceFile + ".pp3", false, new UTF8Encoding(false))) {
-					string section = "";
+                    string section = "";
-
+
-					foreach (string line in lines) {
+                    foreach (string line in lines) {
-						string l = line.Trim();
+                        string l = line.Trim();
-						if (!String.IsNullOrEmpty(line)) {
+                        if (!String.IsNullOrEmpty(line)) {
-
+
-							if (l.StartsWith("["))
+                            if (l.StartsWith("["))
-								section = l.Trim(new char[] { '[', ']' });
+                                section = l.Trim(new char[] { '[', ']' });
-							else if (char.IsLetterOrDigit(l[0]) && l.Contains("=")) {
+                            else if (char.IsLetterOrDigit(l[0]) && l.Contains("=")) {
-								int valPos = l.IndexOf("=") + 1;
+                                int valPos = l.IndexOf("=") + 1;
-
+
-								string newValue = GetCorrectedSetting(nvEXIF, section + "/" + l.Substring(0, valPos - 1), l.Substring(valPos).Trim(),
+                                string newValue = GetCorrectedSetting(nvEXIF, section + "/" + l.Substring(0, valPos - 1), l.Substring(valPos).Trim(),
-									fNumber, exposureSecs, focalLength, iso, lens, camera);
+                                        fNumber, exposureSecs, focalLength, iso, lens, camera);
-
+
-								// Merge in new value
+                                // Merge in new value
-								l = l.Substring(0, valPos) + (newValue ?? "");
+                                l = l.Substring(0, valPos) + (newValue ?? "");
-							}
+                            }
-						}
+                        }
-
+
-						tw.WriteLine(l);
+                        tw.WriteLine(l);
-					}
+                    }
-				}
+                }
-
+
-			} catch (Exception ex) {
+            } catch (Exception ex) {
-				Console.WriteLine("Error: " + ex.ToString());  // can be seen in the RT console window
+                Console.WriteLine("Error: " + ex.ToString());  // can be seen in the RT console window
-
+
-				exitCode = 1;
+                exitCode = 1;
-			}
+            }
-
+
-			return exitCode;
+            return exitCode;
-		}
+        }
-
+
-
+
-		static NameValueCollection ParseFullExifData(string filePath) {
+        static NameValueCollection ParseFullExifData(string filePath) {
-			NameValueCollection nv = new NameValueCollection();
+            NameValueCollection nv = new NameValueCollection();
-
+
-			string exifToolPath = ConfigurationManager.AppSettings["ExifToolPath"];
+            string exifToolPath = ConfigurationManager.AppSettings["ExifToolPath"];
-			if (!String.IsNullOrEmpty(exifToolPath)) {
+            if (!String.IsNullOrEmpty(exifToolPath)) {
-				ProcessStartInfo psi = new ProcessStartInfo(exifToolPath, "\"" + filePath + "\" -tab -short");
+                ProcessStartInfo psi = new ProcessStartInfo(exifToolPath, "\"" + filePath + "\" -tab -short");
-				psi.CreateNoWindow = false;
+                psi.CreateNoWindow = false;
-				psi.UseShellExecute = false;
+                psi.UseShellExecute = false;
-				psi.StandardOutputEncoding = System.Text.Encoding.UTF8;
+                psi.StandardOutputEncoding = System.Text.Encoding.UTF8;
-				psi.RedirectStandardOutput = true;
+                psi.RedirectStandardOutput = true;
-
+
-				Process p = Process.Start(psi);
+                Process p = Process.Start(psi);
-
+
-				using (StreamReader sr = p.StandardOutput) {
+                using (StreamReader sr = p.StandardOutput) {
-					while (!sr.EndOfStream) {
+                    while (!sr.EndOfStream) {
-						string line = sr.ReadLine();
+                        string line = sr.ReadLine();
-						if (line.Contains("\t")) {
+                        if (line.Contains("\t")) {
-							string[] split = line.Split('\t');
+                            string[] split = line.Split('\t');
-							nv.Add(split[0], split[1]);
+                            nv.Add(split[0], split[1]);
-						}
+                        }
-					}
+                    }
-				}
+                }
-
+
-				p.WaitForExit();
+                p.WaitForExit();
-			}
+            }
-
+
-			return nv;
+            return nv;
-		}
+        }
-
+
-		#endregion
+#endregion
-	}
+    }
-
+
-	#region DistortionCorrectProf
+#region DistortionCorrectProf
-	/// <summary>Holds a distortion correction profile for one lens. Uses sample points (focal length vs. dist. correction) as input.</summary>
+    /// <summary>Holds a distortion correction profile for one lens. Uses sample points (focal length vs. dist. correction) as input.</summary>
-	class DistortionCorrectProf {
+    class DistortionCorrectProf {
-		double[] adFocLen, adCorrect;
+        double[] adFocLen, adCorrect;
-
+
-		/// <summary>Parses array to internal structure</summary>
+        /// <summary>Parses array to internal structure</summary>
-		/// <param name="focLen">Focal lengths</param>
+        /// <param name="focLen">Focal lengths</param>
-		/// <param name="correct">Correction factors</param>
+        /// <param name="correct">Correction factors</param>
-		public DistortionCorrectProf(double[] focLen, double[] correct) {
+        public DistortionCorrectProf(double[] focLen, double[] correct) {
-			if (focLen == null || correct == null || focLen.Length != correct.Length || focLen.Length < 2)
+            if (focLen == null || correct == null || focLen.Length != correct.Length || focLen.Length < 2)
-				throw new Exception("DistortionCorrectProf inputs must be valid and of the same lengths, at least 2 points");
+                throw new Exception("DistortionCorrectProf inputs must be valid and of the same lengths, at least 2 points");
-
+
-			adFocLen = focLen; adCorrect = correct;
+            adFocLen = focLen; adCorrect = correct;
-
+
-			for (int i = 0; i < adFocLen.Length - 1; i++)
+            for (int i = 0; i < adFocLen.Length - 1; i++)
-				if (adFocLen[i] >= adFocLen[i + 1]) throw new Exception("The distortion correction focal length points must be ordered!");
+                if (adFocLen[i] >= adFocLen[i + 1]) throw new Exception("The distortion correction focal length points must be ordered!");
-		}
+        }
-
+
-		/// <summary>Calculates regression value of RT distortion amount for the given focal length.</summary>
+        /// <summary>Calculates regression value of RT distortion amount for the given focal length.</summary>
-		/// <param name="focalLength">Input focal length.</param>
+        /// <param name="focalLength">Input focal length.</param>
-		/// <returns>Distortion in RT format.</returns>
+        /// <returns>Distortion in RT format.</returns>
-		public string GetDistortionAmount(double focalLength) {
+        public string GetDistortionAmount(double focalLength) {
-			// if it's out of area (which should just happen with e.g. rounding errors), return flat defaults.
+            // if it's out of area (which should just happen with e.g. rounding errors), return flat defaults.
-			if (focalLength <= adFocLen[0]) return adCorrect[0].ToString("G", CultureInfo.InvariantCulture);
+            if (focalLength <= adFocLen[0]) return adCorrect[0].ToString("G", CultureInfo.InvariantCulture);
-			if (focalLength >= adFocLen[adFocLen.Length - 1]) return adCorrect[adFocLen.Length - 1].ToString("G", CultureInfo.InvariantCulture);
+            if (focalLength >= adFocLen[adFocLen.Length - 1]) return adCorrect[adFocLen.Length - 1].ToString("G", CultureInfo.InvariantCulture);
-
+
-			for (int i = 0; i < adFocLen.Length - 1; i++) {
+            for (int i = 0; i < adFocLen.Length - 1; i++) {
-				if (focalLength >= adFocLen[i] && focalLength < adFocLen[i + 1]) {
+                if (focalLength >= adFocLen[i] && focalLength < adFocLen[i + 1]) {
-					// from the sample curves taken so far, it it safe to take a simple linear interpolation here
+                    // from the sample curves taken so far, it it safe to take a simple linear interpolation here
-					double corr = adCorrect[i] + (adCorrect[i + 1] - adCorrect[i]) * (focalLength - adFocLen[i]) / (adFocLen[i + 1] - adFocLen[i]);
+                    double corr = adCorrect[i] + (adCorrect[i + 1] - adCorrect[i]) * (focalLength - adFocLen[i]) / (adFocLen[i + 1] - adFocLen[i]);
-					return corr.ToString("G3", CultureInfo.InvariantCulture);
+                    return corr.ToString("G3", CultureInfo.InvariantCulture);
-				}
+                }
-			}
+            }
-
+
-			return "";  // should never happen
+            return "";  // should never happen
-		}
+        }
-	}
+    }
-	#endregion
+#endregion
-}
+}

tools/RTProfileBuilderSample.exe.config

@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
-<configuration>
+<configuration>
-	<appSettings>
+    <appSettings>
-		<!-- Set this full path to exiftool.exe. Rename exiftool(-k).exe to exiftool.exe before using it here! 
+        <!-- Set this full path to exiftool.exe. Rename exiftool(-k).exe to exiftool.exe before using it here! 
-			If you leave the value empty, EXIFTOOL is simply not used. -->
+        If you leave the value empty, EXIFTOOL is simply not used. -->
-		<add key="ExifToolPath" value="C:\Program Files (x86)\exiftool.exe"/>
+        <add key="ExifToolPath" value="C:\Program Files (x86)\exiftool.exe"/>
-	</appSettings>
+    </appSettings>
-</configuration>
+</configuration>

tools/osx/Info.plist-bin.in

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
-	<key>CFBundleName</key>
+        <key>CFBundleName</key>
-	<string>RawTherapee-bin</string>
+        <string>RawTherapee-bin</string>
-	<key>CFBundleIdentifier</key>
+        <key>CFBundleIdentifier</key>
-	<string>com.rawtherapee.rawtherapee</string>
+        <string>com.rawtherapee.rawtherapee</string>
-</dict>
+    </dict>
 </plist>

tools/osx/Info.plist.in

@@ -1,167 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
-	<key>CFBundleDevelopmentRegion</key>
+        <key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+        <string>English</string>
-	<key>CFBundleDisplayName</key>
+        <key>CFBundleDisplayName</key>
-	<string>RawTherapee</string>
+        <string>RawTherapee</string>
-	<key>CFBundleDocumentTypes</key>
+        <key>CFBundleDocumentTypes</key>
-	<array>
+        <array>
-		<dict>
+            <dict>
-			<key>CFBundleTypeExtensions</key>
+                <key>CFBundleTypeExtensions</key>
-			<array>
+                <array>
-				<string>pp3</string>
+                    <string>pp3</string>
-				<string>PP3</string>
+                    <string>PP3</string>
-			</array>
+                </array>
-			<key>CFBundleTypeIconFile</key>
+                <key>CFBundleTypeIconFile</key>
-			<string>profile.icns</string>
+                <string>profile.icns</string>
-			<key>CFBundleTypeName</key>
+                <key>CFBundleTypeName</key>
-			<string>RawTherapee Profile Data</string>
+                <string>RawTherapee Profile Data</string>
-			<key>CFBundleTypeRole</key>
+                <key>CFBundleTypeRole</key>
-			<string>Editor</string>
+                <string>Editor</string>
-			<key>LSIsAppleDefaultForType</key>
+                <key>LSIsAppleDefaultForType</key>
-			<true/>
+                <true/>
-			<key>LSItemContentTypes</key>
+                <key>LSItemContentTypes</key>
-			<array>
+                <array>
-				<string>com.rawtherapee.pp3</string>
+                    <string>com.rawtherapee.pp3</string>
-			</array>
+                </array>
-		</dict>
+            </dict>
-		<dict>
+            <dict>
-			<key>CFBundleTypeExtensions</key>
+                <key>CFBundleTypeExtensions</key>
-			<array>
+                <array>
-				<string>3FR</string>
+                    <string>3FR</string>
-				<string>3fr</string>
+                    <string>3fr</string>
-				<string>ARW</string>
+                    <string>ARW</string>
-				<string>arw</string>
+                    <string>arw</string>
-				<string>CR2</string>
+                    <string>CR2</string>
-				<string>cr2</string>
+                    <string>cr2</string>
-				<string>CRF</string>
+                    <string>CRF</string>
-				<string>crf</string>
+                    <string>crf</string>
-				<string>CRW</string>
+                    <string>CRW</string>
-				<string>crw</string>
+                    <string>crw</string>
-				<string>DCR</string>
+                    <string>DCR</string>
-				<string>dcr</string>
+                    <string>dcr</string>
-				<string>DNG</string>
+                    <string>DNG</string>
-				<string>dng</string>
+                    <string>dng</string>
-				<string>FFF</string>
+                    <string>FFF</string>
-				<string>fff</string>
+                    <string>fff</string>
-				<string>IIQ</string>
+                    <string>IIQ</string>
-				<string>iiq</string>
+                    <string>iiq</string>
-				<string>KDC</string>
+                    <string>KDC</string>
-				<string>kdc</string>
+                    <string>kdc</string>
-				<string>MEF</string>
+                    <string>MEF</string>
-				<string>mef</string>
+                    <string>mef</string>
-				<string>MOS</string>
+                    <string>MOS</string>
-				<string>mos</string>
+                    <string>mos</string>
-				<string>MRW</string>
+                    <string>MRW</string>
-				<string>mrw</string>
+                    <string>mrw</string>
-				<string>NEF</string>
+                    <string>NEF</string>
-				<string>nef</string>
+                    <string>nef</string>
-				<string>NRW</string>
+                    <string>NRW</string>
-				<string>nrw</string>
+                    <string>nrw</string>
-				<string>ORF</string>
+                    <string>ORF</string>
-				<string>orf</string>
+                    <string>orf</string>
-				<string>PEF</string>
+                    <string>PEF</string>
-				<string>pef</string>
+                    <string>pef</string>
-				<string>RAF</string>
+                    <string>RAF</string>
-				<string>raf</string>
+                    <string>raf</string>
-				<string>RAW</string>
+                    <string>RAW</string>
-				<string>raw</string>
+                    <string>raw</string>
-				<string>RW2</string>
+                    <string>RW2</string>
-				<string>rw2</string>
+                    <string>rw2</string>
-				<string>RWZ</string>
+                    <string>RWZ</string>
-				<string>rwz</string>
+                    <string>rwz</string>
-				<string>SR2</string>
+                    <string>SR2</string>
-				<string>sr2</string>
+                    <string>sr2</string>
-				<string>SRF</string>
+                    <string>SRF</string>
-				<string>srf</string>
+                    <string>srf</string>
-				<string>SRW</string>
+                    <string>SRW</string>
-				<string>srw</string>
+                    <string>srw</string>
-			</array>
+                </array>
-			<key>CFBundleTypeMIMETypes</key>
+                <key>CFBundleTypeMIMETypes</key>
-			<array>
+                <array>
-				<string>image/raw</string>
+                    <string>image/raw</string>
-			</array>
+                </array>
-			<key>CFBundleTypeName</key>
+                <key>CFBundleTypeName</key>
-			<string>Camera Raw</string>
+                <string>Camera Raw</string>
-			<key>CFBundleTypeRole</key>
+                <key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+                <string>Viewer</string>
-		</dict>
+            </dict>
-		<dict>
+            <dict>
-			<key>CFBundleTypeExtensions</key>
+                <key>CFBundleTypeExtensions</key>
-			<array>
+                <array>
-				<string>JPEG</string>
+                    <string>JPEG</string>
-				<string>jpeg</string>
+                    <string>jpeg</string>
-				<string>JPG</string>
+                    <string>JPG</string>
-				<string>jpg</string>
+                    <string>jpg</string>
-				<string>PNG</string>
+                    <string>PNG</string>
-				<string>png</string>
+                    <string>png</string>
-				<string>TIF</string>
+                    <string>TIF</string>
-				<string>tif</string>
+                    <string>tif</string>
-				<string>TIFF</string>
+                    <string>TIFF</string>
-				<string>tiff</string>
+                    <string>tiff</string>
-			</array>
+                </array>
-			<key>CFBundleTypeName</key>
+                <key>CFBundleTypeName</key>
-			<string>Image</string>
+                <string>Image</string>
-			<key>CFBundleTypeRole</key>
+                <key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+                <string>Viewer</string>
-		</dict>
+            </dict>
-	</array>
+        </array>
-	<key>CFBundleExecutable</key>
+        <key>CFBundleExecutable</key>
-	<string>rawtherapee</string>
+        <string>rawtherapee</string>
-	<key>CFBundleGetInfoString</key>
+        <key>CFBundleGetInfoString</key>
-	<string>@version@, Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
+        <string>@version@, Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
-	<key>CFBundleIconFile</key>
+        <key>CFBundleIconFile</key>
-	<string>rawtherapee.icns</string>
+        <string>rawtherapee.icns</string>
-	<key>CFBundleIdentifier</key>
+        <key>CFBundleIdentifier</key>
-	<string>com.rawtherapee.rawtherapee</string>
+        <string>com.rawtherapee.rawtherapee</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+        <key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+        <string>6.0</string>
-	<key>CFBundleName</key>
+        <key>CFBundleName</key>
-	<string>RawTherapee</string>
+        <string>RawTherapee</string>
-	<key>CFBundlePackageType</key>
+        <key>CFBundlePackageType</key>
-	<string>APPL</string>
+        <string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+        <key>CFBundleShortVersionString</key>
-	<string>@shortVersion@</string>
+        <string>@shortVersion@</string>
-	<key>CFBundleSignature</key>
+        <key>CFBundleSignature</key>
-	<string>????</string>
+        <string>????</string>
-	<key>CFBundleVersion</key>
+        <key>CFBundleVersion</key>
-	<string>@shortVersion@</string>
+        <string>@shortVersion@</string>
-	<key>LSExecutableArchitectures</key>
+        <key>LSExecutableArchitectures</key>
-	<array>
+        <array>
-		<string>@arch@</string>
+            <string>@arch@</string>
-	</array>
+        </array>
-	<key>NSHighResolutionCapable</key>
+        <key>NSHighResolutionCapable</key>
-	<true/>
+        <true/>
-	<key>NSHumanReadableCopyright</key>
+        <key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
+        <string>Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
-	<key>UTExportedTypeDeclarations</key>
+        <key>UTExportedTypeDeclarations</key>
-	<array>
+        <array>
-		<dict>
+            <dict>
-			<key>UTTypeConformsTo</key>
+                <key>UTTypeConformsTo</key>
-			<array>
+                <array>
-				<string>public.data</string>
+                    <string>public.data</string>
-			</array>
+                </array>
-			<key>UTTypeDescription</key>
+                <key>UTTypeDescription</key>
-			<string>RawTherapee Profile Data</string>
+                <string>RawTherapee Profile Data</string>
-			<key>UTTypeIconFile</key>
+                <key>UTTypeIconFile</key>
-			<string>Icons.icns</string>
+                <string>Icons.icns</string>
-			<key>UTTypeIdentifier</key>
+                <key>UTTypeIdentifier</key>
-			<string>com.rawtherapee.pp3</string>
+                <string>com.rawtherapee.pp3</string>
-			<key>UTTypeReferenceURL</key>
+                <key>UTTypeReferenceURL</key>
-			<string>http://www.rawtherapee.com/</string>
+                <string>http://www.rawtherapee.com/</string>
-			<key>UTTypeTagSpecification</key>
+                <key>UTTypeTagSpecification</key>
-			<dict>
+                <dict>
-				<key>com.apple.ostype</key>
+                    <key>com.apple.ostype</key>
-				<string>PP3</string>
+                    <string>PP3</string>
-				<key>public.filename-extension</key>
+                    <key>public.filename-extension</key>
-				<array>
+                    <array>
-					<string>pp3</string>
+                        <string>pp3</string>
-					<string>PP3</string>
+                        <string>PP3</string>
-				</array>
+                    </array>
-			</dict>
+                </dict>
-		</dict>
+            </dict>
-	</array>
+        </array>
-</dict>
+    </dict>
 </plist>

tools/osx/rt.entitlements

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
-	<key>application-identifier</key>
+        <key>application-identifier</key>
-	<string>com.rawtherapee.rawtherapee</string>
+        <string>com.rawtherapee.rawtherapee</string>
-	<key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
+        <key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
-	<array>
+        <array>
-		<string>&quot;/&quot;</string>
+            <string>&quot;/&quot;</string>
-	</array>
+        </array>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
+        <true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
+        <key>com.apple.security.files.user-selected.read-write</key>
-	<true/>
+        <true/>
-	<key>com.apple.security.app-sandbox</key>
+        <key>com.apple.security.app-sandbox</key>
-	<true/>
+        <true/>
-	<key>com.apple.security.files.downloads.read-write</key>
+        <key>com.apple.security.files.downloads.read-write</key>
-	<true/>
+        <true/>
-</dict>
+    </dict>
 </plist>