1- Some french strings have been shortened

2- The fast export panel instruction is now a tooltip (cursor over the title); it's width was a problem and took too much place, breaking the look'n feel
3- Some HSeparator removed from the Demozaicing tool
4- The demosaicing combobox has been normalized: now use the "(unchanged)" label and all tools' specific options appears when demozaicing is set to "(unchanged)"
5- (LAB/CIECAM) removed from the tools' title

rtdata/languages/Czech

@@ -1025,7 +1025,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;Pro Raw obrázky může být použita jak RGB ta
 TP_DIRPYRDENOISE_PERF;RGB režim (raw obrázky)
 TP_DIRPYRDENOISE_RED;Rozdíl barevnosti - Červená
 TP_DIRPYRDENOISE_RGB;RGB
-TP_DIRPYREQUALIZER_LABEL;Kontrast dle detailu úrovní (Lab/CIECAM02)
+TP_DIRPYREQUALIZER_LABEL;Kontrast dle detailu úrovní
 TP_DIRPYREQUALIZER_LUMACOARSEST;Nejhrubší
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Kontrast-
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Kontrast+ 
@@ -1037,7 +1037,7 @@ TP_DISTORTION_AUTO;Automatická korekce zkreslení
 TP_DISTORTION_AUTO_TIP;(Experimentální) Automatická korekce zkreslení objektivu pro některé fotoaparáty (Micro 4/3, některé kompakty a jiné).
 TP_DISTORTION_LABEL;Oprava zkreslení objektivu
 TP_EPD_EDGESTOPPING;Míra zachování hran
-TP_EPD_LABEL;Mapování tónů (Lab/CIECAM02)
+TP_EPD_LABEL;Mapování tónů
 TP_EPD_REWEIGHTINGITERATES;Počet průchodů převážení
 TP_EPD_SCALE;Měřítko
 TP_EPD_STRENGTH;Síla
@@ -1240,7 +1240,7 @@ TP_SHARPENING_EDRADIUS;Poloměr
 TP_SHARPENING_EDTOLERANCE;Tolerance okrajům
 TP_SHARPENING_HALOCONTROL;Omezení haló artefatů
 TP_SHARPENING_HCAMOUNT;Míra
-TP_SHARPENING_LABEL;Doostření (Lab/CIECAM02)
+TP_SHARPENING_LABEL;Doostření
 TP_SHARPENING_METHOD;Metoda
 TP_SHARPENING_ONLYEDGES;Doostřit pouze okraje
 TP_SHARPENING_RADIUS;Poloměr
@@ -1252,7 +1252,7 @@ TP_SHARPENING_THRESHOLD;Práh
 TP_SHARPENING_TOOLTIP;S CIECAM02 očekávejte mírně odlišný efekt. Pokud pozorujete rozdíly, upravte dle potřeby.
 TP_SHARPENING_USM;Maskování rozostření
 TP_SHARPENMICRO_AMOUNT;Kvantita
-TP_SHARPENMICRO_LABEL;Mikrokontrast (Lab/CIECAM02)
+TP_SHARPENMICRO_LABEL;Mikrokontrast
 TP_SHARPENMICRO_MATRIX;Matice 3x3 namísto 5x5
 TP_SHARPENMICRO_UNIFORMITY;Jednolitost
 TP_VIBRANCE_AVOIDCOLORSHIFT;Zabránit posunu barev

rtdata/languages/Francais

@@ -54,30 +54,30 @@ EXIFPANEL_RESETHINT;Réinitialise les données sélectionnées à la valeur init
 EXIFPANEL_RESET;Réinitialiser
 EXIFPANEL_SUBDIRECTORY;Sous-répertoire
 EXPORT_BYPASS_ALL;Sélectionner / Désélectionner tout
