diff --git a/rtdata/languages/English b/rtdata/languages/English
index 6cc5252c4..2565d0f16 100644
--- a/rtdata/languages/English
+++ b/rtdata/languages/English
@@ -151,7 +151,7 @@
!HISTORY_MSG_16;Luminance Black
!HISTORY_MSG_17;Luminance Highlight Compr.
!HISTORY_MSG_18;Luminance Shadow Compr.
-!HISTORY_MSG_19;Luminance Curve
+!HISTORY_MSG_19;'L' Curve
!HISTORY_MSG_1;Photo Loaded
!HISTORY_MSG_20;Sharpening
!HISTORY_MSG_21;Sharpening Radius
@@ -226,14 +226,20 @@
!HISTORY_MSG_84;Perspective correction
!HISTORY_MSG_85;Wavelet coefficients
!HISTORY_MSG_86;Wavelet equalizer
-!HISTORY_MSG_87;Impulse noise reduction
-!HISTORY_MSG_89;Directional pyramid
+!HISTORY_MSG_87;Spot noise reduction
+!HISTORY_MSG_88;Spot NR threshold
+!HISTORY_MSG_89;Noise reduction
!HISTORY_MSG_8;Exposure Compensation
-!HISTORY_MSG_90;Directional pyramid luminance
-!HISTORY_MSG_91;Directional pyramid chominance
-!HISTORY_MSG_92;Directional pyramid gamma
-!HISTORY_MSG_93;Contrast by detail levels parameter
+!HISTORY_MSG_90;NR - luminance
+!HISTORY_MSG_91;NR - chrominance
+!HISTORY_MSG_92;NR - gamma
+!HISTORY_MSG_93;Contrast by detail levels value
!HISTORY_MSG_94;Contrast by detail levels
+!HISTORY_MSG_95;Saturation
+!HISTORY_MSG_96;'a' curve
+!HISTORY_MSG_97;'b' curve
+!HISTORY_MSG_98;Demozaicing
+!HISTORY_MSG_99;Preprocessing
!HISTORY_MSG_9;Highlight Compression
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOTAS;As...
@@ -422,7 +428,7 @@
!PREFERENCES_CMETRICINTENT;Colorimetric Intent
!PREFERENCES_DARKFRAME;Dark frame
!PREFERENCES_DATEFORMAT;Date Format
-!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:n%y : yearn%m : monthn%d : daynnFor example, the hungarian date format is:n%y/%m/%d
+!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y : year\n%m : month\n%d : day\n\nFor example, the hungarian date format is:\n%y/%m/%d
!PREFERENCES_DCBENHANCE;Apply DCB enhancement step
!PREFERENCES_DCBITERATIONS;Number of DCB iterations
!PREFERENCES_DEFAULTLANG;Default language
@@ -462,9 +468,9 @@
!PREFERENCES_OUTDIR;Output Directory
!PREFERENCES_OUTDIRFOLDER;Save to folder
!PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder
-!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OUTDIRTEMPLATE;Use Template
-!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
!PREFERENCES_PARSEDEXT;Parsed Extensions
!PREFERENCES_PARSEDEXTADD;Add Extension
@@ -596,9 +602,9 @@
!TP_DETAIL_AMOUNT;Amount
!TP_DIRPYRDENOISE_CHROMA;Chrominance
!TP_DIRPYRDENOISE_GAMMA;Gamma
-!TP_DIRPYRDENOISE_LABEL;Directional pyramid noise reduction
+!TP_DIRPYRDENOISE_LABEL;Noise reduction
!TP_DIRPYRDENOISE_LUMA;Luminance
-!TP_DIRPYREQUALIZER_LABEL;Directional pyramid equalizer
+!TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels
!TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest
!TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
!TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+
@@ -642,7 +648,7 @@
!TP_ICM_OUTPUTPROFILE;Output Profile
!TP_ICM_SAVEREFERENCE;Save reference image for profiling
!TP_ICM_WORKINGPROFILE;Working Profile
-!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
+!TP_IMPULSEDENOISE_LABEL;Spot Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_BRIGHTNESS;Brightness
!TP_LABCURVE_CONTRAST;Contrast
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 65faf1d8e..42bff48a7 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -180,7 +180,7 @@ TP_HLREC_COLOR;Colour Propagation
!HISTORY_MSG_16;Luminance Black
!HISTORY_MSG_17;Luminance Highlight Compr.
!HISTORY_MSG_18;Luminance Shadow Compr.
-!HISTORY_MSG_19;Luminance Curve
+!HISTORY_MSG_19;'L' Curve
!HISTORY_MSG_1;Photo Loaded
!HISTORY_MSG_20;Sharpening
!HISTORY_MSG_21;Sharpening Radius
@@ -204,6 +204,7 @@ TP_HLREC_COLOR;Colour Propagation
!HISTORY_MSG_43;Luminance Denoising
!HISTORY_MSG_44;Lum. Denoising Radius
!HISTORY_MSG_45;Lum. Denoising Edge Tolerance
+!HISTORY_MSG_4;History Browsing
!HISTORY_MSG_50;Shadow/Highlight tool
!HISTORY_MSG_51;Highlight boost
!HISTORY_MSG_52;Shadow Boost
@@ -224,6 +225,7 @@ TP_HLREC_COLOR;Colour Propagation
!HISTORY_MSG_66;Highlight Recovery
!HISTORY_MSG_67;Highlight Recovery Amount
!HISTORY_MSG_68;Highlight Recovery Method
+!HISTORY_MSG_6;Contrast
!HISTORY_MSG_72;Vignetting Correction
!HISTORY_MSG_73;Channel Mixer
!HISTORY_MSG_74;Resize Scale
@@ -232,6 +234,7 @@ TP_HLREC_COLOR;Colour Propagation
!HISTORY_MSG_77;IPTC Metadata
!HISTORY_MSG_78;Data specified for resize
!HISTORY_MSG_79;Resize width
+!HISTORY_MSG_7;Black
!HISTORY_MSG_80;Resize height
!HISTORY_MSG_81;Resize enabled
!HISTORY_MSG_82;Profile Changed
@@ -239,14 +242,20 @@ TP_HLREC_COLOR;Colour Propagation
!HISTORY_MSG_84;Perspective correction
!HISTORY_MSG_85;Wavelet coefficients
!HISTORY_MSG_86;Wavelet equalizer
-!HISTORY_MSG_87;Impulse noise reduction
-!HISTORY_MSG_89;Directional pyramid
+!HISTORY_MSG_87;Spot noise reduction
+!HISTORY_MSG_88;Spot NR threshold
+!HISTORY_MSG_89;Noise reduction
!HISTORY_MSG_8;Exposure Compensation
-!HISTORY_MSG_90;Directional pyramid luminance
-!HISTORY_MSG_91;Directional pyramid chominance
-!HISTORY_MSG_92;Directional pyramid gamma
-!HISTORY_MSG_93;Contrast by detail levels parameter
+!HISTORY_MSG_90;NR - luminance
+!HISTORY_MSG_91;NR - chrominance
+!HISTORY_MSG_92;NR - gamma
+!HISTORY_MSG_93;Contrast by detail levels value
!HISTORY_MSG_94;Contrast by detail levels
+!HISTORY_MSG_95;Saturation
+!HISTORY_MSG_96;'a' curve
+!HISTORY_MSG_97;'b' curve
+!HISTORY_MSG_98;Demozaicing
+!HISTORY_MSG_99;Preprocessing
!HISTORY_MSG_9;Highlight Compression
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOTAS;As...
@@ -288,6 +297,7 @@ TP_HLREC_COLOR;Colour Propagation
!IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
!IPTCPANEL_CREDIT;Credit
!IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
+!IPTCPANEL_DATECREATED;Date Created
!IPTCPANEL_EMBEDDED;Embedded
!IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file
!IPTCPANEL_HEADLINE;Headline
@@ -425,7 +435,7 @@ TP_HLREC_COLOR;Colour Propagation
!PREFERENCES_CMETRICINTENT;Colorimetric Intent
!PREFERENCES_DARKFRAME;Dark frame
!PREFERENCES_DATEFORMAT;Date Format
-!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:n%y : yearn%m : monthn%d : daynnFor example, the hungarian date format is:n%y/%m/%d
+!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y : year\n%m : month\n%d : day\n\nFor example, the hungarian date format is:\n%y/%m/%d
!PREFERENCES_DCBENHANCE;Apply DCB enhancement step
!PREFERENCES_DCBITERATIONS;Number of DCB iterations
!PREFERENCES_DEFAULTLANG;Default language
@@ -464,9 +474,9 @@ TP_HLREC_COLOR;Colour Propagation
!PREFERENCES_OUTDIR;Output Directory
!PREFERENCES_OUTDIRFOLDER;Save to folder
!PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder
-!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OUTDIRTEMPLATE;Use Template
-!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
!PREFERENCES_PARSEDEXT;Parsed Extensions
!PREFERENCES_PARSEDEXTADD;Add Extension
@@ -593,9 +603,9 @@ TP_HLREC_COLOR;Colour Propagation
!TP_DETAIL_AMOUNT;Amount
!TP_DIRPYRDENOISE_CHROMA;Chrominance
!TP_DIRPYRDENOISE_GAMMA;Gamma
-!TP_DIRPYRDENOISE_LABEL;Directional pyramid noise reduction
+!TP_DIRPYRDENOISE_LABEL;Noise reduction
!TP_DIRPYRDENOISE_LUMA;Luminance
-!TP_DIRPYREQUALIZER_LABEL;Directional pyramid equalizer
+!TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels
!TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest
!TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
!TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+
@@ -638,7 +648,7 @@ TP_HLREC_COLOR;Colour Propagation
!TP_ICM_OUTPUTPROFILE;Output Profile
!TP_ICM_SAVEREFERENCE;Save reference image for profiling
!TP_ICM_WORKINGPROFILE;Working Profile
-!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
+!TP_IMPULSEDENOISE_LABEL;Spot Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_BRIGHTNESS;Brightness
!TP_LABCURVE_CONTRAST;Contrast
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index a6520951a..3d670ccfe 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -151,7 +151,7 @@
!HISTORY_MSG_16;Luminance Black
!HISTORY_MSG_17;Luminance Highlight Compr.
!HISTORY_MSG_18;Luminance Shadow Compr.
-!HISTORY_MSG_19;Luminance Curve
+!HISTORY_MSG_19;'L' Curve
!HISTORY_MSG_1;Photo Loaded
!HISTORY_MSG_20;Sharpening
!HISTORY_MSG_21;Sharpening Radius
@@ -226,14 +226,20 @@
!HISTORY_MSG_84;Perspective correction
!HISTORY_MSG_85;Wavelet coefficients
!HISTORY_MSG_86;Wavelet equalizer
-!HISTORY_MSG_87;Impulse noise reduction
-!HISTORY_MSG_89;Directional pyramid
+!HISTORY_MSG_87;Spot noise reduction
+!HISTORY_MSG_88;Spot NR threshold
+!HISTORY_MSG_89;Noise reduction
!HISTORY_MSG_8;Exposure Compensation
-!HISTORY_MSG_90;Directional pyramid luminance
-!HISTORY_MSG_91;Directional pyramid chominance
-!HISTORY_MSG_92;Directional pyramid gamma
-!HISTORY_MSG_93;Contrast by detail levels parameter
+!HISTORY_MSG_90;NR - luminance
+!HISTORY_MSG_91;NR - chrominance
+!HISTORY_MSG_92;NR - gamma
+!HISTORY_MSG_93;Contrast by detail levels value
!HISTORY_MSG_94;Contrast by detail levels
+!HISTORY_MSG_95;Saturation
+!HISTORY_MSG_96;'a' curve
+!HISTORY_MSG_97;'b' curve
+!HISTORY_MSG_98;Demozaicing
+!HISTORY_MSG_99;Preprocessing
!HISTORY_MSG_9;Highlight Compression
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOTAS;As...
@@ -422,7 +428,7 @@
!PREFERENCES_CMETRICINTENT;Colorimetric Intent
!PREFERENCES_DARKFRAME;Dark frame
!PREFERENCES_DATEFORMAT;Date Format
-!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:n%y : yearn%m : monthn%d : daynnFor example, the hungarian date format is:n%y/%m/%d
+!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y : year\n%m : month\n%d : day\n\nFor example, the hungarian date format is:\n%y/%m/%d
!PREFERENCES_DCBENHANCE;Apply DCB enhancement step
!PREFERENCES_DCBITERATIONS;Number of DCB iterations
!PREFERENCES_DEFAULTLANG;Default language
@@ -462,9 +468,9 @@
!PREFERENCES_OUTDIR;Output Directory
!PREFERENCES_OUTDIRFOLDER;Save to folder
!PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder
-!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OUTDIRTEMPLATE;Use Template
-!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f
+!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
!PREFERENCES_PARSEDEXT;Parsed Extensions
!PREFERENCES_PARSEDEXTADD;Add Extension
@@ -596,9 +602,9 @@
!TP_DETAIL_AMOUNT;Amount
!TP_DIRPYRDENOISE_CHROMA;Chrominance
!TP_DIRPYRDENOISE_GAMMA;Gamma
-!TP_DIRPYRDENOISE_LABEL;Directional pyramid noise reduction
+!TP_DIRPYRDENOISE_LABEL;Noise reduction
!TP_DIRPYRDENOISE_LUMA;Luminance
-!TP_DIRPYREQUALIZER_LABEL;Directional pyramid equalizer
+!TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels
!TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest
!TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
!TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+
@@ -642,7 +648,7 @@
!TP_ICM_OUTPUTPROFILE;Output Profile
!TP_ICM_SAVEREFERENCE;Save reference image for profiling
!TP_ICM_WORKINGPROFILE;Working Profile
-!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
+!TP_IMPULSEDENOISE_LABEL;Spot Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_BRIGHTNESS;Brightness
!TP_LABCURVE_CONTRAST;Contrast
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 8476ef20e..590985f85 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -145,7 +145,7 @@ HISTORY_MSG_15;Luminance - Contraste
HISTORY_MSG_16;Luminance - Noir
HISTORY_MSG_17;Luminance - Compression Hautes lumières
HISTORY_MSG_18;Luminance - Compression des Ombres
-HISTORY_MSG_19;Luminance - Courbe
+HISTORY_MSG_19;Courbe 'L'
HISTORY_MSG_1;Photo chargée
HISTORY_MSG_20;Netteté
HISTORY_MSG_21;Netteté - Rayon
@@ -221,6 +221,7 @@ HISTORY_MSG_84;Correction de la perspective
HISTORY_MSG_85;Coefficients d'ondelette
HISTORY_MSG_86;Égaliseur d'ondelette
HISTORY_MSG_87;Réduction du bruit d'impulsion
+HISTORY_MSG_88;Seuil de réduction de bruit
HISTORY_MSG_89;Réd. du bruit présevant les bords
HISTORY_MSG_8;Compensation d'exposition
HISTORY_MSG_90;Réd. de bruit Luminance
@@ -228,6 +229,11 @@ HISTORY_MSG_91;Réd. de bruit Chominance
HISTORY_MSG_92;Réd. de bruit Gamma
HISTORY_MSG_93;Param. de contraste
HISTORY_MSG_94;Contraste par niveau de détail
+HISTORY_MSG_95;Saturation
+HISTORY_MSG_96;Courbe 'a'
+HISTORY_MSG_97;Courbe 'b'
+HISTORY_MSG_98;Dématriçage
+HISTORY_MSG_99;Pre-traitement
HISTORY_MSG_9;Compression des hautes lumières
HISTORY_NEWSNAPSHOT;Ajouter
HISTORY_NEWSNAPSHOTAS;Sous...
@@ -403,7 +409,7 @@ PREFERENCES_CACHESTRAT2;Optimiser la consommation mémoire au détriment de la v
PREFERENCES_CACHESTRAT;Stratégie de gestion du Cache
PREFERENCES_CACHETHUMBFORM;Format des vignettes du Cache
PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes
-PREFERENCES_CACORRECTION;Appliquer la correction auto. de l'aberration chromatique
+PREFERENCES_CACORRECTION;Correction automatique de\nl'aberration chromatique
PREFERENCES_CLEARDLG_LINE1;Nettoyage du Cache
PREFERENCES_CLEARDLG_LINE2;Ceci peut prendre plusieurs secondes.
PREFERENCES_CLEARDLG_TITLE;Veuillez patienter
@@ -426,7 +432,7 @@ PREFERENCES_DMETHODBATCH;Batch
PREFERENCES_EDITORCMDLINE;Autre ligne de commande
PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur
PREFERENCES_EXTERNALEDITOR;Éditeur externe
-PREFERENCES_FALSECOLOR;Itérations pour la suppression des fausses couleurs
+PREFERENCES_FALSECOLOR;Itérations pour la suppression\ndes fausses couleurs
PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers
PREFERENCES_FILEFORMAT;Format du fichier
PREFERENCES_FORIMAGE;Pour les fichiers images
@@ -436,7 +442,7 @@ PREFERENCES_GREENEQUIL;Équilibrage du vert
PREFERENCES_GTKTHEME;GTK par défaut
PREFERENCES_HINT;Conseil
PREFERENCES_HLTHRESHOLD;Seuil pour le dépassement de domaine supérieur
-PREFERENCES_HOTDEADPIXFILT;Appliquer le filtre des pixels chauds/morts
+PREFERENCES_HOTDEADPIXFILT;Filtrer les pixels chauds/morts
PREFERENCES_ICCDIR;Dossier des profils ICC
PREFERENCES_IMPROCPARAMS;Paramètres de traitement d'image par défaut
PREFERENCES_INTENT_ABSOLUTE;Colorimétrie absolue
@@ -586,7 +592,7 @@ TP_DIRPYRDENOISE_CHROMA;Chrominance
TP_DIRPYRDENOISE_GAMMA;Gamma
TP_DIRPYRDENOISE_LABEL;Réduction du bruit présevant les bords
TP_DIRPYRDENOISE_LUMA;Luminance
-TP_DIRPYREQUALIZER_LABEL;Égaliseur d'amas
+TP_DIRPYREQUALIZER_LABEL;Contraste par niveaux de détail
TP_DIRPYREQUALIZER_LUMACOARSEST;les plus gros
TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contraste-
TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contraste+
@@ -714,38 +720,31 @@ ZOOMPANEL_ZOOM100;Zoom à 100% 1
ZOOMPANEL_ZOOMFITSCREEN;Ajuster à la fenêtre F
ZOOMPANEL_ZOOMIN;Zoom +
ZOOMPANEL_ZOOMOUT;Zoom -
-
-
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-!FILEBROWSER_AUTODARKFRAME;Auto dark frame
-!FILEBROWSER_MOVETODARKFDIR;Move to dark frames directory
-!FILEBROWSER_SELECTDARKFRAME;Select dark frame...
-!MAIN_TAB_RAW;RAW
-!NAVIGATOR_LAB_A_NA;A = n/a
-!NAVIGATOR_LAB_A_VALUE;A = %1
-!NAVIGATOR_LAB_B_NA;B = n/a
-!NAVIGATOR_LAB_B_VALUE;B = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!PARTIALPASTE_LABCURVE;Lab curve
-!PARTIALPASTE_LABCURVE;Luminance curve
-!PREFERENCES_DARKFRAME;Dark frame
-!PREFERENCES_DIRDARKFRAMES;Dark frames directory
-!TP_LABCURVE_BRIGHTNESS;Brightness
-!TP_LABCURVE_CONTRAST;Contrast
-!TP_LABCURVE_CURVEEDITOR;Luminance Curve
-!TP_LABCURVE_LABEL;Lab Curves
-!TP_LABCURVE_SATURATION;Saturation
-!TP_PREPROCESS_DARKFRAME;Dark frame
-!TP_PREPROCESS_DFAUTOSELECT;Auto selection
-!TP_RAWPANEL_DEMOSAICING;Demosaicing
-!TP_RAWPANEL_PREPROCESSING;Preprocessing
-!TP_RESIZE_LANCZOS;Lanczos
-!TP_VIGNETTING_CENTER;Center
-!TP_VIGNETTING_CENTER_X;Center X
-!TP_VIGNETTING_CENTER_Y;Center Y
-!TP_VIGNETTING_STRENGTH;Strength
+FILEBROWSER_AUTODARKFRAME;Soustraction d'image noire automatique
+FILEBROWSER_MOVETODARKFDIR;Déplacer dans le dossier d'images noires
+FILEBROWSER_SELECTDARKFRAME;Choisir une image noire...
+MAIN_TAB_RAW;RAW
+NAVIGATOR_LAB_A_NA;a = n/d
+NAVIGATOR_LAB_A_VALUE;a = %1
+NAVIGATOR_LAB_B_NA;b = n/d
+NAVIGATOR_LAB_B_VALUE;b = %1
+NAVIGATOR_LAB_L_NA;L = n/d
+NAVIGATOR_LAB_L_VALUE;L = %1
+PARTIALPASTE_LABCURVE;Courebes Lab
+PARTIALPASTE_LABCURVE;Courbe de luminance
+PREFERENCES_DARKFRAME;Soustraction d'image noire
+PREFERENCES_DIRDARKFRAMES;Dossier d'images noires
+TP_LABCURVE_BRIGHTNESS;Luminosité
+TP_LABCURVE_CONTRAST;Contraste
+TP_LABCURVE_CURVEEDITOR;Courbe de luminance
+TP_LABCURVE_LABEL;Courbes Lab
+TP_LABCURVE_SATURATION;Saturation
+TP_PREPROCESS_DARKFRAME;Image noire
+TP_PREPROCESS_DFAUTOSELECT;Sélection automatique
+TP_RAWPANEL_DEMOSAICING;Dématriçage
+TP_RAWPANEL_PREPROCESSING;Pre-traitement
+TP_RESIZE_LANCZOS;Lanczos
+TP_VIGNETTING_CENTER;Centre
+TP_VIGNETTING_CENTER_X;Centre X
+TP_VIGNETTING_CENTER_Y;Centre Y
+TP_VIGNETTING_STRENGTH;Force
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 338c9371b..88db8c9b6 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -144,7 +144,7 @@ HISTORY_MSG_15;Luminance Contrast
HISTORY_MSG_16;Luminance Black
HISTORY_MSG_17;Luminance Highlight Compr.
HISTORY_MSG_18;Luminance Shadow Compr.
-HISTORY_MSG_19;Luminance Curve
+HISTORY_MSG_19;'L' Curve
HISTORY_MSG_1;Photo Loaded
HISTORY_MSG_20;Sharpening
HISTORY_MSG_21;Sharpening Radius
@@ -219,14 +219,20 @@ HISTORY_MSG_83;High quality shadows/highlights
HISTORY_MSG_84;Perspective correction
HISTORY_MSG_85;Wavelet coefficients
HISTORY_MSG_86;Wavelet equalizer
-HISTORY_MSG_87;Impulse noise reduction
-HISTORY_MSG_89;Directional pyramid
+HISTORY_MSG_87;Spot noise reduction
+HISTORY_MSG_88;Spot NR threshold
+HISTORY_MSG_89;Noise reduction
HISTORY_MSG_8;Exposure Compensation
-HISTORY_MSG_90;Directional pyramid luminance
-HISTORY_MSG_91;Directional pyramid chominance
-HISTORY_MSG_92;Directional pyramid gamma
-HISTORY_MSG_93;Contrast by detail levels parameter
+HISTORY_MSG_90;NR - luminance
+HISTORY_MSG_91;NR - chrominance
+HISTORY_MSG_92;NR - gamma
+HISTORY_MSG_93;Contrast by detail levels value
HISTORY_MSG_94;Contrast by detail levels
+HISTORY_MSG_95;Saturation
+HISTORY_MSG_96;'a' curve
+HISTORY_MSG_97;'b' curve
+HISTORY_MSG_98;Demozaicing
+HISTORY_MSG_99;Preprocessing
HISTORY_MSG_9;Highlight Compression
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOTAS;As...
@@ -589,9 +595,9 @@ TP_CROP_Y;y
TP_DETAIL_AMOUNT;Amount
TP_DIRPYRDENOISE_CHROMA;Chrominance
TP_DIRPYRDENOISE_GAMMA;Gamma
-TP_DIRPYRDENOISE_LABEL;Directional pyramid noise reduction
+TP_DIRPYRDENOISE_LABEL;Noise reduction
TP_DIRPYRDENOISE_LUMA;Luminance
-TP_DIRPYREQUALIZER_LABEL;Directional pyramid equalizer
+TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels
TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest
TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+
@@ -635,7 +641,7 @@ TP_ICM_OUTPUTDLGLABEL;Select Output ICC Profile...
TP_ICM_OUTPUTPROFILE;Output Profile
TP_ICM_SAVEREFERENCE;Save reference image for profiling
TP_ICM_WORKINGPROFILE;Working Profile
-TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
+TP_IMPULSEDENOISE_LABEL;Spot Noise Reduction
TP_IMPULSEDENOISE_THRESH;Threshold
TP_LABCURVE_BRIGHTNESS;Brightness
TP_LABCURVE_CONTRAST;Contrast
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index fbe40fa1e..9f2a2208e 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -108,19 +108,19 @@ enum ProcEvent {
EvPerspCorr=83,
EvEqualizer=84,
EvEqlEnabled=85,
- EvDemosaic=86,
- EvPreProcess=87,
- EvIDNEnabled=88,
- EvIDNThresh=89,
- EvDPDNEnabled=90,
- EvDPDNLuma=91,
- EvDPDNChroma=92,
- EvDPDNGamma=93,
- EvDirPyrEqualizer=94,
- EvDirPyrEqlEnabled=95,
- EvLSaturation=96,
- EvLaCurve=97,
- EvLbCurve=98,
+ EvIDNEnabled=86,
+ EvIDNThresh=87,
+ EvDPDNEnabled=88,
+ EvDPDNLuma=89,
+ EvDPDNChroma=90,
+ EvDPDNGamma=91,
+ EvDirPyrEqualizer=92,
+ EvDirPyrEqlEnabled=93,
+ EvLSaturation=94,
+ EvLaCurve=95,
+ EvLbCurve=96,
+ EvDemosaic=97,
+ EvPreProcess=98,
NUMOFEVENTS=99
};
}
diff --git a/rtgui/impulsedenoise.cc b/rtgui/impulsedenoise.cc
index 8f82e360e..f09cce743 100644
--- a/rtgui/impulsedenoise.cc
+++ b/rtgui/impulsedenoise.cc
@@ -29,7 +29,7 @@ ImpulseDenoise::ImpulseDenoise () : ToolPanel() {
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
enabled->set_active (false);
- thresh = Gtk::manage (new Adjuster (M("TP_DETAIL_AMOUNT"), 0, 100, 1, 10));
+ thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 10));
pack_start (*enabled);
pack_start (*Gtk::manage (new Gtk::HSeparator()));
@@ -86,7 +86,7 @@ void ImpulseDenoise::adjusterChanged (Adjuster* a, double newval) {
if (listener && enabled->get_active()) {
- listener->panelChanged (EvCDNRadius, Glib::ustring::format (std::setw(2), std::fixed, std::setprecision(1), a->getValue()));
+ listener->panelChanged (EvIDNThresh, Glib::ustring::format (std::setw(2), std::fixed, std::setprecision(1), a->getValue()));
}
}