Normalized RAW tab and enhanced slider behaviour for the RAW tab + Green Equil slider was not listened

rtdata/languages/Catala

@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Últim directori usat
 PREFERENCES_DIROTHER;Un altre
 PREFERENCES_DIRSELECTDLG;Selecc. directori d'inici...
 PREFERENCES_DIRSOFTWARE;Instal·lació al directori
-PREFERENCES_DMETHOD;Mètode
+TP_RAW_DMETHOD;Mètode
 PREFERENCES_EDITORCMDLINE;Una altra línia de comandament
 PREFERENCES_EXTERNALEDITOR;Editor extern
-PREFERENCES_FALSECOLOR;Passos de supressió del fals color
+TP_RAW_FALSECOLOR;Passos de supressió del fals color
 PREFERENCES_FBROWSEROPTS;Opcions gestor d'arxius
 PREFERENCES_FILEFORMAT;Format de fitxer
 PREFERENCES_FORIMAGE;Per fitxers d'imatge

rtdata/languages/Czech

@@ -419,7 +419,7 @@ PREFERENCES_APPLNEXTSTARTUP;Projeví se při dalším spuštění
 PREFERENCES_BATCH_PROCESSING;Dávkové zpracování
 PREFERENCES_BEHAVIOR;Režim
 PREFERENCES_BLINKCLIPPED;Blikání v oříznutých oblastech
-PREFERENCES_CABLUE;Manuální korekce modré CA
+TP_RAWCACORR_CABLUE;Manuální korekce modré CA
 PREFERENCES_CACHECLEARALL;Vymaž vše
 PREFERENCES_CACHECLEARPROFILES;Vymaž profily
 PREFERENCES_CACHECLEARTHUMBS;Vymaž náhledy
@@ -432,8 +432,8 @@ PREFERENCES_CACHESTRAT2;Upřednostnit menší spotřebu paměti před rychlostí
 PREFERENCES_CACHESTRAT;Strategie cache
 PREFERENCES_CACHETHUMBFORM;Formát náhledů v cache
 PREFERENCES_CACHETHUMBHEIGHT;Maximální velikost náhledu
-PREFERENCES_CACORRECTION;Aplikovat automatickou korekci chromatické aberace
-PREFERENCES_CARED;Manuální korekce červené CA
+TP_RAWCACORR_AUTO;Aplikovat automatickou korekci chromatické aberace
+TP_RAWCACORR_CARED;Manuální korekce červené CA
 PREFERENCES_CLEARDLG_LINE1;Čištění cache
 PREFERENCES_CLEARDLG_LINE2;může trvat několik sekund.
 PREFERENCES_CLEARDLG_TITLE;Prosím počkejte.
@@ -443,8 +443,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Štětec přesahu
 PREFERENCES_DARKFRAME;Tmavé snímky
 PREFERENCES_DATEFORMAT;Formát data
 PREFERENCES_DATEFORMATHINT;<i>Lze použít následující formátovací řetězce:</i>\n<b>%y</b><i> : rok (year)</i>\n<b>%m</b><i> : měsíc (month)</i>\n<b>%d</b><i> : den (day)</i>\n<i>\nNapříklad český formát data:</i>\n<b>%d. %m. %y</b>
-PREFERENCES_DCBENHANCE;Aplikovat krok DCB rozšíření
-PREFERENCES_DCBITERATIONS;Počet DCB iterací
+TP_RAW_DCBENHANCE;Aplikovat krok DCB rozšíření
+TP_RAW_DCBITERATIONS;Počet DCB iterací
 PREFERENCES_DEFAULTLANG;Výchozí jazyk
 PREFERENCES_DEFAULTTHEME;Výchozí vzhled
 PREFERENCES_DEMOSAICINGALGO;Demozajkovací algoritmus
@@ -454,28 +454,28 @@ PREFERENCES_DIRLAST;Poslední navštívená složka
 PREFERENCES_DIROTHER;Jiná
 PREFERENCES_DIRSELECTDLG;Zvolte složku s obrázky pro spuštění...
 PREFERENCES_DIRSOFTWARE;Instalační složka
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
 PREFERENCES_EDITORCMDLINE;Jiný příkaz
 PREFERENCES_EDITORLAYOUT;Rozvržení editoru
 PREFERENCES_EXTERNALEDITOR;Externí editor
-PREFERENCES_FALSECOLOR;Počet kroků při potlačování chybných barev
+TP_RAW_FALSECOLOR;Počet kroků při potlačování chybných barev
 PREFERENCES_FBROWSEROPTS;Volby prohlížeče souborů
 PREFERENCES_FILEFORMAT;Formát souboru
 PREFERENCES_FORIMAGE;Pro obrázkové soubory
 PREFERENCES_FORRAW;Pro RAW soubory
 PREFERENCES_GIMPPATH;GIMP instalační adresář
-PREFERENCES_GREENEQUIL;Vyrovnání zelené
+TP_PREPROCESS_GREENEQUIL;Vyrovnání zelené
 PREFERENCES_GTKTHEME;GTK výchozí
 PREFERENCES_HINT;Nápověda
 PREFERENCES_HLTHRESHOLD;Práh pro oříznutá světla
-PREFERENCES_HOTDEADPIXFILT;Aplikovat filtr na vypálené/mrtvé body
+TP_PREPROCESS_HOTDEADPIXFILT;Aplikovat filtr na vypálené/mrtvé body
 PREFERENCES_ICCDIR;Složka ICC profilů
 PREFERENCES_IMPROCPARAMS;Výchozí profily pro zpracování obrázku
 PREFERENCES_INTENT_ABSOLUTE;Absolutní kolorimetrie
 PREFERENCES_INTENT_PERCEPTUAL;Vnímání
 PREFERENCES_INTENT_RELATIVE;Relativní kolorimetrie
 PREFERENCES_INTENT_SATURATION;Saturace
-PREFERENCES_LINEDENOISE;Filtrovat linkové rušení
+TP_PREPROCESS_LINEDENOISE;Filtrovat linkové rušení
 PREFERENCES_LIVETHUMBNAILS;Živé náhledy (pomalejší)
 PREFERENCES_MONITORICC;Profil monitoru
 PREFERENCES_MULTITAB;Mód více karet
@@ -707,10 +707,9 @@ TP_LUMADENOISE_RADIUS;Poloměr
 TP_PERSPECTIVE_HORIZONTAL;Horizontální
 TP_PERSPECTIVE_LABEL;Perspektiva
 TP_PERSPECTIVE_VERTICAL;Vertikální
-TP_PREPROCESS_DARKFRAME;Tmavé snímky
-TP_PREPROCESS_DFAUTOSELECT;Automatický výběr
-TP_RAWPANEL_DEMOSAICING;Demozajkování
-TP_RAWPANEL_PREPROCESSING;Předzpracování
+TP_DARKFRAME_AUTOSELECT;Automatický výběr
+TP_RAW_LABEL;Demozajkování
+TP_PREPROCESS_LABEL;Předzpracování
 TP_RESIZE_BICUBIC;Bikubická
 TP_RESIZE_BICUBICSF;Bikubická (Měkčí)
 TP_RESIZE_BICUBICSH;Bikubická (Ostřejší)

rtdata/languages/Dansk

@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Sidst anvendte mappe
 PREFERENCES_DIROTHER;Andet
 PREFERENCES_DIRSELECTDLG;Vælg startmappe...
 PREFERENCES_DIRSOFTWARE;Installationsmappe
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
 PREFERENCES_EDITORCMDLINE;Anden kommandostreng
 PREFERENCES_EXTERNALEDITOR;Eksternt redigeringsprogram
-PREFERENCES_FALSECOLOR;Antal trin til undertrykkelse af forkert farve
+TP_RAW_FALSECOLOR;Antal trin til undertrykkelse af forkert farve
 PREFERENCES_FBROWSEROPTS;Indstllinger til filbrowser
 PREFERENCES_FILEFORMAT;Filformat
 PREFERENCES_FORIMAGE;Til billedfiler

rtdata/languages/Deutsch

@@ -436,7 +436,7 @@ PREFERENCES_APPLNEXTSTARTUP;erfordert Neustart
 PREFERENCES_BATCH_PROCESSING;Stapelverarbeitung
 PREFERENCES_BEHAVIOR;Verhalten
 PREFERENCES_BLINKCLIPPED;Zu helle/dunkle Bereiche kennzeichnen
-PREFERENCES_CABLUE;CA blau\nmanuelle Korrektur
+TP_RAWCACORR_CABLUE;Blau
 PREFERENCES_CACHECLEARALL;Alles löschen
 PREFERENCES_CACHECLEARPROFILES;Profile löschen
 PREFERENCES_CACHECLEARTHUMBS;Voransichten löschen