-EXPORT_BYPASS_COLORDENOISE;Forcer la réduction du bruit chromatique
+EXPORT_BYPASS_COLORDENOISE;Ignorer la réduction du bruit chromatique
-EXPORT_BYPASS_DEFRINGE;Forcer l'aberration chromatique
+EXPORT_BYPASS_DEFRINGE;Ignorer la corr. d'aberration chromatique
-EXPORT_BYPASS_DIRPYRDENOISE;Forcer la réduction du bruit
+EXPORT_BYPASS_DIRPYRDENOISE;Ignorer la réduction du bruit
-EXPORT_BYPASS_DIRPYREQUALIZER;Forcer le contraste par niveaux de détail
+EXPORT_BYPASS_DIRPYREQUALIZER;Ignorer le contraste par niveaux de détail
-EXPORT_BYPASS_LUMADENOISE;Forcer la réduction du bruit de luminance
+EXPORT_BYPASS_LUMADENOISE;Ignorer la réduction du bruit de luminance
-EXPORT_BYPASS_RAW_ALL_ENHANCE;Forcer l'application de la réduction de bruit/artefact post-dématriçage
+EXPORT_BYPASS_RAW_ALL_ENHANCE;Ignorer la réduction de bruit/artefact post-dématriçage
-EXPORT_BYPASS_RAW_CA;Forcer la correction d'aberration chromatique [raw]
+EXPORT_BYPASS_RAW_CA;Ignorer la corr. d'aberration chromatique [raw]
-EXPORT_BYPASS_RAW_CCSTEPS;Forcer la suppression des fausses couleurs [raw]
+EXPORT_BYPASS_RAW_CCSTEPS;Ignorer la suppr. des fausses couleurs [raw]
-EXPORT_BYPASS_RAW_DCB_ENHANCE;Forcer l'application de la phase d'amélioration de DCB [raw]
+EXPORT_BYPASS_RAW_DCB_ENHANCE;Ignorer la phase d'amélioration de DCB [raw]
-EXPORT_BYPASS_RAW_DCB_ITERATIONS;Forcer le nombre d'itération de DCB [raw]
+EXPORT_BYPASS_RAW_DCB_ITERATIONS;Ignorer le nombre d'itération de DCB [raw]
-EXPORT_BYPASS_RAW_DF;Forcer la Trame Noire [raw]
+EXPORT_BYPASS_RAW_DF;Ignorer la Trame Noire [raw]
-EXPORT_BYPASS_RAW_FF;Forcer le Champ Uniforme [raw]
+EXPORT_BYPASS_RAW_FF;Ignorer le Champ Uniforme [raw]
-EXPORT_BYPASS_RAW_GREENTHRESH;Forcer l'équilibrage du vert [raw]
+EXPORT_BYPASS_RAW_GREENTHRESH;Ignorer l'équilibrage du vert [raw]
-EXPORT_BYPASS_RAW_LINENOISE;Forcer le filtre de bruit de ligne [raw]
+EXPORT_BYPASS_RAW_LINENOISE;Ignorer le filtre de bruit de ligne [raw]
-EXPORT_BYPASS_RAW_LMMSE_ITERATIONS;Forcer le niveau d'amélioration LMMSE [raw]
+EXPORT_BYPASS_RAW_LMMSE_ITERATIONS;Ignorer le niveau d'amélioration LMMSE [raw]
-EXPORT_BYPASS_SHARPENEDGE;Forcer netteté des bords
+EXPORT_BYPASS_SHARPENEDGE;Ignorer netteté des bords
-EXPORT_BYPASS_SHARPENING;Forcer la netteté
+EXPORT_BYPASS_SHARPENING;Ignorer la netteté
-EXPORT_BYPASS_SHARPENMICRO;Forcer netteté des microcontrastes
+EXPORT_BYPASS_SHARPENMICRO;Ignorer netteté des microcontrastes
-EXPORT_BYPASS_SH_HQ;Forcer Ombres/Hautes lumières (haute qualité)
+EXPORT_BYPASS_SH_HQ;Ignorer Ombres/Hautes lumières (HQ)
 EXPORT_FASTEXPORTOPTIONS;<b>Options d'Export Rapide</b>
 EXPORT_INSTRUCTIONS;Les options d'Export Rapide permettent de forcer des paramètres afin d'éviter d'utiliser des outils très consommateur de temps et de ressources, et d'utiliser ces options dans la file de traitement. Cette méthode est recommandée pour la génération rapide d'images de basse résolution quand la vitesse est une priorité ou lorsqu'on désir une version redimensionnée d'une ou plusieurs images de sortie sans avoir à modifier leurs paramètres de développement.
 EXPORT_MAXHEIGHT;Hauteur maximum:
 EXPORT_MAXWIDTH;Largeur maximum:
-EXPORT_PUTTOQUEUEFAST;  Mettre dans la file de traitement pour Export Rapide
+EXPORT_PUTTOQUEUEFAST;Mettre dans la file de traitement\npour Export Rapide
 EXPORT_RAW_DMETHOD;Méthode de dématriçage
 EXPORT_RESIZEMETHOD;Méthode de redimensionnement
 EXTPROGTARGET_1;raw
