Merge branch 'master' into 'gtk3'

Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.

rtdata/languages/default

@@ -171,6 +171,7 @@ FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
 FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
 FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
 FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
+FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
 FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
 FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>
 FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b>
@@ -598,7 +599,7 @@ HISTORY_MSG_363;W - Residual - Compression strength
 HISTORY_MSG_364;W - Final - Contrast balance
 HISTORY_MSG_365;W - Final - Delta balance
 HISTORY_MSG_366;W - Residual - Compression gamma
-HISTORY_MSG_367;W - ES - Local contrast curve
+HISTORY_MSG_367;W - Final - 'After' contrast curve
 HISTORY_MSG_368;W - Final - Contrast balance
 HISTORY_MSG_369;W - Final - Balance method
 HISTORY_MSG_370;W - Final - Local contrast curve
@@ -639,11 +640,11 @@ HISTORY_MSG_404;W - ES - Base amplification
 HISTORY_MSG_405;W - Denoise - Level 4
 HISTORY_MSG_406;W - ES - Neighboring pixels
 HISTORY_MSG_407;Retinex - Method
-HISTORY_MSG_408;Retinex - Neighboring
-HISTORY_MSG_409;Retinex - Gain
-HISTORY_MSG_410;Retinex - Offset
+HISTORY_MSG_408;Retinex - Radius
+HISTORY_MSG_409;Retinex - Contrast
+HISTORY_MSG_410;Retinex - Brightness
 HISTORY_MSG_411;Retinex - Strength
-HISTORY_MSG_412;Retinex - Scales
+HISTORY_MSG_412;Retinex - Gaussian Gradient
 HISTORY_MSG_413;Retinex - Variance
 HISTORY_MSG_414;Retinex - Histogram - Lab
 HISTORY_MSG_415;Retinex - Transmission
@@ -658,6 +659,19 @@ HISTORY_MSG_423;Retinex - Gamma slope
 HISTORY_MSG_424;Retinex - HL threshold
 HISTORY_MSG_425;Retinex - Log base
 HISTORY_MSG_426;Retinex - Hue equalizer
+HISTORY_MSG_427;Output rendering intent
+HISTORY_MSG_428;Monitor rendering intent
+HISTORY_MSG_429;Retinex - Iterations
+HISTORY_MSG_430;Retinex - Transmission Gradient
+HISTORY_MSG_431;Retinex - Strength Gradient
+HISTORY_MSG_432;Retinex - M - Highlights
+HISTORY_MSG_433;Retinex - M - Highlights TW
+HISTORY_MSG_434;Retinex - M - Shadows
+HISTORY_MSG_435;Retinex - M - Shadows TW
+HISTORY_MSG_436;Retinex - M - Radius
+HISTORY_MSG_437;Retinex - M - Method
+HISTORY_MSG_438;Retinex - M - Equalizer
+HISTORY_MSG_439;Retinex - Preview
 HISTORY_NEWSNAPSHOT;Add
 HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snapshot
@@ -775,6 +789,8 @@ MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
 MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
 MAIN_TOOLTIP_THRESHOLD;Threshold
 MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
+MONITOR_SOFTPROOF;Soft-proof
+MONITOR_PROFILE_SYSTEM;System default
 NAVIGATOR_B;B:
 NAVIGATOR_G;G:
 NAVIGATOR_H;H:
@@ -834,6 +850,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
 PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
 PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
 PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+PARTIALPASTE_PRSHARPENING;Post-resize sharpening
 PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
 PARTIALPASTE_RAWCACORR_CABLUE;CA blue
 PARTIALPASTE_RAWCACORR_CARED;CA red
@@ -888,7 +905,7 @@ PREFERENCES_CLIPPINGIND;Clipping Indication
 PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 PREFERENCES_CLUTSDIR;HaldCLUT directory
-PREFERENCES_CMETRICINTENT;Colorimetric intent
+PREFERENCES_MONINTENT;Default monitor intent
 PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -983,7 +1000,7 @@ PREFERENCES_MENUGROUPRANK;Group "Rank"
 PREFERENCES_MENUOPTIONS;Context Menu Options
 PREFERENCES_METADATA;Metadata
 PREFERENCES_MIN;Mini (100x115)
-PREFERENCES_MONITORICC;Monitor color profile
+PREFERENCES_MONPROFILE;Default monitor profile
 PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1002,6 +1019,8 @@ PREFERENCES_PARSEDEXT;Parsed Extensions
 PREFERENCES_PARSEDEXTADD;Add extension
 PREFERENCES_PARSEDEXTADDHINT;Add entered extension to the list.
 PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list.
+PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
+PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
 PREFERENCES_PREVDEMO;Preview Demosaic Method
 PREFERENCES_PREVDEMO_FAST;Fast
 PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1012,6 +1031,7 @@ PREFERENCES_PROFILEPRCACHE;Profile in cache
 PREFERENCES_PROFILEPRFILE;Profile next to the input file
 PREFERENCES_PROFILESAVECACHE;Save processing profile to the cache
 PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file
+PREFERENCES_PROFILE_NONE;None
 PREFERENCES_PROPERTY;Property
 PREFERENCES_PSPATH;Adobe Photoshop installation directory
 PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
@@ -1513,6 +1533,7 @@ TP_ICM_INPUTPROFILE;Input Profile
 TP_ICM_LABEL;Color Management
 TP_ICM_NOICM;No ICM: sRGB Output
 TP_ICM_OUTPUTPROFILE;Output Profile
+TP_ICM_PROFILEINTENT;Rendering Intent
 TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
 TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
@@ -1637,12 +1658,15 @@ TP_RESIZE_WIDTH;Width
 TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
 TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
 TP_RETINEX_CONTEDIT_LH;Hue equalizer
+TP_RETINEX_CONTEDIT_MAP;Mask equalizer
+TP_RETINEX_CURVEEDITOR_MAP;L=f(L)
+TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts!
 TP_RETINEX_CURVEEDITOR_CD;L=f(L)
 TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
 TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
 TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
 TP_RETINEX_FREEGAMMA;Free gamma
-TP_RETINEX_GAIN;Gain
+TP_RETINEX_GAIN;Contrast
 TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
 TP_RETINEX_GAMMA;Gamma
 TP_RETINEX_GAMMA_FREE;Free
@@ -1657,19 +1681,34 @@ TP_RETINEX_HIGHLIGHT;Highlight threshold
 TP_RETINEX_HIGHLIGHT_TOOLTIP;Increase action of High algorithm.\nMay require you to re-adjust "Neighboring pixels" and to increase the "White-point correction" in the Raw tab -> Raw White Points tool.
 TP_RETINEX_HSLSPACE_LIN;HSL-Linear
 TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmic
+TP_RETINEX_ITER;Iterations (Tone-mapping)
+TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time.
+TP_RETINEX_GRAD;Transmission gradient
+TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Variance and Threshold are reduced when iterations increase, and conversely.
+TP_RETINEX_GRADS;Strength gradient
+TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely.
 TP_RETINEX_LABEL;Retinex
 TP_RETINEX_LABSPACE;L*a*b*
 TP_RETINEX_LOW;Low
+TP_RETINEX_MAP;Mask method
+TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow.
+TP_RETINEX_MAP_NONE;None
+TP_RETINEX_MAP_CURV;Curve only
+TP_RETINEX_MAP_GAUS;Gaussian mask
+TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial)
+TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total)
 TP_RETINEX_MEDIAN;Transmission median filter
 TP_RETINEX_METHOD;Method
 TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
 TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
 TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
-TP_RETINEX_NEIGHBOR;Neighboring pixels
+TP_RETINEX_NEIGHBOR;Radius
 TP_RETINEX_NEUTRAL;Reset
 TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values.
-TP_RETINEX_OFFSET;Offset
+TP_RETINEX_OFFSET;Brightness
 TP_RETINEX_SETTINGS;Settings
+TP_RETINEX_SCALES;Gaussian gradient
+TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and Neighboring pixels are reduced when iterations increase, and conversely.
 TP_RETINEX_SLOPE;Free gamma slope
 TP_RETINEX_STRENGTH;Strength
 TP_RETINEX_THRESHOLD;Threshold
@@ -1680,8 +1719,15 @@ TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Vari
 TP_RETINEX_TRANSMISSION;Transmission map
 TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction.
 TP_RETINEX_UNIFORM;Uniform
-TP_RETINEX_VARIANCE;Variance
+TP_RETINEX_VARIANCE;Contrast
 TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts.
+TP_RETINEX_VIEW;Process (Preview)
+TP_RETINEX_VIEW_NONE;Standard
+TP_RETINEX_VIEW_MASK;Mask
+TP_RETINEX_VIEW_UNSHARP;Unsharp mask
+TP_RETINEX_VIEW_TRAN;Transmission - Auto
+TP_RETINEX_VIEW_TRAN2;Transmission - Fixed
+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_RGBCURVES_BLUE;B
 TP_RGBCURVES_CHANNEL;Channel
 TP_RGBCURVES_GREEN;G