diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 87af9a19a..38d8c7588 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -207,7 +207,6 @@ HISTORY_MSG_32;Deconvolució: Ablaniment
 HISTORY_MSG_33;Deconvolució: Iteracions
 HISTORY_MSG_34;Correcció distorsió LCP
 HISTORY_MSG_35;Correcció vorafosc LCP
-HISTORY_MSG_36;Correcció A.C. LCP
 HISTORY_MSG_37;Nivells automàtics
 HISTORY_MSG_38;Mètode de balanç de blancs
 HISTORY_MSG_39;Temperatura de color
@@ -288,11 +287,8 @@ HISTORY_MSG_113;Protecció de tons vermell i pell
 HISTORY_MSG_114;Iteracions DCB
 HISTORY_MSG_115;Iteracions fals color
 HISTORY_MSG_116;DCB ampliat
-HISTORY_MSG_117;Correcció CA vermell
-HISTORY_MSG_118;Correcció CA blau
 HISTORY_MSG_119;Línia dessoroll
 HISTORY_MSG_120;Llindar equil. verd
-HISTORY_MSG_121;Raw auto CA
 HISTORY_MSG_122;Auto marc fosc
 HISTORY_MSG_123;Fitxer de camp fosc
 HISTORY_MSG_124;Correc. expo. linear
@@ -425,7 +421,7 @@ MAIN_TOOLTIP_TOGGLE;Alterna vista abans/després.\nDrecera: <b>Majús-B</b>
 NAVIGATOR_XY_FULL;Amplada = %1, Altura = %2
 NAVIGATOR_XY_NA;x = n/a, y = n/a
 PARTIALPASTE_BASICGROUP;Ajustos bàsics
-PARTIALPASTE_CACORRECTION;Correcció A. C.(Aberració Cromàtica)
+PARTIALPASTE_CACORRECTION;Correcció d'aberració cromàtica
 PARTIALPASTE_CHANNELMIXER;Barrejador de canals
 PARTIALPASTE_COARSETRANS;Rotació 90 graus/ inversió
 PARTIALPASTE_COLORGROUP;Ajustos de color
@@ -625,13 +621,12 @@ TOOLBAR_TOOLTIP_HAND;Eina mà.\nDrecera: <b>h</b>
 TOOLBAR_TOOLTIP_STRAIGHTEN;<b>Dreçar</b> / <b>rotació fina</b>.\nDrecera: <b>s</b>\n\nIndica la vertical o horitzontal dibuixant una línia de guia sobre la previsualització de la imatge. L'angle de rotació es mostrarà junt a la guia. El centre de rotació és el centre geomètric de la imatge.
 TOOLBAR_TOOLTIP_WB;Afina balanç de blancs.\nDrecera: <b>w</b>
 TP_CACORRECTION_BLUE;Blau
-TP_CACORRECTION_LABEL;Correcció A. C. (Aberració Cromàtica)
+TP_CACORRECTION_LABEL;Correcció d'aberració cromàtica
 TP_CACORRECTION_RED;Vermell
 TP_CHMIXER_BLUE;Canal blau
 TP_CHMIXER_GREEN;Canal verd
 TP_CHMIXER_LABEL;Barrejador de canals
 TP_CHMIXER_RED;Canal vermell
-TP_CHROMATABERR_LABEL;Aberració cromàtica
 TP_COARSETRAF_TOOLTIP_HFLIP;Inversió horitzontal
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotació esquerra.\nDrecera: <b>[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotació dreta.\nDrecera: <b>]</b>
@@ -777,7 +772,7 @@ TP_PREPROCESS_NO_FOUND;No trobat
 TP_RAWCACORR_AUTO;Auto correcció
 TP_RAWCACORR_CABLUE;Blau
 TP_RAWCACORR_CARED;Vermell
-TP_RAWEXPOS_BLACKS;Nivells negres
+TP_RAWCACORR_LABEL;Correcció d'aberració cromàtica
 TP_RAWEXPOS_LINEAR;Punt blanc: factor de correcció linear
 TP_RAWEXPOS_TWOGREEN;Dos verds junts
 TP_RAW_DCBENHANCE;Aplica pas de millora  DCB
@@ -988,6 +983,10 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
 !HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
 !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
+!HISTORY_MSG_36;Lens Correction - CA
+!HISTORY_MSG_117;Raw CA correction - Red
+!HISTORY_MSG_118;Raw CA correction - Blue
+!HISTORY_MSG_121;Raw CA Correction - Auto
 !HISTORY_MSG_166;Exposure - Reset
 !HISTORY_MSG_173;NR - Detail recovery
 !HISTORY_MSG_174;CIECAM02
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index d791a72d3..df3093b9d 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -1604,7 +1604,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_CBDL_BEF;Before Black-and-White
 !TP_CBDL_METHOD;Process located
 !TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space.