@@ -117,7 +117,7 @@ FILEBROWSER_NEW_NAME;Nouveau nom:
 FILEBROWSER_OPENDEFAULTVIEWER;Visualiseur par défaut de Windows (image déjà traitée) 
 FILEBROWSER_PARTIALPASTEPROFILE;Coller partiellement
 FILEBROWSER_PASTEPROFILE;Coller le profil
-FILEBROWSER_POPUPCANCELJOB;Abandonner la file de traitement
+FILEBROWSER_POPUPCANCELJOB;Retirer de la file de traitement
 FILEBROWSER_POPUPCOLORLABEL0;Label: Aucun
 FILEBROWSER_POPUPCOLORLABEL1;Label: Rouge
 FILEBROWSER_POPUPCOLORLABEL2;Label: Jaune
@@ -976,7 +976,7 @@ TP_COLORAPP_GAMUT;Contrôle du gamut (Lab)
 TP_COLORAPP_GAMUT_TOOLTIP;Permet le controle du gamut en mode Lab
 TP_COLORAPP_HUE;Teinte (h)
 TP_COLORAPP_HUE_TOOLTIP;Teinte (h) - angle entre 0° et 360°
-TP_COLORAPP_LABEL;Modèle CIE d'Apparence de la Couleur (CAM02)
+TP_COLORAPP_LABEL;Apparence de la Couleur (CIECAM02)
 TP_COLORAPP_LABEL_CAM02;Édition de l'image avec CIECAM
 TP_COLORAPP_LABEL_SCENE;Conditions de la scène
 TP_COLORAPP_LABEL_VIEWING;Conditions de visionnage
@@ -1029,7 +1029,7 @@ TP_CROP_X;X
 TP_CROP_Y;Y
 TP_DARKFRAME_AUTOSELECT;Sélection automatique
 TP_DARKFRAME_LABEL;Trame Noire
-TP_DEFRINGE_LABEL;Aberration chromatique (lab / ciecam02)
+TP_DEFRINGE_LABEL;Aberration chromatique
 TP_DEFRINGE_RADIUS;Rayon
 TP_DEFRINGE_THRESHOLD;Seuil
 TP_PFCURVE_CURVEEDITOR_CH;Teinte
@@ -1048,7 +1048,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;Pour les images raw, les méthodes RVB ou Lab pe
 TP_DIRPYRDENOISE_PERF;Mode RVB (images raw)
 TP_DIRPYRDENOISE_RED;Delta chrominance Rouge
 TP_DIRPYRDENOISE_RGB;RVB
-TP_DIRPYREQUALIZER_LABEL;Contraste par niveaux de détail (lab / ciecam02)
+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+
@@ -1060,7 +1060,7 @@ TP_DISTORTION_AUTO;Correction auto de la distorsion
 TP_DISTORTION_AUTO_TIP;(Experimental) Corrige la distorsion de l'objectif automatiquement pour certains APN (M4/3, quelques compacts, etc.)
 TP_DISTORTION_LABEL;Distorsion
 TP_EPD_EDGESTOPPING;Arrêt des bords
-TP_EPD_LABEL;Compression tonale (lab / ciecam02)
+TP_EPD_LABEL;Compression tonale
 TP_EPD_REWEIGHTINGITERATES;Itérations de la pondération
 TP_EPD_SCALE;Échelle
 TP_EPD_STRENGTH;Force
@@ -1149,7 +1149,7 @@ TP_ICM_SAVEREFERENCE;Utiliser l'image comme profil de référence
 TP_ICM_TONECURVE;Utiliser la courbe tonale du profil DCP
 TP_ICM_TONECURVE_TOOLTIP;Permet d'utiliser la courbe tonale contenue dans le profile DCP, si elle existe
 TP_ICM_WORKINGPROFILE;Profil de Travail
-TP_IMPULSEDENOISE_LABEL;Réduction du bruit d'impulsion (Lab/CIECAM02)
+TP_IMPULSEDENOISE_LABEL;Réduction du bruit d'impulsion
 TP_IMPULSEDENOISE_THRESH;Seuil
 TP_LABCURVE_AVOIDCOLORSHIFT;Éviter les dérives de teinte
 TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Ramènes les données dans le gamut de l'espace couleur de travail\npuis applique la correction de Munsell