@@ -449,8 +449,8 @@ PREFERENCES_CACHESTRAT2;Priorität auf minimierten Speicherverbrauch (geringere
 PREFERENCES_CACHESTRAT;Strategie des Zwischenspeichers
 PREFERENCES_CACHETHUMBFORM;Format der Voransichten
 PREFERENCES_CACHETHUMBHEIGHT;Maximale Höhe der Voransichten
-PREFERENCES_CACORRECTION;Autom. Korrektur Chrom. Aberration
-PREFERENCES_CARED;CA rot\nmanuelle Korrektur
+TP_RAWCACORR_AUTO;Autom. Korrektur Chrom. Aberration
+TP_RAWCACORR_CARED;Rot
 PREFERENCES_CLIPPINGIND;Anzeige zu heller/dunkler Bereiche
 PREFERENCES_CMETRICINTENT;Farbraumtransformation
 PREFERENCES_CUTOVERLAYBRUSH;Abdeckfarbe für Ausschnitt
@@ -460,8 +460,8 @@ PREFERENCES_DARKFRAMESHOTS;Aufnahmen
 PREFERENCES_DARKFRAMETEMPLATES;Vorlagen
 PREFERENCES_DATEFORMAT;Datumsformat
 PREFERENCES_DATEFORMATHINT;Die folgenden Variablen können verwendet werden:\n<b>%y</b> : <i>Jahr</i>\n<b>%m</b> : <i>Monat</i>\n<b>%d</b> : <i>Tag</i>\n\nDas deutsche Datumsformat beispielsweise ist:\n<b>%d.%m.%y</b>
-PREFERENCES_DCBENHANCE;DCB Verfeinerungsschritt durchführen
-PREFERENCES_DCBITERATIONS;Anzahl der DCB Iterationen
+TP_RAW_DCBENHANCE;DCB Verfeinerungsschritt durchführen
+TP_RAW_DCBITERATIONS;Anzahl der DCB Iterationen
 PREFERENCES_DEFAULTLANG;Sprache für Menüs und Dialoge
 PREFERENCES_DEFAULTTHEME;Standard-Oberflächendesign
 PREFERENCES_DEMOSAICINGALGO;Algorithmus zur Entrasterung
@@ -471,29 +471,28 @@ PREFERENCES_DIRLAST;Zuletzt geöffnetes Verzeichnis
 PREFERENCES_DIROTHER;Anderes
 PREFERENCES_DIRSELECTDLG;Wähle das Bild-Verzeichnis beim Programmstart...
 PREFERENCES_DIRSOFTWARE;Installationsverzeichnis
-PREFERENCES_DMETHOD;Methode
+TP_RAW_DMETHOD;Methode
 PREFERENCES_EDITORCMDLINE;Andere Befehlszeile
 PREFERENCES_EDITORLAYOUT;Editor-Layout
-PREFERENCES_EXPOS;Belichtung vor Interpolation:\nKorrektur (lin)
 PREFERENCES_EXTERNALEDITOR;Externer Editor
-PREFERENCES_FALSECOLOR;Falschfarbenunterdrückung\nStufen
+TP_RAW_FALSECOLOR;Stufen Falschfarben-Unterdrückung
 PREFERENCES_FBROWSEROPTS;Einstellungen zu Bildinformationen
 PREFERENCES_FILEFORMAT;Dateiformat
 PREFERENCES_FORIMAGE;Für Bilddateien
 PREFERENCES_FORRAW;Für RAW-Dateien
 PREFERENCES_GIMPPATH;GIMP Installationsverzeichnis
-PREFERENCES_GREENEQUIL;Grün-Ausgleich
+TP_PREPROCESS_GREENEQUIL;Grün-Ausgleich
 PREFERENCES_GTKTHEME;Standard GTK
 PREFERENCES_HINT;Erklärungen
 PREFERENCES_HLTHRESHOLD;Schwellenwert - zu hell
-PREFERENCES_HOTDEADPIXFILT;Hot/Dead-Pixel-Filter anwenden
+TP_PREPROCESS_HOTDEADPIXFILT;Hot/Dead Pixel Filter anwenden
 PREFERENCES_ICCDIR;ICC-Profile-Verzeichnis
 PREFERENCES_IMPROCPARAMS;Standard-Bildbearbeitungsparameter
 PREFERENCES_INTENT_ABSOLUTE;Absolut farbmetrisch
 PREFERENCES_INTENT_PERCEPTUAL;Wahrnehmungsabhängig
 PREFERENCES_INTENT_RELATIVE;Relativ farbmetrisch
 PREFERENCES_INTENT_SATURATION;Sättigung
-PREFERENCES_LINEDENOISE;Zeilenrausch-Filter
+TP_PREPROCESS_LINEDENOISE;Zeilenrausch-Filter
 PREFERENCES_LIVETHUMBNAILS;Live Voransichten (langsamer)
 PREFERENCES_MONITORICC;Monitor-Profil
 PREFERENCES_MULTITAB;Multi-Reiter Modus
@@ -724,10 +723,10 @@ TP_LUMADENOISE_RADIUS;Radius
 TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspektive
 TP_PERSPECTIVE_VERTICAL;Vertikal
-TP_PREPROCESS_DARKFRAME;Dunkelbild
-TP_PREPROCESS_DFAUTOSELECT;Automatische Auswahl
-TP_RAWPANEL_DEMOSAICING;Demosaic
-TP_RAWPANEL_PREPROCESSING;Vorverarbeitung
+TP_DARKFRAME_AUTOSELECT;Automatische Auswahl
+GENERAL_FILE;Datei
+TP_RAW_LABEL;Farbinterpolation
+TP_PREPROCESS_LABEL;Vorverarbeitung
 TP_RESIZE_APPLIESTO;Gilt für:
 TP_RESIZE_BICUBIC;Bikubisch
 TP_RESIZE_BICUBICSF;Bikubisch (Weicher)

rtdata/languages/English (UK)

@@ -2,8 +2,6 @@
 #00 English (UK)
 #01 05.12.2010: Richard Regal
 #01 17.10.2010: Richard Regal
-<<<<<<< local
->>>>>>> other
 HISTORY_MSG_34;Avoid Colour Clipping
 HISTORY_MSG_37;Colour Boost
 HISTORY_MSG_39;Colour Temperature
@@ -29,7 +27,7 @@ PARTIALPASTE_COLORSHIFT;Colour shift
 PREFERENCES_BEHAVIOR;Behavior
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
-PREFERENCES_FALSECOLOR;False colour suppression steps
+TP_RAW_FALSECOLOR;False colour suppression steps
 PREFERENCES_TAB_COLORMGR;Colour Management
 TP_COLORBOOST_AVOIDCOLORCLIP;Avoid colour clipping
 TP_COLORBOOST_LABEL;Colour Boost

rtdata/languages/Espanol

@@ -15,12 +15,14 @@ BATCH_PROCESSING;Proceso por lotes
 CURVEEDITOR_CURVE;Curva
 CURVEEDITOR_CURVES;Curvas
 CURVEEDITOR_CUSTOM;Personalizado
+CURVEEDITOR_DARKS;Penumbras
 CURVEEDITOR_FILEDLGFILTERANY;Cuaquier archivo
 CURVEEDITOR_FILEDLGFILTERCURVE;Archivos de curvas
 CURVEEDITOR_HIGHLIGHTS;Luces altas
 CURVEEDITOR_LIGHTS;Luces
 CURVEEDITOR_LINEAR;Lineal
 CURVEEDITOR_LOADDLGLABEL;Cargar curva...
+CURVEEDITOR_NURBS;Jaula de control
 CURVEEDITOR_PARAMETRIC;Parametrica
 CURVEEDITOR_SAVEDLGLABEL;Guardar curva...
 CURVEEDITOR_SHADOWS;Sombras
@@ -34,10 +36,10 @@ EXIFFILTER_DIALOGLABEL;Filtro Exif
 EXIFFILTER_FOCALLEN;Distancia focal
 EXIFFILTER_ISO;ISO
 EXIFFILTER_LENS;Objectivo
-EXIFFILTER_SHUTTER;tiempo de exposición
+EXIFFILTER_SHUTTER;Tiempo de exposición
 EXIFPANEL_ADDEDIT;Agregar/Cambiar
 EXIFPANEL_ADDEDITHINT;Agregar atributo nuevo o cambiar atributo
-EXIFPANEL_ADDTAGDLG_ENTERVALUE;Entroducir valor
+EXIFPANEL_ADDTAGDLG_ENTERVALUE;Introducir valor
 EXIFPANEL_ADDTAGDLG_SELECTTAG;Seleccionar atributo
 EXIFPANEL_ADDTAGDLG_TITLE;Agregar/Cambiar atributo
 EXIFPANEL_KEEP;Conservar
@@ -60,10 +62,10 @@ FILEBROWSER_DELETEDLGMSG;¿Seguro que quieres borrar los %1 archivos seleccionad
 FILEBROWSER_EMPTYTRASH;Vaciar papelera
 FILEBROWSER_EMPTYTRASHHINT;Borrar archivos de la papelera definitivamente
 FILEBROWSER_EXIFFILTERAPPLY;Aplicar
-FILEBROWSER_EXIFFILTERAPPLYHINT;Activar/desactivar filtro exif en el explorador de archivos
+FILEBROWSER_EXIFFILTERAPPLYHINT;Activar/desactivar filtro Exif en el explorador de archivos
 FILEBROWSER_EXIFFILTERLABEL;Filtro Exif
 FILEBROWSER_EXIFFILTERSETTINGS;Ajuste
-FILEBROWSER_EXIFFILTERSETTINGSHINT;Cambiar ajustes del filtro exif
+FILEBROWSER_EXIFFILTERSETTINGSHINT;Cambiar ajustes del filtro Exif
 FILEBROWSER_NEW_NAME;Nuevo nombre:
 FILEBROWSER_PARTIALPASTEPROFILE;Pegar perfil parcialmente
 FILEBROWSER_PASTEPROFILE;Pegar perfil
@@ -102,6 +104,7 @@ FILEBROWSER_STARTPROCESSINGHINT;Iniciar procesamiento de imagenes en la cola
 FILEBROWSER_STOPPROCESSING;Parar procesamiento
 FILEBROWSER_STOPPROCESSINGHINT;Parar procesamiento de imagenes en la cola
 FILEBROWSER_THUMBSIZE;Tamaño miniatura
+FILEBROWSER_TOOLTIP_STOPPROCESSING;Iniciar procesamiento automáticamente cuando llega un nuevo trabajo
 FILEBROWSER_USETEMPLATE;Utilizar plantilla:
 FILEBROWSER_ZOOMINHINT;Agrandar miniatura
 FILEBROWSER_ZOOMOUTHINT;Reducir miniatura
@@ -123,6 +126,10 @@ GENERAL_PORTRAIT;Retrato
 GENERAL_SAVE;Guardar
 GENERAL_UNCHANGED;(Sin cambios)
 GENERAL_YES;Sí
+HISTOGRAM_BUTTON_B;B
+HISTOGRAM_BUTTON_G;G
+HISTOGRAM_BUTTON_L;L
+HISTOGRAM_BUTTON_R;R
 HISTOGRAM_LABEL;Histograma
 HISTOGRAM_TOOLTIP_B;Mostrar/Ocultar histograma AZUL
 HISTOGRAM_TOOLTIP_G;Mostrar/Ocultar histograma VERDE
@@ -133,6 +140,16 @@ HISTORY_CUSTOMCURVE;Curva a medida
 HISTORY_DELSNAPSHOT;Quitar Instantánea
 HISTORY_FROMCLIPBOARD;Desde el portapapeles
 HISTORY_LABEL;Historial
+HISTORY_MSG_100;Saturación RGB
+HISTORY_MSG_101;Ec. HSV -- Tono
+HISTORY_MSG_102;Ec. HSV -- Saturación
+HISTORY_MSG_103;Ec. HSV -- Valor
+HISTORY_MSG_104;Ecualizador HSV
+HISTORY_MSG_105;Quitar borde púrpura
+HISTORY_MSG_106;Quitar borde púrpura Radio
+HISTORY_MSG_107;Quitar borde púrpura Umbral
+HISTORY_MSG_109;Cambiar tamaño rectángulo limitador
+HISTORY_MSG_110;Cambio tamaño aplica a
 HISTORY_MSG_10;Compresión de Sombras
 HISTORY_MSG_11;Curva de Tono
 HISTORY_MSG_12;Exposición Automática
@@ -215,11 +232,22 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_MSG_82;Perfil Cambiado
 HISTORY_MSG_83;Alta Calidad Sombras/Luces Altas
 HISTORY_MSG_84;Corrección de Perspectiva
+HISTORY_MSG_85;Coeficientes wavelet
+HISTORY_MSG_86;Ecualizador wavelet
+HISTORY_MSG_87;Reducción ruido impulsivo
+HISTORY_MSG_88;Umbral reducc. ruido impuls.
 HISTORY_MSG_89;Reducción de ruido
 HISTORY_MSG_8;Compensación de Exposición
+HISTORY_MSG_90;NR - luminancia
+HISTORY_MSG_91;NR - crominancia
+HISTORY_MSG_92;NR - gamma
+HISTORY_MSG_93;Contraste por niveles de detalle value
+HISTORY_MSG_94;Contraste por niveles de detalle
 HISTORY_MSG_95;Saturacion
 HISTORY_MSG_96;Curva 'a'
 HISTORY_MSG_97;Curva 'b'
+HISTORY_MSG_98;Desmosaicado
+HISTORY_MSG_99;Preprocesamiento
 HISTORY_MSG_9;Compresión de Luces Altas
 HISTORY_NEWSNAPSHOT;Instantánea nueva
 HISTORY_NEWSNAPSHOTAS;Como...
@@ -323,6 +351,7 @@ MAIN_TAB_METADATA;Metadata
 MAIN_TAB_RAW;RAW
 MAIN_TAB_TAGGING;Tagging
 MAIN_TAB_TRANSFORM;Transformar
+MAIN_TOGGLE_BEFORE_AFTER;A|D
 MAIN_TOOLTIP_HIDEFP;Mostrar/Ocultar panel inferior (explorador carpetas y arch. tecla F)
 MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar panel izquierdo (incluyendo historial, tecla H)
 MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas
@@ -331,6 +360,26 @@ MAIN_TOOLTIP_PREFERENCES;Ajustar preferencias
 MAIN_TOOLTIP_QINFO; Información breve de la imagen
 MAIN_TOOLTIP_SAVE;Guardar imagen a la carpeta predeterminada
 MAIN_TOOLTIP_SAVEAS;Guardar imagen a una carpeta seleccionada
+MAIN_TOOLTIP_TOGGLE;Cambiar vista antes/después <b>B</b>
+NAVIGATOR_B_NA;B = n/a
+NAVIGATOR_B_VALUE;B = %1
+NAVIGATOR_G_NA;G = n/a
+NAVIGATOR_G_VALUE;G = %1
+NAVIGATOR_H_NA;H = n/a
+NAVIGATOR_H_VALUE;H = %1
+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
+NAVIGATOR_R_NA;R = n/a
+NAVIGATOR_R_VALUE;R = %1
+NAVIGATOR_S_NA;S = n/a
+NAVIGATOR_S_VALUE;S = %1
+NAVIGATOR_V_NA;V = n/a
+NAVIGATOR_V_VALUE;V = %1
+NAVIGATOR_XY_NA;x = n/a, y = n/a
 PARTIALPASTE_BASICGROUP;Ajustes Básicos
 PARTIALPASTE_CACORRECTION;Corrección de Aberraciones Cromáticas
 PARTIALPASTE_COARSETRANS;Rotar 90 grados / voltear
@@ -342,11 +391,15 @@ PARTIALPASTE_COLORSHIFT;Cambio de Colores
 PARTIALPASTE_COMPOSITIONGROUP;Ajustes al respecto de la figuración
 PARTIALPASTE_CROP;Recortar
 PARTIALPASTE_DIALOGLABEL;Pegar perfil de procesamiento parcialmente
+PARTIALPASTE_DIRPYRDENOISE;Reducción de ruido
+PARTIALPASTE_DIRPYREQUALIZER;Contraste mediante niveles de detalle
 PARTIALPASTE_DISTORTION;Distorsión
 PARTIALPASTE_EXIFCHANGES;Cambio en datos exif
 PARTIALPASTE_EXPOSURE;Exposición
 PARTIALPASTE_HLRECOVERY;Recuperación de Luces Altas
+PARTIALPASTE_HSVEQUALIZER;Ecualizador HSV
 PARTIALPASTE_ICMSETTINGS;Ajustes GIC
+PARTIALPASTE_IMPULSEDENOISE;Reducción de ruido impulsivo
 PARTIALPASTE_IPTCINFO;Informaciones IPTC
 PARTIALPASTE_LABCURVE;Curva Lab
 PARTIALPASTE_LENSGROUP;Ajustes al respecto del objetivo
@@ -360,11 +413,13 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Sombras/Luces Altas
 PARTIALPASTE_SHARPENING;Enfoque
 PARTIALPASTE_VIGNETTING;Corrección de viñeteo
 PARTIALPASTE_WHITEBALANCE;Equilibrio de Blancos
+POPUPBUTTON_SELECTOPTIONHINT;RMB para cambiar opción
 PREFERENCES_ADD;Añadir
 PREFERENCES_APPLNEXTSTARTUP;aplicado al próximo arranque
 PREFERENCES_BATCH_PROCESSING;Proceso por lotes
 PREFERENCES_BEHAVIOR;Comportamiento
 PREFERENCES_BLINKCLIPPED;Parpadear áreas cortadas
+TP_RAWCACORR_CABLUE;Azul
 PREFERENCES_CACHECLEARALL;Borrar todo
 PREFERENCES_CACHECLEARPROFILES;Borrar perfiles
 PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas
@@ -377,6 +432,8 @@ PREFERENCES_CACHESTRAT2;Preferir consume de memoria bajo sobre velocidad
 PREFERENCES_CACHESTRAT;Estrategia de la memoria intermedia
 PREFERENCES_CACHETHUMBFORM;Formato de las miniaturas
 PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas
+TP_RAWCACORR_AUTO;Aplicar autocorrección aberr. cromát.
+TP_RAWCACORR_CARED;Rojo
 PREFERENCES_CLEARDLG_LINE1;Borrando memoria intermedia
 PREFERENCES_CLEARDLG_LINE2;Puede durar unos segundos.
 PREFERENCES_CLEARDLG_TITLE;Aguardar, por favor
@@ -384,6 +441,8 @@ PREFERENCES_CLIPPINGIND;Indicación de recortes
 PREFERENCES_CMETRICINTENT;Intento Colorimétrico
 PREFERENCES_DATEFORMAT;Formato de Fechas
 PREFERENCES_DATEFORMATHINT;<i>Se puede usar las variables siguientes:</i>\n<b>%y</b><i> : año</i>\n<b>%m</b><i> : mes</i>\n<b>%d</b><i> : dia</i>\n<i>\nPor ejemplo, la fecha en Argentina es:</i>\n<b>%d/%m/%y</b>
+TP_RAW_DCBENHANCE;Aplicar paso mejora DCB
+TP_RAW_DCBITERATIONS;Número iteraciones DCB
 PREFERENCES_DEFAULTLANG;Idioma predeterminado
 PREFERENCES_DEFAULTTHEME;Estilo predeterminado
 PREFERENCES_DEMOSAICINGALGO;Algoritmo de desmosaicado
@@ -392,24 +451,28 @@ PREFERENCES_DIRLAST;Última carpeta visitada
 PREFERENCES_DIROTHER;Otro
 PREFERENCES_DIRSELECTDLG;Seleccionar Carpeta de Imagenes en el arranque...
 PREFERENCES_DIRSOFTWARE;Carpeta de instalación
-PREFERENCES_DMETHOD;Método
+TP_RAW_DMETHOD;Método
 PREFERENCES_EDITORCMDLINE;Otro mandato
+PREFERENCES_EDITORLAYOUT;Aspecto del editor
 PREFERENCES_EXTERNALEDITOR;Editor externa
-PREFERENCES_FALSECOLOR;Pasos de supresión de colores falsos
+TP_RAW_FALSECOLOR;Pasos de supresión de colores falsos
 PREFERENCES_FBROWSEROPTS;Opciones del Explorador de archivos
 PREFERENCES_FILEFORMAT;Formato de Archivos
 PREFERENCES_FORIMAGE;Para Archivos de Imágenes
 PREFERENCES_FORRAW;Para archivos RAW
 PREFERENCES_GIMPPATH;Carpeta de instalación de GIMP
+TP_PREPROCESS_GREENEQUIL;Equilibrado del verde
 PREFERENCES_GTKTHEME;Estilo de GTK predeterminado
 PREFERENCES_HINT;Consejo
 PREFERENCES_HLTHRESHOLD;Umbral de luces altas cortados
+TP_PREPROCESS_HOTDEADPIXFILT;Aplicar filtro de píxel dañado
 PREFERENCES_ICCDIR;Carpeta de Perfiles ICC
 PREFERENCES_IMPROCPARAMS;Parámetros predeterminados de procesamiento de imágenes
 PREFERENCES_INTENT_ABSOLUTE;Colorimétrico Absoluto
 PREFERENCES_INTENT_PERCEPTUAL;Perceptual
 PREFERENCES_INTENT_RELATIVE;Colorimétrico Relativo
 PREFERENCES_INTENT_SATURATION;Saturación
+TP_PREPROCESS_LINEDENOISE;Filtro de ruido de línea
 PREFERENCES_LIVETHUMBNAILS;Miniaturas 'en vivo' (mas lento)
 PREFERENCES_MONITORICC;Perfil de Pantalla
 PREFERENCES_OUTDIR;Carpeta de Salida
@@ -488,6 +551,7 @@ SAVEDLG_PUTTOQUEUETAIL;Poner al fin de la cola
 SAVEDLG_SAVEIMMEDIATELY;Guardar inmediatamente
 SAVEDLG_SAVESPP;Guardar parámetros de procesamiento con la imagen
 SAVEDLG_TIFFFILTER;Archivos TIFF
+SAVEDLG_TIFFUNCOMPRESSED;TIFF sin compresión
 TOOLBAR_TOOLTIP_CROP;Elección de recorte (tecla C)
 TOOLBAR_TOOLTIP_HAND;Herramienta mano (tecla N)
 TOOLBAR_TOOLTIP_STRAIGHTEN;Elección de línea recta (tecla S)
@@ -524,6 +588,7 @@ TP_COLORSHIFT_LABEL;Cambio de Colores
 TP_CROP_DPI;DPI=
 TP_CROP_FIXRATIO;Fijar Proporciones:
 TP_CROP_GTDIAGONALS;Regla de las diagonales
+TP_CROP_GTGRID;Rejilla
 TP_CROP_GTHARMMEANS1;Forma armónica 1
 TP_CROP_GTHARMMEANS2;Forma armónica 2
 TP_CROP_GTHARMMEANS3;Forma armónica 3
@@ -537,15 +602,21 @@ TP_CROP_SELECTCROP;    Seleccionar Recorte
 TP_CROP_W;An
 TP_CROP_X;x
 TP_CROP_Y;y
+TP_DEFRINGE_LABEL;Quitar borde púrpura
+TP_DEFRINGE_RADIUS;Radio
+TP_DEFRINGE_THRESHOLD;Umbral
 TP_DETAIL_AMOUNT;Cantidad
 TP_DIRPYRDENOISE_CHROMA;Crominancia
 TP_DIRPYRDENOISE_GAMMA;Gamma
 TP_DIRPYRDENOISE_LABEL;Reducción de ruido
 TP_DIRPYRDENOISE_LUMA;Luminancia
 TP_DIRPYREQUALIZER_LABEL;Contraste mediante niveles de detalle
+TP_DIRPYREQUALIZER_LUMACOARSEST;Más grueso
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Contraste-
 TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS;Contraste+
+TP_DIRPYREQUALIZER_LUMAFINEST;Más fino
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Neutro
+TP_DIRPYREQUALIZER_THRESHOLD;Umbral
 TP_DISTORTION_AMOUNT;Cantidad
 TP_DISTORTION_LABEL;Distorsión
 TP_EQUALIZER_CONTRAST_MINUS;Contraste-
@@ -561,6 +632,7 @@ TP_EXPOSURE_CONTRAST;Contraste
 TP_EXPOSURE_CURVEEDITOR;Curva de Tono
 TP_EXPOSURE_EXPCOMP;Comp. de Expos.
 TP_EXPOSURE_LABEL;Exposición
+TP_EXPOSURE_SATURATION;Saturación
 TP_HLREC_CIELAB;Superposición de CIELab
 TP_HLREC_COLOR;Propagación de Color
 TP_HLREC_LABEL;Recuperación de Luces Altas
@@ -573,6 +645,7 @@ TP_ICM_INPUTCAMERA;Valores predeterminados de la cámara
 TP_ICM_INPUTCUSTOM;A Medida
 TP_ICM_INPUTDLGLABEL;Seleccionar perfil ICC de entrada...
 TP_ICM_INPUTEMBEDDED;Usar Incrustado, si es posible
+TP_ICM_INPUTNONE;Sin perfil
 TP_ICM_INPUTPROFILE;Perfil de Entrada
 TP_ICM_LABEL;GIC
 TP_ICM_NOICM;Ningún MIC: Salida sRGB
@@ -580,11 +653,15 @@ TP_ICM_OUTPUTDLGLABEL;Seleccionar perfil ICC de salida...
 TP_ICM_OUTPUTPROFILE;Perfil de Salida
 TP_ICM_SAVEREFERENCE;Guardar imagen de referencia para el perfilado
 TP_ICM_WORKINGPROFILE;Perfil de Trabajo
+TP_IMPULSEDENOISE_LABEL;Reducc. ruido impulsivo
+TP_IMPULSEDENOISE_THRESH;Umbral
 TP_LABCURVE_BRIGHTNESS;Brillo
 TP_LABCURVE_CONTRAST;Contraste
 TP_LABCURVE_CURVEEDITOR;Curva de Luminancia
 TP_LABCURVE_LABEL;Curvas Lab
 TP_LABCURVE_SATURATION;Saturación
+TP_LENSGEOM_AUTOCROP;Auto recorte
+TP_LENSGEOM_FILL;Auto relleno
 TP_LENSGEOM_LABEL;Objetivo / Geometría
 TP_LUMACURVE_BLACKLEVEL;Negro
 TP_LUMACURVE_BRIGHTNESS;Brillo
@@ -599,19 +676,30 @@ TP_LUMADENOISE_RADIUS;Radio
 TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspectiva
 TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DFAUTOSELECT;Selección automática
-TP_RAWPANEL_PREPROCESSING;Preprocesando
+TP_DARKFRAME_AUTOSELECT;Selección automática
+TP_RAW_LABEL;Desmosaicado
+TP_PREPROCESS_LABEL;Preprocesado
+TP_RESIZE_APPLIESTO;Aplica a:
 TP_RESIZE_BICUBIC;Bicúbica
-TP_RESIZE_BICUBICSF;Bicúbica (Más suave)
-TP_RESIZE_BICUBICSH;Bicúbica (Más enfocado)
+TP_RESIZE_BICUBICSF;Bicúbica (más suave)
+TP_RESIZE_BICUBICSH;Bicúbica (más enfocado)
 TP_RESIZE_BILINEAR;Bilineal
+TP_RESIZE_CROPPEDAREA;Área recortada
+TP_RESIZE_DOWNSCALEB;Reducir resolución (más calidad)
+TP_RESIZE_DOWNSCALEF;Reducir resolución (más velocidad)
+TP_RESIZE_FITBOX;Rectángulo límite
+TP_RESIZE_FULLIMAGE;Imagen completa
 TP_RESIZE_FULLSIZE;Tamaño de imagen completo:
 TP_RESIZE_H;Al:
-TP_RESIZE_LABEL;Cambiar Tamaño
+TP_RESIZE_HEIGHT;Altura
+TP_RESIZE_LABEL;Cambiar tamaño
+TP_RESIZE_LANCZOS;Lanczos
 TP_RESIZE_METHOD;Método: 
 TP_RESIZE_NEAREST;Más cercano
 TP_RESIZE_SCALE;Escala
+TP_RESIZE_SPECIFY;Especificar:
 TP_RESIZE_W;An:
+TP_RESIZE_WIDTH;Anchura
 TP_ROTATE_AUTOCROP;Recorte Automático
 TP_ROTATE_DEGREE;Grados
 TP_ROTATE_FILL;Llenar
@@ -640,8 +728,12 @@ TP_SHARPENING_RLD_ITERATIONS;Reiteraciones
 TP_SHARPENING_THRESHOLD;Umbral
 TP_SHARPENING_USM;Máscara de enfoque
 TP_VIGNETTING_AMOUNT;Cantidad
+TP_VIGNETTING_CENTER;Centro
+TP_VIGNETTING_CENTER_X;Centro X
+TP_VIGNETTING_CENTER_Y;Centro Y
 TP_VIGNETTING_LABEL;Corrección de viñeteo
 TP_VIGNETTING_RADIUS;Radio
+TP_VIGNETTING_STRENGTH;Intensidad
 TP_WBALANCE_AUTO;Auto
 TP_WBALANCE_CAMERA;Cámara
 TP_WBALANCE_CUSTOM;A Medida

rtdata/languages/Euskara

@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Azkena ikusitako karpeta
 PREFERENCES_DIROTHER;Besterik
 PREFERENCES_DIRSELECTDLG;Abioko irudien karpeta hautatu...
 PREFERENCES_DIRSOFTWARE;Inatalazio karpeta
-PREFERENCES_DMETHOD;Metodoa
+TP_RAW_DMETHOD;Metodoa
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Okerreko kolore ezabaketa atalak
+TP_RAW_FALSECOLOR;Okerreko kolore ezabaketa atalak
 PREFERENCES_FBROWSEROPTS;Arakatzailearen aukerak
 PREFERENCES_FILEFORMAT;Artxiboen formatua
 PREFERENCES_FORIMAGE;Irudi artxiboetarako

rtdata/languages/Francais

@@ -122,6 +122,7 @@ GENERAL_LANDSCAPE;Paysage
 GENERAL_LOAD;Charger
 GENERAL_NA;indisponible
 GENERAL_NO;Non
+GENERAL_NONE;Aucun
 GENERAL_OK;OK
 GENERAL_PORTRAIT;Portrait
 GENERAL_SAVE;Enregistrer
@@ -156,6 +157,22 @@ HISTORY_MSG_110;Redim. s'applique à
 HISTORY_MSG_111;Éviter l'écrêtage couleur
 HISTORY_MSG_112;Limiteur de saturation
 HISTORY_MSG_113;Limite de saturation
+HISTORY_MSG_114;Nbr d'itération DCB
+HISTORY_MSG_115;Nbr d'itération des fausses couleurs
+HISTORY_MSG_116;DCB amélioré
+HISTORY_MSG_117;Corr. aberr. chromatique rouge
+HISTORY_MSG_118;Corr. aberr. chromatique bleu
+HISTORY_MSG_119;Filtre de bruit de ligne
+HISTORY_MSG_120;Équilibrage du vert
+HISTORY_MSG_121;Corr. auto. de l'aberr. chromatique
+HISTORY_MSG_122;Trame Noire automatique
+HISTORY_MSG_123;Champ Uniforme automatique
+HISTORY_MSG_124;Correct. d'expo linéaire
+HISTORY_MSG_125;Correct. d'expo préservant les HL
+HISTORY_MSG_126;Champ Uniforme - Fichier
+HISTORY_MSG_127;Champ Uniforme - Auto sélection
+HISTORY_MSG_128;Champ Uniforme - Rayon
+HISTORY_MSG_129;Champ Uniforme - Type de floutage
 HISTORY_MSG_11;Courbe tonale
 HISTORY_MSG_12;Exposition auto
 HISTORY_MSG_13;Rognage de l'exposition
@@ -251,8 +268,8 @@ 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;Traitement pre-dématriçage
+HISTORY_MSG_98;Algorithme de dématriçage
+HISTORY_MSG_99;Filtrage des pixels chauds/morts
 HISTORY_MSG_9;Compression des hautes lumières
 HISTORY_NEWSNAPSHOT;Ajouter
 HISTORY_NEWSNAPSHOTAS;Sous...
@@ -422,7 +439,7 @@ PREFERENCES_APPLNEXTSTARTUP;appliqué au prochain lancement
 PREFERENCES_BATCH_PROCESSING;Traitement par lot
 PREFERENCES_BEHAVIOR;Comportement
 PREFERENCES_BLINKCLIPPED;Faire clignoter les zones hors domaine
-PREFERENCES_CABLUE;Correct. manuelle de\nl'aberr. chrom. bleue
+TP_RAWCACORR_CABLUE;Bleue
 PREFERENCES_CACHECLEARALL;Tout nettoyer
 PREFERENCES_CACHECLEARPROFILES;Nettoyer les profils
 PREFERENCES_CACHECLEARTHUMBS;Nettoyer les vignettes
@@ -435,8 +452,8 @@ 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;Correction automatique de\nl'aberration chromatique
-PREFERENCES_CARED;Correct. manuelle de\nl'aberr. chrom. rouge
+TP_RAWCACORR_AUTO;Correction automatique
+TP_RAWCACORR_CARED;Rouge
 PREFERENCES_CLIPPINGIND;Indication du dépassement de plage dynamique
 PREFERENCES_CMETRICINTENT;Intention Colorimétrique
 PREFERENCES_CUTOVERLAYBRUSH;Masque de recadrage
@@ -446,8 +463,8 @@ PREFERENCES_DARKFRAMESHOTS;image(s)
 PREFERENCES_DARKFRAMETEMPLATES;modèle(s)
 PREFERENCES_DATEFORMAT;Format de la date
 PREFERENCES_DATEFORMATHINT;<i>Vous pouvez utiliser les paramètres de chaînes formatés suivants:</i>\n<b>%y</b><i> : année</i>\n<b>%m</b><i> : mois</i>\n<b>%d</b><i> : jour</i>\n<i>\nPar exemple, le format de date française est:</i>\n<b>%d/%m/%y</b>
-PREFERENCES_DCBENHANCE;Appliquer la phase d'amélioration de DCB
-PREFERENCES_DCBITERATIONS;Nombre d'itération de DCB
+TP_RAW_DCBENHANCE;Appliquer la phase d'amélioration de DCB
+TP_RAW_DCBITERATIONS;Nombre d'itération de DCB
 PREFERENCES_DEFAULTLANG;Langue par défaut
 PREFERENCES_DEFAULTTHEME;Thème par défaut
 PREFERENCES_DEMOSAICINGALGO;Algorithme de dématriçage
@@ -457,29 +474,29 @@ PREFERENCES_DIRLAST;Dernier dossier visité
 PREFERENCES_DIROTHER;Autre
 PREFERENCES_DIRSELECTDLG;Choix du dossier Image au lancement...
 PREFERENCES_DIRSOFTWARE;Dossier d'installation
-PREFERENCES_DMETHOD;Méthode
+TP_RAW_DMETHOD;Méthode
 PREFERENCES_EDITORCMDLINE;Autre ligne de commande
 PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur
-PREFERENCES_EXPOS;Facteur de correction\nd'exposition (linéaire)
+TP_RAWEXPOS_LINEAR;Facteur de corr. linéaire
 PREFERENCES_EXTERNALEDITOR;Éditeur externe
-PREFERENCES_FALSECOLOR;Itérations pour la suppression\ndes fausses couleurs
+TP_RAW_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
 PREFERENCES_FORRAW;Pour les fichiers RAW
 PREFERENCES_GIMPPATH;Dossier d'intallation de GIMP
-PREFERENCES_GREENEQUIL;Équilibrage du vert
+TP_PREPROCESS_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;Filtrer les pixels chauds/morts
+TP_PREPROCESS_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
 PREFERENCES_INTENT_PERCEPTUAL;Perceptuel
 PREFERENCES_INTENT_RELATIVE;Colorimétrie relative
 PREFERENCES_INTENT_SATURATION;Saturation
-PREFERENCES_LINEDENOISE;Filtre de bruit de Ligne
+TP_PREPROCESS_LINEDENOISE;Filtre de bruit de Ligne
 PREFERENCES_LIVETHUMBNAILS;Vignettes "Live" (plus lent)
 PREFERENCES_MONITORICC;Profil du moniteur
 PREFERENCES_MULTITAB;Mode éditeurs multiple
@@ -496,7 +513,7 @@ PREFERENCES_PARSEDEXT;Extensions considérées
 PREFERENCES_PARSEDEXTADD;Ajout de l'extension
 PREFERENCES_PARSEDEXTADDHINT;Tapez une extension et cliquez ce bouton pour l'ajouter à la liste
 PREFERENCES_PARSEDEXTDELHINT;Supprime de la liste les extensions sélectionnées
-PREFERENCES_PRESER;Correct. d'expo. préservant\nles hautes lumières (EV)
+TP_RAWEXPOS_PRESER;Corr. préservant les HL (EV)
 PREFERENCES_PROFILEHANDLING;Gestionnaire des profils de traitement
 PREFERENCES_PROFILELOADPR;Priorité de chargement des profils
 PREFERENCES_PROFILEPRCACHE;Profil dans le Cache
@@ -583,6 +600,7 @@ 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_DEGREE;degré:
 TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche
@@ -622,6 +640,7 @@ TP_CROP_SELECTCROP;    Sélection du recadrage
 TP_CROP_W;L
 TP_CROP_X;x
 TP_CROP_Y;y
+TP_DARKFRAME_LABEL;Trame Noire
 TP_DEFRINGE_LABEL;Suppression de l'aberr. chromatique
 TP_DEFRINGE_RADIUS;Rayon
 TP_DEFRINGE_THRESHOLD;Seuil
@@ -645,6 +664,7 @@ TP_EQUALIZER_FINEST;les plus petites
 TP_EQUALIZER_LABEL;Égaliseur d'ondelette
 TP_EQUALIZER_LARGEST;les plus grandes
 TP_EQUALIZER_NEUTRAL;Neutre
+TP_EXPOSCORR_LABEL;Exposition
 TP_EXPOSURE_AUTOLEVELS;Niveaux Auto
 TP_EXPOSURE_BLACKLEVEL;Noir
 TP_EXPOSURE_BRIGHTNESS;Luminosité
@@ -710,10 +730,10 @@ TP_LUMADENOISE_RADIUS;Rayon
 TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspective
 TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DARKFRAME;Trame noire
-TP_PREPROCESS_DFAUTOSELECT;Sélection automatique
-TP_RAWPANEL_DEMOSAICING;Dématriçage
-TP_RAWPANEL_PREPROCESSING;Traitement pre-dématriçage
+TP_DARKFRAME_AUTOSELECT;Sélection automatique
+TP_RAW_LABEL;Dématriçage
+TP_PREPROCESS_NO_FOUND;Aucun trouvé
+TP_PREPROCESS_LABEL;Traitement pre-dématriçage
 TP_RESIZE_APPLIESTO;S'applique à:
 TP_RESIZE_BICUBIC;Bicubique
 TP_RESIZE_BICUBICSF;Bicubique (Plus doux)
@@ -795,4 +815,12 @@ ZOOMPANEL_ZOOMOUT;Zoom <b>-</b>
 ! Untranslated keys follow; remove the ! prefix after an entry is translated.
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
-
+PARTIALPASTE_DARKFRAMEAUTOSELECT;Sélection auto de la Trame Noire
+PARTIALPASTE_DARKFRAMEFILE;Fichier de Trame Noire
+PARTIALPASTE_EVERYTHING;Tout
+PARTIALPASTE_FLATFIELDAUTOSELECT;Sélection auto du Champ Uniforme
+PARTIALPASTE_FLATFIELDBLURRADIUS;Rayon de floutage du Champ Uniforme
+PARTIALPASTE_FLATFIELDBLURTYPE;Type de floutage du Champ Uniforme
+PARTIALPASTE_FLATFIELDFILE;Fichier de Champ Uniforme
+PARTIALPASTE_RAWGROUP;Réglages RAW
+GENERAL_FILE;Fichier

rtdata/languages/Greek

@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Τελευταία τοποθεσία που χρησιμο
 PREFERENCES_DIROTHER;Άλλο
 PREFERENCES_DIRSELECTDLG;Επιλέξτε τοποθεσία εικόνων κατά την έναρξη...
 PREFERENCES_DIRSOFTWARE;Τοποθεσία εγκατάστασης
-PREFERENCES_DMETHOD;Μέθοδος
+TP_RAW_DMETHOD;Μέθοδος
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Βήματα καταστολής σφαλμένων χρωμάτων
+TP_RAW_FALSECOLOR;Βήματα καταστολής σφαλμένων χρωμάτων
 PREFERENCES_FBROWSEROPTS;Επιλογές περιήγησης αρχείων
 PREFERENCES_FILEFORMAT;Είδος αρχείου
 PREFERENCES_FORIMAGE;Για αρχεία εικόνων

rtdata/languages/Hebrew

@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;תיקיה האחרונה שביקרתי בה
 PREFERENCES_DIROTHER;אחר
 PREFERENCES_DIRSELECTDLG;בחר תיקיית צילומים לאתחול
 PREFERENCES_DIRSOFTWARE;תיקיית התקנה
-PREFERENCES_DMETHOD;שיטה
+TP_RAW_DMETHOD;שיטה
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;דחיית צבע מסולף
+TP_RAW_FALSECOLOR;דחיית צבע מסולף
 PREFERENCES_FBROWSEROPTS;ברירות דפדפן
 PREFERENCES_FILEFORMAT;תצורת קובץ
 PREFERENCES_FORIMAGE;עבור קבצי צילום

rtdata/languages/Italian

@@ -419,7 +419,7 @@ PREFERENCES_APPLNEXTSTARTUP;applicato al prossimo avvio
 PREFERENCES_BATCH_PROCESSING;Elaborazione batch
 PREFERENCES_BEHAVIOR;Comportamento
 PREFERENCES_BLINKCLIPPED;Lampeggia le aree tosate
-PREFERENCES_CABLUE;Correzione AC blu manuale
+TP_RAWCACORR_CABLUE;Blu
 PREFERENCES_CACHECLEARALL;Ripulisci tutto
 PREFERENCES_CACHECLEARPROFILES;Ripulisci i profili
 PREFERENCES_CACHECLEARTHUMBS;Ripulisci le miniature
@@ -432,8 +432,8 @@ PREFERENCES_CACHESTRAT2;Privilegia il minore consumo di memoria alla rapidità
 PREFERENCES_CACHESTRAT;Strategia di precaricamento
 PREFERENCES_CACHETHUMBFORM;Formato delle miniature precaricate
 PREFERENCES_CACHETHUMBHEIGHT;Massima quantità di miniature
-PREFERENCES_CACORRECTION;Correzione AC automatica
-PREFERENCES_CARED;Correzione AC rossa manuale
+TP_RAWCACORR_AUTO;Correzione AC automatica
+TP_RAWCACORR_CARED;Rossa
 PREFERENCES_CLEARDLG_LINE1;Ripulitura dati in memoria
 PREFERENCES_CLEARDLG_LINE2;Questa operazione potrebbe impiegare alcuni secondi.
 PREFERENCES_CLEARDLG_TITLE;Prego attendere
@@ -443,8 +443,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Pennello copertura ritaglio
 PREFERENCES_DARKFRAME;Dark frame
 PREFERENCES_DATEFORMAT;Formato data
 PREFERENCES_DATEFORMATHINT;<i>Puoi usare le seguenti stringhe di formattazione:</i>\n<b>%y</b><i> : anno</i>\n<b>%m</b><i> : mese</i>\n<b>%d</b><i> : giorno</i>\n<i>\nPer esempio, il formato italiano per la data è:</i>\n<b>%d/%m/%y</b>
-PREFERENCES_DCBENHANCE;Applicare passi di miglioramento DCB
-PREFERENCES_DCBITERATIONS;Numbero di iterazioni DCB
+TP_RAW_DCBENHANCE;Applicare passi di miglioramento DCB
+TP_RAW_DCBITERATIONS;Numbero di iterazioni DCB
 PREFERENCES_DEFAULTLANG;Lingua predefinita
 PREFERENCES_DEFAULTTHEME;Aspetto ordinario
 PREFERENCES_DEMOSAICINGALGO;Algoritmo di demosaicizzazione
@@ -454,28 +454,28 @@ PREFERENCES_DIRLAST;Ultima cartella visitata
 PREFERENCES_DIROTHER;Altra
 PREFERENCES_DIRSELECTDLG;Seleziona la cartella delle immagini all'avvio...
 PREFERENCES_DIRSOFTWARE;Cartella d'installazione
-PREFERENCES_DMETHOD;Metodo
+TP_RAW_DMETHOD;Metodo
 PREFERENCES_EDITORCMDLINE;Esegui altro da linea di comando
 PREFERENCES_EDITORLAYOUT;Layout editor
 PREFERENCES_EXTERNALEDITOR;Programmi di ritocco esterni
-PREFERENCES_FALSECOLOR;Iterazioni per la soppressione dei falsi colori
+TP_RAW_FALSECOLOR;Iterazioni per la soppressione dei falsi colori
 PREFERENCES_FBROWSEROPTS;Opzioni del navigatore di file
 PREFERENCES_FILEFORMAT;Formato file
 PREFERENCES_FORIMAGE;Per file immagine
 PREFERENCES_FORRAW;Per file RAW
 PREFERENCES_GIMPPATH;Cartella d'installazione di GIMP
-PREFERENCES_GREENEQUIL;Equilibrazione del verde
+TP_PREPROCESS_GREENEQUIL;Equilibrazione del verde
 PREFERENCES_GTKTHEME;Predefinito GTK
 PREFERENCES_HINT;Suggerimento
 PREFERENCES_HLTHRESHOLD;Soglia per le alteluci tosate
-PREFERENCES_HOTDEADPIXFILT;Filtro pixel caldi/morti
+TP_PREPROCESS_HOTDEADPIXFILT;Filtro pixel caldi/morti
 PREFERENCES_ICCDIR;Cartella profili ICC
 PREFERENCES_IMPROCPARAMS;Parametri predefiniti di elaborazione dell'immagine
 PREFERENCES_INTENT_ABSOLUTE;Colorimetrico Assoluto
 PREFERENCES_INTENT_PERCEPTUAL;Percettivo
 PREFERENCES_INTENT_RELATIVE;Colorimetrico Relativo
 PREFERENCES_INTENT_SATURATION;Saturazione
-PREFERENCES_LINEDENOISE;Filtro rumore di linea
+TP_PREPROCESS_LINEDENOISE;Filtro rumore di linea
 PREFERENCES_LIVETHUMBNAILS;Miniature sincronizzate (maggiore lentezza)
 PREFERENCES_MONITORICC;Profilo dello schermo
 PREFERENCES_MULTITAB;Modalità tab multipli
@@ -706,10 +706,9 @@ TP_LUMADENOISE_RADIUS;Raggio
 TP_PERSPECTIVE_HORIZONTAL;Orizzontale
 TP_PERSPECTIVE_LABEL;Prospettiva
 TP_PERSPECTIVE_VERTICAL;Verticale
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Selezione automatica
-TP_RAWPANEL_DEMOSAICING;Demosaicizzazione
-TP_RAWPANEL_PREPROCESSING;Pre-elaborazione
+TP_DARKFRAME_AUTOSELECT;Selezione automatica
+TP_RAW_LABEL;Demosaicizzazione
+TP_PREPROCESS_LABEL;Pre-elaborazione
 TP_RESIZE_BICUBIC;Bicubico
 TP_RESIZE_BICUBICSF;Bicubico (più sfumato)
 TP_RESIZE_BICUBICSH;Bicubico (più definito)

rtdata/languages/Latvian

@@ -347,10 +347,10 @@ PREFERENCES_DIRLAST;Pēdējā lietotā mape
 PREFERENCES_DIROTHER;Cita
 PREFERENCES_DIRSELECTDLG;Izvēlies attēlu mapi sākumam...
 PREFERENCES_DIRSOFTWARE;Uzstādīšanas mape
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
 PREFERENCES_EDITORCMDLINE;Cita komandrinda
 PREFERENCES_EXTERNALEDITOR;Ārējais redaktors
-PREFERENCES_FALSECOLOR;Neīsto krāsu slāpēšanas soļi
+TP_RAW_FALSECOLOR;Neīsto krāsu slāpēšanas soļi
 PREFERENCES_FBROWSEROPTS;Failu pārlūka iespējas
 PREFERENCES_FILEFORMAT;Faila formāts
 PREFERENCES_FORIMAGE;Attēlu failiem

rtdata/languages/Magyar

@@ -394,7 +394,7 @@ PREFERENCES_CACHESTRAT2;Inkább memóriatakarékos, mint gyors
 PREFERENCES_CACHESTRAT;Gyorsítótár stratégia
 PREFERENCES_CACHETHUMBFORM;Előnézeti kép formátuma
 PREFERENCES_CACHETHUMBHEIGHT;Előnézeti kép maximális magassága
-PREFERENCES_CACORRECTION;Színihiba (kromatikus aberráció) automatikus helyesbítése
+TP_RAWCACORR_AUTO;Színihiba (kromatikus aberráció) automatikus helyesbítése
 PREFERENCES_CLEARDLG_LINE1;Gyorsítótár ürítése
 PREFERENCES_CLEARDLG_LINE2;Ez eltarthat pár másodpercig.
 PREFERENCES_CLEARDLG_TITLE;Kérem várjon
@@ -402,8 +402,8 @@ PREFERENCES_CLIPPINGIND;Kiégett és bebukott részek jelzése
 PREFERENCES_CMETRICINTENT;Intent
 PREFERENCES_DATEFORMAT;Dátumformátum
 PREFERENCES_DATEFORMATHINT;<i>A következő jeleket lehet használni:</i>\n<b>%y</b><i> : év</i>\n<b>%m</b><i> : hónap</i>\n<b>%d</b><i> : nap</i>\n<i>\nPéldául a magyar dátumformátum:</i>\n<b>%y/%m/%d</b>
-PREFERENCES_DCBENHANCE;DCB helyesbítő lépés alkalmazása
-PREFERENCES_DCBITERATIONS;DCB iterációk száma
+TP_RAW_DCBENHANCE;DCB helyesbítő lépés alkalmazása
+TP_RAW_DCBITERATIONS;DCB iterációk száma
 PREFERENCES_DEFAULTLANG;Alapértelmezett nyelv
 PREFERENCES_DEFAULTTHEME;Alapértelmezett kinézet
 PREFERENCES_DEMOSAICINGALGO;Bayer interpoláció
@@ -413,11 +413,11 @@ PREFERENCES_DIRLAST;Utoljára látogatott könyvtár
 PREFERENCES_DIROTHER;Más
 PREFERENCES_DIRSELECTDLG;Képek könyvtára induláskor...
 PREFERENCES_DIRSOFTWARE;Telepítés helye
-PREFERENCES_DMETHOD;Algoritmus
+TP_RAW_DMETHOD;Algoritmus
 PREFERENCES_EDITORCMDLINE;Egyéb parancssor
 PREFERENCES_EDITORLAYOUT;Szerkesztési mód
 PREFERENCES_EXTERNALEDITOR;Külső képszerkesztő program
-PREFERENCES_FALSECOLOR;Színhiba-elnyomási lépések
+TP_RAW_FALSECOLOR;Színhiba-elnyomási lépések
 PREFERENCES_FBROWSEROPTS;Állományböngésző beállításai
 PREFERENCES_FILEFORMAT;Állományformátum
 PREFERENCES_FORIMAGE;Egyéb képekhez
@@ -426,14 +426,14 @@ PREFERENCES_GIMPPATH;GIMP telepítési könyvtára
 PREFERENCES_GTKTHEME;Alap GTK kinézet
 PREFERENCES_HINT;Tipp
 PREFERENCES_HLTHRESHOLD;Küszöbérték kiégett területekhez
-PREFERENCES_HOTDEADPIXFILT;Hot/dead pixel szűrő alkalmazása
+TP_PREPROCESS_HOTDEADPIXFILT;Hot/dead pixel szűrő alkalmazása
 PREFERENCES_ICCDIR;ICC profilok könyvtára
 PREFERENCES_IMPROCPARAMS;Alapértelmezett feldolgozási paraméterek
 PREFERENCES_INTENT_ABSOLUTE;Abszolút kolorimetrikus
 PREFERENCES_INTENT_PERCEPTUAL;Perceptuális
 PREFERENCES_INTENT_RELATIVE;Relatív kolorimetrikus
 PREFERENCES_INTENT_SATURATION;Színtelítettség
-PREFERENCES_LINEDENOISE;Sorzaj-szűrő
+TP_PREPROCESS_LINEDENOISE;Sorzaj-szűrő
 PREFERENCES_LIVETHUMBNAILS;Élő előnézeti képek (lassabb)
 PREFERENCES_MONITORICC;Monitor ICC profilja
 PREFERENCES_MULTITAB;Több szerkesztőfül
@@ -660,10 +660,9 @@ TP_LUMADENOISE_RADIUS;Sugár
 TP_PERSPECTIVE_HORIZONTAL;Vízszintes
 TP_PERSPECTIVE_LABEL;Perspektíva
 TP_PERSPECTIVE_VERTICAL;Függőleges
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Auto selection
-TP_RAWPANEL_DEMOSAICING;Deinterpoláció
-TP_RAWPANEL_PREPROCESSING;Előfeldolgozás
+TP_DARKFRAME_AUTOSELECT;Auto selection
+TP_RAW_LABEL;Deinterpoláció
+TP_PREPROCESS_LABEL;Előfeldolgozás
 TP_RESIZE_BICUBIC;Bicubic
 TP_RESIZE_BICUBICSF;Bicubic (lágyabb)
 TP_RESIZE_BICUBICSH;Bicubic (keményebb)

rtdata/languages/Nederlands

@@ -427,7 +427,7 @@ PREFERENCES_CACHESTRAT2;Langzamer, minder geheugenbeslag
 PREFERENCES_CACHESTRAT;Cache-strategie
 PREFERENCES_CACHETHUMBFORM;Miniatuurformaat cache
 PREFERENCES_CACHETHUMBHEIGHT;Maximale hoogte miniaturen
-PREFERENCES_CACORRECTION;Automatische CA-correctie
+TP_RAWCACORR_AUTO;Automatische CA-correctie
 PREFERENCES_CLEARDLG_LINE1;Cache legen...
 PREFERENCES_CLEARDLG_LINE2;Dit kan even duren.
 PREFERENCES_CLEARDLG_TITLE;Momentje svp.
@@ -436,8 +436,8 @@ PREFERENCES_CMETRICINTENT;Bedoelde colorimetrie
 PREFERENCES_DARKFRAME;Dark-frame
 PREFERENCES_DATEFORMAT;Datumformaat
 PREFERENCES_DATEFORMATHINT;<i>U kunt de volgende formaten gebruiken:</i>\n<b>%y</b><i> : jaar</i>\n<b>%m</b><i> : maand</i>\n<b>%d</b><i> : dag</i>\n<i>\nHet Nederlandse datumformaat is bijvoorbeeld:</i>\n<b>%d/%m/%y</b>
-PREFERENCES_DCBENHANCE;Pas DCB-verbetering toe
-PREFERENCES_DCBITERATIONS;Aantal DCB-herhalingen
+TP_RAW_DCBENHANCE;Pas DCB-verbetering toe
+TP_RAW_DCBITERATIONS;Aantal DCB-herhalingen
 PREFERENCES_DEFAULTLANG;Standaardtaal
 PREFERENCES_DEFAULTTHEME;Standaardthema
 PREFERENCES_DEMOSAICINGALGO;Demozaïek-algoritme
@@ -447,28 +447,28 @@ PREFERENCES_DIRLAST;Laatst bezochte map
 PREFERENCES_DIROTHER;Anders
 PREFERENCES_DIRSELECTDLG;Selecteer standaardmap bij opstarten...
 PREFERENCES_DIRSOFTWARE;Installatiemap
-PREFERENCES_DMETHOD;Methode
+TP_RAW_DMETHOD;Methode
 PREFERENCES_EDITORCMDLINE;Andere editor, geef pad
 PREFERENCES_EDITORLAYOUT;Bewerkingsvenster 
 PREFERENCES_EXTERNALEDITOR;Externe editor
-PREFERENCES_FALSECOLOR;Stapgrootte kleurfoutonderdrukking
+TP_RAW_FALSECOLOR;Stapgrootte kleurfoutonderdrukking
 PREFERENCES_FBROWSEROPTS;Opties bestandsnavigator
 PREFERENCES_FILEFORMAT;Bestandstype
 PREFERENCES_FORIMAGE;Voor niet-RAW-bestanden
 PREFERENCES_FORRAW;Voor RAW-bestanden
 PREFERENCES_GIMPPATH;Installatiemap GIMP
-PREFERENCES_GREENEQUIL;Groenbalans
+TP_PREPROCESS_GREENEQUIL;Groenbalans
 PREFERENCES_GTKTHEME;GTK standaard
 PREFERENCES_HINT;Voorbeeld
 PREFERENCES_HLTHRESHOLD;Grenswaarde overbelichting
-PREFERENCES_HOTDEADPIXFILT;Filter hete/dode pixels
+TP_PREPROCESS_HOTDEADPIXFILT;Filter hete/dode pixels
 PREFERENCES_ICCDIR;Map met ICC-profielen
 PREFERENCES_IMPROCPARAMS;Standaardprofiel
 PREFERENCES_INTENT_ABSOLUTE;Absolute colorimetrie
 PREFERENCES_INTENT_PERCEPTUAL;Waargenomen colorimetrie
 PREFERENCES_INTENT_RELATIVE;Relatieve colorimetrie
 PREFERENCES_INTENT_SATURATION;Verzadiging
-PREFERENCES_LINEDENOISE;Lijnruisfilter
+TP_PREPROCESS_LINEDENOISE;Lijnruisfilter
 PREFERENCES_LIVETHUMBNAILS;Live-miniaturen (langzamer)
 PREFERENCES_MONITORICC;Monitorprofiel
 PREFERENCES_MULTITAB;Multi-tab-modus
@@ -696,10 +696,9 @@ TP_LUMADENOISE_RADIUS;Straal
 TP_PERSPECTIVE_HORIZONTAL;Horizontaal
 TP_PERSPECTIVE_LABEL;Perspectief
 TP_PERSPECTIVE_VERTICAL;Verticaal
-TP_PREPROCESS_DARKFRAME;Dark-frame
-TP_PREPROCESS_DFAUTOSELECT;Automatische selectie
-TP_RAWPANEL_DEMOSAICING;Demozaïekproces
-TP_RAWPANEL_PREPROCESSING;Voorbewerking
+TP_DARKFRAME_AUTOSELECT;Automatische selectie
+TP_RAW_LABEL;Demozaïekproces
+TP_PREPROCESS_LABEL;Voorbewerking
 TP_RESIZE_BICUBIC;Bikubisch
 TP_RESIZE_BICUBICSF;Bikubisch (zachter)
 TP_RESIZE_BICUBICSH;Bikubisch (scherper)

rtdata/languages/Norsk BM

@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Sidste besøkte mappe
 PREFERENCES_DIROTHER;Annen
 PREFERENCES_DIRSELECTDLG;Velg bildemappe ved oppstart...
 PREFERENCES_DIRSOFTWARE;Installasjons-mappe
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
 PREFERENCES_EDITORCMDLINE;Annen kommandolinje
 PREFERENCES_EXTERNALEDITOR;Ekstern editor
-PREFERENCES_FALSECOLOR;Falsk fargefortrengningsverdi
+TP_RAW_FALSECOLOR;Falsk fargefortrengningsverdi
 PREFERENCES_FBROWSEROPTS;Filfremviser-innstillinger
 PREFERENCES_FILEFORMAT;Filformat
 PREFERENCES_FORIMAGE;For bildefiler

rtdata/languages/Polish

@@ -353,10 +353,10 @@ PREFERENCES_DIRLAST;Ostatnio odwiedzony katalog
 PREFERENCES_DIROTHER;Inny
 PREFERENCES_DIRSELECTDLG;Wybierz katalog z obrazami po uruchomieniu...
 PREFERENCES_DIRSOFTWARE;Katalog instalacyjny
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;Zewnętrzny edytor
-PREFERENCES_FALSECOLOR;Kroki zapobiegania zafałszowaniom kolorów
+TP_RAW_FALSECOLOR;Kroki zapobiegania zafałszowaniom kolorów
 PREFERENCES_FBROWSEROPTS;Opcje przeglądarki plików
 PREFERENCES_FILEFORMAT;Format pliku
 PREFERENCES_FORIMAGE;Dla plików z obrazami

rtdata/languages/Polish (Latin Characters)

@@ -352,10 +352,10 @@ PREFERENCES_DIRLAST;Ostatnio odwiedzony katalog
 PREFERENCES_DIROTHER;Inny
 PREFERENCES_DIRSELECTDLG;Wybierz katalog z obrazami po uruchomieniu...
 PREFERENCES_DIRSOFTWARE;Katalog instalacyjny
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;Zewnetrzny edytor
-PREFERENCES_FALSECOLOR;Kroki zapobiegania zafalszowaniom kolorow
+TP_RAW_FALSECOLOR;Kroki zapobiegania zafalszowaniom kolorow
 PREFERENCES_FBROWSEROPTS;Opcje przegladarki plikow
 PREFERENCES_FILEFORMAT;Format pliku
 PREFERENCES_FORIMAGE;Dla plikow z obrazami

rtdata/languages/Portugues (Brasil)

@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Último directory visitado
 PREFERENCES_DIROTHER;Outro
 PREFERENCES_DIRSELECTDLG;selecionar diretório de imagem na inicialização...
 PREFERENCES_DIRSOFTWARE;Diretório de instalação
-PREFERENCES_DMETHOD;Método
+TP_RAW_DMETHOD;Método
 PREFERENCES_EDITORCMDLINE;Outra Linha de Comando
 PREFERENCES_EXTERNALEDITOR;Editor externo
-PREFERENCES_FALSECOLOR;Supressão de cor falsa
+TP_RAW_FALSECOLOR;Supressão de cor falsa
 PREFERENCES_FBROWSEROPTS;Opções do navegador de arquivos
 PREFERENCES_FILEFORMAT;Formato de arquivo
 PREFERENCES_FORIMAGE;Para arquivos de imagem

rtdata/languages/Russian

@@ -9,6 +9,8 @@
 ADJUSTER_RESET_TO_DEFAULT;По умолчанию
 BATCHQUEUE_AUTOSTART;Автостарт
 BATCH_PROCESSING;Пакетная обработка
+CURVEEDITOR_CURVE;Кривая
+CURVEEDITOR_CURVES;Кривые
 CURVEEDITOR_CUSTOM;Произвольный
 CURVEEDITOR_DARKS;Темные тона
 CURVEEDITOR_FILEDLGFILTERANY;Любые файлы
@@ -25,9 +27,11 @@ CURVEEDITOR_TOOLTIPLINEAR;Выставить линейную тоновую к
 CURVEEDITOR_TOOLTIPLOAD;Загрузить тоновую кривую
 CURVEEDITOR_TOOLTIPSAVE;Сохранить тоновую кривую
 CURVEEDITOR_TYPE;Тип:
+EDITWINDOW_TITLE;Редактор
 EXIFFILTER_APERTURE;Диафрагма
 EXIFFILTER_CAMERA;Камера
 EXIFFILTER_DIALOGLABEL;Фильтр Exif
+EXIFFILTER_FILETYPE;Тип фильтра
 EXIFFILTER_FOCALLEN;Фокусное расстояние
 EXIFFILTER_ISO;ISO
 EXIFFILTER_LENS;Объектив
@@ -139,6 +143,10 @@ HISTORY_CUSTOMCURVE;Пользовательская кривая
 HISTORY_DELSNAPSHOT;Удалить снимок
 HISTORY_FROMCLIPBOARD;Из буфера обмена
 HISTORY_LABEL;История
+HISTORY_MSG_100;RGB насыщенность
+HISTORY_MSG_105;Подавление ореолов
+HISTORY_MSG_106;Подавление ореолов: радиус
+HISTORY_MSG_107;Подавление ореоловЖ порог
 HISTORY_MSG_10;Сжатие теней
 HISTORY_MSG_11;Тоновая кривая
 HISTORY_MSG_12;Автоматическая настройка
@@ -224,11 +232,19 @@ HISTORY_MSG_84;Коррекция перспективы
 HISTORY_MSG_85;Вейвлет коэффициенты
 HISTORY_MSG_86;Вейвлет эквалайзер
 HISTORY_MSG_87;Подаление импульсного шума
+HISTORY_MSG_88;Impulse NR: порог
 HISTORY_MSG_89;Направленная пирамида
 HISTORY_MSG_8;Компенсация экспозиции
 HISTORY_MSG_90;Направленная пирамида яркость
 HISTORY_MSG_91;Направленная пирамида цветность
 HISTORY_MSG_92;Направленная пирамида гамма
+HISTORY_MSG_93;Контраст по уровням детализации: значение
+HISTORY_MSG_94;Контраст по уровням детализации
+HISTORY_MSG_95;Насыщенность
+HISTORY_MSG_96;Кривая 'a'
+HISTORY_MSG_97;Кривая 'b'
+HISTORY_MSG_98;Демозаик
+HISTORY_MSG_99;Припроцессор
 HISTORY_MSG_9;Сжатие светов
 HISTORY_NEWSNAPSHOT;Новый снимок
 HISTORY_NEWSNAPSHOTAS;Как...
@@ -306,6 +322,7 @@ MAIN_BUTTON_SENDTOEDITOR;Открыть в редакторе
 MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Редактировать изображение во внешнем редакторе <b>Ctrl+E</b>
 MAIN_BUTTON_UNFULLSCREEN;Оконный режим
 MAIN_FRAME_BATCHQUEUE;Очередь обработки
+MAIN_FRAME_EDITOR;Редактор
 MAIN_FRAME_FILEBROWSER;Файловый браузер
 MAIN_FRAME_PLACES;Закладки
 MAIN_FRAME_PLACES_ADD;Добавить
@@ -333,6 +350,7 @@ MAIN_TAB_FILTER;Фильтр
 MAIN_TAB_ICM;ICM
 MAIN_TAB_IPTC;IPTC
 MAIN_TAB_METADATA;Метаданные
+MAIN_TAB_RAW;RAW
 MAIN_TAB_TAGGING;Метки
 MAIN_TAB_TRANSFORM;Преобразования
 MAIN_TOGGLE_BEFORE_AFTER;Д|П
@@ -374,11 +392,13 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Тени/света
 PARTIALPASTE_SHARPENING;Повышение резкости
 PARTIALPASTE_VIGNETTING;Коррекция виньетирования
 PARTIALPASTE_WHITEBALANCE;Баланс белого
+POPUPBUTTON_SELECTOPTIONHINT;Нажмите правую кнопку мыши для изменения
 PREFERENCES_ADD;Добавить
 PREFERENCES_APPLNEXTSTARTUP;Нужен перезапуск
 PREFERENCES_BATCH_PROCESSING;Пакетная обработка
 PREFERENCES_BEHAVIOR;Поведение
 PREFERENCES_BLINKCLIPPED;Мигать проблемными зонами
+TP_RAWCACORR_CABLUE;синий
 PREFERENCES_CACHECLEARALL;Удалить все
 PREFERENCES_CACHECLEARPROFILES;Удалить параметры обработки
 PREFERENCES_CACHECLEARTHUMBS;Удалить эскизы
@@ -391,7 +411,8 @@ PREFERENCES_CACHESTRAT2;Меньше расход памяти - скорост
 PREFERENCES_CACHESTRAT;Стратегия кэширования
 PREFERENCES_CACHETHUMBFORM;Формат кэширования эскизов
 PREFERENCES_CACHETHUMBHEIGHT;Максимальная высота эскиза
-PREFERENCES_CACORRECTION;Применить автоматическую коррекцию ХА
+TP_RAWCACORR_AUTO;Применить автоматическую коррекцию ХА
+TP_RAWCACORR_CARED;красный
 PREFERENCES_CLEARDLG_LINE1;Очистка кэша
 PREFERENCES_CLEARDLG_LINE2;Это может занять несколько секунд.
 PREFERENCES_CLEARDLG_TITLE;Пожалуйста, подождите
@@ -400,8 +421,8 @@ PREFERENCES_CMETRICINTENT;Колориметрическое преобразо
 PREFERENCES_DARKFRAME;Тёмный кадр
 PREFERENCES_DATEFORMAT;Формат даты
 PREFERENCES_DATEFORMATHINT;<i>Вы можете использовать следующие элементы форматирования:</i>\n<b>%y</b><i> : год</i>\n<b>%m</b><i> : месяц</i>\n<b>%d</b><i> : день</i>\n<i>\nНапример, венгерский формат даты такой:</i>\n<b>%y/%m/%d</b>
-PREFERENCES_DCBENHANCE;Применить шаг улучшения DCB
-PREFERENCES_DCBITERATIONS;Количество итераций DCB
+TP_RAW_DCBENHANCE;Применить шаг улучшения DCB
+TP_RAW_DCBITERATIONS;Количество итераций DCB
 PREFERENCES_DEFAULTLANG;Язык по умолчанию
 PREFERENCES_DEFAULTTHEME;Тема по умолчанию
 PREFERENCES_DEMOSAICINGALGO;Алгоритм получения изображения
@@ -411,31 +432,32 @@ PREFERENCES_DIRLAST;Последний каталог
 PREFERENCES_DIROTHER;Другой
 PREFERENCES_DIRSELECTDLG;Выберите каталог для хранения изображений
 PREFERENCES_DIRSOFTWARE;Каталог установки
-PREFERENCES_DMETHOD;Метод
+TP_RAW_DMETHOD;Метод
 PREFERENCES_EDITORCMDLINE;Другой (путь к исполняемому файлу)
 PREFERENCES_EDITORLAYOUT;Тип редактора
 PREFERENCES_EXTERNALEDITOR;Внешний редактор
-PREFERENCES_FALSECOLOR;Шагов для подавления ложных цветов:
+TP_RAW_FALSECOLOR;Шагов для подавления ложных цветов:
 PREFERENCES_FBROWSEROPTS;Настройки
 PREFERENCES_FILEFORMAT;Формат файлов
 PREFERENCES_FORIMAGE;Для изображений
 PREFERENCES_FORRAW;Для RAW файлов
 PREFERENCES_GIMPPATH;Каталог установки GIMP
-PREFERENCES_GREENEQUIL;Выравнивание зелёного
+TP_PREPROCESS_GREENEQUIL;Выравнивание зелёного
 PREFERENCES_GTKTHEME;GTK по умолчанию
 PREFERENCES_HINT;Подсказка
 PREFERENCES_HLTHRESHOLD;Порог срабатывания пересветов
-PREFERENCES_HOTDEADPIXFILT;Применить фильтр горячих/темных пикселей
+TP_PREPROCESS_HOTDEADPIXFILT;Применить фильтр горячих/темных пикселей
 PREFERENCES_ICCDIR;Каталог ICC профилей
 PREFERENCES_IMPROCPARAMS;Параметры обработки по умолчанию
 PREFERENCES_INTENT_ABSOLUTE;Абсолютное
 PREFERENCES_INTENT_PERCEPTUAL;Перцепционное
 PREFERENCES_INTENT_RELATIVE;Относительное
 PREFERENCES_INTENT_SATURATION;По насыщенности
-PREFERENCES_LINEDENOISE;Фильтр линейного шума
+TP_PREPROCESS_LINEDENOISE;Фильтр линейного шума
 PREFERENCES_LIVETHUMBNAILS;Эскизы в реальном времени (медленно)
 PREFERENCES_MONITORICC;Профиль монитора
 PREFERENCES_MULTITAB;Много вкладок
+PREFERENCES_MULTITABDUALMON;Режим многих вкладок, на втором мониторе (если возможно)
 PREFERENCES_OUTDIR;Каталог
 PREFERENCES_OUTDIRFOLDER;Каталог для сохранения изображений
 PREFERENCES_OUTDIRFOLDERHINT;Сохранение изображений в выбранный каталог
@@ -443,6 +465,7 @@ PREFERENCES_OUTDIRHINT;<i>Вы можете использовать следу
 PREFERENCES_OUTDIRTEMPLATE;Использовать шаблон
 PREFERENCES_OUTDIRTEMPLATEHINT;<i>Вы можете использовать следующие элементы форматирования:</i>\n<b>%f, %d1, %d2, ..., %p1, %p2, ...</b>\n<i>\nЭти элементы соответствуют каталогам и подкаталогам в пути к RAW-файлу.\n\nНапример, если был открыт каталог </i> <b>/home/tom/image/02-09-2006/dsc0012.nef</b><i>, то элементы форматирования будут выглядеть так:\n</i><b>%f=dsc0012, %d1=02-09-2006, %d2=image, ...\n%p1=/home/tom/image/02-09-2006, %p2=/home/tom/image, p3=/home/tom, ...\n</b><i>\nЕсли вы хотите сохранять изображения в каталоге с оригиналом, введите:\n</i><b>%p1/%f\n</b><i>\nЕсли вы хотите сохранять изображения в каталоге "converted", расположенной в каталоге оригинального файла, введите строку:\n</i><b>%p1/converted/%f\n</b><i>\nДля сохранения изображений папке в "/home/tom/converted" с сохранением подкаталогов с датами, введите строку:\n</i><b>%p2/converted/%d1/%f</b>
 PREFERENCES_OVERLAY_FILENAMES;Показывать имена файлов поверх миниатюр
+PREFERENCES_OVERWRITEOUTPUTFILE;Перезаписывать существующие выходные файлы
 PREFERENCES_PARSEDEXT;Расширения для предпросмотра
 PREFERENCES_PARSEDEXTADD;Добавить
 PREFERENCES_PARSEDEXTADDHINT;Введите расширение и нажмите на эту кнопку, чтобы добавить его в список
@@ -466,6 +489,7 @@ PREFERENCES_SHOWDATETIME;Показывать дату и время
 PREFERENCES_SHOWONLYRAW;Показывать только RAW-файлы
 PREFERENCES_SHTHRESHOLD;Порог срабатывания затемнений
 PREFERENCES_SINGLETAB;Одна вкладка
+PREFERENCES_SINGLETABVERTAB;Режим с одной вкладкой редактирования, вертикальные вкладки
 PREFERENCES_STARTUPIMDIR;Каталог изображений при запуске
 PREFERENCES_TAB_BROWSER;Браузер файлов
 PREFERENCES_TAB_COLORMGR;Управления цветом
@@ -557,6 +581,7 @@ TP_COLORSHIFT_LABEL;Сдвиг цвета
 TP_CROP_DPI;DPI=
 TP_CROP_FIXRATIO;Пропорция:
 TP_CROP_GTDIAGONALS;Правило диагоналей
+TP_CROP_GTGRID;Сетка
 TP_CROP_GTHARMMEANS1;Среднее гармоническое 1
 TP_CROP_GTHARMMEANS2;Среднее гармоническое 2
 TP_CROP_GTHARMMEANS3;Среднее гармоническое 3
@@ -570,6 +595,9 @@ TP_CROP_SELECTCROP; Вкл. режим обрезки
 TP_CROP_W;Ш
 TP_CROP_X;x
 TP_CROP_Y;y
+TP_DEFRINGE_LABEL;Подавление ореолов
+TP_DEFRINGE_RADIUS;Радиус
+TP_DEFRINGE_THRESHOLD;Порог
 TP_DETAIL_AMOUNT;Степень
 TP_DIRPYRDENOISE_CHROMA;Цветность
 TP_DIRPYRDENOISE_GAMMA;Гамма
@@ -600,11 +628,20 @@ TP_EXPOSURE_CONTRAST;Контраст
 TP_EXPOSURE_CURVEEDITOR;Тоновая кривая
 TP_EXPOSURE_EXPCOMP;Компенсация экспозиции
 TP_EXPOSURE_LABEL;Экспозиция
+TP_EXPOSURE_SATURATION;Насыщенность
 TP_HLREC_CIELAB;Смешивание CIELab
 TP_HLREC_COLOR;Реконструкция цвета
 TP_HLREC_LABEL;Восстановление ярких участков
 TP_HLREC_LUMINANCE;Восстановление яркости
 TP_HLREC_METHOD;Метод:
+TP_HSVEQUALIZER1;Красный
+TP_HSVEQUALIZER2;Жёлтый
+TP_HSVEQUALIZER3;Лимонный
+TP_HSVEQUALIZER4;Зелёный
+TP_HSVEQUALIZER5;Голубой
+TP_HSVEQUALIZER6;Синий
+TP_HSVEQUALIZER7;Фиолетовый
+TP_HSVEQUALIZER8;Пурпурный
 TP_ICM_FILEDLGFILTERANY;Любые файлы
 TP_ICM_FILEDLGFILTERICM;Файлы ICC профилей
 TP_ICM_GAMMABEFOREINPUT;Применять гамму для профиля
@@ -612,6 +649,7 @@ TP_ICM_INPUTCAMERA;По умолчанию для камеры
 TP_ICM_INPUTCUSTOM;Пользовательский
 TP_ICM_INPUTDLGLABEL;Выберите входной ICC профиль...
 TP_ICM_INPUTEMBEDDED;Использовать встроенный, если это возможно
+TP_ICM_INPUTNONE;Без профиля
 TP_ICM_INPUTPROFILE;Входной профиль
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Без ICM: sRGB на выходе
@@ -642,10 +680,9 @@ TP_LUMADENOISE_RADIUS;радиус
 TP_PERSPECTIVE_HORIZONTAL;Горизонтальная
 TP_PERSPECTIVE_LABEL;Перспектива
 TP_PERSPECTIVE_VERTICAL;Вертикальная
-TP_PREPROCESS_DARKFRAME;Темный кадр
-TP_PREPROCESS_DFAUTOSELECT;Автовыбор
-TP_RAWPANEL_DEMOSAICING;Демозаик
-TP_RAWPANEL_PREPROCESSING;Предобработка
+TP_DARKFRAME_AUTOSELECT;Автовыбор
+TP_RAW_LABEL;Демозаик
+TP_PREPROCESS_LABEL;Предобработка
 TP_RESIZE_BICUBIC;Бикубический
 TP_RESIZE_BICUBICSF;Мягкий бикубический
 TP_RESIZE_BICUBICSH;Резкий бикубический

rtdata/languages/Serbian (Cyrilic Characters)

@@ -423,7 +423,7 @@ PREFERENCES_CACHESTRAT2;Мала заузетост меморије, уз сп
 PREFERENCES_CACHESTRAT;Остава
 PREFERENCES_CACHETHUMBFORM;Формат умањених приказа
 PREFERENCES_CACHETHUMBHEIGHT;Највећа висина приказа
-PREFERENCES_CACORRECTION;Исправи хроматске аберације
+TP_RAWCACORR_AUTO;Исправи хроматске аберације
 PREFERENCES_CLEARDLG_LINE1;Чишћење оставе
 PREFERENCES_CLEARDLG_LINE2;Ово може да потраје неколико секунди.
 PREFERENCES_CLEARDLG_TITLE;Сачекајте
@@ -432,8 +432,8 @@ PREFERENCES_CMETRICINTENT;Колориметријска намера
 PREFERENCES_DARKFRAME;Тамни кадар
 PREFERENCES_DATEFORMAT;Формат датума
 PREFERENCES_DATEFORMATHINT;<i>Можете задати следеће формате:</i>\n<b>%y</b><i> :година</i>\n<b>%m</b><i> : месец</i>\n<b>%d</b><i> : дан</i>\n<i>\nУ Србији се највише користи:</i>\n<b>%d.%m.%y</b>
-PREFERENCES_DCBENHANCE;Примени ДЦБ побољшање
-PREFERENCES_DCBITERATIONS;Број ДЦБ пролаза
+TP_RAW_DCBENHANCE;Примени ДЦБ побољшање
+TP_RAW_DCBITERATIONS;Број ДЦБ пролаза
 PREFERENCES_DEFAULTLANG;Језик програма
 PREFERENCES_DEFAULTTHEME;Тема програма
 PREFERENCES_DEMOSAICINGALGO;Алгоритам за склапање
@@ -443,28 +443,28 @@ PREFERENCES_DIRLAST;Последњи директоријум
 PREFERENCES_DIROTHER;Неки други
 PREFERENCES_DIRSELECTDLG;Бира одређени директоријум са сликама...
 PREFERENCES_DIRSOFTWARE;Директоријум са инсталацијом
-PREFERENCES_DMETHOD;Начин
+TP_RAW_DMETHOD;Начин
 PREFERENCES_EDITORCMDLINE;Произвољна наредба
 PREFERENCES_EDITORLAYOUT;Размештај програма
 PREFERENCES_EXTERNALEDITOR;Спољни уређивач
-PREFERENCES_FALSECOLOR;Кораци за пригушивање лажне боје
+TP_RAW_FALSECOLOR;Кораци за пригушивање лажне боје
 PREFERENCES_FBROWSEROPTS;Опције разгледача датотеке
 PREFERENCES_FILEFORMAT;Формат датотеке
 PREFERENCES_FORIMAGE;За датотеке са сликама
 PREFERENCES_FORRAW;За RAW датотеке
 PREFERENCES_GIMPPATH;Директоријум са инсталираним Гимпом
-PREFERENCES_GREENEQUIL;Калибрација зелене боје
+TP_PREPROCESS_GREENEQUIL;Калибрација зелене боје
 PREFERENCES_GTKTHEME;ГТК тема
 PREFERENCES_HINT;Савет
 PREFERENCES_HLTHRESHOLD;Праг за одсечене светле делове
-PREFERENCES_HOTDEADPIXFILT;Избаци прегореле и мртве пикселе
+TP_PREPROCESS_HOTDEADPIXFILT;Избаци прегореле и мртве пикселе
 PREFERENCES_ICCDIR;ИЦЦ директоријум
 PREFERENCES_IMPROCPARAMS;Подразумевани параметри за обраду слика
 PREFERENCES_INTENT_ABSOLUTE;Апсолутно колориметријски
 PREFERENCES_INTENT_PERCEPTUAL;Перцептуално
 PREFERENCES_INTENT_RELATIVE;Релативно колориметријски
 PREFERENCES_INTENT_SATURATION;Засићени приказ
-PREFERENCES_LINEDENOISE;Линијски филтер шума
+TP_PREPROCESS_LINEDENOISE;Линијски филтер шума
 PREFERENCES_LIVETHUMBNAILS;„Живи“ прикази (спорије)
 PREFERENCES_MONITORICC;Профил монитора
 PREFERENCES_MULTITAB;Режим у више листова
@@ -689,10 +689,9 @@ TP_LUMADENOISE_RADIUS;Полупречник
 TP_PERSPECTIVE_HORIZONTAL;Хоризонтална
 TP_PERSPECTIVE_LABEL;Перспектива
 TP_PERSPECTIVE_VERTICAL;Вертикална
-TP_PREPROCESS_DARKFRAME;Тамни кадар
-TP_PREPROCESS_DFAUTOSELECT;Сам изабери
-TP_RAWPANEL_DEMOSAICING;Расклапање мозаика
-TP_RAWPANEL_PREPROCESSING;Предобрада
+TP_DARKFRAME_AUTOSELECT;Сам изабери
+TP_RAW_LABEL;Расклапање мозаика
+TP_PREPROCESS_LABEL;Предобрада
 TP_RESIZE_BICUBIC;Бикубично
 TP_RESIZE_BICUBICSF;Бикубично (мекше)
 TP_RESIZE_BICUBICSH;Бикубично (оштрије)

rtdata/languages/Serbian (Latin Characters)

@@ -423,7 +423,7 @@ PREFERENCES_CACHESTRAT2;Mala zauzetost memorije, uz sporiji rad
 PREFERENCES_CACHESTRAT;Ostava
 PREFERENCES_CACHETHUMBFORM;Format umanjenih prikaza
 PREFERENCES_CACHETHUMBHEIGHT;Najveća visina prikaza
-PREFERENCES_CACORRECTION;Ispravi hromatske aberacije
+TP_RAWCACORR_AUTO;Ispravi hromatske aberacije
 PREFERENCES_CLEARDLG_LINE1;Čišćenje ostave
 PREFERENCES_CLEARDLG_LINE2;Ovo može da potraje nekoliko sekundi.
 PREFERENCES_CLEARDLG_TITLE;Sačekajte
@@ -432,8 +432,8 @@ PREFERENCES_CMETRICINTENT;Kolorimetrijska namera
 PREFERENCES_DARKFRAME;Tamni kadar
 PREFERENCES_DATEFORMAT;Format datuma
 PREFERENCES_DATEFORMATHINT;<i>Možete zadati sledeće formate:</i>\n<b>%y</b><i> :godina</i>\n<b>%m</b><i> : mesec</i>\n<b>%d</b><i> : dan</i>\n<i>\nU Srbiji se najviše koristi:</i>\n<b>%d.%m.%y</b>
-PREFERENCES_DCBENHANCE;Primeni DCB poboljšanje
-PREFERENCES_DCBITERATIONS;Broj DCB prolaza
+TP_RAW_DCBENHANCE;Primeni DCB poboljšanje
+TP_RAW_DCBITERATIONS;Broj DCB prolaza
 PREFERENCES_DEFAULTLANG;Jezik programa
 PREFERENCES_DEFAULTTHEME;Tema programa
 PREFERENCES_DEMOSAICINGALGO;Algoritam za sklapanje
@@ -443,28 +443,28 @@ PREFERENCES_DIRLAST;Poslednji direktorijum
 PREFERENCES_DIROTHER;Neki drugi
 PREFERENCES_DIRSELECTDLG;Bira određeni direktorijum sa slikama...
 PREFERENCES_DIRSOFTWARE;Direktorijum sa instalacijom
-PREFERENCES_DMETHOD;Način
+TP_RAW_DMETHOD;Način
 PREFERENCES_EDITORCMDLINE;Proizvoljna naredba
 PREFERENCES_EDITORLAYOUT;Razmeštaj programa
 PREFERENCES_EXTERNALEDITOR;Spoljni uređivač
-PREFERENCES_FALSECOLOR;Koraci za prigušivanje lažne boje
+TP_RAW_FALSECOLOR;Koraci za prigušivanje lažne boje
 PREFERENCES_FBROWSEROPTS;Opcije razgledača datoteke
 PREFERENCES_FILEFORMAT;Format datoteke
 PREFERENCES_FORIMAGE;Za datoteke sa slikama
 PREFERENCES_FORRAW;Za RAW datoteke
 PREFERENCES_GIMPPATH;Direktorijum sa instaliranim Gimpom
-PREFERENCES_GREENEQUIL;Kalibracija zelene boje
+TP_PREPROCESS_GREENEQUIL;Kalibracija zelene boje
 PREFERENCES_GTKTHEME;GTK tema
 PREFERENCES_HINT;Savet
 PREFERENCES_HLTHRESHOLD;Prag za odsečene svetle delove
-PREFERENCES_HOTDEADPIXFILT;Izbaci pregorele i mrtve piksele
+TP_PREPROCESS_HOTDEADPIXFILT;Izbaci pregorele i mrtve piksele
 PREFERENCES_ICCDIR;ICC direktorijum
 PREFERENCES_IMPROCPARAMS;Podrazumevani parametri za obradu slika
 PREFERENCES_INTENT_ABSOLUTE;Apsolutno kolorimetrijski
 PREFERENCES_INTENT_PERCEPTUAL;Perceptualno
 PREFERENCES_INTENT_RELATIVE;Relativno kolorimetrijski
 PREFERENCES_INTENT_SATURATION;Zasićeni prikaz
-PREFERENCES_LINEDENOISE;Linijski filter šuma
+TP_PREPROCESS_LINEDENOISE;Linijski filter šuma
 PREFERENCES_LIVETHUMBNAILS;„Živi“ prikazi (sporije)
 PREFERENCES_MONITORICC;Profil monitora
 PREFERENCES_MULTITAB;Režim u više listova
@@ -689,10 +689,9 @@ TP_LUMADENOISE_RADIUS;Poluprečnik
 TP_PERSPECTIVE_HORIZONTAL;Horizontalna
 TP_PERSPECTIVE_LABEL;Perspektiva
 TP_PERSPECTIVE_VERTICAL;Vertikalna
-TP_PREPROCESS_DARKFRAME;Tamni kadar
-TP_PREPROCESS_DFAUTOSELECT;Sam izaberi
-TP_RAWPANEL_DEMOSAICING;Rasklapanje mozaika
-TP_RAWPANEL_PREPROCESSING;Predobrada
+TP_DARKFRAME_AUTOSELECT;Sam izaberi
+TP_RAW_LABEL;Rasklapanje mozaika
+TP_PREPROCESS_LABEL;Predobrada
 TP_RESIZE_BICUBIC;Bikubično
 TP_RESIZE_BICUBICSF;Bikubično (mekše)
 TP_RESIZE_BICUBICSH;Bikubično (oštrije)

rtdata/languages/Slovak

@@ -399,7 +399,7 @@ PREFERENCES_CACHESTRAT2;Uprednostniť malú spotrebu pamäte pred rýchlosťou
 PREFERENCES_CACHESTRAT;Stratégia použitia cache
 PREFERENCES_CACHETHUMBFORM;Formát zmenšenín pre cache
 PREFERENCES_CACHETHUMBHEIGHT;Maximálna výška zmenšenín
-PREFERENCES_CACORRECTION;Použiť automatickú úpravu CA
+TP_RAWCACORR_AUTO;Použiť automatickú úpravu CA
 PREFERENCES_CLEARDLG_LINE1;Čistím cache
 PREFERENCES_CLEARDLG_LINE2;Môže to pár sekúnd trvať.
 PREFERENCES_CLEARDLG_TITLE;Prosím, čakajte.
@@ -407,8 +407,8 @@ PREFERENCES_CLIPPINGIND;Indikácia orezu
 PREFERENCES_CMETRICINTENT;Kolorimetrický zámer
 PREFERENCES_DATEFORMAT;Formát dátumu
 PREFERENCES_DATEFORMATHINT;<i>Môžete použiť nasledujúce formátovacie reťazce:</i>\n<b>%y</b><i> : rok</i>\n<b>%m</b><i> : mesiac</i>\n<b>%d</b><i> : deň</i>\n<i>\nNapríklad, slovenský formát je:</i>\n<b>%d.%m.%y</b>
-PREFERENCES_DCBENHANCE;Použiť vylepšovací krok DCB
-PREFERENCES_DCBITERATIONS;Počet iterácií DCB
+TP_RAW_DCBENHANCE;Použiť vylepšovací krok DCB
+TP_RAW_DCBITERATIONS;Počet iterácií DCB
 PREFERENCES_DEFAULTLANG;Predvolený jazyk
 PREFERENCES_DEFAULTTHEME;Predvolený vzhľad
 PREFERENCES_DEMOSAICINGALGO;Demozaikovací algoritmus
@@ -417,29 +417,29 @@ PREFERENCES_DIRLAST;Posledný navštívený adresár
 PREFERENCES_DIROTHER;Iný
 PREFERENCES_DIRSELECTDLG;Vybrať adresár s obrázkami pri spustení...
 PREFERENCES_DIRSOFTWARE;Inštalačný adresár
-PREFERENCES_DMETHOD;Metóda
-PREFERENCES_DMETHODBATCH;Dávka
+TP_RAW_DMETHOD;Metóda
+TP_RAW_DMETHODBATCH;Dávka
 PREFERENCES_EDITORCMDLINE;Iný príkazový riadok
 PREFERENCES_EDITORLAYOUT;Rozloženie editora
 PREFERENCES_EXTERNALEDITOR;Externý editor
-PREFERENCES_FALSECOLOR;Kroky potlačenia chybných farieb
+TP_RAW_FALSECOLOR;Kroky potlačenia chybných farieb
 PREFERENCES_FBROWSEROPTS;Voľby prehliadača súborov
 PREFERENCES_FILEFORMAT;Formát súborov
 PREFERENCES_FORIMAGE;Pre obrazové súbory
 PREFERENCES_FORRAW;Pre RAW súbory
 PREFERENCES_GIMPPATH;Inštalačný adresár GIMPu
-PREFERENCES_GREENEQUIL;Vyvažovanie zelenej
+TP_PREPROCESS_GREENEQUIL;Vyvažovanie zelenej
 PREFERENCES_GTKTHEME;GTK predvolený
 PREFERENCES_HINT;Tip
 PREFERENCES_HLTHRESHOLD;Prah pre orezanie najvyšších svetiel
-PREFERENCES_HOTDEADPIXFILT;Použiť filter na horúce/mŕtve pixely
+TP_PREPROCESS_HOTDEADPIXFILT;Použiť filter na horúce/mŕtve pixely
 PREFERENCES_ICCDIR;Adresár s ICC profilmy
 PREFERENCES_IMPROCPARAMS;Predvolené parametre spracovania obrazu
 PREFERENCES_INTENT_ABSOLUTE;Absolútny kolorimetrický
 PREFERENCES_INTENT_PERCEPTUAL;Vnímaný
 PREFERENCES_INTENT_RELATIVE;Relatívny kolorimetrický
 PREFERENCES_INTENT_SATURATION;Sýtosť
-PREFERENCES_LINEDENOISE;Filter šumu vedenia
+TP_PREPROCESS_LINEDENOISE;Filter šumu vedenia
 PREFERENCES_LIVETHUMBNAILS;Živé zmenšeniny (pomalšie)
 PREFERENCES_MONITORICC;Profil monitora
 PREFERENCES_MULTITAB;Režim viacerých kariet

rtdata/languages/Suomi

@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Viimeksi käytetty hakemisto
 PREFERENCES_DIROTHER;Muu
 PREFERENCES_DIRSELECTDLG;Valitse kuvahakemisto käynnistettäessä...
 PREFERENCES_DIRSOFTWARE;Asennushakemisto
-PREFERENCES_DMETHOD;Menetelmä
+TP_RAW_DMETHOD;Menetelmä
 PREFERENCES_EDITORCMDLINE;Muu komentorivi
 PREFERENCES_EXTERNALEDITOR;Ulkoinen ohjelma
-PREFERENCES_FALSECOLOR;Värivääristymien eston määrä
+TP_RAW_FALSECOLOR;Värivääristymien eston määrä
 PREFERENCES_FBROWSEROPTS;Näytettävät tiedot
 PREFERENCES_FILEFORMAT;Tallennuksen asetukset
 PREFERENCES_FORIMAGE;Kuvatiedostoille

rtdata/languages/Swedish

@@ -3,6 +3,9 @@
 #01 Translated by Emil Ericsson
 #02 2008-01-22
 #03 2010-10-12, 2010-10-18, 2010-10-24, 2010-11-01, 2010-11-04, 2010-11-07, 2010-11-11, 2010-11-13, 2010-11-29 update by Johan Andersson
+ABOUT_TAB_BUILD;Version
+ABOUT_TAB_CREDITS;Erkännande
+ABOUT_TAB_SPLASH;Splash
 ADJUSTER_RESET_TO_DEFAULT;Återställ till standard
 BATCHQUEUE_AUTOSTART;Autostart
 BATCH_PROCESSING;Batchbehandling
@@ -28,6 +31,7 @@ EDITWINDOW_TITLE;Bildredigering
 EXIFFILTER_APERTURE;Bländare
 EXIFFILTER_CAMERA;Kamera
 EXIFFILTER_DIALOGLABEL;EXIF-filter
+EXIFFILTER_FILETYPE;Filtyp
 EXIFFILTER_FOCALLEN;Brännvidd
 EXIFFILTER_ISO;ISO
 EXIFFILTER_LENS;Objektiv
@@ -147,7 +151,10 @@ HISTORY_MSG_104;HSV Equalizer
 HISTORY_MSG_105;Reducering av överstrålning
 HISTORY_MSG_106;Radie för reducering av överstrålning
 HISTORY_MSG_107;Tröskelvärde för reducering av överstrålning
+HISTORY_MSG_108;Storleksförändring på avgränsad yta
+HISTORY_MSG_109;Storleksförändring tillämpas på
 HISTORY_MSG_10;Skuggkomprimering
+HISTORY_MSG_110;Storleksförändring tillämpas på
 HISTORY_MSG_11;Tonkurva
 HISTORY_MSG_12;Autoexponering
 HISTORY_MSG_13;Exponeringsmarkering
@@ -389,11 +396,16 @@ PARTIALPASTE_COLORMIXER;Färgmixer
 PARTIALPASTE_COLORSHIFT;Färgskift
 PARTIALPASTE_COMPOSITIONGROUP;Komponeringsinställningar
 PARTIALPASTE_CROP;Beskär
+PARTIALPASTE_DARKFRAMEAUTOSELECT;Automatiskt val av svartbild
+PARTIALPASTE_DARKFRAMEFILE;Svartbildsfil
 PARTIALPASTE_DIALOGLABEL;Partiell inklistring av processprofiler
 PARTIALPASTE_DISTORTION;Distortionsrättning
+PARTIALPASTE_EVERYTHING;Allt
 PARTIALPASTE_EXIFCHANGES;Förändringar i EXIF-informationen
 PARTIALPASTE_EXPOSURE;Exponering
 PARTIALPASTE_HLRECOVERY;Högdageråterskapning
+PARTIALPASTE_HLRECOVERYAMOUNT;Högdageråterställningsmängd
+PARTIALPASTE_HLRECOVERYTHRESHOLD;Högdageråterställning, tröskelvärde
 PARTIALPASTE_ICMSETTINGS;ICM-inställningar
 PARTIALPASTE_IPTCINFO;IPTC info
 PARTIALPASTE_LABCURVE;Labkurva
@@ -402,6 +414,7 @@ PARTIALPASTE_LUMACURVE;Luminanskurva
 PARTIALPASTE_LUMADENOISE;Reducera luminansbrus
 PARTIALPASTE_LUMINANCEGROUP;Luminansrelaterade inställningar
 PARTIALPASTE_METAICMGROUP;Metadata/ICM inställningar
+PARTIALPASTE_RAWGROUP;Råinställningar
 PARTIALPASTE_RESIZE;Ändra storlek
 PARTIALPASTE_ROTATION;Rotering
 PARTIALPASTE_SHADOWSHIGHLIGHTS;Skuggor/Högdagrar
@@ -414,7 +427,7 @@ PREFERENCES_APPLNEXTSTARTUP;Ändras vid nästa uppstart
 PREFERENCES_BATCH_PROCESSING;Batchbehandling
 PREFERENCES_BEHAVIOR;Uppträdande
 PREFERENCES_BLINKCLIPPED;Blinka markerade områden
-PREFERENCES_CABLUE;Blå CA manuell korrigering
+TP_RAWCACORR_CABLUE;Blå
 PREFERENCES_CACHECLEARALL;Återställ alla
 PREFERENCES_CACHECLEARPROFILES;Återställ profiler
 PREFERENCES_CACHECLEARTHUMBS;Ta bort cachade miniatyrbilder
@@ -427,8 +440,8 @@ PREFERENCES_CACHESTRAT2;Föredra låg minnesanvändning framför hastighet
 PREFERENCES_CACHESTRAT;Cachestrategi
 PREFERENCES_CACHETHUMBFORM;Miniatyrbildens format i cachen
 PREFERENCES_CACHETHUMBHEIGHT;Maximal storlek på miniatyrbilderna
-PREFERENCES_CACORRECTION;Reducera kromatiska abberationer
-PREFERENCES_CARED;Röd CA manuell korrigering
+TP_RAWCACORR_AUTO;Reducera kromatiska abberationer
+TP_RAWCACORR_CARED;Röd
 PREFERENCES_CLEARDLG_LINE1;Rensa cache
 PREFERENCES_CLEARDLG_LINE2;Det här tar kanske ett par sekunder...
 PREFERENCES_CLEARDLG_TITLE;Var vänlig vänta
@@ -438,8 +451,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Bakgrundsfärg vid beskärning
 PREFERENCES_DARKFRAME;Svartbild
 PREFERENCES_DATEFORMAT;Datumformat
 PREFERENCES_DATEFORMATHINT;<i>Du kan använda de följande formatteringssträngarna:</i>\n<b>%y</b><i> : år</i>\n<b>%m</b><i> : månad</i>\n<b>%d</b><i> : dag</i>\n<i>\nTill exempel är det svenska datumformatet:</i>-n<b>%y-%m-%d</b>
-PREFERENCES_DCBENHANCE;Applicera DCB-förbättringssteg
-PREFERENCES_DCBITERATIONS;Antal DCB-iterationer
+TP_RAW_DCBENHANCE;Applicera DCB-förbättringssteg
+TP_RAW_DCBITERATIONS;Antal DCB-iterationer
 PREFERENCES_DEFAULTLANG;Förvalt språk
 PREFERENCES_DEFAULTTHEME;Förvalt tema
 PREFERENCES_DEMOSAICINGALGO;Algoritm för demosaicing
@@ -449,29 +462,29 @@ PREFERENCES_DIRLAST;Senaste besökta katalog
 PREFERENCES_DIROTHER;Annan
 PREFERENCES_DIRSELECTDLG;Välj bildkatalog vid uppstart...
 PREFERENCES_DIRSOFTWARE;Installationskatalog
-PREFERENCES_DMETHOD;Metod
-PREFERENCES_DMETHODBATCH;Batch
+TP_RAW_DMETHOD;Metod
+TP_RAW_DMETHODBATCH;Batch
 PREFERENCES_EDITORCMDLINE;Annan kommandorad
 PREFERENCES_EDITORLAYOUT;Layout på redigeringsvyn
 PREFERENCES_EXTERNALEDITOR;Externt bildredigeringsprogram
-PREFERENCES_FALSECOLOR;Falskt färgbortträngningssteg
+TP_RAW_FALSECOLOR;Falskt färgbortträngningssteg
 PREFERENCES_FBROWSEROPTS;Filbläddrarinställningar
 PREFERENCES_FILEFORMAT;Filformat
 PREFERENCES_FORIMAGE;För bildfiler
 PREFERENCES_FORRAW;För råbilder
 PREFERENCES_GIMPPATH;Installationskatalog för GIMP
-PREFERENCES_GREENEQUIL;Grönbalansering
+TP_PREPROCESS_GREENEQUIL;Grönbalansering
 PREFERENCES_GTKTHEME;GTK standard
 PREFERENCES_HINT;Tips
 PREFERENCES_HLTHRESHOLD;Tröskelvärde för högdagrar
-PREFERENCES_HOTDEADPIXFILT;Applicera het- och dödpixelfiltrering
+TP_PREPROCESS_HOTDEADPIXFILT;Applicera het- och dödpixelfiltrering
 PREFERENCES_ICCDIR;Katalog för ICC-profiler
 PREFERENCES_IMPROCPARAMS;Standardprofiler
 PREFERENCES_INTENT_ABSOLUTE;Totalkolorimetrisk
 PREFERENCES_INTENT_PERCEPTUAL;Upplevd
 PREFERENCES_INTENT_RELATIVE;Relativ kolorimetrisk
 PREFERENCES_INTENT_SATURATION;Mättnad
-PREFERENCES_LINEDENOISE;Linjärt brusfilter
+TP_PREPROCESS_LINEDENOISE;Linjärt brusfilter
 PREFERENCES_LIVETHUMBNAILS;Alltid uppdaterade miniatyrbilder(långsammare)
 PREFERENCES_MONITORICC;Skärmprofil
 PREFERENCES_MULTITAB;Öppna bilderna i olika flikar
@@ -702,16 +715,19 @@ TP_LUMADENOISE_RADIUS;Radie
 TP_PERSPECTIVE_HORIZONTAL;Horisontell
 TP_PERSPECTIVE_LABEL;Perspektiv
 TP_PERSPECTIVE_VERTICAL;Vertikal
-TP_PREPROCESS_DARKFRAME;Svartbild
-TP_PREPROCESS_DFAUTOSELECT;Välj svartbild automatiskt
-TP_RAWPANEL_DEMOSAICING;Demosaicing
-TP_RAWPANEL_PREPROCESSING;Förbehandling
+TP_DARKFRAME_AUTOSELECT;Välj svartbild automatiskt
+TP_RAW_LABEL;Demosaicing
+TP_PREPROCESS_LABEL;Förbehandling
+TP_RESIZE_APPLIESTO;Tillämpas på:
 TP_RESIZE_BICUBIC;Bikubisk
 TP_RESIZE_BICUBICSF;Bikubisk (Mjukare)
 TP_RESIZE_BICUBICSH;Bikubisk (Skarpare)
 TP_RESIZE_BILINEAR;Bilinjär
+TP_RESIZE_CROPPEDAREA;Beskuren yta
 TP_RESIZE_DOWNSCALEB;Nedsampla (Bättre)
 TP_RESIZE_DOWNSCALEF;Skala ned (Snabbare)
+TP_RESIZE_FITBOX;Begränsad yta
+TP_RESIZE_FULLIMAGE;Hela bilden
 TP_RESIZE_FULLSIZE;Full bildstorlek:
 TP_RESIZE_H;H:
 TP_RESIZE_HEIGHT;Höjd

rtdata/languages/Turkish

@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Son gidilen dizin
 PREFERENCES_DIROTHER;Diğer
 PREFERENCES_DIRSELECTDLG;Başlangıç görüntü dizinini seç...
 PREFERENCES_DIRSOFTWARE;Kurulum dizini
-PREFERENCES_DMETHOD;Yöntem
+TP_RAW_DMETHOD;Yöntem
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Hatalı-renk bastırma değerleri
+TP_RAW_FALSECOLOR;Hatalı-renk bastırma değerleri
 PREFERENCES_FBROWSEROPTS;Dosya gezgini seçenekleri
 PREFERENCES_FILEFORMAT;Dosya biçimi
 PREFERENCES_FORIMAGE;Gürüntü dosyaları için

rtdata/languages/default

@@ -117,11 +117,13 @@ GENERAL_DISABLE;Disable
 GENERAL_DISABLED;Disabled
 GENERAL_ENABLE;Enable
 GENERAL_ENABLED;Enabled
+GENERAL_FILE;File
 GENERAL_HIGH_QUALITY;High Quality
 GENERAL_LANDSCAPE;Landscape
 GENERAL_LOAD;Load
 GENERAL_NA;n/a
 GENERAL_NO;No
+GENERAL_NONE;None
 GENERAL_OK;OK
 GENERAL_PORTRAIT;Portrait
 GENERAL_SAVE;Save
@@ -156,6 +158,18 @@ HISTORY_MSG_110;Resizing applies to
 HISTORY_MSG_111;Avoid Color Clipping
 HISTORY_MSG_112;Saturation Limiter
 HISTORY_MSG_113;Saturation Limit
+HISTORY_MSG_114;DCB Iterations
+HISTORY_MSG_115;False color iterations
+HISTORY_MSG_116;Enhanced DCB
+HISTORY_MSG_117;Red CA correction
+HISTORY_MSG_118;Blue CA correction
+HISTORY_MSG_119;Line denoise
+HISTORY_MSG_120;Green equil. threshold
+HISTORY_MSG_121;Auto CA
+HISTORY_MSG_122;Auto Dark Frame
+HISTORY_MSG_123;Dark Frame File
+HISTORY_MSG_124;Linear exp. correction
+HISTORY_MSG_125;Expo. correction preserving HL
 HISTORY_MSG_11;Tone Curve
 HISTORY_MSG_12;Auto Exposure
 HISTORY_MSG_13;Exposure Clipping
@@ -251,8 +265,8 @@ HISTORY_MSG_94;Contrast by detail levels
 HISTORY_MSG_95;Saturation
 HISTORY_MSG_96;'a' curve
 HISTORY_MSG_97;'b' curve
-HISTORY_MSG_98;Demosaicing
-HISTORY_MSG_99;Preprocessing
+HISTORY_MSG_98;Demosaicing method
+HISTORY_MSG_99;Hot/dead pixel filtering
 HISTORY_MSG_9;Highlight Compression
 HISTORY_NEWSNAPSHOT;Add
 HISTORY_NEWSNAPSHOTAS;As...
@@ -422,7 +436,6 @@ PREFERENCES_APPLNEXTSTARTUP;restart required
 PREFERENCES_BATCH_PROCESSING;Batch Processing
 PREFERENCES_BEHAVIOR;Behavior
 PREFERENCES_BLINKCLIPPED;Blink clipped areas
-PREFERENCES_CABLUE;CA Blue manual correction
 PREFERENCES_CACHECLEARALL;Clear All
 PREFERENCES_CACHECLEARPROFILES;Clear Profiles
 PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
@@ -435,8 +448,6 @@ PREFERENCES_CACHESTRAT2;Prefer Low Memory Consumption to Speed
 PREFERENCES_CACHESTRAT;Cache Strategy
 PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
-PREFERENCES_CACORRECTION;Apply CA auto correction
-PREFERENCES_CARED;CA Red manual correction
 PREFERENCES_CLIPPINGIND;Clipping indication
 PREFERENCES_CMETRICINTENT;Colorimetric Intent
 PREFERENCES_CUTOVERLAYBRUSH;Cut overlay brush
@@ -446,8 +457,6 @@ PREFERENCES_DARKFRAMESHOTS;shots
 PREFERENCES_DARKFRAMETEMPLATES;templates
 PREFERENCES_DATEFORMAT;Date Format
 PREFERENCES_DATEFORMATHINT;<i>You can use the following formatting strings:</i>\n<b>%y</b><i> : year</i>\n<b>%m</b><i> : month</i>\n<b>%d</b><i> : day</i>\n<i>\nFor example, the hungarian date format is:</i>\n<b>%y/%m/%d</b>
-PREFERENCES_DCBENHANCE;Apply DCB enhancement step
-PREFERENCES_DCBITERATIONS;Number of DCB iterations
 PREFERENCES_DEFAULTLANG;Default language
 PREFERENCES_DEFAULTTHEME;Default theme
 PREFERENCES_DEMOSAICINGALGO;Demosaicing Algorithm
@@ -457,29 +466,23 @@ PREFERENCES_DIRLAST;Last visited directory
 PREFERENCES_DIROTHER;Other
 PREFERENCES_DIRSELECTDLG;Select Image Directory at Startup...
 PREFERENCES_DIRSOFTWARE;Installation directory
-PREFERENCES_DMETHOD;Method
 PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EDITORLAYOUT;Editor Layout
-PREFERENCES_EXPOS;Exposure before interpolation\n :correction (lin)
 PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;False color suppression steps
 PREFERENCES_FBROWSEROPTS;File Browser Options
 PREFERENCES_FILEFORMAT;File format
 PREFERENCES_FORIMAGE;For image files
 PREFERENCES_FORRAW;For RAW files
 PREFERENCES_GIMPPATH;GIMP installation directory
-PREFERENCES_GREENEQUIL;Green equilibration
 PREFERENCES_GTKTHEME;GTK default
 PREFERENCES_HINT;Hint
 PREFERENCES_HLTHRESHOLD;Threshold for clipped highlights
-PREFERENCES_HOTDEADPIXFILT;Apply hot/dead pixel filter
 PREFERENCES_ICCDIR;Directory of ICC profiles
 PREFERENCES_IMPROCPARAMS;Default image processing parameters
 PREFERENCES_INTENT_ABSOLUTE;Absolute Colorimetric
 PREFERENCES_INTENT_PERCEPTUAL;Perceptual
 PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
 PREFERENCES_INTENT_SATURATION;Saturation
-PREFERENCES_LINEDENOISE;Line noise filter
 PREFERENCES_LIVETHUMBNAILS;Live Thumbnails (slower)
 PREFERENCES_MONITORICC;Monitor Profile
 PREFERENCES_MULTITAB;Multiple tabs mode
@@ -496,7 +499,6 @@ PREFERENCES_PARSEDEXT;Parsed Extensions
 PREFERENCES_PARSEDEXTADD;Add Extension
 PREFERENCES_PARSEDEXTADDHINT;Type an extension and press this button to append list
 PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list
-PREFERENCES_PRESER;Exposure before interpolation\n :preserve highlights (EV)
 PREFERENCES_PROFILEHANDLING;Processing Profile Handling
 PREFERENCES_PROFILELOADPR;Profile Loading Priority
 PREFERENCES_PROFILEPRCACHE;Profile in Cache
@@ -583,6 +585,7 @@ TP_CHMIXER_BLUE;Blue
 TP_CHMIXER_GREEN;Green
 TP_CHMIXER_LABEL;Channel Mixer
 TP_CHMIXER_RED;Red
+TP_CHROMATABERR_LABEL;Chromatic Aberration
 TP_COARSETRAF_DEGREE;degree:
 TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left
@@ -622,6 +625,7 @@ TP_CROP_SELECTCROP;    Select Crop
 TP_CROP_W;W
 TP_CROP_X;x
 TP_CROP_Y;y
+TP_DARKFRAME_LABEL;Dark Frame
 TP_DEFRINGE_LABEL;Defringe
 TP_DEFRINGE_RADIUS;Radius
 TP_DEFRINGE_THRESHOLD;Threshold
@@ -645,6 +649,7 @@ TP_EQUALIZER_FINEST;finest
 TP_EQUALIZER_LABEL;Wavelet equalizer
 TP_EQUALIZER_LARGEST;coarsest
 TP_EQUALIZER_NEUTRAL;Neutral
+TP_EXPOSCORR_LABEL;Exposure
 TP_EXPOSURE_AUTOLEVELS;Auto Levels
 TP_EXPOSURE_BLACKLEVEL;Black
 TP_EXPOSURE_BRIGHTNESS;Brightness
@@ -710,10 +715,22 @@ TP_LUMADENOISE_RADIUS;Radius
 TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspective
 TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Auto selection
-TP_RAWPANEL_DEMOSAICING;Demosaicing
-TP_RAWPANEL_PREPROCESSING;Preprocessing
+TP_RAWCACORR_AUTO;Auto correction
+TP_RAWCACORR_CARED;Red
+TP_RAWCACORR_CABLUE;Blue
+TP_DARKFRAME_AUTOSELECT;Auto selection
+TP_RAWEXPOS_LINEAR;Linear corr. factor
+TP_PREPROCESS_GREENEQUIL;Green equilibration
+TP_PREPROCESS_HOTDEADPIXFILT;Apply hot/dead pixel filter
+TP_PREPROCESS_NO_FOUND;None found
+TP_PREPROCESS_LABEL;Preprocessing
+TP_PREPROCESS_LINEDENOISE;Line noise filter
+TP_RAWEXPOS_PRESER;HL preserving corr. (EV)
+TP_RAW_DCBENHANCE;Apply DCB enhancement step
+TP_RAW_DCBITERATIONS;Number of DCB iterations
+TP_RAW_DMETHOD;Method
+TP_RAW_FALSECOLOR;False color suppression steps
+TP_RAW_LABEL;Demosaicing
 TP_RESIZE_APPLIESTO;Applies to:
 TP_RESIZE_BICUBIC;Bicubic
 TP_RESIZE_BICUBICSF;Bicubic (Softer)

rtengine/procevents.h

@@ -119,8 +119,8 @@ enum ProcEvent {
     EvLSaturation=94,
     EvLaCurve=95,
     EvLbCurve=96,
-    EvDemosaic=97,
-    EvPreProcess=98,
+    EvDemosaicMethod=97,
+    EvPreProcessHotDeadPixel=98,
     EvSaturation=99,
     EvHSVEqualizerH=100,
     EvHSVEqualizerS=101,
@@ -135,7 +135,19 @@ enum ProcEvent {
     EvLAvoidClip=110,
     EvLSatLimiter=111,
     EvLSatLimit=112,
-    NUMOFEVENTS=113
+    EvDemosaicDCBIter=113,
+    EvDemosaicFalseColorIter=114,
+    EvDemosaicDCBEnhanced=115,
+    EvPreProcessCARed=116,
+    EvPreProcessCABlue=117,
+    EvPreProcessLineDenoise=118,
+    EvPreProcessGEquilThresh=119,
+    EvPreProcessAutoCA=120,
+    EvPreProcessAutoDF=121,
+    EvPreProcessDFFile=122,
+    EvPreProcessExpCorrLinear=123,
+    EvPreProcessExpCorrPH=124,
+    NUMOFEVENTS=125
     };
 }
 #endif

rtengine/refreshmap.cc

@@ -117,8 +117,8 @@ DIRPYREQUALIZER,  // EvDirPyrEqlEnabled,
 LUMINANCECURVE,   // EvLSaturation,
 LUMINANCECURVE,   // EvLaCurve,
 LUMINANCECURVE,   // EvLbCurve,
-DEMOSAIC,         // EvDemosaic
-DARKFRAME,        // EvPreProcess
+DEMOSAIC,         // EvDemosaicMethod
+DARKFRAME,        // EvPreProcessHotDeadPixel
 RGBCURVE,         // EvSaturation,
 RGBCURVE,         // EvHSVEqualizerH,
 RGBCURVE,         // EvHSVEqualizerS,
@@ -133,5 +133,17 @@ RESIZE,           // EvResizeAppliesTo
 LUMINANCECURVE,   // EvCBAvoidClip,
 LUMINANCECURVE,   // EvCBSatLimiter,
 LUMINANCECURVE,   // EvCBSatLimit,
+DEMOSAIC,         // EvDemosaicDCBIter
+DEMOSAIC,         // EvDemosaicFalseColorIter
+DEMOSAIC,         // EvDemosaicDCBEnhanced
+DARKFRAME,        // EvPreProcessCARed
+DARKFRAME,        // EvPreProcessCABlue
+DARKFRAME,        // EvPreProcessLineDenoise
+DARKFRAME,        // EvPreProcessGEquilThresh
+DARKFRAME,        // EvPreProcessAutoCA
+DARKFRAME,        // EvPreProcessAutoDF
+DARKFRAME,        // EvPreProcessDFFile
+DARKFRAME,        // EvPreProcessExpCorrLinear
+DARKFRAME         // EvPreProcessExpCorrPH
 };
 