-!TP_CHROMATABERR_LABEL;Chromatic Aberration
 !TP_COLORAPP_ABSOLUTELUMINANCE;Absolute luminance
 !TP_COLORAPP_ALGO;Algorithm
 !TP_COLORAPP_ALGO_ALL;All
@@ -1904,7 +1903,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_RAWCACORR_AUTOIT;Iterations
 !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_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
-!TP_RAWEXPOS_BLACKS;Black Levels
+!TP_RAWCACORR_LABEL;Chromatic Aberration Correction
 !TP_RAWEXPOS_BLACK_0;Green 1 (lead)
 !TP_RAWEXPOS_BLACK_1;Red
 !TP_RAWEXPOS_BLACK_2;Blue
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 0ab5a61c8..ff8293acb 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -1390,7 +1390,6 @@ TP_CHMIXER_BLUE;Modrý kanál
 TP_CHMIXER_GREEN;Zelený kanál
 TP_CHMIXER_LABEL;Míchání kanálů
 TP_CHMIXER_RED;Červený kanál
-TP_CHROMATABERR_LABEL;Chromatická aberace
 TP_COARSETRAF_TOOLTIP_HFLIP;Překlopit horizontálně.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Otočit doleva.\n\nZkratky:\n<b>[</b> - režim více karet editoru,\n<b>Alt-[</b>- režim jedné karty editoru.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Otočit doprava.\n\nZkratky:\n<b>]</b> - režim více karet editoru,\n<b>Alt-]</b>- režim jedné karty editoru.
@@ -1824,7 +1823,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;Toto nastavení je dostupné po zatržení volby "Au
 TP_RAWCACORR_AVOIDCOLORSHIFT;Zabránit posunu barev
 TP_RAWCACORR_CABLUE;Modrá
 TP_RAWCACORR_CARED;Červená
-TP_RAWEXPOS_BLACKS;Úrovně černé
+TP_RAWCACORR_LABEL;Korekce chromatické aberace
 TP_RAWEXPOS_BLACK_0;Zelená 1 (řídící)
 TP_RAWEXPOS_BLACK_1;Červená
 TP_RAWEXPOS_BLACK_2;Modrá
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index e4eebfb77..db136f330 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -1447,7 +1447,6 @@ TP_CHMIXER_BLUE;Blau-Kanal
 TP_CHMIXER_GREEN;Grün-Kanal
 TP_CHMIXER_LABEL;RGB-Kanalmixer
 TP_CHMIXER_RED;Rot-Kanal
-TP_CHROMATABERR_LABEL;Chromatische Aberration
 TP_COARSETRAF_TOOLTIP_HFLIP;Horizontal spiegeln.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Nach links drehen.\nTaste: <b>[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Nach rechts drehen.\nTaste: <b>]</b>
@@ -1887,7 +1886,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;Diese Einstellung ist verfügbar, wenn "Autokorrektu
 TP_RAWCACORR_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
 TP_RAWCACORR_CABLUE;Blau
 TP_RAWCACORR_CARED;Rot
-TP_RAWEXPOS_BLACKS;Schattenkompression
+TP_RAWCACORR_LABEL;Chromatische Aberration
 TP_RAWEXPOS_BLACK_0;Grün 1 (Master)
 TP_RAWEXPOS_BLACK_1;Rot
 TP_RAWEXPOS_BLACK_2;Blau
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 1b7b6847d..ac4b15e3d 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -1426,7 +1426,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_CHMIXER_GREEN;Green channel
 !TP_CHMIXER_LABEL;Channel Mixer
 !TP_CHMIXER_RED;Red channel
-!TP_CHROMATABERR_LABEL;Chromatic Aberration
 !TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally.
 !TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\n\nShortcuts:\n<b>[</b> - Multiple Editor Tabs Mode,\n<b>Alt-[</b> - Single Editor Tab Mode.
 !TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotate right.\n\nShortcuts:\n<b>]</b> - Multiple Editor Tabs Mode,\n<b>Alt-]</b> - Single Editor Tab Mode.
@@ -1823,7 +1822,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !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_RAWCACORR_CABLUE;Blue
 !TP_RAWCACORR_CARED;Red
-!TP_RAWEXPOS_BLACKS;Black Levels
+!TP_RAWCACORR_LABEL;Chromatic Aberration Correction
 !TP_RAWEXPOS_BLACK_0;Green 1 (lead)
 !TP_RAWEXPOS_BLACK_1;Red
 !TP_RAWEXPOS_BLACK_2;Blue
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 1bfeb0df7..10ad1f740 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -1370,7 +1370,6 @@
 !TP_CHMIXER_GREEN;Green channel
 !TP_CHMIXER_LABEL;Channel Mixer
 !TP_CHMIXER_RED;Red channel
-!TP_CHROMATABERR_LABEL;Chromatic Aberration
 !TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally.
 !TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\n\nShortcuts:\n<b>[</b> - Multiple Editor Tabs Mode,\n<b>Alt-[</b> - Single Editor Tab Mode.
 !TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotate right.\n\nShortcuts:\n<b>]</b> - Multiple Editor Tabs Mode,\n<b>Alt-]</b> - Single Editor Tab Mode.