@@ -1275,7 +1275,7 @@ TP_SHARPENING_EDRADIUS;Rayon
 TP_SHARPENING_EDTOLERANCE;Tolérance des bords
 TP_SHARPENING_HALOCONTROL;Contrôle du halo
 TP_SHARPENING_HCAMOUNT;Quantité
-TP_SHARPENING_LABEL;Netteté (lab / ciecam02)
+TP_SHARPENING_LABEL;Netteté
 TP_SHARPENING_METHOD;Méthode
 TP_SHARPENING_ONLYEDGES;Améliorer seulement les bords
 TP_SHARPENING_RADIUS;Rayon
@@ -1287,7 +1287,7 @@ TP_SHARPENING_THRESHOLD;Seuil
 TP_SHARPENING_TOOLTIP;Un effet légèrement différent peut être obtenu avec CIECAM02. Si différence observée, ajuster les réglages
 TP_SHARPENING_USM;Masque flou
 TP_SHARPENMICRO_AMOUNT;Quantité
-TP_SHARPENMICRO_LABEL;Microcontraste (lab / ciecam02)
+TP_SHARPENMICRO_LABEL;Microcontraste
 TP_SHARPENMICRO_MATRIX;Matrice 3×3 au lieu de 5×5
 TP_SHARPENMICRO_UNIFORMITY;Uniformité
 TP_VIBRANCE_AVOIDCOLORSHIFT;Éviter les dérives de teinte

rtdata/languages/Italiano

@@ -1009,7 +1009,7 @@ TP_CROP_X;X
 TP_CROP_Y;Y
 TP_DARKFRAME_AUTOSELECT;Autoselezione
 TP_DARKFRAME_LABEL;Dark Frame
-TP_DEFRINGE_LABEL;Defringe (Lab/CIECAM02)
+TP_DEFRINGE_LABEL;Defringe
 TP_DEFRINGE_RADIUS;Raggio
 TP_DEFRINGE_THRESHOLD;Soglia
 TP_DIRPYRDENOISE_BLUE;Delta di Crominanza - Blu
@@ -1026,7 +1026,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;Per immagini raw può essere usato il metodo RGB
 TP_DIRPYRDENOISE_PERF;Modo RGB (immagini raw)
 TP_DIRPYRDENOISE_RED;Delta di Crominanza - Rosso
 TP_DIRPYRDENOISE_RGB;RGB
-TP_DIRPYREQUALIZER_LABEL;Contrasto per livelli di dettaglio (Lab/CIECAM02)
+TP_DIRPYREQUALIZER_LABEL;Contrasto per livelli di dettaglio
 TP_DIRPYREQUALIZER_LUMACOARSEST;Estesissimo
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrasto-
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrasto+
@@ -1038,7 +1038,7 @@ TP_DISTORTION_AUTO; Autocorrezione Distorsione
 TP_DISTORTION_AUTO_TIP;(Sperimentale) Corregge la distorsione delle ottiche automaticamente per alcune fotocamere (Micro 4/3, alcune compatte, ecc.)
 TP_DISTORTION_LABEL;Distorsione
 TP_EPD_EDGESTOPPING;Blocco ai Bordi
-TP_EPD_LABEL;Tone Mapping (Lab/CIECAM02)
+TP_EPD_LABEL;Tone Mapping
 TP_EPD_REWEIGHTINGITERATES;Iterazioni di Ribilanciamento
 TP_EPD_SCALE;Scala
 TP_EPD_STRENGTH;Forza
@@ -1241,7 +1241,7 @@ TP_SHARPENING_EDRADIUS;Raggio
 TP_SHARPENING_EDTOLERANCE;Tolleranza bordi
 TP_SHARPENING_HALOCONTROL;Controllo dell'alone
 TP_SHARPENING_HCAMOUNT;Quantità
-TP_SHARPENING_LABEL;Nitidezza (Lab/CIECAM02)
+TP_SHARPENING_LABEL;Nitidezza
 TP_SHARPENING_METHOD;Metodo
 TP_SHARPENING_ONLYEDGES;Definisci solo i bordi
 TP_SHARPENING_RADIUS;Raggio
@@ -1253,7 +1253,7 @@ TP_SHARPENING_THRESHOLD;Soglia
 TP_SHARPENING_TOOLTIP;Aspettati un risultato leggermente diverso quando usato con CIECAM02. Se noti differenze, regola a tuo piacimento.
 TP_SHARPENING_USM;Maschera di contrasto
 TP_SHARPENMICRO_AMOUNT;Quantità