rtgui/CMakeLists.txt

@@ -26,6 +26,7 @@ set (BASESOURCEFILES
     batchqueue.cc lwbutton.cc lwbuttonset.cc
     batchqueuebuttonset.cc browserfilter.cc exiffiltersettings.cc
     profilestore.cc partialpastedlg.cc rawprocess.cc preprocess.cc
+    darkframe.cc rawcacorrection.cc rawexposure.cc
     equalizer.cc dirpyrequalizer.cc hsvequalizer.cc defringe.cc
     popupcommon.cc popupbutton.cc popuptogglebutton.cc)
 

rtgui/adjuster.cc

@@ -21,17 +21,19 @@
 #include <math.h>
 #include <multilangmgr.h>
 #include <rtengine.h>
+#include <options.h>
 
 extern Glib::ustring argv0;
 
-int Adjuster::delay = 1000;
-
 Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, bool editedcb) {
 
   adjusterListener = NULL;
   afterReset = false;
   blocked = false;
 
+  // TODO: let the user chose the default value of Adjuster::delay, for slow machines
+  delay = options.adjusterDelay;		// delay is no more static, so we can set the delay individually (usefull for the RAW editor tab)
+
   set_border_width (2);
 
   hbox = Gtk::manage (new Gtk::HBox ());
@@ -212,6 +214,16 @@ double Adjuster::getValue () {
   return spin->get_value ();
 }
 
+int Adjuster::getIntValue () {
+
+  return spin->get_value_as_int ();
+}
+
+Glib::ustring Adjuster::getTextValue () {
+
+  return spin->get_text ();
+}
+
 bool Adjuster::notifyListener () {
 
   if (adjusterListener!=NULL  && !blocked) {

rtgui/adjuster.h

@@ -57,13 +57,15 @@ class Adjuster : public Gtk::VBox {
 
   public:
 
-    static int delay;
+    int delay;
 
     Adjuster (Glib::ustring label, double vmin, double vmax, double vstep, double vdefault, bool editedCheckBox=false);
     virtual ~Adjuster ();
     void setAdjusterListener (AdjusterListener* alistener);
 
     double getValue ();
+    int getIntValue ();
+    Glib::ustring getTextValue ();
     void setValue (double a);   
     void setLimits (double vmin, double vmax, double vstep, double vdefault);
     void setEnabled (bool enabled);

rtgui/darkframe.cc

@@ -0,0 +1,121 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <darkframe.h>
+#include <options.h>
+#include <guiutils.h>
+#include <sstream>
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+DarkFrame::DarkFrame () : Gtk::VBox(), FoldableToolPanel(this)
+{
+	hbdf = Gtk::manage(new Gtk::HBox());
+	darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
+	dfLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
+	btnReset = Gtk::manage(new Gtk::Button());
+	btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
+	hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4);
+	hbdf->pack_start(*darkFrameFile);
+	hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);
+	dfAuto = Gtk::manage(new Gtk::CheckButton((M("TP_DARKFRAME_AUTOSELECT"))));
+
+	pack_start( *hbdf, Gtk::PACK_SHRINK, 4);
+	pack_start( *dfAuto, Gtk::PACK_SHRINK, 4);
+
+	dfautoconn = dfAuto->signal_toggled().connect ( sigc::mem_fun(*this, &DarkFrame::dfAutoChanged), true);
+	dfFile = darkFrameFile->signal_file_set().connect ( sigc::mem_fun(*this, &DarkFrame::darkFrameChanged), true);
+	btnReset->signal_clicked().connect( sigc::mem_fun(*this, &DarkFrame::darkFrameReset), true );
+}
+
+void DarkFrame::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+	disableListener ();
+	dfautoconn.block(true);
+
+	if(pedited ){
+		dfAuto->set_inconsistent(!pedited->raw.dfAuto );
+	}
+	if (Glib::file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
+		darkFrameFile->set_filename (pp->raw.dark_frame);
+	else if( !options.rtSettings.darkFramesPath.empty() )
+		darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
+	hbdf->set_sensitive( !pp->raw.df_autoselect );
+
+	lastDFauto = pp->raw.df_autoselect;
+
+	dfAuto->set_active( pp->raw.df_autoselect );
+	dfChanged = false;
+
+	dfautoconn.block(false);
+	enableListener ();
+}
+
+void DarkFrame::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+	pp->raw.dark_frame = darkFrameFile->get_filename();
+	pp->raw.df_autoselect = dfAuto->get_active();
+
+	if (pedited) {
+		pedited->raw.darkFrame = dfChanged;
+		pedited->raw.dfAuto = !dfAuto->get_inconsistent();
+	}
+
+}
+
+void DarkFrame::dfAutoChanged()
+{
+    if (batchMode) {
+        if (dfAuto->get_inconsistent()) {
+        	dfAuto->set_inconsistent (false);
+        	dfautoconn.block (true);
+        	dfAuto->set_active (false);
+        	dfautoconn.block (false);
+        }
+        else if (lastDFauto)
+        	dfAuto->set_inconsistent (true);
+
+        lastDFauto = dfAuto->get_active ();
+    }
+
+	hbdf->set_sensitive( !dfAuto->get_active() );
+    if (listener)
+        listener->panelChanged (EvPreProcessAutoDF, dfAuto->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
+}
+
+void DarkFrame::darkFrameChanged()
+{
+	dfChanged=true;
+    if (listener)
+        listener->panelChanged (EvPreProcessDFFile, Glib::path_get_basename(darkFrameFile->get_filename()));
+}
+
+void DarkFrame::darkFrameReset()
+{
+	dfChanged=true;
+	//darkFrameFile->set_current_name("");
+	darkFrameFile->set_filename ("");
+
+		if( !options.rtSettings.darkFramesPath.empty() )
+	  	darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
+
+    if (listener)
+        listener->panelChanged (EvPreProcessDFFile, M("GENERAL_NONE"));
+
+}

rtgui/darkframe.h

@@ -0,0 +1,53 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _DARKFRAME_H_
+#define _DARKFRAME_H_
+
+#include <gtkmm.h>
+#include <toolpanel.h>
+#include <rawimage.h>
+
+class DarkFrame : public Gtk::VBox, public FoldableToolPanel {
+
+protected:
+
+	Gtk::ComboBoxText* darkFrameMethod;
+	Gtk::FileChooserButton *darkFrameFile;
+    Gtk::HBox *hbdf;
+    Gtk::Button *btnReset;
+    Gtk::Label *dfLabel;
+	Gtk::Label *dfInfo;
+    Gtk::CheckButton* dfAuto;
+    bool dfChanged;
+	bool lastDFauto;
+	sigc::connection dfautoconn, dfFile;
+
+public:
+
+	DarkFrame ();
+
+    void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+    void write          (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+
+    void darkFrameChanged ();
+    void darkFrameReset   ();
+    void dfAutoChanged    ();
+};
+
+#endif

rtgui/options.cc

@@ -18,7 +18,6 @@
  */
 #include <options.h>
 #include <stdio.h>
-#include <adjuster.h>
 #include <glib/gstdio.h>
 #include <sstream>
 #include <multilangmgr.h>
@@ -58,6 +57,7 @@ void Options::setDefaults () {
     defProfRaw = "default";
     defProfImg = "neutral";
     dateFormat = "%y-%m-%d";
+    adjusterDelay = 0;
     startupDir = 1;
     startupPath = "";
     profilePath = "profiles";
@@ -177,7 +177,7 @@ if (keyFile.has_group ("General")) {
         
     if (keyFile.has_key ("General", "StartupPath"))      startupPath     = keyFile.get_string ("General", "StartupPath");
     if (keyFile.has_key ("General", "DateFormat"))       dateFormat      = keyFile.get_string ("General", "DateFormat");
-    if (keyFile.has_key ("General", "AdjusterDelay"))    Adjuster::delay = keyFile.get_integer ("General", "AdjusterDelay");
+    if (keyFile.has_key ("General", "AdjusterDelay"))    adjusterDelay   = keyFile.get_integer ("General", "AdjusterDelay");
     if (keyFile.has_key ("General", "StoreLastProfile")) savesParamsAtExit = keyFile.get_boolean ("General", "StoreLastProfile");
     if (keyFile.has_key ("General", "DualProcSupport"))  rtSettings.dualThreadEnabled = keyFile.get_boolean ("General", "DualProcSupport");
     if (keyFile.has_key ("General", "MultiUser"))        multiUser       = keyFile.get_boolean ("General", "MultiUser");
@@ -318,7 +318,7 @@ int Options::saveToFile (Glib::ustring fname) {
         keyFile.set_string ("General", "StartupDirectory", "last");
     keyFile.set_string  ("General", "StartupPath", startupPath);
     keyFile.set_string  ("General", "DateFormat", dateFormat);
-    keyFile.set_integer ("General", "AdjusterDelay", Adjuster::delay);
+    keyFile.set_integer ("General", "AdjusterDelay", adjusterDelay);
     keyFile.set_boolean ("General", "DualProcSupport", rtSettings.dualThreadEnabled);
     keyFile.set_boolean ("General", "MultiUser", multiUser);
     keyFile.set_string  ("General", "Language", language);
@@ -326,8 +326,8 @@ int Options::saveToFile (Glib::ustring fname) {
     keyFile.set_boolean ("General", "UseSystemTheme", useSystemTheme);
     keyFile.set_integer ("General", "Version", TAGDISTANCE);
     keyFile.set_boolean ("General", "FirstRun", firstRun);
-	keyFile.set_string  ("General", "DarkFramesPath", rtSettings.darkFramesPath);
-	keyFile.set_boolean ("General", "Verbose", rtSettings.verbose);
+    keyFile.set_string  ("General", "DarkFramesPath", rtSettings.darkFramesPath);
+    keyFile.set_boolean ("General", "Verbose", rtSettings.verbose);
 
     keyFile.set_integer ("External Editor", "EditorKind", editorToSendTo);
     keyFile.set_string  ("External Editor", "GimpDir", gimpDir);

rtgui/options.h

@@ -58,6 +58,7 @@ class Options {
     Glib::ustring defProfRaw;
     Glib::ustring defProfImg;
     Glib::ustring dateFormat;
+    int adjusterDelay;
     int  startupDir;
     Glib::ustring startupPath;
     Glib::ustring profilePath;

rtgui/preprocess.cc

@@ -17,242 +17,108 @@
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <preprocess.h>
-#include <options.h>
 #include <guiutils.h>
+#include <safegtk.h>
+#include <sstream>
+
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-PreProcess::PreProcess (): Gtk::VBox(), FoldableToolPanel(this)
+PreProcess::PreProcess () : Gtk::VBox(), FoldableToolPanel(this)
 {
-	hbdf = Gtk::manage(new Gtk::HBox());
-	darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_PREPROCESS_DARKFRAME"), Gtk::FILE_CHOOSER_ACTION_OPEN));
-	dfLabel = Gtk::manage(new Gtk::Label(M("TP_PREPROCESS_DARKFRAME")));
-	btnReset = Gtk::manage(new Gtk::Button());
-	btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
-	hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4);
-	hbdf->pack_start(*darkFrameFile);
-	hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);
-	dfAuto = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_DFAUTOSELECT"))));
+	hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_HOTDEADPIXFILT"))));
 
-	caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_CACORRECTION"))));
-	caRed = Gtk::manage(new Adjuster (M("PREFERENCES_CARED"),-4.0,4.0,0.1,0));
-	caRed->setAdjusterListener (this);
-	caRed->show();
-	caBlue = Gtk::manage(new Adjuster (M("PREFERENCES_CABLUE"),-4.0,4.0,0.1,0));
-	caBlue->setAdjusterListener (this);
-	caBlue->show();
-//exposi
-	/*exPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
-	exPos->setAdjusterListener (this);
-	exPos->show();
-	exPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
-	exPreser->setAdjusterListener (this);
-	exPreser->show();*/
-	PexPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
-	PexPos->setAdjusterListener (this);
-	PexPos->show();
-	PexPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
-	PexPreser->setAdjusterListener (this);
-	PexPreser->show();
-
-	
-	hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_HOTDEADPIXFILT"))));
-
-	lineDenoise = Gtk::manage(new Adjuster (M("PREFERENCES_LINEDENOISE"),0,1000,1,0));
+	lineDenoise = Gtk::manage(new Adjuster (M("TP_PREPROCESS_LINEDENOISE"),0,1000,1,0));
 	lineDenoise->setAdjusterListener (this);
+	if (lineDenoise->delay < 1000) lineDenoise->delay = 1000;
 	lineDenoise->show();
 
-	greenEqThreshold = Gtk::manage(new Adjuster (M("PREFERENCES_GREENEQUIL"),0,100,1,0));
+	greenEqThreshold = Gtk::manage(new Adjuster (M("TP_PREPROCESS_GREENEQUIL"),0,100,1,0));
 	greenEqThreshold->setAdjusterListener (this);
+	if (greenEqThreshold->delay < 1000) greenEqThreshold->delay = 1000;
 	greenEqThreshold->show();
 
-    pack_start( *hbdf, Gtk::PACK_SHRINK, 4);
-    pack_start( *dfAuto, Gtk::PACK_SHRINK, 4);
-    pack_start( *Gtk::manage (new  Gtk::HSeparator()));
-    pack_start( *hotDeadPixel, Gtk::PACK_SHRINK, 4);
-    pack_start( *Gtk::manage (new  Gtk::HSeparator()));
-    pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
-	pack_start( *caRed, Gtk::PACK_SHRINK, 4);
-    pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
-	pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
-    pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
+	pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4);
 
-    pack_start( *Gtk::manage (new  Gtk::HSeparator()));
-    pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4);
-    pack_start( *Gtk::manage (new  Gtk::HSeparator()));
-    pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4);
+	pack_start( *Gtk::manage (new  Gtk::HSeparator()));
 
-   caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::caCorrectionChanged), true);
-   dfautoconn = dfAuto->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::dfAutoChanged), true);
-   hdpixelconn = hotDeadPixel->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::hotDeadPixelChanged), true);
-   dfFile = darkFrameFile->signal_file_set().connect ( sigc::mem_fun(*this, &PreProcess::darkFrameChanged), true);
-   btnReset->signal_clicked().connect( sigc::mem_fun(*this, &PreProcess::darkFrameReset), true );
+	pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4);
+
+	pack_start( *Gtk::manage (new  Gtk::HSeparator()));
+
+	pack_start( *hotDeadPixel, Gtk::PACK_SHRINK, 4);
+
+	hdpixelconn = hotDeadPixel->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::hotDeadPixelChanged), true);
 }
 