@@ -1810,7 +1809,7 @@
 !TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
 !TP_RAWCACORR_CABLUE;Blue
 !TP_RAWCACORR_CARED;Red
-!TP_RAWEXPOS_BLACKS;Black Levels
+!TP_RAWCACORR_LABEL;Chromatic Aberration Correction
 !TP_RAWEXPOS_BLACK_0;Green 1 (lead)
 !TP_RAWEXPOS_BLACK_1;Red
 !TP_RAWEXPOS_BLACK_2;Blue
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index e0d3972bf..9ffbb0323 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -341,9 +341,9 @@ HISTORY_MSG_30;Deconvolución - Radio
 HISTORY_MSG_31;Deconvolución - Cantidad
 HISTORY_MSG_32;Deconvolución - Amortiguación
 HISTORY_MSG_33;Deconvolución - Iteraciones
-HISTORY_MSG_34;LCP - Corrección de distorsión
-HISTORY_MSG_35;LCP - Corrección de Viñeta
-HISTORY_MSG_36;LCP - Corrección Aberr.Crom.
+HISTORY_MSG_34;Corrección de distorsión
+HISTORY_MSG_35;Corrección de Viñeta
+HISTORY_MSG_36;Corrección Aberr.Crom.
 HISTORY_MSG_37;Niveles automáticos
 HISTORY_MSG_38;Método de Balance de Blancos
 HISTORY_MSG_39;Temperatura de color
@@ -1415,7 +1415,6 @@ TP_CHMIXER_BLUE;Canal Azul
 TP_CHMIXER_GREEN;Canal Verde
 TP_CHMIXER_LABEL;Mezclador de canales
 TP_CHMIXER_RED;Canal Rojo
-TP_CHROMATABERR_LABEL;Aberración cromática (AC)
 TP_COARSETRAF_TOOLTIP_HFLIP;Voltear horizontalmente.\nTecla de Atajo: '['
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotar a la izquierda.\nTecla de Atajo: ']'
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotar a la derecha
@@ -1849,7 +1848,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;Esta configuración está disponible si se marca "Co
 TP_RAWCACORR_AVOIDCOLORSHIFT;Evitar el cambio de color
 TP_RAWCACORR_CABLUE;Azul
 TP_RAWCACORR_CARED;Rojo
-TP_RAWEXPOS_BLACKS;Niveles de negro
+TP_RAWCACORR_LABEL;Corrección de aberraciones cromáticas
 TP_RAWEXPOS_BLACK_0;Verde 1 (principal)
 TP_RAWEXPOS_BLACK_1;Rojo
 TP_RAWEXPOS_BLACK_2;Azul
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index c2c3bead1..36ffa2afa 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1349,7 +1349,7 @@ TP_BWMIX_TCMODE_STANDARD;N&B Standard
 TP_BWMIX_TCMODE_WEIGHTEDSTD;N&B Standard Pondéré
 TP_BWMIX_VAL;L
 TP_CACORRECTION_BLUE;Bleu
-TP_CACORRECTION_LABEL;Aberration chromatique
+TP_CACORRECTION_LABEL;Aberration Chromatique
 TP_CACORRECTION_RED;Rouge
 TP_CBDL_AFT;Après Noir-et-Blanc
 TP_CBDL_BEF;Avant Noir-et-Blanc
@@ -1359,7 +1359,6 @@ TP_CHMIXER_BLUE;Bleu
 TP_CHMIXER_GREEN;Vert
 TP_CHMIXER_LABEL;Mixage des canaux
 TP_CHMIXER_RED;Rouge
-TP_CHROMATABERR_LABEL;Aberration Chromatique
 TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche\nRaccourci: <b>[</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotation vers la droite\nRaccourci: <b>]</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-]</b>
@@ -1793,7 +1792,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;Ce réglage est disponible si "Correction-auto" est
 TP_RAWCACORR_AVOIDCOLORSHIFT;Éviter les dérives couleurs
 TP_RAWCACORR_CABLUE;Bleu
 TP_RAWCACORR_CARED;Rouge
-TP_RAWEXPOS_BLACKS;Niveaux de noir
+TP_RAWCACORR_LABEL;Aberration Chromatique
 TP_RAWEXPOS_BLACK_0;Vert 1 (maître)
 TP_RAWEXPOS_BLACK_1;Rouge
 TP_RAWEXPOS_BLACK_2;Bleu
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index c65c1ef6f..cece7e78b 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -234,9 +234,9 @@ HISTORY_MSG_30;RLD - Raggio
 HISTORY_MSG_31;RLD - Quantità
 HISTORY_MSG_32;RLD - Smorzamento
 HISTORY_MSG_33;RLD - Iterazioni