-TP_SHARPENMICRO_LABEL;Microcontrasto (Lab/CIECAM02)
+TP_SHARPENMICRO_LABEL;Microcontrasto
 TP_SHARPENMICRO_MATRIX;Matrice 3×3 invece di 5×5
 TP_SHARPENMICRO_UNIFORMITY;Uniformità
 TP_VIBRANCE_AVOIDCOLORSHIFT;Evita il color shift

rtdata/languages/Japanese

@@ -1041,7 +1041,7 @@ TP_CROP_X;X
 TP_CROP_Y;Y
 TP_DARKFRAME_AUTOSELECT;自動選択
 TP_DARKFRAME_LABEL;ダークフレーム
-TP_DEFRINGE_LABEL;フリンジ低減 (Lab/CIECAM02)
+TP_DEFRINGE_LABEL;フリンジ低減
 TP_DEFRINGE_RADIUS;半径
 TP_DEFRINGE_THRESHOLD;しきい値
 TP_DIRPYRDENOISE_BLUE;色差 ブルー
@@ -1057,7 +1057,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;RAW画像は、RGBまたはLab方式のいずれ
 TP_DIRPYRDENOISE_PERF;RGB モード(RAW画像)
 TP_DIRPYRDENOISE_RED;色差 レッド
 TP_DIRPYRDENOISE_RGB;RGB
-TP_DIRPYREQUALIZER_LABEL;ディテールのコントラスト (Lab/CIECAM02)
+TP_DIRPYREQUALIZER_LABEL;ディテールのコントラスト
 TP_DIRPYREQUALIZER_LUMACOARSEST;粗い
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;コントラスト－
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;コントラスト＋
@@ -1069,7 +1069,7 @@ TP_DISTORTION_AUTO;自動歪曲収差補正
 TP_DISTORTION_AUTO_TIP;(試用) 自動レンズ収差補正 (M4/3, 一部のコンデジ, etc.)
 TP_DISTORTION_LABEL;歪曲収差補正
 TP_EPD_EDGESTOPPING;エッジ停止
-TP_EPD_LABEL;トーンマッピング (Lab/CIECAM02)
+TP_EPD_LABEL;トーンマッピング
 TP_EPD_REWEIGHTINGITERATES;再加重反復
 TP_EPD_SCALE;スケール
 TP_EPD_STRENGTH;強さ
@@ -1284,7 +1284,7 @@ TP_SHARPENING_EDRADIUS;半径
 TP_SHARPENING_EDTOLERANCE;エッジ許容
 TP_SHARPENING_HALOCONTROL;ハロ抑制
 TP_SHARPENING_HCAMOUNT;適用量
-TP_SHARPENING_LABEL;シャープ化 (Lab/CIECAM02)
+TP_SHARPENING_LABEL;シャープ化
 TP_SHARPENING_METHOD;方式
 TP_SHARPENING_ONLYEDGES;エッジのみシャープ化
 TP_SHARPENING_RADIUS;半径
@@ -1296,7 +1296,7 @@ TP_SHARPENING_THRESHOLD;しきい値
 TP_SHARPENING_TOOLTIP;CIECAM02で使用する場合、わずかに異なる効果が期待されます。違いが認められた場合、好みに合わせて調整します
 TP_SHARPENING_USM;アンシャープマスク
 TP_SHARPENMICRO_AMOUNT;適用量
-TP_SHARPENMICRO_LABEL;マイクロコントラスト (Lab/CIECAM02)
+TP_SHARPENMICRO_LABEL;マイクロコントラスト
 TP_SHARPENMICRO_MATRIX;3×3マトリクスの代わりに 5×5
 TP_SHARPENMICRO_UNIFORMITY;均等
 TP_VIBRANCE_AVOIDCOLORSHIFT;色ずれを回避

rtdata/languages/Nederlands

@@ -1000,7 +1000,7 @@ TP_CROP_X;X
 TP_CROP_Y;Y
 TP_DARKFRAME_AUTOSELECT;Automatische selectie
 TP_DARKFRAME_LABEL;Donkerframe
-TP_DEFRINGE_LABEL;Verzachten (Lab/CIECAM02)
+TP_DEFRINGE_LABEL;Verzachten
 TP_DEFRINGE_RADIUS;Straal
 TP_DEFRINGE_THRESHOLD;Drempel
 TP_DIRPYRDENOISE_BLUE;Delta Chrominantie Blauw