-
 void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
 {
-   disableListener ();
-   caacsconn.block (true);
-   dfautoconn.block(true);
-   hdpixelconn.block (true);
+	disableListener ();
+	hdpixelconn.block (true);
 
-   if(pedited ){
-	   dfAuto->set_inconsistent(!pedited->raw.dfAuto );
-	   caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
-	   caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
-	   caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
-	   PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
-	   PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
+	if(pedited ){
+		hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel);
+		lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited );
+		greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited );
+	}
 
-	   //exposure
-	   hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel);
-	   lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited );
-	   greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited );
-   }
+	lastHot = pp->raw.hotdeadpix_filt;
 
-   if (Glib::file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
-      darkFrameFile->set_filename (pp->raw.dark_frame);
-   else if( !options.rtSettings.darkFramesPath.empty() )
-	   darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
+	hotDeadPixel->set_active (pp->raw.hotdeadpix_filt);
+	lineDenoise->setValue (pp->raw.linenoise);
+	greenEqThreshold->setValue (pp->raw.greenthresh);
 
-   lastCA  = pp->raw.ca_autocorrect;
-   lastHot = pp->raw.hotdeadpix_filt;
-   lastDFauto = pp->raw.df_autoselect;
-
-   dfAuto->set_active( pp->raw.df_autoselect );
-   caAutocorrect->set_active(pp->raw.ca_autocorrect);
-	caRed->setValue (pp->raw.cared);
-	caBlue->setValue (pp->raw.cablue);
-	PexPos->setValue (pp->raw.expos);
-	PexPreser->setValue (pp->raw.preser);//exposi
-	
-   hotDeadPixel->set_active (pp->raw.hotdeadpix_filt);
-   lineDenoise->setValue (pp->raw.linenoise);
-   greenEqThreshold->setValue (pp->raw.greenthresh);
-
-   dfChanged = false;
-
-
-   caacsconn.block (false);
-   dfautoconn.block(false);
-   hdpixelconn.block (false);
-
-   enableListener ();
+	hdpixelconn.block (false);
+	enableListener ();
 }
 
 void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
 {
-	pp->raw.dark_frame = darkFrameFile->get_filename();
-	pp->raw.df_autoselect = dfAuto->get_active();
-	pp->raw.ca_autocorrect = caAutocorrect->get_active();
-	pp->raw.cared = (double)caRed->getValue();
-	pp->raw.cablue = (double)caBlue->getValue();
-	pp->raw.expos = (double)PexPos->getValue();
-	pp->raw.preser = (double)PexPreser->getValue();//exposi
-	
 	pp->raw.hotdeadpix_filt = hotDeadPixel->get_active();
-	pp->raw.linenoise = (int)lineDenoise->getValue();
-	pp->raw.greenthresh = (int)greenEqThreshold->getValue();
+	pp->raw.linenoise = lineDenoise->getIntValue();
+	pp->raw.greenthresh = greenEqThreshold->getIntValue();
 
 	if (pedited) {
-		pedited->raw.darkFrame = dfChanged;
-		pedited->raw.dfAuto = !dfAuto->get_inconsistent();
 		pedited->raw.linenoise = lineDenoise->getEditedState ();
 		pedited->raw.greenEq= greenEqThreshold->getEditedState ();
-		pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
-		pedited->raw.caRed = caRed->getEditedState ();
-		pedited->raw.caBlue = caBlue->getEditedState ();
-		pedited->raw.exPos = PexPos->getEditedState ();
-		pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
-		
 		pedited->raw.hotDeadPixel = !hotDeadPixel->get_inconsistent();
 	}
 }
 
 void PreProcess::adjusterChanged (Adjuster* a, double newval)
 {
-    if (listener)
-        listener->panelChanged (EvPreProcess,  Glib::ustring("params") );
+	if (listener) {
+
+		Glib::ustring value = a->getTextValue();
+
+		if (a == greenEqThreshold)
+			listener->panelChanged (EvPreProcessGEquilThresh,  value );
+		else if (a == lineDenoise)
+			listener->panelChanged (EvPreProcessLineDenoise,  value );
+	}
 }
 
 void PreProcess::setBatchMode(bool batchMode)
 {
-   ToolPanel::setBatchMode (batchMode);
-	caRed->showEditedCB ();
-	caBlue->showEditedCB ();
-	PexPos->showEditedCB ();
-	PexPreser->showEditedCB ();//exposi
-	
-   lineDenoise->showEditedCB ();
-   greenEqThreshold->showEditedCB ();
+	ToolPanel::setBatchMode (batchMode);
+	lineDenoise->showEditedCB ();
+	greenEqThreshold->showEditedCB ();
 }
 
 void PreProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
 {
 	lineDenoise->setDefault( defParams->raw.linenoise);
-	caRed->setDefault( defParams->raw.cared);
-	caBlue->setDefault( defParams->raw.cablue);
-	PexPos->setDefault( defParams->raw.expos);
-	PexPreser->setDefault( defParams->raw.preser);
-	
 	greenEqThreshold->setDefault (defParams->raw.greenthresh);
+
 	if (pedited) {
 		lineDenoise->setDefaultEditedState( pedited->raw.linenoise ? Edited : UnEdited);
-		caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
-		caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
-		PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
-		PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
-		
 		greenEqThreshold->setDefaultEditedState(pedited->raw.greenEq ? Edited : UnEdited);
-	}else{
+	} else {
 		lineDenoise->setDefaultEditedState( Irrelevant );
-		caRed->setDefaultEditedState( Irrelevant );
-		caBlue->setDefaultEditedState( Irrelevant );
-		PexPos->setDefaultEditedState( Irrelevant );
-		PexPreser->setDefaultEditedState( Irrelevant );
-		
 		greenEqThreshold->setDefaultEditedState(Irrelevant );
 	}
 }
 