-HISTORY_MSG_34;LCP - Correzione Distorsione
-HISTORY_MSG_35;LCP - Correzione Vignettatura
-HISTORY_MSG_36;LCP - Correzione AC
+HISTORY_MSG_34;Correzione Distorsione
+HISTORY_MSG_35;Correzione Vignettatura
+HISTORY_MSG_36;Correzione AC
 HISTORY_MSG_37;Livelli Automatici
 HISTORY_MSG_38;WB - Metodo
 HISTORY_MSG_39;WB - Temperatura
@@ -835,7 +835,6 @@ TP_CHMIXER_BLUE;Canale Blu
 TP_CHMIXER_GREEN;Canale Verde
 TP_CHMIXER_LABEL;Miscelatore Canali
 TP_CHMIXER_RED;Canale Rosso
-TP_CHROMATABERR_LABEL;Aberrazione Cromatica
 TP_COARSETRAF_TOOLTIP_HFLIP;Rifletti orizzontalmente.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Ruota a sinistra.\nScorciatoie:\n<b>[</b> - Modalità a Scheda Multipla,\n<b>Alt-[</b> - Modalità a Scheda Singola.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Ruota a destra.\nScorciatoie:\n<b>]</b> - Modalità a Scheda Multipla,\n<b>Alt-]</b> - Modalità a Scheda Singola.
@@ -1092,7 +1091,7 @@ TP_PREPROCESS_NO_FOUND;Nessuno presente
 TP_RAWCACORR_AUTO;Autocorrezione
 TP_RAWCACORR_CABLUE;Blu
 TP_RAWCACORR_CARED;Rosso
-TP_RAWEXPOS_BLACKS;Livelli del nero
+TP_RAWCACORR_LABEL;Correzione AC
 TP_RAWEXPOS_LINEAR;Punto del Bianco - Correzione
 TP_RAWEXPOS_TWOGREEN;Valori del verde uniti
 TP_RAW_DCBENHANCE;Miglioramento DCB
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index d06635394..2e5e103bf 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -314,9 +314,9 @@ HISTORY_MSG_30;デコンボリューション 半径
 HISTORY_MSG_31;デコンボリューション 適用量
 HISTORY_MSG_32;デコンボリューション 減衰
 HISTORY_MSG_33;デコンボリューション 繰返し
-HISTORY_MSG_34;LCP 歪曲収差補正
-HISTORY_MSG_35;LCP 周辺光量補正
-HISTORY_MSG_36;LCP 色収差補正
+HISTORY_MSG_34;歪曲収差補正
+HISTORY_MSG_35;周辺光量補正
+HISTORY_MSG_36;色収差補正
 HISTORY_MSG_37;オートレベル
 HISTORY_MSG_38;ホワイトバランス　モード
 HISTORY_MSG_39;色温度
@@ -1400,7 +1400,6 @@ TP_CHMIXER_BLUE;ブルー
 TP_CHMIXER_GREEN;グリーン
 TP_CHMIXER_LABEL;チャンネルミキサー
 TP_CHMIXER_RED;レッドチャンネル
-TP_CHROMATABERR_LABEL;色収差
 TP_COARSETRAF_TOOLTIP_HFLIP;左右反転
 TP_COARSETRAF_TOOLTIP_ROTLEFT;90度左回転\nショートカット: <b>[</b>\n\nシングル・エディタ・タブのショートカット: <b>Alt-[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;90度右回転\nショートカット: <b>]</b>\n\nシングル・エディタ・タブのショートカット: <b>Alt-]</b>
@@ -1840,7 +1839,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;”自動補正”が有効になっている場合
 TP_RAWCACORR_AVOIDCOLORSHIFT;色ずれを回避
 TP_RAWCACORR_CABLUE;ブルー
 TP_RAWCACORR_CARED;レッド
-TP_RAWEXPOS_BLACKS;黒レベル
+TP_RAWCACORR_LABEL;色収差補正
 TP_RAWEXPOS_BLACK_0;グリーン1（先頭）
 TP_RAWEXPOS_BLACK_1;レッド
 TP_RAWEXPOS_BLACK_2;ブルー
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 95b6d311d..692c02c83 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -601,7 +601,6 @@ TP_CHMIXER_BLUE;Kék
 TP_CHMIXER_GREEN;Zöld
 TP_CHMIXER_LABEL;Színkeverő
 TP_CHMIXER_RED;Piros
-TP_CHROMATABERR_LABEL;Színihiba (kromatikus aberráció)
 TP_COARSETRAF_TOOLTIP_HFLIP;Vizszintes tükrözés
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Forgatás balra
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Forgatás jobbra
@@ -706,10 +705,10 @@ TP_PREPROCESS_GREENEQUIL;Zöldegyensúly
 TP_PREPROCESS_LABEL;Előfeldolgozás
 TP_PREPROCESS_LINEDENOISE;Sorzaj-szűrő
 TP_PREPROCESS_NO_FOUND;Nincs elérhető
-TP_RAWCACORR_AUTO;Színihiba (kromatikus aberráció) automatikus helyesbítése
+TP_RAWCACORR_AUTO;Automatikus helyesbítése
 TP_RAWCACORR_CABLUE;Kék
 TP_RAWCACORR_CARED;Vörös