@@ -1016,7 +1016,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;Voor raw afbeeldingen kan RGB of Lab methode wor
 TP_DIRPYRDENOISE_PERF;RGB mode (raw afbeeldingen)
 TP_DIRPYRDENOISE_RED;Delta Chrominantie Rood
 TP_DIRPYRDENOISE_RGB;RGB
-TP_DIRPYREQUALIZER_LABEL;Detailcontrast (Lab/CIECAM02)
+TP_DIRPYREQUALIZER_LABEL;Detailcontrast
 TP_DIRPYREQUALIZER_LUMACOARSEST;grofste
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+
@@ -1028,7 +1028,7 @@ TP_DISTORTION_AUTO; Automatische correctie lensvervorming
 TP_DISTORTION_AUTO_TIP;(Experimenteel) Automatische correctie lensvervorming voor sommige camera's (M4/3, enkele compacts, etc.)
 TP_DISTORTION_LABEL;Corrigeer lensvervorming
 TP_EPD_EDGESTOPPING;Randen
-TP_EPD_LABEL;Tonemapping (Lab/CIECAM02)
+TP_EPD_LABEL;Tonemapping
 TP_EPD_REWEIGHTINGITERATES;Herhaling
 TP_EPD_SCALE;Schaal
 TP_EPD_STRENGTH;Sterkte
@@ -1229,7 +1229,7 @@ TP_SHARPENING_EDRADIUS;Straal
 TP_SHARPENING_EDTOLERANCE;Randtolerantie
 TP_SHARPENING_HALOCONTROL;Halocontrole
 TP_SHARPENING_HCAMOUNT;Hoeveelheid
-TP_SHARPENING_LABEL;Verscherpen (Lab/CIECAM02)
+TP_SHARPENING_LABEL;Verscherpen
 TP_SHARPENING_METHOD;Methode
 TP_SHARPENING_ONLYEDGES;Alleen randen verscherpen
 TP_SHARPENING_RADIUS;Straal
@@ -1241,7 +1241,7 @@ TP_SHARPENING_THRESHOLD;Drempel
 TP_SHARPENING_TOOLTIP;Hou rekening met een enigszins ander effect in combinatie met CIECAM02. Aanpassen naar eigen smaak.
 TP_SHARPENING_USM;Onscherpmasker
 TP_SHARPENMICRO_AMOUNT;Hoeveelheid
-TP_SHARPENMICRO_LABEL;Microcontrast (Lab/CIECAM02)
+TP_SHARPENMICRO_LABEL;Microcontrast
 TP_SHARPENMICRO_MATRIX;3×3-matrix ipv. 5×5
 TP_SHARPENMICRO_UNIFORMITY;Uniformiteit
 TP_VIBRANCE_AVOIDCOLORSHIFT;Vermijd kleurverschuiving

rtdata/languages/Swedish

@@ -1016,7 +1016,7 @@ TP_DISTORTION_AUTO;Automatisk distorsionskorrigering
 TP_DISTORTION_AUTO_TIP;(Experimentell) Korrigera automatiskt objektivdistorsion för vissa kameror (M4/3, vissa kompaktkameror, etc.)
 TP_DISTORTION_LABEL;Distorsion
 TP_EPD_EDGESTOPPING;Stoppa vid kanter
-TP_EPD_LABEL;Tone Mapping (Lab/CIECAM02)
+TP_EPD_LABEL;Tone Mapping
 TP_EPD_REWEIGHTINGITERATES;Återviktade iterationer
 TP_EPD_SCALE;Skala
 TP_EPD_STRENGTH;Styrka

rtdata/languages/default

@@ -1022,7 +1022,7 @@ TP_CROP_X;X
 TP_CROP_Y;Y
 TP_DARKFRAME_AUTOSELECT;Auto selection
 TP_DARKFRAME_LABEL;Dark Frame
-TP_DEFRINGE_LABEL;Defringe (Lab/CIECAM02)
+TP_DEFRINGE_LABEL;Defringe
 TP_DEFRINGE_RADIUS;Radius
 TP_DEFRINGE_THRESHOLD;Threshold
 TP_PFCURVE_CURVEEDITOR_CH;Hue
