diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 07fe45c45..d006e1995 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -1649,7 +1649,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index bbc927e21..e58875107 100644
--- a/rtdata/languages/Chinese (Simplified)
+++ b/rtdata/languages/Chinese (Simplified)
@@ -1595,7 +1595,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_COLORAPP_TCMODE_LABEL1;Curve mode 1
!TP_COLORAPP_TCMODE_LABEL2;Curve mode 2
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 393bc960e..5a330fd13 100644
--- a/rtdata/languages/Chinese (Traditional)
+++ b/rtdata/languages/Chinese (Traditional)
@@ -1450,7 +1450,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index fba26c21c..a7a743377 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -2197,7 +2197,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 6ce51da05..da080ee2b 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 958d69524..60a276a20 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -42,6 +42,7 @@
#41 03.05.2017 Erweiterung/Korrekturen (TooWaBoo) RT 5.0 r1
#42 13.05.2017 Erweiterung (TooWaBoo) RT 5.0 r1
#43 21.07.2017 Erweiterung (TooWaBoo) RT 5.1
+#44 21.09.2017 Erweiterung (TooWaBoo) RT 5.2
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@@ -77,6 +78,7 @@ CURVEEDITOR_TOOLTIPPASTE;Kurve aus Zwischenablage einfügen
CURVEEDITOR_TOOLTIPSAVE;Kurve speichern
CURVEEDITOR_TYPE;Typ:
DIRBROWSER_FOLDERS;Ordner
+DONT_SHOW_AGAIN;Meldung nicht mehr anzeigen.
DYNPROFILEEDITOR_DELETE;Löschen
DYNPROFILEEDITOR_EDIT;Ändern
DYNPROFILEEDITOR_EDIT_RULE;Profilregel ändern
@@ -275,6 +277,7 @@ GENERAL_PORTRAIT;Portrait
GENERAL_SAVE;Speichern
GENERAL_UNCHANGED;(Unverändert)
GENERAL_WARNING;Warnung
+GIMP_PLUGIN_INFO;Willkommen zum RawTherapee GIMP-Plugin!\nNach den Änderungen bitte das RawTherapee-Fenster schließen.\nDas Bild wird dann automatisch in GIMP importiert.
HISTOGRAM_TOOLTIP_B;Blau-Histogramm ein-/ausblenden
HISTOGRAM_TOOLTIP_BAR;RGB-Anzeigeleiste ein-/ausblenden\n\nZum Fixieren/Lösen der Anzeige muss mit der\nrechten Maustaste ins Bildfenster geklickt werden.
HISTOGRAM_TOOLTIP_CHRO;Chromatizität-Histogramm ein/ausblenden
@@ -463,8 +466,8 @@ HISTORY_MSG_173;(Rauschreduzierung)\nLuminanzdetails
HISTORY_MSG_174;(CIECAM02)
HISTORY_MSG_175;(CIECAM02) - Szene\nCAT02-Adaptation
HISTORY_MSG_176;(CIECAM02)\nBetrachtungsbed.\nUmgebung
-HISTORY_MSG_177;(CIECAM02) - Szene\nLeuchtstärke
-HISTORY_MSG_178;(CIECAM02)\nBetrachtungsbed.\nLeuchtstärke
+HISTORY_MSG_177;(CIECAM02) - Szene\nLuminanz
+HISTORY_MSG_178;(CIECAM02)\nBetrachtungsbed.\nLuminanz
HISTORY_MSG_179;(CIECAM02) - Szene\nWeißpunktmodell
HISTORY_MSG_180;(CIECAM02) - Helligkeit (J)
HISTORY_MSG_181;(CIECAM02) - Buntheit (H)
@@ -492,7 +495,7 @@ HISTORY_MSG_202;(Rauschreduzierung)\nDelta-Chrominanz\nBlau / Gelb
HISTORY_MSG_203;(Rauschreduzierung)\nMethode
HISTORY_MSG_204;(Sensor-Matrix)\nFarbinterpolation\nLMMSE-Verbesserung
HISTORY_MSG_205;(CIECAM02)\nBetrachtungsbed.\nHot / Bad-Pixelfilter
-HISTORY_MSG_206;(CIECAM02) - Szene\nAuto-Leuchtstärke
+HISTORY_MSG_206;(CIECAM02) - Szene\nAuto-Luminanz
HISTORY_MSG_207;(Farbsaum entfernen)\nFarbtonkurve
HISTORY_MSG_208;(Weißabgleich)\nBlau / Rot-Korrektur
HISTORY_MSG_210;(Grauverlaufsfilter)\nRotationswinkel
@@ -761,6 +764,18 @@ HISTORY_MSG_472;(Sensor-Matrix)\nFarbinterpolation\nWeicher Übergang
HISTORY_MSG_473;(Sensor-Matrix)\nFarbinterpolation\nLMMSE für Bewegungs-\nteile verwenden
HISTORY_MSG_474;(Sensor-Matrix)\nFarbinterpolation\nFrame-Helligkeit angleichen
HISTORY_MSG_475;(Sensor-Matrix)\nFarbinterpolation)\nAusgleich pro Kanal
+HISTORY_MSG_476;(CIECAM02)\nBetrachtungsbed.\nFarbtemperatur
+HISTORY_MSG_477;(CIECAM02)\nBetrachtungsbed.\nTönung
+HISTORY_MSG_478;(CIECAM02)\nBetrachtungsbed.\nYb% (Ø Luminanz)
+HISTORY_MSG_479;(CIECAM02)\nBetrachtungsbed.\nCAT02 Adaptation
+HISTORY_MSG_480;(CIECAM02)\nBetrachtungsbed.\nAuto CAT02 Adaptation
+HISTORY_MSG_481;(CIECAM02) - Szene\nFarbtemperatur
+HISTORY_MSG_482;(CIECAM02) - Szene\nTönung
+HISTORY_MSG_483;(CIECAM02) - Szene\nYb% (Ø Luminanz)
+HISTORY_MSG_484;(CIECAM02) - Szene\nAuto Yb%
+HISTORY_MSG_485;(Objektivkorrektur)\nProfil
+HISTORY_MSG_486;(Objektivkorrektur)\nProfil - Kamera
+HISTORY_MSG_487;(Objektivkorrektur)\nProfil - Objektiv
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s
HISTORY_SNAPSHOT;Schnappschuss
@@ -807,6 +822,10 @@ IPTCPANEL_TITLE;Titel
IPTCPANEL_TITLEHINT;Geben Sie einen kurzen lesbaren Namen\nfür das Bild ein, z.B. den Dateinamen.
IPTCPANEL_TRANSREFERENCE;Verarbeitungs-ID
IPTCPANEL_TRANSREFERENCEHINT;Geben Sie eine Kennung zur Kontrolle oder\nVerfolgung des Arbeitsablaufes ein.
+LENSPROFILE_CORRECTION_AUTOMATCH;Automatisch (Lensfun)
+LENSPROFILE_CORRECTION_LCPFILE;LCP-Datei
+LENSPROFILE_CORRECTION_MANUAL;Benutzerdefiniert (Lensfun)
+LENSPROFILE_LENS_WARNING;Warnung: Der Cropfaktor des Profils entspricht nicht dem des Objektivs.\nDies kann zu einem fehlerhaften Ergebnis führen.
MAIN_BUTTON_FULLSCREEN;Vollbild\nTaste: F11
MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F4\n\nNavigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F4
MAIN_BUTTON_NAVPREV_TOOLTIP;Navigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F3\n\nNavigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F3
@@ -865,6 +884,7 @@ MAIN_TAB_WAVELET_TOOLTIP;Taste: Alt + w
MAIN_TOOLTIP_BACKCOLOR0;Hintergrundfarbe der Vorschau basierend auf dem: Oberflächendesign\nTaste: 9
MAIN_TOOLTIP_BACKCOLOR1;Hintergrundfarbe der Vorschau: Schwarz\nTaste: 9
MAIN_TOOLTIP_BACKCOLOR2;Hintergrundfarbe der Vorschau: Weiß\nTaste: 9
+MAIN_TOOLTIP_BACKCOLOR3;Hintergrundfarbe der Vorschau: Mittleres Grau\nTaste: 9
MAIN_TOOLTIP_BEFOREAFTERLOCK;Vorher-Ansicht: Sperren / Entsperren\n\nGesperrt: Friert die Vorher-Ansicht ein, so\ndass sich die Gesamtwirkung mehrerer\nBearbeitungsschritte beurteilen lässt.\n\nEntsperrt: Die Vorher-Ansicht hinkt dem\naktuellen Bild immer einen Bearbeitungs-\nschritt hinterher.
MAIN_TOOLTIP_HIDEHP;Linkes Bedienfeld ein-/ausblenden\nTaste: l
MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten\nTaste: <
@@ -974,6 +994,7 @@ PREFERENCES_AUTLISSTD;Hoch
PREFERENCES_AUTLISVLOW;Keine
PREFERENCES_AUTLOW;Niedrig
PREFERENCES_AUTOMONPROFILE;Automatisch das für den aktuellen Monitor festgelegte Profil verwenden.
+PREFERENCES_AUTOSAVE_TP_OPEN;Werkzeugstatus vor dem Beenden automatisch speichern
PREFERENCES_AUTSTD;Standard
PREFERENCES_BATCH_PROCESSING;Stapelverarbeitung
PREFERENCES_BEHADDALL;Alle hinzufügen
@@ -1010,6 +1031,7 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;Tag-ID
PREFERENCES_CUSTPROFBUILDPATH;Anwendungspfad
PREFERENCES_CUTOVERLAYBRUSH;Farbe/Transparenz für Schnittmaske
PREFERENCES_D50;5000K
+PREFERENCES_D50_OLD;5000K
PREFERENCES_D55;5500K
PREFERENCES_D60;6000K
PREFERENCES_D65;6500K
@@ -1053,6 +1075,7 @@ PREFERENCES_GREY05;Yb = 05 CIE L#30
PREFERENCES_GREY10;Yb = 10 CIE L#40
PREFERENCES_GREY15;Yb = 15 CIE L#45
PREFERENCES_GREY18;Yb = 18 CIE L#50
+PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
PREFERENCES_GREY23;Yb = 23 CIE L#55
PREFERENCES_GREY30;Yb = 30 CIE L#60
PREFERENCES_GREY40;Yb = 40 CIE L#70
@@ -1074,6 +1097,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Wahrnehmungsabhängig
PREFERENCES_INTENT_RELATIVE;Relativ farbmetrisch
PREFERENCES_INTENT_SATURATION;Sättigung
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Zeige das eingebettete JPEG als Miniaturbild, wenn die RAW-Datei noch nicht editiert wurde
+PREFERENCES_LANG;Sprache
PREFERENCES_LANGAUTODETECT;Systemsprache verwenden
PREFERENCES_LEVAUTDN;Rauschreduzierungsstufe
PREFERENCES_LEVDN;Zellengröße
@@ -1135,6 +1159,7 @@ PREFERENCES_REMEMBERZOOMPAN;Zoom und Bildposition merken
PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Öffnen eines neuen Bildes mit den Zoom- und Positionswerten\ndes vorangegangenen Bildes.\n\nFunktioniert nur unter folgenden Bedingungen:\nEin-Reitermodus aktiv\n“Demosaikmethode für 100%-Ansicht“ muss auf “Wie im Bild-\nverarbeitungsprofil vorgegeben“ eingestellt sein.
PREFERENCES_RGBDTL_LABEL;Maximale Anzahl Threads für Rauschreduzierung
PREFERENCES_RGBDTL_TOOLTIP;Die Rauschreduzierung benötigt mindestens 128MB RAM für ein 10 Megapixel-Bild oder 512MB für ein 40 Megapixel-Bild, und zusätzlich 128MB RAM pro Thread. Je mehr Threads parallel ablaufen, desto schneller ist die Berechnung. Bei Einstellung "0" werden so viele Threads wie möglich benutzt.
+PREFERENCES_SAVE_TP_OPEN_NOW;Werkzeugstatus jetzt sichern
PREFERENCES_SELECTFONT;Schriftart
PREFERENCES_SELECTFONT_COLPICKER;Schriftart für die Farbwähler
PREFERENCES_SELECTLANG;Sprache
@@ -1165,6 +1190,7 @@ PREFERENCES_TAB_GENERAL;Allgemein
PREFERENCES_TAB_IMPROC;Bildbearbeitung
PREFERENCES_TAB_PERFORMANCE;Performance & Qualität
PREFERENCES_TAB_SOUND;Klänge
+PREFERENCES_THEME;Oberflächendesign
PREFERENCES_TIMAX;Hoch
PREFERENCES_TINB;Anzahl Kacheln
PREFERENCES_TISTD;Standard
@@ -1322,9 +1348,9 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Horizontal spiegeln
TP_COARSETRAF_TOOLTIP_ROTLEFT;Nach links drehen\nTaste: [
TP_COARSETRAF_TOOLTIP_ROTRIGHT;Nach rechts drehen\nTaste: ]
TP_COARSETRAF_TOOLTIP_VFLIP;Vertikal spiegeln
-TP_COLORAPP_ADAPTSCENE;Leuchtstärke (cd/m²)
+TP_COLORAPP_ADAPTSCENE;Luminanz (cd/m²)
TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute Luminanz der Szenenleuchstärket\n(normalerweise 2000cd/m²)
-TP_COLORAPP_ADAPTVIEWING;Leuchtstärke (cd/m²)
+TP_COLORAPP_ADAPTVIEWING;Luminanz (cd/m²)
TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolute Luminanz der Betrachtungsumgebung\n(normalerweise 16cd/m²)
TP_COLORAPP_ADAP_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), werden die optimalen\nWerte aus den Exif-Daten automatisch berechnet.
TP_COLORAPP_ALGO;Algorithmus
@@ -1358,6 +1384,7 @@ TP_COLORAPP_DATACIE;CIECAM02-Ausgabe-Histogramm in\nKurven anzeigen
TP_COLORAPP_DATACIE_TOOLTIP;Wenn aktiviert, zeigen die Histogramme\nder CIECAM02-Kurven die angenäherten\nWerte/Bereiche für J oder Q und C, S oder M\nNACH den CIECAM02-Anpassungen an. Das\nbetrifft nicht das Haupt-Histogramm.\n\nWenn deaktiviert, zeigen die Histogramme\nder CIECAM02-Kurven die L*a*b*-Werte\nVOR den CIECAM02-Anpassungen an.
TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), wird ein optimaler\nWert berechnet, der von CAT02 und CIECAM02\nverwendet wird.\nUm den Wert manuell zu setzen, muss die Option\ndeaktiviert sein (Werte über 64 sind empfohlen).
TP_COLORAPP_DEGREE_TOOLTIP;Umfang der “CIE Chromatic Adaptation Transform 2002“
+TP_COLORAPP_FREE;Farbtemperatur + Tönung + CAT02 + [Ausgabe]
TP_COLORAPP_GAMUT;Gamutkontrolle (L*a*b*)
TP_COLORAPP_GAMUT_TOOLTIP;Gamutkontrolle im L*a*b*-Modus erlauben.
TP_COLORAPP_HUE;Farbton (H)
@@ -1370,6 +1397,8 @@ TP_COLORAPP_LIGHT;Helligkeit (J)
TP_COLORAPP_LIGHT_TOOLTIP;Helligkeit in CIECAM02 unterscheidet sich\nvon L*a*b* und RGB Helligkeit
TP_COLORAPP_MODEL;Weißpunktmodell
TP_COLORAPP_MODEL_TOOLTIP;Weißabgleich [RT] + [Ausgabe]:\nRT's Weißabgleich wird für die Szene verwendet,\nCIECAM02 auf D50 gesetzt und der Weißabgleich\ndes Ausgabegerätes kann unter:\nEinstellungen > Farb-Management\neingestellt werden.\n\nWeißabgleich [RT+CAT02] + [Ausgabe]:\nRT's Weißabgleich wird für CAT02 verwendet und\nder Weißabgleich des Ausgabegerätes kann unter\nEinstellungen > Farb-Management\neingestellt werden.
+TP_COLORAPP_NEUTRAL;Zurücksetzen
+TP_COLORAPP_NEUTRAL_TIP;Setzt alle CIECAM02-Parameter auf Vorgabewerte zurück.
TP_COLORAPP_RSTPRO;Hautfarbtöne schützen
TP_COLORAPP_RSTPRO_TOOLTIP;Hautfarbtöne schützen\nWirkt sich auf Regler und Kurven aus.
TP_COLORAPP_SHARPCIE;--unused--
@@ -1390,10 +1419,14 @@ TP_COLORAPP_TCMODE_LABEL2;Tonwertkurve 2 Modus
TP_COLORAPP_TCMODE_LABEL3;Farbkurve Modus
TP_COLORAPP_TCMODE_LIGHTNESS;Helligkeit (J)
TP_COLORAPP_TCMODE_SATUR;Sättigung (S)
+TP_COLORAPP_TEMP_TOOLTIP;Um eine Farbtemperatur auszuwählen\nsetzen Sie die Tönung immer auf "1".\nA Temp=2856\nD50 Temp=5003\nD55 Temp=5503\nD65 Temp=6504\nD75 Temp=7504
TP_COLORAPP_TONECIE;Dynamikkompression mittels\nCIECAM02-Helligkeit (Q)
TP_COLORAPP_TONECIE_TOOLTIP;Wenn diese Option ausgeschaltet ist, wird die Dynamikkompression im L*a*b*-Farbraum durchgeführt.\nWenn die Option eingeschaltet ist, wird CIECAM02 für die Dynamikkompression verwendet. Das Werkzeug Dynamikkompression muss aktiviert sein, damit diese Option berücksichtigt wird.
TP_COLORAPP_WBCAM;[RT+CAT02] + [Ausgabe]
TP_COLORAPP_WBRT;[RT] + [Ausgabe]
+TP_COLORAPP_YB;Yb% (Ø Luminanz)
+TP_COLORAPP_YBSCENE;Yb% (Ø Luminanz)
+TP_COLORAPP_YBSCENE_TOOLTIP;Wenn aktiviert, wird der Durchschnittswert der Luminanz berechnet.
TP_COLORTONING_AB;o C/L
TP_COLORTONING_AUTOSAT;Automatisch
TP_COLORTONING_BALANCE;Farbausgleich
@@ -2185,39 +2218,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f
ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: +
ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: -
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!DONT_SHOW_AGAIN;Don't show this message again.
-!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTORY_MSG_476;CAM02 - Temp out
-!HISTORY_MSG_477;CAM02 - Green out
-!HISTORY_MSG_478;CAM02 - Yb out
-!HISTORY_MSG_479;CAM02 - CAT02 adaptation out
-!HISTORY_MSG_480;CAM02 - Automatic CAT02 out
-!HISTORY_MSG_481;CAM02 - Temp scene
-!HISTORY_MSG_482;CAM02 - Green scene
-!HISTORY_MSG_483;CAM02 - Yb scene
-!HISTORY_MSG_484;CAM02 - Auto Yb scene
-!HISTORY_MSG_485;Lens Correction
-!HISTORY_MSG_486;Lens Correction - Camera
-!HISTORY_MSG_487;Lens Correction - Lens
-!LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
-!LENSPROFILE_CORRECTION_LCPFILE;LCP File
-!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
-!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
-!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
-!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_D50_OLD;5000K
-!PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
-!PREFERENCES_LANG;Language
-!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
-!PREFERENCES_THEME;Theme
-!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
-!TP_COLORAPP_NEUTRAL;Reset
-!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
-!TP_COLORAPP_YB;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index a632c0d25..0ab6aae48 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -1403,7 +1403,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index e8ec3a284..abad71651 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -1362,7 +1362,7 @@
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 6c722dd1b..141a36c8b 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -1852,7 +1852,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index 1b7fb8018..2abf08f8b 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index e3409b605..e7fdc8592 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2159,7 +2159,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 36cf4575a..631b789d9 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -1447,7 +1447,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index eb80f7201..36eaa57b6 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 21cf64c5f..2a2a4f761 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -1723,7 +1723,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 8975daff9..7665c03dd 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -2033,7 +2033,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index a5ad7bea8..a9565f70c 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 6b28bb7d3..73ad45af0 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -1600,7 +1600,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 3704e0caa..f75a8626e 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -2172,7 +2172,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 2d2efc092..7c12038a7 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -1447,7 +1447,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index 898d082b1..789a76eeb 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -1800,7 +1800,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index f221adcdf..a32059598 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -1800,7 +1800,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index bf2c1ec53..b1d6b77d3 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 41721ea3d..2b09c7c65 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -1713,7 +1713,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index b5b006810..ec4c6597d 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -1715,7 +1715,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 84f32d779..5cc7873c5 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -1715,7 +1715,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 26844fdd2..ee719f656 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -1487,7 +1487,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index 3185e9eaf..571a3c084 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -1448,7 +1448,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 3ff2503a2..87e0b81a6 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -2015,7 +2015,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
!TP_COLORAPP_NEUTRAL;Reset
!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_YB;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index d011379ee..1e873db1f 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -1447,7 +1447,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
!TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
!TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
!TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
!TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
!TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/languages/default b/rtdata/languages/default
index a736259da..a2f8a7044 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1481,7 +1481,7 @@ TP_COLORAPP_TCMODE_LABEL2;Curve mode 2
TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
TP_COLORAPP_TCMODE_SATUR;Saturation
-TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css
index 398bb97d4..e0e6fe096 100644
--- a/rtdata/themes/RawTherapee-GTK3-20_.css
+++ b/rtdata/themes/RawTherapee-GTK3-20_.css
@@ -31,7 +31,7 @@ scrollbar:not(.overlay-indicator):hover {
color: #666666;
}
-.view:selected {
+.view:selected:not(check):not(radio) {
color: #262626;
background-color: #AAAAAA
}
diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 0976278f0..6e73a70c8 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -3058,34 +3058,60 @@ void CLASS sony_arw_load_raw()
void CLASS sony_arw2_load_raw()
{
- uchar *data, *dp;
- ushort pix[16];
- int row, col, val, max, min, imax, imin, sh, bit, i;
- data = (uchar *) malloc (raw_width+1);
- merror (data, "sony_arw2_load_raw()");
- for (row=0; row < height; row++) {
- fread (data, 1, raw_width, ifp);
- for (dp=data, col=0; col < raw_width-30; dp+=16) {
- max = 0x7ff & (val = sget4(dp));
- min = 0x7ff & val >> 11;
- imax = 0x0f & val >> 22;
- imin = 0x0f & val >> 26;
- for (sh=0; sh < 4 && 0x80 << sh <= max-min; sh++);
- for (bit=30, i=0; i < 16; i++)
- if (i == imax) pix[i] = max;
- else if (i == imin) pix[i] = min;
- else {
- pix[i] = ((sget2(dp+(bit >> 3)) >> (bit & 7) & 0x7f) << sh) + min;
- if (pix[i] > 0x7ff) pix[i] = 0x7ff;
- bit += 7;
- }
- for (i=0; i < 16; i++, col+=2)
- RAW(row,col) = curve[pix[i] << 1]; // >> 2; RT: disabled shifting to avoid precision loss
- col -= col & 1 ? 1:31;
+#if defined( _OPENMP ) && defined( MYFILE_MMAP )
+#pragma omp parallel
+#endif
+{
+ uchar *data = new (std::nothrow) uchar[raw_width + 1];
+ merror(data, "sony_arw2_load_raw()");
+ IMFILE ifpthr = *ifp;
+ int pos = ifpthr.pos;
+ ushort pix[16];
+
+#if defined( _OPENMP ) && defined( MYFILE_MMAP )
+ // only master thread will update the progress bar
+ ifpthr.plistener = nullptr;
+ #pragma omp master
+ {
+ ifpthr.plistener = ifp->plistener;
}
- }
- free (data);
+ #pragma omp for schedule(dynamic,16) nowait
+#endif
+
+ for (int row = 0; row < height; row++) {
+ fseek(&ifpthr, pos + row * raw_width, SEEK_SET);
+ fread(data, 1, raw_width, &ifpthr);
+ uchar *dp = data;
+ for (int col = 0; col < raw_width - 30; dp += 16) {
+ int val = sget4(dp);
+ int max = 0x7ff & val;
+ int min = 0x7ff & val >> 11;
+ int imax = 0x0f & val >> 22;
+ int imin = 0x0f & val >> 26;
+ int bit = 30;
+ for (int i = 0; i < 16; i++) {
+ if (i == imax) {
+ pix[i] = max;
+ } else if (i == imin) {
+ pix[i] = min;
+ } else {
+ int sh;
+ for (sh = 0; sh < 4 && 0x80 << sh <= max - min; sh++)
+ ;
+ pix[i] = ((sget2(dp + (bit >> 3)) >> (bit & 7) & 0x7f) << sh) + min;
+ pix[i] = std::min(pix[i], (ushort)0x7ff);
+ bit += 7;
+ }
+ }
+ for (int i = 0; i < 16; i++, col += 2) {
+ RAW(row,col) = curve[pix[i] << 1]; // >> 2; RT: disabled shifting to avoid precision loss
+ }
+ col -= col & 1 ? 1:31;
+ }
+ }
+ delete [] data;
+}
maximum = curve[0x7ff << 1]; // RT: fix maximum.
maximum = 16300; // RT: conservative white level tested on various ARW2 cameras. This constant was set in 2013-12-17, may need re-evaluation in the future.
}
diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc
index f36e798d9..de392623d 100644
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -112,7 +112,10 @@ void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblac
}
}
- if (data && (this->get_cam_mul(0) == -1 || forceAutoWB)) {
+ if (this->get_cam_mul(0) == -1 || forceAutoWB) {
+ if(!data) { // this happens only for thumbnail creation when get_cam_mul(0) == -1
+ compress_image(0, false);
+ }
memset(dsum, 0, sizeof dsum);
if (this->isBayer()) {
@@ -673,7 +676,7 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
return 0;
}
-float** RawImage::compress_image(int frameNum)
+float** RawImage::compress_image(int frameNum, bool freeImage)
{
if( !image ) {
return nullptr;
@@ -757,8 +760,10 @@ float** RawImage::compress_image(int frameNum)
}
}
- free(image); // we don't need this anymore
- image = nullptr;
+ if(freeImage) {
+ free(image); // we don't need this anymore
+ image = nullptr;
+ }
return data;
}
diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h
index c2cdcb6ec..b8a45d708 100644
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -121,7 +121,7 @@ public:
{
return image;
}
- float** compress_image(int frameNum); // revert to compressed pixels format and release image data
+ float** compress_image(int frameNum, bool freeImage = true); // revert to compressed pixels format and release image data
float** data; // holds pixel values, data[i][j] corresponds to the ith row and jth column
unsigned prefilters; // original filters saved ( used for 4 color processing )
unsigned int getFrameCount() const { return is_raw; }
diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc
index 01b00dd53..cabafad32 100644
--- a/rtexif/canonattribs.cc
+++ b/rtexif/canonattribs.cc
@@ -785,6 +785,7 @@ public:
choices.insert (p_t (183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"));
choices.insert (p_t (183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"));
choices.insert (p_t (183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"));
+ choices.insert (p_t (183, "Sigma 100-400mm f/5-6.3 DG OS HSM"));
choices.insert (p_t (184, "Canon EF 400mm f/2.8L + 2x"));
choices.insert (p_t (185, "Canon EF 600mm f/4L IS"));
choices.insert (p_t (186, "Canon EF 70-200mm f/4L"));
@@ -797,7 +798,8 @@ public:
choices.insert (p_t (194, "Canon EF 80-200mm f/4.5-5.6 USM"));
choices.insert (p_t (195, "Canon EF 35-105mm f/4.5-5.6 USM"));
choices.insert (p_t (196, "Canon EF 75-300mm f/4-5.6 USM"));
- choices.insert (p_t (197, "Canon EF 75-300mm f/4-5.6 IS USM"));
+ choices.insert (p_t (197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens"));
+ choices.insert (p_t (197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS"));
choices.insert (p_t (198, "Canon EF 50mm f/1.4 USM or Zeiss Lens"));
choices.insert (p_t (198, "Zeiss Otus 55mm f/1.4 ZE"));
choices.insert (p_t (198, "Zeiss Otus 85mm f/1.4 ZE"));
@@ -859,11 +861,13 @@ public:
choices.insert (p_t (490, "Canon EF 8-15mm f/4L Fisheye USM"));
choices.insert (p_t (491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens"));
choices.insert (p_t (491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"));
+ choices.insert (p_t (491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"));
choices.insert (p_t (492, "Canon EF 400mm f/2.8L IS II USM"));
choices.insert (p_t (493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"));
choices.insert (p_t (493, "Canon EF 24-105mm f/4L IS USM"));
choices.insert (p_t (494, "Canon EF 600mm f/4.0L IS II USM"));
- choices.insert (p_t (495, "Canon EF 24-70mm f/2.8L II USM"));
+ choices.insert (p_t (495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens"));
+ choices.insert (p_t (495, "Sigma 24-70mm F2.8 DG OS HSM | A"));
choices.insert (p_t (496, "Canon EF 200-400mm f/4L IS USM"));
choices.insert (p_t (499, "Canon EF 200-400mm f/4L IS USM + 1.4x"));
choices.insert (p_t (502, "Canon EF 28mm f/2.8 IS USM"));
@@ -872,7 +876,8 @@ public:
choices.insert (p_t (505, "Canon EF 35mm f/2 IS USM"));
choices.insert (p_t (506, "Canon EF 400mm f/4 DO IS II USM"));
choices.insert (p_t (507, "Canon EF 16-35mm f/4L IS USM"));
- choices.insert (p_t (508, "Canon EF 11-24mm f/4L USM"));
+ choices.insert (p_t (508, "Canon EF 11-24mm f/4L USM or Tamron Lens"));
+ choices.insert (p_t (508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"));
choices.insert (p_t (747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"));
choices.insert (p_t (747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2"));
choices.insert (p_t (748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"));
@@ -896,8 +901,10 @@ public:
choices.insert (p_t (4156, "Canon EF 50mm f/1.8 STM"));
choices.insert (p_t (4157, "Canon EF-M 18-150mm 1:3.5-6.3 IS STM"));
choices.insert (p_t (4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"));
+ choices.insert (p_t (4160, "Canon EF-S 35mm f/2.8 Macro IS STM"));
choices.insert (p_t (36910, "Canon EF 70-300mm f/4-5.6 IS II USM"));
choices.insert (p_t (36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"));
+ choices.insert (p_t (61494, "Canon CN-E 85mm T1.3 L F"));
choices.insert (p_t (65535, "n/a"));
}
@@ -1577,7 +1584,7 @@ public:
choices[41353216] = "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS";
choices[41943040] = "PowerShot A495";
choices[42008576] = "PowerShot A490";
- choices[42074112] = "PowerShot A3100 IS / A3150 IS";
+ choices[42074112] = "PowerShot A3100/A3150 IS";
choices[42139648] = "PowerShot A3000 IS";
choices[42205184] = "PowerShot SD1400 IS / IXUS 130 / IXY 400F";
choices[42270720] = "PowerShot SD1300 IS / IXUS 105 / IXY 200F";
@@ -1621,7 +1628,7 @@ public:
choices[52887552] = "PowerShot A2400 IS";
choices[52953088] = "PowerShot A2300";
choices[53673984] = "PowerShot G15";
- choices[53739520] = "PowerShot SX50";
+ choices[53739520] = "PowerShot SX50 HS";
choices[53805056] = "PowerShot SX160 IS";
choices[53870592] = "PowerShot S110 (new)";
choices[53936128] = "PowerShot SX500 IS";
@@ -1631,6 +1638,7 @@ public:
choices[54591488] = "PowerShot SX270 HS";
choices[54657024] = "PowerShot A3500 IS";
choices[54722560] = "PowerShot A2600";
+ choices[54788096] = "PowerShot SX275 HS";
choices[54853632] = "PowerShot A1400";
choices[54919168] = "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F";
choices[54984704] = "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F";
@@ -1679,6 +1687,11 @@ public:
choices[67371009] = "IXY 180";
choices[67436544] = "PowerShot SX720 HS";
choices[67502080] = "PowerShot SX620 HS";
+ choices[67567616] = "EOS M6";
+ choices[68157440] = "PowerShot G9 X Mark II";
+ choices[68485120] = "PowerShot ELPH 185 / IXUS 185 / IXY 200";
+ choices[68550656] = "PowerShot SX430 IS";
+ choices[68616192] = "PowerShot SX730 HS";
choices[100925440] = "PowerShot S100 / Digital IXUS / IXY Digital";
choices[1074255475] = "DC19/DC21/DC22";
choices[1074255476] = "XH A1";
@@ -1763,6 +1776,10 @@ public:
choices[2147484563] = "EOS Rebel T6i / 750D / Kiss X8i";
choices[2147484673] = "EOS 5DS R";
choices[2147484676] = "EOS Rebel T6 / 1300D / Kiss X80";
+ choices[2147484677] = "EOS Rebel T7i / 800D / Kiss X9i";
+ choices[2147484678] = "EOS 6D Mark II";
+ choices[2147484680] = "EOS 77D / 9000D";
+ choices[2147484695] = "EOS Rebel SL2 / 200D / Kiss X9";
}
};
CAModelIDInterpreter caModelIDInterpreter;
diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc
index bf4fc5a6b..ac8e69ead 100644
--- a/rtexif/nikonattribs.cc
+++ b/rtexif/nikonattribs.cc
@@ -680,6 +680,7 @@ const std::map NALensDataInterpreter::lenses = {
{"10 3D 3C 60 2C 3C D2 02", "Tamron AF 28-80mm f/3.5-5.6 Aspherical (177D)"},
{"10 48 8E 8E 30 30 08 00", "AF Nikkor 300mm f/4 IF-ED"},
{"11 48 44 5C 24 24 08 00", "AF Zoom-Nikkor 35-70mm f/2.8"},
+ {"11 48 44 5C 24 24 15 00", "AF Zoom-Nikkor 35-70mm f/2.8"},
{"12 36 5C 81 35 3D 09 00", "Cosina AF Zoom 70-210mm f/4.5-5.6 MC Macro"},
{"12 36 69 97 35 42 09 00", "Soligor AF Zoom 100-400mm 1:4.5-6.7 MC"},
{"12 38 69 97 35 42 09 02", "Promaster Spectrum 7 100-400mm f/4.5-6.7"},
@@ -1002,6 +1003,7 @@ const std::map NALensDataInterpreter::lenses = {
{"A7 3C 53 80 30 3C C2 0E", "AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II"},
{"A7 49 80 A0 24 24 4B 06", "Sigma APO 200-500mm f/2.8 EX DG"},
{"A7 4B 62 62 2C 2C A9 0E", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"},
+ {"A8 38 18 30 34 3C D3 8E", "AF-P DX Nikkor 10-20mm f/4.5-5.6G VR"},
{"A8 48 80 98 30 30 AA 0E", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED II"},
{"A8 48 8E 8E 30 30 C3 0E", "AF-S Nikkor 300mm f/4E PF ED VR"},
{"A8 48 8E 8E 30 30 C3 4E", "AF-S Nikkor 300mm f/4E PF ED VR"},
@@ -1030,6 +1032,8 @@ const std::map NALensDataInterpreter::lenses = {
{"B6 48 37 56 24 24 1C 02", "Sigma 24-60mm f/2.8 EX DG"},
{"B7 44 60 98 34 3C B9 0E", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
{"B8 40 2D 44 2C 34 BA 06", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
+ {"BF 4E 26 26 1E 1E 01 04", "Irix 15mm f/2.4 Firefly"},
+ {"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
{"CC 4C 50 68 14 14 4B 06", "Sigma 50-100mm f/1.8 DC HSM | A"},
{"CD 3D 2D 70 2E 3C 4B 0E", "Sigma 18-125mm f/3.8-5.6 DC OS HSM"},
{"CE 34 76 A0 38 40 4B 0E", "Sigma 150-500mm f/5-6.3 DG OS APO HSM"},
@@ -1083,7 +1087,7 @@ const std::map NALensDataInterpreter::lenses = {
{"FE 53 5C 80 24 24 84 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"},
{"FE 54 5C 80 24 24 DF 0E", "Tamron SP 70-200mm f/2.8 Di VC USD (A009)"},
{"FE 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F004)"},
- {"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"}
+ {"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"},
};
const TagAttrib nikonISOInfoAttribs[] = {
diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc
index 2c52a0c88..a1f752f5e 100644
--- a/rtexif/pentaxattribs.cc
+++ b/rtexif/pentaxattribs.cc
@@ -928,6 +928,7 @@ public:
choices.insert (p_t (256 * 8 + 30, "Sigma 17-70mm f/2.8-4 DC Macro HSM | C"));
choices.insert (p_t (256 * 8 + 31, "Sigma 18-35mm f/1.8 DC HSM"));
choices.insert (p_t (256 * 8 + 32, "Sigma 30mm f/1.4 DC HSM | A"));
+ choices.insert (p_t (256 * 8 + 33, "Sigma 18-200mm f/3.5-6.3 DC MACRO HSM"));
choices.insert (p_t (256 * 8 + 34, "Sigma 18-300mm f/3.5-6.3 DC Macro HSM"));
choices.insert (p_t (256 * 8 + 59, "HD PENTAX-D FA 150-450mm f/4.5-5.6 ED DC AW"));
choices.insert (p_t (256 * 8 + 60, "HD PENTAX-D FA* 70-200mm f/2.8 ED DC AW"));
@@ -977,6 +978,7 @@ public:
choices.insert (p_t (256 * 13 + 19, "smc PENTAX-D FA 645 25mm f/4 AL [IF] SDM AW"));
choices.insert (p_t (256 * 13 + 20, "HD PENTAX-D FA 645 90mm f/2.8 ED AW SR"));
choices.insert (p_t (256 * 13 + 253, "HD PENTAX-DA 645 28-45mm f/4.5 ED AW SR"));
+ choices.insert (p_t (256 * 13 + 254, "smc PENTAX-DA 645 25mm f/4 AL [IF] SDM AW"));
choices.insert (p_t (256 * 21 + 0, "Pentax Q Manual Lens"));
choices.insert (p_t (256 * 21 + 1, "01 Standard Prime 8.5mm f/1.9"));
choices.insert (p_t (256 * 21 + 2, "02 Standard Zoom 5-15mm f/2.8-4.5"));
diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc
index 7195bf8e5..4e5fa4ba2 100644
--- a/rtexif/sonyminoltaattribs.cc
+++ b/rtexif/sonyminoltaattribs.cc
@@ -664,7 +664,7 @@ public:
{128, "Sigma 35mm f/1.4 DG HSM"},
{128, "Sigma 18-35mm f/1.8 DC HSM"},
{128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"},
- {128, "Sigma 24-105mm f/4 DG HSM | Art 013"},
+ {128, "Sigma 24-105mm f/4 DG HSM | A"},
{129, "Tamron Lens (129)"},
{129, "Tamron 200-400mm f/5.6 LD"},
{129, "Tamron 70-300mm f/4-5.6 LD"},
@@ -684,6 +684,8 @@ public:
{213, "Tamron 16-300mm f/3.5-6.3 Di II PZD Macro"},
{214, "Tamron SP 150-600mm f/5-6.3 Di USD"},
{215, "Tamron SP 15-30mm f/2.8 Di USD"},
+ {216, "Tamron SP 45mm f/1.8 Di USD"},
+ {217, "Tamron SP 35mm f/1.8 Di USD"},
{218, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD (F017)"},
{224, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD (F004)"},
{255, "Tamron Lens (255)"},
@@ -838,6 +840,7 @@ public:
{6553, "Sony E 20mm f/2.8"},
{6553, "Sony E 35mm f/1.8 OSS"},
{6553, "Sony E PZ 18-105mm f/4 G OSS"},
+ {6553, "Sony FE 12-24mm f/4 G"},
{6553, "Sony FE 90mm f/2.8 Macro G OSS"},
{6553, "Sony E 18-50mm f/4-5.6"},
{6553, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
@@ -851,6 +854,7 @@ public:
{6553, "Sony FE 28mm f/2"},
{6553, "Sony FE PZ 28-135mm f/4 G OSS"},
{6553, "Sony FE 100mm f/2.8 STF GM OSS"},
+ {6553, "Sony E PZ 18-110mm f/4 G OSS"},
{6553, "Sony FE 24-70mm f/2.8 GM"},
{6553, "Sony FE 50mm f/1.4 ZA"},
{6553, "Sony FE 85mm f/1.4 GM"},
@@ -858,17 +862,27 @@ public:
{6553, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"},
{6553, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"},
{6553, "Sony FE 70-300mm f/4.5-5.6 G OSS"},
+ {6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS"},
+ {6553, "Sony FE 16-35mm f/2.8 GM"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
+ {6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
+ {6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"},
{6553, "Samyang AF 50mm f/1.4 FE"},
{6553, "Samyang AF 14mm f/2.8 FE"},
+ {6553, "Samyang AF 35mm f/2.8 FE"},
{6553, "Sigma 19mm f/2.8 [EX] DN"},
{6553, "Sigma 30mm f/2.8 [EX] DN"},
{6553, "Sigma 60mm f/2.8 DN"},
- {6553, "Sigma 30mm f/1.4 DC DN | C 016"},
+ {6553, "Sigma 30mm f/1.4 DC DN | C"},
{6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{6553, "Tokina Firin 20mm f/2 FE MF"},
+ {6553, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
+ {6553, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
+ {6553, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
+ {6553, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
+ {6553, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{6553, "Zeiss Touit 12mm f/2.8"},
{6553, "Zeiss Touit 32mm f/1.8"},
{6553, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -1029,6 +1043,7 @@ public:
{65535, "Sony E 20mm f/2.8"},
{65535, "Sony E 35mm f/1.8 OSS"},
{65535, "Sony E PZ 18-105mm f/4 G OSS"},
+ {65535, "Sony FE 12-24mm f/4 G"},
{65535, "Sony FE 90mm f/2.8 Macro G OSS"},
{65535, "Sony E 18-50mm f/4-5.6"},
{65535, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
@@ -1042,6 +1057,7 @@ public:
{65535, "Sony FE 28mm f/2"},
{65535, "Sony FE PZ 28-135mm f/4 G OSS"},
{65535, "Sony FE 100mm f/2.8 STF GM OSS"},
+ {65535, "Sony E PZ 18-110mm f/4 G OSS"},
{65535, "Sony FE 24-70mm f/2.8 GM"},
{65535, "Sony FE 50mm f/1.4 ZA"},
{65535, "Sony FE 85mm f/1.4 GM"},
@@ -1049,17 +1065,27 @@ public:
{65535, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"},
{65535, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"},
{65535, "Sony FE 70-300mm f/4.5-5.6 G OSS"},
+ {65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS"},
+ {65535, "Sony FE 16-35mm f/2.8 GM"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
+ {65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
+ {65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"},
{65535, "Samyang AF 50mm f/1.4 FE"},
{65535, "Samyang AF 14mm f/2.8 FE"},
+ {65535, "Samyang AF 35mm f/2.8 FE"},
{65535, "Sigma 19mm f/2.8 [EX] DN"},
{65535, "Sigma 30mm f/2.8 [EX] DN"},
{65535, "Sigma 60mm f/2.8 DN"},
- {65535, "Sigma 30mm f/1.4 DC DN | C 016"},
+ {65535, "Sigma 30mm f/1.4 DC DN | C"},
{65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{65535, "Tokina Firin 20mm f/2 FE MF"},
+ {65535, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
+ {65535, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
+ {65535, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
+ {65535, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
+ {65535, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{65535, "Zeiss Touit 12mm f/2.8"},
{65535, "Zeiss Touit 32mm f/1.8"},
{65535, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -1121,7 +1147,7 @@ public:
SALensID2Interpreter ()
{
choices.insert (p_t (0, "Unknown E-mount lens or other lens"));
- choices.insert (p_t (1, "Sony LA-EA1 Adapter"));
+ choices.insert (p_t (1, "Sony LA-EA1 or Sigma MC-11 Adapter"));
choices.insert (p_t (2, "Sony LA-EA2 Adapter"));
choices.insert (p_t (3, "Sony LA-EA3 Adapter"));
choices.insert (p_t (6, "Sony LA-EA4 Adapter"));
@@ -1148,6 +1174,7 @@ public:
choices.insert (p_t (32798, "Sony E 20mm f/2.8"));
choices.insert (p_t (32799, "Sony E 35mm f/1.8 OSS"));
choices.insert (p_t (32800, "Sony E PZ 18-105mm f/4 G OSS"));
+ choices.insert (p_t (32801, "Sony FE 12-24mm f/4 G"));
choices.insert (p_t (32802, "Sony FE 90mm f/2.8 Macro G OSS"));
choices.insert (p_t (32803, "Sony E 18-50mm f/4-5.6"));
choices.insert (p_t (32807, "Sony E PZ 18-200mm f/3.5-6.3 OSS"));
@@ -1161,6 +1188,7 @@ public:
choices.insert (p_t (32816, "Sony FE 28mm f/2"));
choices.insert (p_t (32817, "Sony FE PZ 28-135mm f/4 G OSS"));
choices.insert (p_t (32819, "Sony FE 100mm f/2.8 STF GM OSS"));
+ choices.insert (p_t (32820, "Sony E PZ 18-110mm f/4 G OSS"));
choices.insert (p_t (32821, "Sony FE 24-70mm f/2.8 GM"));
choices.insert (p_t (32822, "Sony FE 50mm f/1.4 ZA"));
choices.insert (p_t (32823, "Sony FE 85mm f/1.4 GM"));
@@ -1168,11 +1196,15 @@ public:
choices.insert (p_t (32826, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
choices.insert (p_t (32827, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
choices.insert (p_t (32828, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
+ choices.insert (p_t (32829, "Sony FE 100-400mm f/4.5-5.6 GM OSS"));
choices.insert (p_t (32830, "Sony FE 70-200mm f/2.8 GM OSS"));
- choices.insert (p_t (33002, "Sigma 85mm f/1.4 DG HSM | A 016 (+ Metabones Ver.50)"));
+ choices.insert (p_t (32831, "Sony FE 16-35mm f/2.8 GM"));
+ choices.insert (p_t (33002, "Sigma 85mm f/1.4 DG HSM | A (+ Metabones Ver.50)"));
choices.insert (p_t (33072, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"));
choices.insert (p_t (33073, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"));
choices.insert (p_t (33076, "Sony FE 100mm f/2.8 STF GM OSS (macro mode)"));
+ choices.insert (p_t (33077, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"));
+ choices.insert (p_t (33078, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"));
choices.insert (p_t (49201, "Zeiss Touit 12mm f/2.8"));
choices.insert (p_t (49202, "Zeiss Touit 32mm f/1.8"));
choices.insert (p_t (49203, "Zeiss Touit 50mm f/2.8 Macro"));
@@ -1184,24 +1216,26 @@ public:
choices.insert (p_t (49233, "Zeiss Loxia 35mm f/2"));
choices.insert (p_t (49234, "Zeiss Loxia 21mm f/2.8"));
choices.insert (p_t (49235, "Zeiss Loxia 85mm f/2.4"));
- choices.insert (p_t (50480, "Sigma 30mm f/1.4 DC DN | C 016"));
- choices.insert (p_t (50481, "Sigma 50mm f/1.4 DG HSM | A 014 + MC-11"));
- choices.insert (p_t (50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C 014 + MC-11"));
- choices.insert (p_t (50483, "Sigma 18-35mm f/1.8 DC HSM | A 013 + MC-11"));
- choices.insert (p_t (50484, "Sigma 24-35mm f/2 DG HSM | A 015 + MC-11"));
- choices.insert (p_t (50486, "Sigma 150-600mm f/5-6.3 DG OS HSM | C 015 + MC-11"));
- choices.insert (p_t (50487, "Sigma 20mm f/1.4 DG HSM | A 015 + MC-11"));
- choices.insert (p_t (50488, "Sigma 35mm f/1.4 DG HSM | A 012 + MC-11"));
- choices.insert (p_t (50489, "Sigma 150-600mm f/5-6.3 DG OS HSM | S 014 + MC-11"));
- choices.insert (p_t (50490, "Sigma 120-300mm f/2.8 DG OS HSM | S 013 + MC-11"));
- choices.insert (p_t (50492, "Sigma 24-105mm f/4 DG OS HSM | A 013 + MC-11"));
- choices.insert (p_t (50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C 013 + MC-11"));
- choices.insert (p_t (50495, "Sigma 50-100mm f/1.8 DC HSM | A 016 + MC-11"));
+ choices.insert (p_t (50480, "Sigma 30mm f/1.4 DC DN | C"));
+ choices.insert (p_t (50481, "Sigma 50mm f/1.4 DG HSM | A + MC-11"));
+ choices.insert (p_t (50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C + MC-11"));
+ choices.insert (p_t (50483, "Sigma 18-35mm f/1.8 DC HSM | A + MC-11"));
+ choices.insert (p_t (50484, "Sigma 24-35mm f/2 DG HSM | A + MC-11"));
+ choices.insert (p_t (50486, "Sigma 150-600mm f/5-6.3 DG OS HSM | C + MC-11"));
+ choices.insert (p_t (50487, "Sigma 20mm f/1.4 DG HSM | A + MC-11"));
+ choices.insert (p_t (50488, "Sigma 35mm f/1.4 DG HSM | A + MC-11"));
+ choices.insert (p_t (50489, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + MC-11"));
+ choices.insert (p_t (50490, "Sigma 120-300mm f/2.8 DG OS HSM | S + MC-11"));
+ choices.insert (p_t (50492, "Sigma 24-105mm f/4 DG OS HSM | A + MC-11"));
+ choices.insert (p_t (50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C + MC-11"));
+ choices.insert (p_t (50495, "Sigma 50-100mm f/1.8 DC HSM | A + MC-11"));
choices.insert (p_t (50992, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"));
choices.insert (p_t (50993, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"));
choices.insert (p_t (50994, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"));
+ choices.insert (p_t (50995, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"));
choices.insert (p_t (50996, "Voigtlander NOKTON 40mm f/1.2 Aspherical"));
- choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 FE"));
+ choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 FE or Samyang AF 35mm f/2.8 FE"));
+ choices.insert (p_t (51505, "Samyang AF 35mm f/2.8 FE"));
}
virtual std::string toString (Tag* t)
diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc
index 93426a1c6..4e5e885ea 100644
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -1623,7 +1623,7 @@ void CropWindow::expose (Cairo::RefPtr cr)
const int shThreshold = options.shadowThreshold;
const float ShawdowFac = 64.f / (options.shadowThreshold + 1);
const float HighlightFac = 64.f / (256 - options.highlightThreshold);
- const bool showclippedAny = (!showR && !showG && !showB && !showL); // will show clipping if any of RGB chanels is clipped
+ const bool showclippedAny = (!showR && !showG && !showB && !showL); // will show clipping if any (all) of RGB chanels is (shadow) clipped
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
@@ -1681,17 +1681,21 @@ void CropWindow::expose (Cairo::RefPtr cr)
}
if (showcs) {
- if ((showclippedAny || showR) && currWS[0] <= shThreshold ) {
+ bool scR = currWS[0] <= shThreshold;
+ bool scG = currWS[1] <= shThreshold;
+ bool scB = currWS[2] <= shThreshold;
+
+ if (((showclippedAny && (scG && scB)) || showR) && scR ) {
delta += currWS[0];
changedSH = true;
}
- if ((showclippedAny || showG) && currWS[1] <= shThreshold ) {
+ if (((showclippedAny && (scR && scB)) || showG) && scG ) {
delta += currWS[1];
changedSH = true;
}
- if ((showclippedAny || showB) && currWS[2] <= shThreshold ) {
+ if (((showclippedAny && (scR && scG)) || showB) && scB ) {
delta += currWS[2];
changedSH = true;
}
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index f95e27321..fb4c34069 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -182,7 +182,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
updateDisabled(false);
} else if (LCPStore::getInstance()->isValidLCPFileName(pp->lensProf.lcpFile)) {
fcbLCPFile->set_filename (pp->lensProf.lcpFile);
- updateDisabled(true);
+ if(corrLcpFile->get_active()) {
+ updateDisabled(true);
+ }
} else {
fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
updateDisabled(false);
@@ -194,17 +196,18 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
const LFDatabase *db = LFDatabase::getInstance();
LFCamera c;
- LFLens l;
- if (metadata) {
- c = db->findCamera(metadata->getMake(), metadata->getModel());
- l = db->findLens(c, metadata->getLens());
- }
if (!setLensfunCamera(pp->lensProf.lfCameraMake, pp->lensProf.lfCameraModel) && !pp->lensProf.lfManual()) {
- setLensfunCamera(c.getMake(), c.getModel());
+ if (metadata) {
+ c = db->findCamera(metadata->getMake(), metadata->getModel());
+ setLensfunCamera(c.getMake(), c.getModel());
+ }
}
if (!setLensfunLens(pp->lensProf.lfLens) && !pp->lensProf.lfManual()) {
- setLensfunLens(l.getLens());
+ if (metadata) {
+ LFLens l = db->findLens(c, metadata->getLens());
+ setLensfunLens(l.getLens());
+ }
}
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
@@ -231,7 +234,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
void LensProfilePanel::updateLensfunWarning()
{
warning->hide();
- if (corrLensfunManual->get_active()) {
+ if (corrLensfunManual->get_active() || corrLensfunAuto->get_active()) {
const LFDatabase *db = LFDatabase::getInstance();
auto itc = lensfunCameras->get_active();
diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc
index 54f536f3a..74f2e1b65 100644
--- a/rtgui/main-cli.cc
+++ b/rtgui/main-cli.cc
@@ -424,12 +424,16 @@ int processLineParams ( int argc, char **argv )
}
} else {
outputType = "jpg";
- compression = atoi (currParam.substr (2).c_str());
+ if(currParam.size() < 3) {
+ compression = 92;
+ } else {
+ compression = atoi (currParam.substr (2).c_str());
- if (compression < 0 || compression > 100) {
- std::cerr << "Error: the value accompanying the -j switch has to be in the [0-100] range!" << std::endl;
- deleteProcParams (processingParams);
- return -3;
+ if (compression < 0 || compression > 100) {
+ std::cerr << "Error: the value accompanying the -j switch has to be in the [0-100] range!" << std::endl;
+ deleteProcParams (processingParams);
+ return -3;
+ }
}
}
diff --git a/tools/generateLensList b/tools/generateRtexifUpdates
similarity index 66%
rename from tools/generateLensList
rename to tools/generateRtexifUpdates
index 13738a359..95a32c088 100755
--- a/tools/generateLensList
+++ b/tools/generateRtexifUpdates
@@ -1,24 +1,24 @@
#!/usr/bin/env bash
# This Bash4 script generates lens ID and other parameter lists for rtexif/*.cc
-# files using ExifTool. It uses xmlstarlet to parse ExifTool's output.
+# using ExifTool. It uses xmlstarlet to parse ExifTool's output.
#
# Run the script from the project root:
-# ./tools/generateLensList
+# ./tools/generateRtexifUpdates
#
-# Manually replace old code in rtexif/* with new from /tmp/rt-generateLensList/*
+# Manually replace old code in rtexif/* with new from /tmp/rt-generateRtexifUpdates/*
#
# Blame DrSlony
# Please report bugs or enhancements to https://github.com/Beep6581/RawTherapee
-et="$HOME/programs/code-exiftool/exiftool"
+et="$HOME/programs/Image-ExifTool-10.61/exiftool"
hash "$et" 2>/dev/null || { echo >&2 "ExifTool not found, install it first."; exit 1; }
hash xmlstarlet 2>/dev/null || { echo >&2 "XMLStarlet not found, install it first."; exit 1; }
unset cam cams
-tmpdir="/tmp/rt-generateLensList"
+tmpdir="/tmp/rt-generateRtexifUpdates"
printf '%s\n' "ExifTool version: $("$et" -ver)" "" "XMLStarlet version: $(xmlstarlet --version)" | sed 's/^/# /'
@@ -30,15 +30,18 @@ mkdir -p "$tmpdir" || { printf '%s\n' "Error creating $tmpdir" ""; exit 1; }
echo
# Canon
-printf '%s\n' "Saving ${tmpdir}/canon"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon"
-sed -r -i -e '/-1\tn\/a/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/ choices.insert(p_t(/' -e 's/$/"));/' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/canon"
+printf '%s\n' "Saving ${tmpdir}/canon_lenses"
+xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_lenses"
+sed -r -i -e '/-1\tn\/a/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/ choices.insert (p_t (/' -e 's/$/"));/' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/canon_lenses"
# xmlstarlet sel -T -t -m "taginfo/table/tag[@name='EasyMode']/values/key" -v "concat(@id,' ',val)" -n < <(exiftool -listx -canon:all) | sed -r -e '/-1\tn\/a/d' -e 's/([0-9]+)[0-9.]*\t/\1] = "/' -e 's/^/ choices[/' -e 's/$/";/'
+printf '%s\n' "Saving ${tmpdir}/canon_cameras"
+xmlstarlet sel -T -t -m "taginfo/table/tag[@name='CanonModelID']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_cameras"
+sed -r -i -e 's/^/ choices[/' -e 's/\t/] = "/' -e 's/$/";/' "${tmpdir}/canon_cameras"
# Nikon LensIDs are composite tags
printf '%s\n' "Saving ${tmpdir}/nikon"
xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensID']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -composite:all) > "${tmpdir}/nikon"
-sed -r -i -e '/^... /d' -e 's/^/ {"/' -e 's/([A-F0-9]+)[A-F0-9.]*\t/\1", "/' -e 's/$/"},/' -e 's|(.* ")(.*) F([0-9]+)|\1\2 f/\3|' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/nikon"
+sed -r -i -e '/^... /d' -e 's/^/ {"/' -e 's/([A-F0-9]+)[A-F0-9.]*\t/\1", "/' -e 's/$/"},/' -e 's|(.* ")(.*) F([0-9]+)|\1\2 f/\3|' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/nikon"
# Olympus
printf '%s\n' "Saving ${tmpdir}/olympus"
@@ -48,7 +51,7 @@ sed -r -i -e '/0 00 00\tNone/d' -e 's/^/ lenses["0/' -e 's/\t/"] = "/' -e
# Pentax
printf '%s\n' "Saving ${tmpdir}/pentax"
xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -pentax:all) | sort -fuV > "${tmpdir}/pentax"
-sed -r -i -e 's/^/ choices.insert(p_t(256 * /' -e 's/([0-9]+) ([0-9]+)([0-9.]*)/\1 + \2/' -e 's/\t/, "/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|' "${tmpdir}/pentax"
+sed -r -i -e 's/^/ choices.insert (p_t (256 * /' -e 's/([0-9]+) ([0-9]+)([0-9.]*)/\1 + \2/' -e 's/\t/, "/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|' "${tmpdir}/pentax"
# Sony
printf '%s\n' "Saving ${tmpdir}/sony"
@@ -56,6 +59,6 @@ xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "con
# Sony has more lenses under the LensType2 tag
printf '%s\n' "Saving ${tmpdir}/sony-lenstype2"
xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType2']/values/key" -v "concat(@id,' ',val)" -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony-lenstype2"
-sed -r -i -e 's/^/ {/' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/$/"},/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony"
-sed -r -i -e '/255\tTamron Lens (255)/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/ choices.insert(p_t(/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony-lenstype2"
+sed -r -i -e 's/^/ {/' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/$/"},/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony"
+sed -r -i -e '/255\tTamron Lens (255)/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/ choices.insert (p_t (/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony-lenstype2"