-TP_RAWEXPOS_BLACKS;Feketeszintek
+TP_RAWCACORR_LABEL;Kromatikus aberráció
 TP_RAWEXPOS_LINEAR;Fehérszint: lineáris korrelációs faktor
 TP_RAWEXPOS_TWOGREEN;Zöldek együtt
 TP_RAW_DCBENHANCE;DCB helyesbítő lépés alkalmazása
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 46d273d77..3ac4d8d6c 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -278,9 +278,9 @@ HISTORY_MSG_30;RL-verscherping - Straal
 HISTORY_MSG_31;RL-verscherping - Hoeveelheid
 HISTORY_MSG_32;RL-verscherping - Demping
 HISTORY_MSG_33;RL-verscherping - Herhaling
-HISTORY_MSG_34;LCP Lensvervorming correctie
-HISTORY_MSG_35;LCP Vignettering correctie
-HISTORY_MSG_36;LCP CA correctie
+HISTORY_MSG_34;Lensvervorming correctie
+HISTORY_MSG_35;Vignettering correctie
+HISTORY_MSG_36;CA correctie
 HISTORY_MSG_37;Automatische Niveaus
 HISTORY_MSG_38;Witbalans Methode
 HISTORY_MSG_39;Kleurtemperatuur
@@ -1162,7 +1162,6 @@ TP_CHMIXER_BLUE;Blauw
 TP_CHMIXER_GREEN;Groen
 TP_CHMIXER_LABEL;Kleurkanaal mixer
 TP_CHMIXER_RED;Rood
-TP_CHROMATABERR_LABEL;Chromatische aberratie
 TP_COARSETRAF_TOOLTIP_HFLIP;Horizontaal spiegelen
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\n\nSneltoets:\n<b>[</b> - Multi-tab Mode,\n<b>Alt-[</b> - Enkel-tab Mode.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotate right.\n\nSneltoets:\n<b>]</b> - Multi-tab Mode,\n<b>Alt-]</b> - Enkel-tab Mode.
@@ -1530,7 +1529,7 @@ TP_PRSHARPENING_TOOLTIP;Verscherp na verkleinen. Werkt alleen als verkleinen act
 TP_RAWCACORR_AUTO;Automatische CA-correctie
 TP_RAWCACORR_CABLUE;Blauw
 TP_RAWCACORR_CARED;Rood
-TP_RAWEXPOS_BLACKS;Zwartniveaus
+TP_RAWCACORR_LABEL;Corrigeer chromatische aberratie
 TP_RAWEXPOS_BLACK_0;Groen 1 (leidend)
 TP_RAWEXPOS_BLACK_1;Rood
 TP_RAWEXPOS_BLACK_2;Blauw
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index e0b5b7685..75453e6e7 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -238,9 +238,9 @@ HISTORY_MSG_30;RLD - Promień
 HISTORY_MSG_31;RLD - Siła
 HISTORY_MSG_32;RLD - Tłumienie
 HISTORY_MSG_33;RLD - Powtórzenia
-HISTORY_MSG_34;LCP - Korekcja dystorsji
-HISTORY_MSG_35;LCP - Korekcja winietowania
-HISTORY_MSG_36;LCP - Korekcja aberacji
+HISTORY_MSG_34;Korekcja dystorsji
+HISTORY_MSG_35;Korekcja winietowania
+HISTORY_MSG_36;Korekcja aberacji
 HISTORY_MSG_37;Automatyczna ekspozycja
 HISTORY_MSG_38;Metoda balansu bieli
 HISTORY_MSG_39;BB - Temperatura
@@ -885,7 +885,6 @@ TP_CHMIXER_BLUE;Niebieski
 TP_CHMIXER_GREEN;Zielony
 TP_CHMIXER_LABEL;Mieszacz kanałów
 TP_CHMIXER_RED;Czerwony
-TP_CHROMATABERR_LABEL;Aberracja chromatyczna
 TP_COARSETRAF_TOOLTIP_HFLIP;Odbij w poziomie
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Obróć w lewo.\n\nSkróty:\n<b>[</b> - Tryb wielu zakładek,\n<b>Alt-[</b> - Tryb jednej zakładki.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Obróć w prawo.\n\nSkróty:\n<b>]</b> - Tryb wielu zakładek,\n<b>Alt-]</b> - Tryb jednej zakładki.
@@ -1202,7 +1201,7 @@ TP_PREPROCESS_NO_FOUND;Nic nie znaleziono
 TP_RAWCACORR_AUTO;Autokorekcja
 TP_RAWCACORR_CABLUE;Niebieski
 TP_RAWCACORR_CARED;Czerwony
-TP_RAWEXPOS_BLACKS;Poziomy czerni
+TP_RAWCACORR_LABEL;Korekcja aberracji chromatycznej
 TP_RAWEXPOS_BLACK_0;Zielony 1 (główny)
 TP_RAWEXPOS_BLACK_1;Czerwony
 TP_RAWEXPOS_BLACK_2;Niebieski