@@ -1042,7 +1042,7 @@ TP_DIRPYRDENOISE_METHOD_TOOLTIP;For raw images either RGB or Lab methods can be
 TP_DIRPYRDENOISE_PERF;RGB mode (raw images)
 TP_DIRPYRDENOISE_RED;Delta chrominance Red
 TP_DIRPYRDENOISE_RGB;RGB
-TP_DIRPYREQUALIZER_LABEL;Contrast by Detail Levels (Lab/CIECAM02)
+TP_DIRPYREQUALIZER_LABEL;Contrast by Detail Levels
 TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contrast-
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contrast+ 
@@ -1054,7 +1054,7 @@ TP_DISTORTION_AUTO;Auto Distortion Correction
 TP_DISTORTION_AUTO_TIP;(Exprimental) Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.)
 TP_DISTORTION_LABEL;Distortion
 TP_EPD_EDGESTOPPING;Edge Stopping
-TP_EPD_LABEL;Tone Mapping (Lab/CIECAM02)
+TP_EPD_LABEL;Tone Mapping
 TP_EPD_REWEIGHTINGITERATES;Reweighting Iterates
 TP_EPD_SCALE;Scale
 TP_EPD_STRENGTH;Strength
@@ -1135,7 +1135,7 @@ TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
 TP_ICM_TONECURVE;Use DCP's tone curve
 TP_ICM_TONECURVE_TOOLTIP;Enable to use tone curves that may be contained in DCP profiles.
 TP_ICM_WORKINGPROFILE;Working Profile
-TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction (Lab/CIECAM02)
+TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
 TP_IMPULSEDENOISE_THRESH;Threshold
 TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
 TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction
@@ -1258,7 +1258,7 @@ TP_SHARPENING_EDRADIUS;Radius
 TP_SHARPENING_EDTOLERANCE;Edge Tolerance
 TP_SHARPENING_HALOCONTROL;Halo control
 TP_SHARPENING_HCAMOUNT;Amount
-TP_SHARPENING_LABEL;Sharpening  (Lab/CIECAM02)
+TP_SHARPENING_LABEL;Sharpening
 TP_SHARPENING_METHOD;Method
 TP_SHARPENING_ONLYEDGES;Sharpen only edges
 TP_SHARPENING_RADIUS;Radius
@@ -1270,7 +1270,7 @@ TP_SHARPENING_THRESHOLD;Threshold
 TP_SHARPENING_TOOLTIP;Expect a slightly different effect when used with CIECAM02. If difference is observed, adjust to taste.
 TP_SHARPENING_USM;Unsharp Mask
 TP_SHARPENMICRO_AMOUNT;Quantity
-TP_SHARPENMICRO_LABEL;Microcontrast (Lab/CIECAM02)
+TP_SHARPENMICRO_LABEL;Microcontrast
 TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
 TP_SHARPENMICRO_UNIFORMITY;Uniformity
 TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift

rtgui/exportpanel.cc

@@ -35,17 +35,10 @@ ExportPanel::ExportPanel () : listener (NULL) {
 
 	Gtk::Label* labExportTitle = Gtk::manage ( new Gtk::Label (M("EXPORT_FASTEXPORTOPTIONS")) );
 	labExportTitle->set_use_markup (true);
+	labExportTitle->set_tooltip_text (M("EXPORT_INSTRUCTIONS"));
 	labExportTitle->set_alignment(Gtk::ALIGN_LEFT);
 	pack_start(*labExportTitle, Gtk::PACK_SHRINK, 4);
 
-	Gtk::Label* labInstructions = Gtk::manage ( new Gtk::Label (M("EXPORT_INSTRUCTIONS")) );
-	labInstructions->set_use_markup (true);
-	labInstructions->set_line_wrap (true);
-	labInstructions->set_alignment(Gtk::ALIGN_LEFT);
-	Gtk::HBox* hbInstructions = Gtk::manage (new Gtk::HBox ());
-	hbInstructions->pack_start(*labInstructions, Gtk::PACK_SHRINK, 4);
-	pack_start(*hbInstructions, Gtk::PACK_SHRINK, 4);
-
 	bypass_ALL              = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_ALL")));
 	bypass_sharpening       = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_SHARPENING")));
 	bypass_sharpenEdge      = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_SHARPENEDGE")));

rtgui/rawprocess.cc

@@ -49,7 +49,6 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
    dcbOptions->pack_start(*dcbIterations);
    dcbOptions->pack_start(*dcbEnhance);
    pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
-   pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 4 );
 
    lmmseOptions = Gtk::manage (new Gtk::VBox ());
    lmmseOptions->set_border_width(4);