-void PreProcess::caCorrectionChanged()
-{
-    if (batchMode) {
-        if (caAutocorrect->get_inconsistent()) {
-        	caAutocorrect->set_inconsistent (false);
-        	caacsconn.block (true);
-            caAutocorrect->set_active (false);
-            caacsconn.block (false);
-        }
-        else if (lastCA)
-        	caAutocorrect->set_inconsistent (true);
-
-        lastCA = caAutocorrect->get_active ();
-    }
-    if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_CACORRECTION"))+"="+(caAutocorrect->get_active()?"ON":"OFF") );
-}
-
-void PreProcess::dfAutoChanged()
-{
-    if (batchMode) {
-        if (dfAuto->get_inconsistent()) {
-        	dfAuto->set_inconsistent (false);
-        	dfautoconn.block (true);
-        	dfAuto->set_active (false);
-        	dfautoconn.block (false);
-        }
-        else if (lastDFauto)
-        	dfAuto->set_inconsistent (true);
-
-        lastDFauto = dfAuto->get_active ();
-    }
-	hbdf->set_sensitive( !dfAuto->get_active() );
-    if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DFAUTOSELECT"))+"="+(dfAuto->get_active()?"ON":"OFF") );
-}
-
 void PreProcess::hotDeadPixelChanged ()
 {
     if (batchMode) {
@@ -268,21 +134,5 @@ void PreProcess::hotDeadPixelChanged ()
         lastHot = hotDeadPixel->get_active ();
     }
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_HOTDEADPIXFILT"))+"="+(hotDeadPixel->get_active()?"ON":"OFF") );
-}
-void PreProcess::darkFrameChanged()
-{
-	dfChanged=true;
-    if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"="+darkFrameFile->get_filename());
-}
-
-void PreProcess::darkFrameReset()
-{
-	dfChanged=true;
-	darkFrameFile->set_current_name("");
-	darkFrameFile->set_filename ("");
-    if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"=0" );
-
+        listener->panelChanged (EvPreProcessHotDeadPixel, hotDeadPixel->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
 }