diff --git a/rtdata/languages/Portugues b/rtdata/languages/Portugues
index 5c9ad041d..57b2758a7 100644
--- a/rtdata/languages/Portugues
+++ b/rtdata/languages/Portugues
@@ -1359,7 +1359,6 @@ TP_CHMIXER_BLUE;Canal azul
 TP_CHMIXER_GREEN;Canal verde
 TP_CHMIXER_LABEL;Misturador de canais
 TP_CHMIXER_RED;Canal vermelho
-TP_CHROMATABERR_LABEL;Aberração cromática
 TP_COARSETRAF_TOOLTIP_HFLIP;Espelhar horizontalmente.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rodar para a esquerda.\n\nAtalhos:\n<b>[</b> - Modo de editor em várias abas,\n<b>Alt-[</b> - Modo de editor numa só aba.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rodar para a direita.\n\nAtalhos:\n<b>]</b> - Modo de editor em várias abas,\n<b>Alt-]</b> - Modo de editor numa só aba.
@@ -1793,7 +1792,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;Esta funcionalidade está disponível se a opção "
 TP_RAWCACORR_AVOIDCOLORSHIFT;Evitar mudança de cor
 TP_RAWCACORR_CABLUE;Azul
 TP_RAWCACORR_CARED;Vermelho
-TP_RAWEXPOS_BLACKS;Níveis de preto
+TP_RAWCACORR_LABEL;Correção de aberração cromática
 TP_RAWEXPOS_BLACK_0;Verde 1 (guia)
 TP_RAWEXPOS_BLACK_1;Vermelho
 TP_RAWEXPOS_BLACK_2;Azul
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 725bfe873..8e6dbd45d 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -1357,7 +1357,6 @@ TP_CHMIXER_BLUE;Canal azul
 TP_CHMIXER_GREEN;Canal verde
 TP_CHMIXER_LABEL;Misturador de canais
 TP_CHMIXER_RED;Canal vermelho
-TP_CHROMATABERR_LABEL;Aberração Cromática
 TP_COARSETRAF_TOOLTIP_HFLIP;Girar horizontalmente.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotacione à esquerda.\n\nAtalhos:\n<b>[</b> - Modo de Guias do Editor Múltiplo,\n<b>Alt-[</b> - Modo de Guia do Editor Único.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotacione à direita.\n\nAtalhos:\n<b>]</b> - Modo de Guias do Editor Múltiplo,\n<b>Alt-]</b> - Modo de Guia do Editor Único.
@@ -1787,7 +1786,7 @@ TP_RAWCACORR_AUTOIT;Interações
 TP_RAWCACORR_AVOIDCOLORSHIFT;Evitar mudança de cor
 TP_RAWCACORR_CABLUE;Azul
 TP_RAWCACORR_CARED;Vermelho
-TP_RAWEXPOS_BLACKS;Níveis de Preto
+TP_RAWCACORR_LABEL;Correção de Aberração Cromática
 TP_RAWEXPOS_BLACK_0;Verde 1 (guia)
 TP_RAWEXPOS_BLACK_1;Vermelho
 TP_RAWEXPOS_BLACK_2;Azul
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 6632580d8..62c3d797d 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -269,9 +269,9 @@ HISTORY_MSG_30;Деконволюция: Радиус
 HISTORY_MSG_31;Деконволюция: Значение
 HISTORY_MSG_32;Деконволюция: Ослабление
 HISTORY_MSG_33;Деконволюция: Повторы
-HISTORY_MSG_34;ПКО: коррекция искажения
-HISTORY_MSG_35;ПКО: коррекция виньетирования
-HISTORY_MSG_36;ПКО: коррекция ХА
+HISTORY_MSG_34;коррекция искажения
+HISTORY_MSG_35;коррекция виньетирования
+HISTORY_MSG_36;коррекция ХА
 HISTORY_MSG_37;Автоматические уровни
 HISTORY_MSG_38;Метод определения баланса белого
 HISTORY_MSG_39;Баланс белого: температура
@@ -984,7 +984,6 @@ TP_CHMIXER_BLUE;Синий
 TP_CHMIXER_GREEN;Зелёный
 TP_CHMIXER_LABEL;Цветовые каналы
 TP_CHMIXER_RED;Красный
-TP_CHROMATABERR_LABEL;Хроматические аберрации
 TP_COARSETRAF_TOOLTIP_HFLIP;Горизонтальное зеркальное отражение
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Повернуть влево\n\nГорячие клавиши:\n<b>[</b> - режим множественных редакторов,\n<b>Alt-[</b> - режим одного редактора
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Повернуть вправо\n\nГорячие клавиши:\n<b>]</b> - режим множественных редакторов,\n<b>Alt-]</b> - режим одного редактора
@@ -1266,7 +1265,7 @@ TP_RAWCACORR_AUTOIT;Подходов
 TP_RAWCACORR_AVOIDCOLORSHIFT;Избегать сдвига цветов
 TP_RAWCACORR_CABLUE;Синий
 TP_RAWCACORR_CARED;Красный