@@ -60,23 +59,17 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
 
    if (lmmseIterations->delay < 1000) lmmseIterations->delay = 1000;
    lmmseIterations->show();
-  // dcbEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_DCBENHANCE")));
    lmmseOptions->pack_start(*lmmseIterations);
-  // dcbOptions->pack_start(*dcbEnhance);
    pack_start( *lmmseOptions, Gtk::PACK_SHRINK, 4);
-   pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 4 );
 
-   
+   pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
-   ccOptions = Gtk::manage (new Gtk::VBox ());
-   ccOptions->set_border_width(4);
    ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,0 ));
    ccSteps->setAdjusterListener (this);
    if (ccSteps->delay < 1000) ccSteps->delay = 1000;
    ccSteps->show();
    pack_start( *ccSteps, Gtk::PACK_SHRINK, 4);
 
-   pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
+   //pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
-
    //allOptions = Gtk::manage (new Gtk::VBox ());
    //allOptions->set_border_width(2);
    //allEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_ALLENHANCE")));
@@ -102,31 +95,6 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
            dmethod->set_active(i);
            break;
        }
-   //allEnhance->set_active(pp->raw.all_enhance);
-
-   dcbIterations->setValue (pp->raw.dcb_iterations);
-   dcbEnhance->set_active(pp->raw.dcb_enhance);
-   ccSteps->setValue (pp->raw.ccSteps);
-   if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::dcb])
-	   dcbOptions->show();
-   else
-	   dcbOptions->hide();
-
-   lmmseIterations->setValue (pp->raw.lmmse_iterations);
-   if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::lmmse])
-	   lmmseOptions->show();
-   else
-	   lmmseOptions->hide();
-	   
-   if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::eahd] ||
-	   pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::hphd] ||
-	   pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::vng4])
-	   ccOptions->show();
-   else
-	   ccOptions->hide();
-
-   lastDCBen = pp->raw.dcb_enhance;
-   //lastALLen = pp->raw.all_enhance;
 
    if(pedited ){
        ccSteps->setEditedState (pedited->raw.ccSteps ? Edited : UnEdited);
@@ -139,6 +107,35 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
            dmethod->set_active(procparams::RAWParams::numMethods); // No name
    }
 
+   //allEnhance->set_active(pp->raw.all_enhance);
+
+   dcbIterations->setValue (pp->raw.dcb_iterations);
+   dcbEnhance->set_active(pp->raw.dcb_enhance);
+   ccSteps->setValue (pp->raw.ccSteps);
+   if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::dcb] ||
+       dmethod->get_active_row_number() == procparams::RAWParams::numMethods)
+       dcbOptions->show();
+   else
+       dcbOptions->hide();
+
+   lmmseIterations->setValue (pp->raw.lmmse_iterations);
+   if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::lmmse] ||
+       dmethod->get_active_row_number() == procparams::RAWParams::numMethods)
+       lmmseOptions->show();
+   else
+       lmmseOptions->hide();
+
+   // Flase color suppression is applied to all demozaicing method, so don't hide anything
+   /*if (pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::eahd] ||
+       pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::hphd] ||
+       pp->raw.dmethod == procparams::RAWParams::methodstring[procparams::RAWParams::vng4])
+       ccSteps->show();
+   else
+       ccSteps->hide();*/
+
+   lastDCBen = pp->raw.dcb_enhance;
+   //lastALLen = pp->raw.all_enhance;
+
    methodconn.block (false);
    dcbEnhconn.block (false);
    //allEnhconn.block (false);
@@ -171,6 +168,7 @@ void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
 
 void RawProcess::setBatchMode(bool batchMode)
 {
+   dmethod->append_text (M("GENERAL_UNCHANGED"));
    dmethod->set_active(procparams::RAWParams::numMethods); // No name
    dcbOptions->hide();
    lmmseOptions->hide();

rtgui/rawprocess.h

@@ -33,7 +33,6 @@ class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
     Gtk::Label* methodl;
     Adjuster* ccSteps;
     Gtk::VBox *dcbOptions;
-    Gtk::VBox *ccOptions;
     Adjuster* dcbIterations;
     Gtk::CheckButton* dcbEnhance;
     //Gtk::VBox *allOptions;