rtgui/preprocess.h

@@ -22,32 +22,19 @@
 #include <gtkmm.h>
 #include <adjuster.h>
 #include <toolpanel.h>
+#include <rawimage.h>
 
-
-class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel{
+class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
 
   protected:
 
-    Gtk::ComboBoxText* darkFrameMethod;
-    Gtk::FileChooserButton *darkFrameFile;
-    Gtk::HBox *hbdf;
-    Gtk::Button *btnReset;
-    Gtk::Label *dfLabel;
-    bool dfChanged;
-
-	Adjuster* caRed;
-    Adjuster* caBlue;
-	Adjuster* PexPos;
-	Adjuster* PexPreser;
-	
     Adjuster* lineDenoise;
-    Adjuster* greenEqThreshold;
-    Gtk::CheckButton* caAutocorrect;
-    Gtk::CheckButton* hotDeadPixel;
-    Gtk::CheckButton* dfAuto;
-    bool lastCA,lastHot,lastDFauto;
 
-    sigc::connection caacsconn,dfautoconn,hdpixelconn,dfFile;
+    Adjuster* greenEqThreshold;
+    Gtk::CheckButton* hotDeadPixel;
+	bool lastHot;
+	sigc::connection hdpixelconn;
+
   public:
 
     PreProcess ();
@@ -58,11 +45,7 @@ class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
     void setDefaults    (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
 
     void adjusterChanged     (Adjuster* a, double newval);
-    void caCorrectionChanged();
     void hotDeadPixelChanged();
-    void darkFrameChanged();
-    void darkFrameReset();
-    void dfAutoChanged();
 };
 
 #endif

rtgui/rawcacorrection.cc

@@ -0,0 +1,143 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <rawcacorrection.h>
+#include <guiutils.h>
+#include <safegtk.h>
+#include <sstream>
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+RAWCACorr::RAWCACorr () : Gtk::VBox(), FoldableToolPanel(this)
+{
+	caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("TP_RAWCACORR_AUTO"))));
+	caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"),-4.0,4.0,0.1,0));
+	caRed->setAdjusterListener (this);
+	if (caRed->delay < 1000) caRed->delay = 1000;
+	caRed->show();
+	caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"),-4.0,4.0,0.1,0));
+	caBlue->setAdjusterListener (this);
+	if (caBlue->delay < 1000) caBlue->delay = 1000;
+	caBlue->show();
+
+	pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
+	pack_start( *caRed, Gtk::PACK_SHRINK, 4);
+	pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
+
+	caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &RAWCACorr::caCorrectionChanged), true);
+}
+
+void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+	disableListener ();
+	caacsconn.block (true);
+
+	if(pedited ){
+		caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
+		caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
+		caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
+	}
+
+	lastCA  = pp->raw.ca_autocorrect;
+
+	caAutocorrect->set_active(pp->raw.ca_autocorrect);
+	caRed->setValue (pp->raw.cared);
+	caBlue->setValue (pp->raw.cablue);
+
+	caacsconn.block (false);
+	enableListener ();
+}
+
+void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+	pp->raw.ca_autocorrect = caAutocorrect->get_active();
+	pp->raw.cared = caRed->getValue();
+	pp->raw.cablue = caBlue->getValue();
+
+	if (pedited) {
+		pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
+		pedited->raw.caRed = caRed->getEditedState ();
+		pedited->raw.caBlue = caBlue->getEditedState ();
+	}
+
+}
+
+void RAWCACorr::adjusterChanged (Adjuster* a, double newval)
+{
+	if (listener) {
+
+		Glib::ustring value = a->getTextValue();
+
+		if (a == caRed)
+			listener->panelChanged (EvPreProcessCARed,  value );
+		else if (a == caBlue)
+			listener->panelChanged (EvPreProcessCABlue,  value );
+	}
+}
+
+void RAWCACorr::setBatchMode(bool batchMode)
+{
+	ToolPanel::setBatchMode (batchMode);
+	caRed->showEditedCB ();
+	caBlue->showEditedCB ();
+}
+
+void RAWCACorr::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
+{
+	caRed->setDefault( defParams->raw.cared);
+	caBlue->setDefault( defParams->raw.cablue);
+
+	if (pedited) {
+		caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
+		caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
+	} else {
+		caRed->setDefaultEditedState( Irrelevant );
+		caBlue->setDefaultEditedState( Irrelevant );
+	}
+}
+
+void RAWCACorr::caCorrectionChanged()
+{
+    if (batchMode) {
+        if (caAutocorrect->get_inconsistent()) {
+        	caAutocorrect->set_inconsistent (false);
+        	caacsconn.block (true);
+            caAutocorrect->set_active (false);
+            caacsconn.block (false);
+        }
+        else if (lastCA)
+        	caAutocorrect->set_inconsistent (true);
+
+        lastCA = caAutocorrect->get_active ();
+
+    }
+    else {
+    	// For non batch mode, we disable the red and blue slider if caAutocorrect is true
+    	if (caAutocorrect->get_active ()) {
+    		caRed->set_sensitive(false);
+    		caBlue->set_sensitive(false);
+    	}
+    	else {
+    		caRed->set_sensitive(true);
+    		caBlue->set_sensitive(true);
+    	}
+    }
+    if (listener)
+        listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
+}