-TP_RAWEXPOS_BLACKS;Уровни черного
+TP_RAWCACORR_LABEL;Хроматические аберрации
 TP_RAWEXPOS_BLACK_0;Зелёный 1 (ведущий)
 TP_RAWEXPOS_BLACK_1;Красный
 TP_RAWEXPOS_BLACK_2;Синий
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 4224ef46a..066169b04 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -799,7 +799,6 @@ TP_CHMIXER_BLUE;Плава
 TP_CHMIXER_GREEN;Зелена
 TP_CHMIXER_LABEL;Мешање канала
 TP_CHMIXER_RED;Црвена
-TP_CHROMATABERR_LABEL;Хроматске аберације
 TP_COARSETRAF_TOOLTIP_HFLIP;Изврће слику хоризонтално
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Окреће слику улево
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Окреће слику удесно
@@ -1048,7 +1047,7 @@ TP_PREPROCESS_NO_FOUND;Није пронађено
 TP_RAWCACORR_AUTO;Исправи хроматске аберације
 TP_RAWCACORR_CABLUE;Плава
 TP_RAWCACORR_CARED;Црвена
-TP_RAWEXPOS_BLACKS;Ниво црне
+TP_RAWCACORR_LABEL;Хроматске аберације
 TP_RAWEXPOS_LINEAR;Линеарни фактор корекције
 TP_RAWEXPOS_TWOGREEN;Обе зелене
 TP_RAW_DCBENHANCE;Примени ДЦБ побољшање
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 73826351f..aa6fcb340 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -248,9 +248,9 @@ HISTORY_MSG_30;RLD - Radie
 HISTORY_MSG_31;RLD - Mängd
 HISTORY_MSG_32;RLD - Dämpning
 HISTORY_MSG_33;RLD - Upprepningar
-HISTORY_MSG_34;LCP distorsionskorrigering
-HISTORY_MSG_35;LCP vinjetteringskorrigering
-HISTORY_MSG_36;LCP Kromatiska aberattioner
+HISTORY_MSG_34;Distorsionskorrigering
+HISTORY_MSG_35;Vinjetteringskorrigering
+HISTORY_MSG_36;Kromatiska aberattioner
 HISTORY_MSG_37;Autonivåer
 HISTORY_MSG_38;Vitbalansmetod
 HISTORY_MSG_39;VB - Färgtemperatur
@@ -1054,7 +1054,6 @@ TP_CHMIXER_BLUE;Blå kanal
 TP_CHMIXER_GREEN;Grön kanal
 TP_CHMIXER_LABEL;Kanalmixer
 TP_CHMIXER_RED;Röd kanal
-TP_CHROMATABERR_LABEL;Kromatiska abberationer
 TP_COARSETRAF_TOOLTIP_HFLIP;Vänd horisontellt
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotera åt vänster.\nKortkommando: <b>[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotera åt höger.\nKortkommando: <b>]</b>
@@ -1397,7 +1396,7 @@ TP_PRSHARPENING_TOOLTIP;Skärper bilden efter att den storleksförändrats. Fung
 TP_RAWCACORR_AUTO;Reducera automatiskt kromatiska abberationer
 TP_RAWCACORR_CABLUE;Blå
 TP_RAWCACORR_CARED;Röd
-TP_RAWEXPOS_BLACKS;Svartpunktsnivåer
+TP_RAWCACORR_LABEL;Reducera kromatiska abberationer
 TP_RAWEXPOS_BLACK_0;Grön 1 (ledare)
 TP_RAWEXPOS_BLACK_1;Röd
 TP_RAWEXPOS_BLACK_2;Blå
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 2561283aa..f7ffaf308 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1556,7 +1556,6 @@ TP_CHMIXER_BLUE;Blue channel
 TP_CHMIXER_GREEN;Green channel
 TP_CHMIXER_LABEL;Channel Mixer
 TP_CHMIXER_RED;Red channel
-TP_CHROMATABERR_LABEL;Chromatic Aberration
 TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\n\nShortcuts:\n<b>[</b> - Multiple Editor Tabs Mode,\n<b>Alt-[</b> - Single Editor Tab Mode.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotate right.\n\nShortcuts:\n<b>]</b> - Multiple Editor Tabs Mode,\n<b>Alt-]</b> - Single Editor Tab Mode.
@@ -2169,7 +2168,7 @@ TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is ch
 TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
 TP_RAWCACORR_CABLUE;Blue
 TP_RAWCACORR_CARED;Red
-TP_RAWEXPOS_BLACKS;Black Levels
+TP_RAWCACORR_LABEL;Chromatic Aberration Correction
 TP_RAWEXPOS_BLACK_0;Green 1 (lead)
 TP_RAWEXPOS_BLACK_1;Red
 TP_RAWEXPOS_BLACK_2;Blue
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index eb0fce064..6097cf8ae 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -699,10 +699,7 @@ public:
     ProcEvent(): code_(0) {}
     ProcEvent(ProcEventCode code): code_(code) {}
     explicit ProcEvent(int code): code_(code) {}
-    operator int()
-    {
-        return code_;
-    }
+    operator int() const { return code_; }
 
 private:
     int code_;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 2c08ed408..da0a5773e 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -397,8 +397,8 @@ Gtk::Widget* Preferences::getBatchProcPanel()
     appendBehavList(mi, M("TP_WAVELET_EDGEDETECTTHR"), ADDSET_WA_EDGEDETECTTHR, true);
     appendBehavList(mi, M("TP_WAVELET_EDGEDETECTTHR2"), ADDSET_WA_EDGEDETECTTHR2, true);
 
-    mi = behModel->append();
-    mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_BAYER_LABEL"));
+    mi = behModel->append ();
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_RAW_SENSOR_BAYER_LABEL"));
     appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_BAYER_FALSE_COLOR_SUPPRESSION, false);
     appendBehavList (mi, M ("TP_RAW_DCBITERATIONS") + ", " + M("TP_RAW_LMMSEITERATIONS"), ADDSET_BAYER_ITER, false);
     appendBehavList (mi, M ("TP_RAW_DUALDEMOSAICCONTRAST"), ADDSET_BAYER_DUALDEMOZCONTRAST, false);
@@ -407,29 +407,29 @@ Gtk::Widget* Preferences::getBatchProcPanel()
     appendBehavList (mi, M ("TP_RAW_PIXELSHIFTEPERISO"), ADDSET_BAYER_PS_EPERISO, false);
 
     mi = behModel->append ();
-    mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_XTRANS_LABEL"));
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_RAW_SENSOR_XTRANS_LABEL"));
     appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION, false);
 
     mi = behModel->append ();
-    mi->set_value(behavColumns.label, M("TP_PREPROCESS_LABEL"));
-    appendBehavList(mi, M("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
-    appendBehavList(mi, M("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_PREPROCESS_LABEL"));
+    appendBehavList (mi, M ("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
+    appendBehavList (mi, M ("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);
 
-    mi = behModel->append();
-    mi->set_value(behavColumns.label, M("TP_EXPOS_WHITEPOINT_LABEL"));
-    appendBehavList(mi, M("TP_RAWEXPOS_LINEAR"), ADDSET_RAWEXPOS_LINEAR, false);
+    mi = behModel->append ();
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_EXPOS_WHITEPOINT_LABEL"));
+    appendBehavList (mi, M ("TP_RAWEXPOS_LINEAR"), ADDSET_RAWEXPOS_LINEAR, false);
 
-    mi = behModel->append();
-    mi->set_value(behavColumns.label, M("TP_RAWEXPOS_BLACKS"));
-    appendBehavList(mi, M("TP_RAWEXPOS_RGB"), ADDSET_RAWEXPOS_BLACKS, false);
+    mi = behModel->append ();
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_EXPOS_BLACKPOINT_LABEL"));
+    appendBehavList (mi, M ("TP_RAWEXPOS_RGB"), ADDSET_RAWEXPOS_BLACKS, false);
 
-    mi = behModel->append();
-    mi->set_value(behavColumns.label, M("TP_FLATFIELD_LABEL"));
-    appendBehavList(mi, M("TP_FLATFIELD_CLIPCONTROL"), ADDSET_RAWFFCLIPCONTROL, true);
+    mi = behModel->append ();
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_FLATFIELD_LABEL"));
+    appendBehavList (mi, M ("TP_FLATFIELD_CLIPCONTROL"), ADDSET_RAWFFCLIPCONTROL, true);
 
-    mi = behModel->append();
-    mi->set_value(behavColumns.label, M("TP_CHROMATABERR_LABEL"));
-    appendBehavList(mi, M("TP_RAWCACORR_CARED") + ", " + M("TP_RAWCACORR_CABLUE"), ADDSET_RAWCACORR, true);
+    mi = behModel->append ();
+    mi->set_value (behavColumns.label, M("MAIN_TAB_RAW") + " - " + M("TP_RAWCACORR_LABEL"));
+    appendBehavList (mi, M ("TP_RAWCACORR_CARED") + ", " + M ("TP_RAWCACORR_CABLUE"), ADDSET_RAWCACORR, true);
 
     behTreeView->expand_all();
 
diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc
index 06780559d..a6b624562 100644
--- a/rtgui/rawcacorrection.cc
+++ b/rtgui/rawcacorrection.cc
@@ -28,7 +28,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROMATABERR_LABEL"))
+RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_RAWCACORR_LABEL"))
 {
     auto m = ProcEventMapper::getInstance();
     EvPreProcessCAAutoiterations = m->newEvent(DARKFRAME, "HISTORY_MSG_RAWCACORR_AUTOIT");