rtgui/rawcacorrection.h

@@ -0,0 +1,49 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _RAWCACORRECTION_H_
+#define _RAWCACORRECTION_H_
+
+#include <gtkmm.h>
+#include <adjuster.h>
+#include <toolpanel.h>
+#include <rawimage.h>
+
+class RAWCACorr : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
+
+protected:
+    Gtk::CheckButton* caAutocorrect;
+	Adjuster* caRed;
+    Adjuster* caBlue;
+	bool lastCA;
+	sigc::connection caacsconn;
+
+public:
+
+	RAWCACorr ();
+
+	void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+    void write          (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+    void setBatchMode   (bool batchMode);
+    void setDefaults    (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+
+    void adjusterChanged     (Adjuster* a, double newval);
+    void caCorrectionChanged ();
+};
+
+#endif

rtgui/rawexposure.cc

@@ -0,0 +1,101 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <rawexposure.h>
+#include <guiutils.h>
+#include <safegtk.h>
+#include <sstream>
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+RAWExposure::RAWExposure () : Gtk::VBox(), FoldableToolPanel(this)
+{
+	PexPos = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_LINEAR"),0.2,4.0,0.1,1));
+	PexPos->setAdjusterListener (this);
+	if (PexPos->delay < 1000) PexPos->delay = 1000;
+	PexPos->show();
+	PexPreser = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_PRESER"),0,2.5,0.1,0));
+	PexPreser->setAdjusterListener (this);
+	if (PexPreser->delay < 1000) PexPreser->delay = 1000;
+	PexPreser->show();
+
+	pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
+	pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
+}
+
+void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+	disableListener ();
+
+	if(pedited ){
+		PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
+		PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
+	}
+
+	PexPos->setValue (pp->raw.expos);
+	PexPreser->setValue (pp->raw.preser);//exposi
+
+	enableListener ();
+}
+
+void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+	pp->raw.expos = PexPos->getValue();
+	pp->raw.preser = PexPreser->getValue();//exposi
+
+	if (pedited) {
+		pedited->raw.exPos = PexPos->getEditedState ();
+		pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
+	}
+
+}
+
+void RAWExposure::adjusterChanged (Adjuster* a, double newval)
+{
+	if (listener) {
+
+		Glib::ustring value = a->getTextValue();
+
+		if (a == PexPos)
+			listener->panelChanged (EvPreProcessExpCorrLinear,  value );
+		else if (a == PexPreser)
+			listener->panelChanged (EvPreProcessExpCorrPH,  value );
+	}
+}
+
+void RAWExposure::setBatchMode(bool batchMode)
+{
+	ToolPanel::setBatchMode (batchMode);
+	PexPos->showEditedCB ();
+	PexPreser->showEditedCB ();//exposi
+}
+
+void RAWExposure::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
+{
+	PexPos->setDefault( defParams->raw.expos);
+	PexPreser->setDefault( defParams->raw.preser);
+
+	if (pedited) {
+		PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
+		PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
+	} else {
+		PexPos->setDefaultEditedState( Irrelevant );
+		PexPreser->setDefaultEditedState( Irrelevant );
+	}
+}

rtgui/rawexposure.h

@@ -0,0 +1,45 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _RAWEXPOSURE_H_
+#define _RAWEXPOSURE_H_
+
+#include <gtkmm.h>
+#include <adjuster.h>
+#include <toolpanel.h>
+#include <rawimage.h>
+
+class RAWExposure : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
+
+protected:
+	Adjuster* PexPos;
+	Adjuster* PexPreser;
+
+public:
+
+	RAWExposure ();
+
+    void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+    void write          (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+    void setBatchMode   (bool batchMode);
+    void setDefaults    (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+
+    void adjusterChanged     (Adjuster* a, double newval);
+};
+
+#endif

rtgui/rawprocess.cc

@@ -25,7 +25,7 @@ using namespace rtengine::procparams;
 RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
 {
    Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
-   hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("PREFERENCES_DMETHOD") +": ")));
+   hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") +": ")));
    dmethod = Gtk::manage (new Gtk::ComboBoxText ());
    for( size_t i=0; i< procparams::RAWParams::numMethods;i++)
 	   dmethod->append_text(procparams::RAWParams::methodstring[i]);
@@ -37,10 +37,11 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
    dcbOptions = Gtk::manage (new Gtk::VBox ());
    dcbOptions->set_border_width(4);
 
-   dcbIterations = Gtk::manage (new Adjuster (M("PREFERENCES_DCBITERATIONS"),0,5,1,2));
-   dcbIterations ->setAdjusterListener (this);
-   dcbIterations ->show();
-   dcbEnhance = Gtk::manage (new Gtk::CheckButton(M("PREFERENCES_DCBENHANCE")));
+   dcbIterations = Gtk::manage (new Adjuster (M("TP_RAW_DCBITERATIONS"),0,5,1,2));
+   dcbIterations->setAdjusterListener (this);
+   if (dcbIterations->delay < 1000) dcbIterations->delay = 1000;
+   dcbIterations->show();
+   dcbEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_DCBENHANCE")));
    dcbOptions->pack_start(*dcbIterations);
    dcbOptions->pack_start(*dcbEnhance);
    pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
@@ -48,8 +49,9 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
 
    ccOptions = Gtk::manage (new Gtk::VBox ());
    ccOptions->set_border_width(4);
-   ccSteps = Gtk::manage (new Adjuster (M("PREFERENCES_FALSECOLOR"),0,5,1,2 ));
+   ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,2 ));
    ccSteps->setAdjusterListener (this);
+   if (ccSteps->delay < 1000) ccSteps->delay = 1000;
    ccSteps->show();
    pack_start( *ccSteps, Gtk::PACK_SHRINK, 4);
 
@@ -103,8 +105,8 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
 
 void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
 {
-	pp->raw.ccSteps = (int)ccSteps->getValue();
-	pp->raw.dcb_iterations = (int)dcbIterations->getValue();
+	pp->raw.ccSteps = ccSteps->getIntValue();
+	pp->raw.dcb_iterations = dcbIterations->getIntValue();
 	pp->raw.dcb_enhance = dcbEnhance->get_active();
 
 	int currentRow = dmethod->get_active_row_number();
@@ -143,8 +145,12 @@ void RawProcess::setDefaults(const rtengine::procparams::ProcParams* defParams,
 
 void RawProcess::adjusterChanged (Adjuster* a, double newval)
 {
-    if (listener)
-        listener->panelChanged (EvDemosaic, Glib::ustring("params") );
+    if (listener) {
+    	if (a == dcbIterations)
+    		listener->panelChanged (EvDemosaicDCBIter, a->getTextValue() );
+    	else if (a == ccSteps)
+    		listener->panelChanged (EvDemosaicFalseColorIter, a->getTextValue() );
+    }
 }
 
 void RawProcess::methodChanged ()
@@ -160,7 +166,7 @@ void RawProcess::methodChanged ()
 	    s = procparams::RAWParams::methodstring[curSelection];
 
     if (listener)
-        listener->panelChanged (EvDemosaic, Glib::ustring(M("PREFERENCES_DMETHOD"))+ "="+ s);
+        listener->panelChanged (EvDemosaicMethod, s);
 }
 
 void RawProcess::dcbEnhanceChanged ()
@@ -178,5 +184,5 @@ void RawProcess::dcbEnhanceChanged ()
         lastDCBen = dcbEnhance->get_active ();
     }
     if (listener)
-        listener->panelChanged (EvDemosaic, Glib::ustring("params") );
+        listener->panelChanged (EvDemosaicDCBEnhanced, dcbEnhance->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
 }

rtgui/toolpanelcoord.cc

@@ -21,6 +21,7 @@
 #include <ilabel.h>
 #include <options.h>
 #include <imagesource.h>
+#include <dfmanager.h>
 
 using namespace rtengine::procparams;
 
@@ -63,6 +64,9 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL)  {
     hsvequalizer        = Gtk::manage (new HSVEqualizer ());
     rawprocess          = Gtk::manage (new RawProcess ());
     preprocess          = Gtk::manage (new PreProcess ());
+    darkframe           = Gtk::manage (new DarkFrame ());
+    rawcacorrection     = Gtk::manage (new RAWCACorr ());
+    rawexposure         = Gtk::manage (new RAWExposure ());
 
     addPanel (colorPanel, whitebalance,         M("TP_WBALANCE_LABEL"));       toolPanels.push_back (whitebalance);
     addPanel (exposurePanel, curve,             M("TP_EXPOSURE_LABEL"));       toolPanels.push_back (curve);
@@ -90,8 +94,11 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL)  {
     addPanel (lensgeom->getPackBox(), cacorrection, M("TP_CACORRECTION_LABEL")); toolPanels.push_back (cacorrection);
     addPanel (lensgeom->getPackBox(), vignetting,   M("TP_VIGNETTING_LABEL"));   toolPanels.push_back (vignetting);
     addPanel (colorPanel, icm,                  M("TP_ICM_LABEL"));             toolPanels.push_back (icm);
-    addPanel (rawPanel, rawprocess,             M("TP_RAWPANEL_DEMOSAICING"));  toolPanels.push_back (rawprocess);
-    addPanel (rawPanel, preprocess,             M("TP_RAWPANEL_PREPROCESSING"));toolPanels.push_back (preprocess);
+    addPanel (rawPanel, rawprocess,             M("TP_RAW_LABEL"));            toolPanels.push_back (rawprocess);
+    addPanel (rawPanel, preprocess,             M("TP_PREPROCESS_LABEL"));     toolPanels.push_back (preprocess);
+    addPanel (rawPanel, rawexposure,            M("TP_EXPOSCORR_LABEL"));      toolPanels.push_back (rawexposure);
+    addPanel (rawPanel, darkframe,              M("TP_DARKFRAME_LABEL"));      toolPanels.push_back (darkframe);
+    addPanel (rawPanel, rawcacorrection,        M("TP_CHROMATABERR_LABEL"));   toolPanels.push_back (rawcacorrection);
 
     toolPanels.push_back (coarse);
     toolPanels.push_back (exifpanel);

rtgui/toolpanelcoord.h

@@ -59,6 +59,9 @@
 #include <hsvequalizer.h>
 #include <rawprocess.h>
 #include <preprocess.h>
+#include <darkframe.h>
+#include <rawcacorrection.h>
+#include <rawexposure.h>
 
 class ImageEditorCoordinator;
 
@@ -101,6 +104,9 @@ class ToolPanelCoordinator :    public ToolPanelListener,
         HSVEqualizer * hsvequalizer;
         RawProcess* rawprocess;
         PreProcess* preprocess;
+        DarkFrame* darkframe;
+        RAWCACorr* rawcacorrection;
+        RAWExposure* rawexposure;
 
         std::vector<PParamsChangeListener*> paramcListeners;
 
@@ -161,6 +167,9 @@ class ToolPanelCoordinator :    public ToolPanelListener,
         void getAutoWB (double& temp, double& green) { if (ipc) ipc->getAutoWB (temp, green); }
         void getCamWB (double& temp, double& green)  { if (ipc) ipc->getCamWB (temp, green); }
 
+        //DFProvider interface
+        rtengine::RawImage* getDF();
+
         // rotatelistener interface
         void straightenRequested ();
         void autoCropRequested ();