diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index adc0528ea..34c74ea67 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -5,6 +5,7 @@ ABOUT_TAB_CREDITS;Crédits
ABOUT_TAB_LICENSE;Licence
ABOUT_TAB_RELEASENOTES;Notes de version
ABOUT_TAB_SPLASH;Splash
+ADJUSTER_RESET_TO_DEFAULT;Clic - réinitialise à la valeur par défaut.\nCtrl+clic - réinitialise à la valeur initiale.
BATCHQUEUE_AUTOSTART;Démarrage auto
BATCHQUEUE_AUTOSTARTHINT;Démarrer automatiquement le traitement à l'arrivée d'une nouvelle tâche
BATCHQUEUE_DESTFILENAME;Chemin et nom de fichier
@@ -40,6 +41,10 @@ DYNPROFILEEDITOR_DELETE;Supprimer
DYNPROFILEEDITOR_EDIT;Modifier
DYNPROFILEEDITOR_EDIT_RULE;Modifier une règle de Profil Dynamique
DYNPROFILEEDITOR_ENTRY_TOOLTIP;La correspondance est insensible à la casse.\nUtilisez le préfix "re:" pour entrer\nune expression régulière.
+DYNPROFILEEDITOR_IMGTYPE_ANY;Tout
+DYNPROFILEEDITOR_IMGTYPE_HDR;HDR
+DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift
+DYNPROFILEEDITOR_IMGTYPE_STD;Standard
DYNPROFILEEDITOR_MOVE_DOWN;Déplacer vers le bas
DYNPROFILEEDITOR_MOVE_UP;Déplacer vers le haut
DYNPROFILEEDITOR_NEW;Nouveau
@@ -53,6 +58,7 @@ EXIFFILTER_CAMERA;Appareil photo
EXIFFILTER_EXPOSURECOMPENSATION;Compensation d'exposition (EV)
EXIFFILTER_FILETYPE;Type de fichier
EXIFFILTER_FOCALLEN;Longueur focale
+EXIFFILTER_IMAGETYPE;Type d'image
EXIFFILTER_ISO;ISO
EXIFFILTER_LENS;Objectif
EXIFFILTER_METADATAFILTER;Activer les filtres sur les Métadonnées
@@ -111,6 +117,8 @@ FILEBROWSER_AUTOFLATFIELD;Champ Uniforme auto
FILEBROWSER_BROWSEPATHBUTTONHINT;Cliquez pour parcourir le chemin saisi
FILEBROWSER_BROWSEPATHHINT;Saisissez le chemin à parcourir\nCtrl-O pour placer le focus sur le champ de saisie.\nEntrée / Ctrl-Entrée pour y naviguer;\nEsc pour effacer les modifications.\nShift-Esc pour enlever le focus.\n\n\nRaccourcis pour les chemins:\n ~ - le dossier utilisateur\n ! - le dossier Images de l'utilisateur
FILEBROWSER_CACHE;Cache
+FILEBROWSER_CACHECLEARFROMFULL;Vider tout y compris les profils mis en cache
+FILEBROWSER_CACHECLEARFROMPARTIAL;Vider tout sauf les profils mis en cache
FILEBROWSER_CLEARPROFILE;Remettre le profil à zéro
FILEBROWSER_COLORLABEL_TOOLTIP;Label couleur\n\nUtilisez le menu déroulant ou le raccourci clavier:\nShift-Ctrl-0 Pas de couleur\nShift-Ctrl-1 Rouge\nShift-Ctrl-2 Jaune\nShift-Ctrl-3 Vert\nShift-Ctrl-4 Bleu\nShift-Ctrl-5 Pourpre
FILEBROWSER_COPYPROFILE;Copier le profil
@@ -225,6 +233,7 @@ GENERAL_NONE;Aucun
GENERAL_OK;OK
GENERAL_OPEN;Ouvrir
GENERAL_PORTRAIT;Portrait
+GENERAL_RESET;Réinitialiser
GENERAL_SAVE;Enregistrer
GENERAL_SAVE_AS;Enregistrer sous...
GENERAL_SLIDER;Curseur
@@ -237,6 +246,7 @@ HISTOGRAM_TOOLTIP_CHRO;Montrer/Cacher l'histogramme de Chromaticité
HISTOGRAM_TOOLTIP_FULL;Basculer la vue de l'histogramme : complet (activé) / zoomé (désactivé)
HISTOGRAM_TOOLTIP_G;Montrer/cacher l'histogramme VERT
HISTOGRAM_TOOLTIP_L;Montrer/cacher l'histogramme Luminance CIELAB
+HISTOGRAM_TOOLTIP_MODE;Bascule entre une échelle linéaire, linéaire-log et log-log de l'histogramme.
HISTOGRAM_TOOLTIP_R;Montrer/cacher l'histogramme ROUGE
HISTOGRAM_TOOLTIP_RAW;Montrer/Cacher l'histogramme des données RAW
HISTORY_CHANGED;Changé
@@ -476,7 +486,9 @@ HISTORY_MSG_231;N&B - Courbe 'Avant'
HISTORY_MSG_232;N&B - Type de courbe 'Avant'
HISTORY_MSG_233;N&B - Courbe 'Après'
HISTORY_MSG_234;N&B - Type de courbe 'Après'
+HISTORY_MSG_235;N&B - Mixeur de Canaux - Auto
HISTORY_MSG_236;--inutilisé--
+HISTORY_MSG_237;N&B - Mixeur de Canaux
HISTORY_MSG_238;FD - Étendu
HISTORY_MSG_239;FD - Force
HISTORY_MSG_240;FD - Centre
@@ -512,6 +524,7 @@ HISTORY_MSG_269;Virage Partiel - HL - Rouge
HISTORY_MSG_270;Virage Partiel - HL - Vert
HISTORY_MSG_271;Virage Partiel - HL - Bleu
HISTORY_MSG_272;Virage Partiel - Balance
+HISTORY_MSG_273;Virage Partiel - Balance Couleur O/TM/HL
HISTORY_MSG_274;Virage Partiel - Saturation des ombres
HISTORY_MSG_275;Virage Partiel - Saturation des HL
HISTORY_MSG_276;Virage Partiel - Opacité
@@ -630,6 +643,7 @@ HISTORY_MSG_388;O - Résiduel - BC vert moyen
HISTORY_MSG_389;O - Résiduel - BC bleu moyen
HISTORY_MSG_390;O - Résiduel - BC vert bas
HISTORY_MSG_391;O - Résiduel - BC bleu bas
+HISTORY_MSG_392;O - Résiduel - Balance Couleur
HISTORY_MSG_393;DCP - Table de corresp. (LUT)
HISTORY_MSG_394;DCP - Exposition de base
HISTORY_MSG_395;DCP - Table de base
@@ -709,25 +723,65 @@ HISTORY_MSG_484;CAM02 - Yb auto scène
HISTORY_MSG_485;Correction d'Objectif
HISTORY_MSG_486;Corr. d'Obj. - Appareil
HISTORY_MSG_487;Corr. d'Obj. - Objectif
+HISTORY_MSG_488;Compression de Plage Dymanique
+HISTORY_MSG_489;CPD - Détail
+HISTORY_MSG_490;CPD - Quantité
HISTORY_MSG_491;Balances des Blancs
HISTORY_MSG_492;Courbes RVB
HISTORY_MSG_493;Ajustements L*a*b*
+HISTORY_MSG_CLAMPOOG;Tronquer les couleurs hors gamut
HISTORY_MSG_COLORTONING_LABGRID_VALUE;Virage Partiel - Correction couleur
+HISTORY_MSG_COLORTONING_LABREGION_AB;Virage Partiel - Correction couleur
+HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;Virage Partiel - Masque C
+HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;Virage Partiel - Masque T
+HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;Virage Partiel - Luminosité
+HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;Virage Partiel - Masque L
+HISTORY_MSG_COLORTONING_LABREGION_LIST;Virage Partiel - Liste
+HISTORY_MSG_COLORTONING_LABREGION_SATURATION;Virage Partiel - Saturation
+HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;Virage Partiel - Montrer le masque
+HISTORY_MSG_DEHAZE_DEPTH;EB - Profondeur
+HISTORY_MSG_DEHAZE_ENABLED;Élimination de la Brume
+HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;EB - Montrer carte de profondeur
+HISTORY_MSG_DEHAZE_STRENGTH;EB - Force
+HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Double dématriçage - Seuil auto
+HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Double dématriçage - Seuil de contraste
HISTORY_MSG_HISTMATCHING;Calcul Courbe Tonale svt Aperçu
+HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Sortie - Primaires
+HISTORY_MSG_ICM_OUTPUT_TEMP;Sortie - ICC-v4 illuminant D
+HISTORY_MSG_ICM_OUTPUT_TYPE;Sortie - Type
+HISTORY_MSG_ICM_WORKING_GAMMA;Travail - Gamma
+HISTORY_MSG_ICM_WORKING_SLOPE;Travail - Pente
+HISTORY_MSG_ICM_WORKING_TRC_METHOD;Travail - Méthode TRC
HISTORY_MSG_LOCALCONTRAST_AMOUNT;Contraste Local - Quantité
HISTORY_MSG_LOCALCONTRAST_DARKNESS;Contraste Local - Ombres
HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste Local
HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste Local - H.L.
HISTORY_MSG_LOCALCONTRAST_RADIUS;Contraste Local - Rayon
HISTORY_MSG_METADATA_MODE;Mode de copie des métadonnées
+HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontraste - Seuil de contraste
+HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Méthode de dématriçage pour les mouvements
+HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Direction du filtre de bruit de ligne
+HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;Filtre de ligne PDAF
+HISTORY_MSG_PRSHARPEN_CONTRAST;NPR - Seuil de contraste
+HISTORY_MSG_RAWCACORR_AUTOIT;A.C. Raw - Itérations
+HISTORY_MSG_RAWCACORR_COLORSHIFT;A.C. Raw - Éviter les dérives de teinte
+HISTORY_MSG_RAW_BORDER;Bord Raw
+HISTORY_MSG_RESIZE_ALLOWUPSCALING;Redim. - Autoriser l'agrandissement
+HISTORY_MSG_SHARPENING_CONTRAST;Netteté - Seuil de contraste
+HISTORY_MSG_SH_COLORSPACE;O/HL - Espace couleur
+HISTORY_MSG_SOFTLIGHT_ENABLED;Lumière douce
+HISTORY_MSG_SOFTLIGHT_STRENGTH;Lumière douce - Force
+HISTORY_MSG_TM_FATTAL_ANCHOR;CPD - Ancre
HISTORY_NEWSNAPSHOT;Ajouter
HISTORY_NEWSNAPSHOT_TOOLTIP;Raccourci: Alt-s
HISTORY_SNAPSHOT;Capture
HISTORY_SNAPSHOTS;Captures
ICCPROFCREATOR_ADD_PARAM_IN_DESC;Ajoute le paramètre Gamma et Pente (Slope) à la fin de la description
ICCPROFCREATOR_COPYRIGHT;Copyright:
+ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Réinitialise au copyright par défaut, attribué à "RawTherapee, CC0"
ICCPROFCREATOR_CUSTOM;Personnalisé
ICCPROFCREATOR_DESCRIPTION;Description:
+ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Ajouter les valeurs gamma et pente à la description
ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Laisser vide pour que mettre la description par défaut
ICCPROFCREATOR_GAMMA;Gamma
ICCPROFCREATOR_ICCVERSION;Version du profil généré:
@@ -881,6 +935,7 @@ MAIN_TOOLTIP_PREVIEWFOCUSMASK;Affichage du Masque du focus\nRaccourci: canal Vert\nRaccourci: g
MAIN_TOOLTIP_PREVIEWL;Affichage de la Luminosité\nRaccourci: v\n\n0.299*R + 0.587*V + 0.114*B
MAIN_TOOLTIP_PREVIEWR;Affichage du canal Rouge\nRaccourci: r
+MAIN_TOOLTIP_PREVIEWSHARPMASK;Prévisualiser le masque de contraste de netteté.\nRaccourci: Aucun\n\nNe fonctionne que si l'outil Netteté est activé et pour un zomm >= 100%.
MAIN_TOOLTIP_QINFO;Informations rapide sur l'image\nRaccourci: i
MAIN_TOOLTIP_SHOWHIDELP1;Montrer/Cacher le panneau gauche\nRaccourci: l
MAIN_TOOLTIP_SHOWHIDERP1;Afficher/Cacher le panneau droit\nRaccourci: Alt-l
@@ -918,6 +973,7 @@ PARTIALPASTE_CROP;Recadrage
PARTIALPASTE_DARKFRAMEAUTOSELECT;Sélection auto de la Trame Noire
PARTIALPASTE_DARKFRAMEFILE;Fichier de Trame Noire
PARTIALPASTE_DEFRINGE;Aberration chromatique
+PARTIALPASTE_DEHAZE;Élimination de la Brume
PARTIALPASTE_DETAILGROUP;Détail
PARTIALPASTE_DIALOGLABEL;Collage partiel de profil de traitement
PARTIALPASTE_DIRPYRDENOISE;Réduction du bruit
@@ -951,13 +1007,16 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Filtrage des pixels morts
PARTIALPASTE_PREPROCESS_GREENEQUIL;Équilibrage du vert
PARTIALPASTE_PREPROCESS_HOTPIXFILT;Filtrage des pixels chauds
PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtre de bruit de ligne
+PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;Filtre de ligne PDAF
PARTIALPASTE_PRSHARPENING;Netteté post-redim.
PARTIALPASTE_RAWCACORR_AUTO;Corr. auto. de l'aberr. chromatique
-PARTIALPASTE_RAWCACORR_CAREDBLUE;Aberr. chromatique rouge et bleu
+PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;A.C. Raw - Éviter les dérives couleurs
+PARTIALPASTE_RAWCACORR_CAREDBLUE;A.C. Raw - Rouge et bleu
PARTIALPASTE_RAWEXPOS_BLACK;Niveaux de noir
PARTIALPASTE_RAWEXPOS_LINEAR;Correction du point blanc
PARTIALPASTE_RAWEXPOS_PRESER;Préservation des hautes humières
PARTIALPASTE_RAWGROUP;Réglages RAW
+PARTIALPASTE_RAW_BORDER;Bord Raw
PARTIALPASTE_RAW_DCBENHANCE;Amélioration de DCB
PARTIALPASTE_RAW_DCBITERATIONS;Nombre d'itération de DCB
PARTIALPASTE_RAW_DMETHOD;Algorithme de dématriçage
@@ -973,6 +1032,8 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Ombres/Hautes lumières
PARTIALPASTE_SHARPENEDGE;Bords
PARTIALPASTE_SHARPENING;Netteté
PARTIALPASTE_SHARPENMICRO;Microcontraste
+PARTIALPASTE_SOFTLIGHT;Lumière douce
+PARTIALPASTE_TM_FATTAL;Compression de plage dynamique
PARTIALPASTE_VIBRANCE;Vibrance
PARTIALPASTE_VIGNETTING;Correction du vignettage
PARTIALPASTE_WAVELETGROUP;Niveaux d'ondelette
@@ -988,6 +1049,11 @@ PREFERENCES_BEHAVIOR;Comportement
PREFERENCES_BEHSETALL;Tout à 'Remplace'
PREFERENCES_BEHSETALLHINT;Règle tous les paramètres sur le mode Remplace.\nLa modification des paramètres dans le panneau d'édition en par lot sera absolue, les valeurs réelles seront affichées
PREFERENCES_BLACKBODY;Tungstène
+PREFERENCES_CACHECLEAR;Vider
+PREFERENCES_CACHECLEAR_ALL;Vider tous les fichiers mis en cache :
+PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Vider tous les fichiers mis en cache excepté les profils de traitement :
+PREFERENCES_CACHECLEAR_ONLYPROFILES;Vider seulement les profils de traitement mis en cache :
+PREFERENCES_CACHECLEAR_SAFETY;Seuls les fichiers mis en cache sont effacés. Les profils de traitement enregitrés à côté des images sources ne sont pas touchés.
PREFERENCES_CACHEMAXENTRIES;Nombre maximal d'éléments dans le Cache
PREFERENCES_CACHEOPTS;Options du Cache
PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes
@@ -1001,7 +1067,7 @@ PREFERENCES_CLUTSCACHE_LABEL;Nombre maximum de chache CLUT
PREFERENCES_CLUTSDIR;Dossier HaldCLUT
PREFERENCES_CMMBPC;Compensation du point noir
PREFERENCES_CROP;Édition du recadrage
-PREFERENCES_CROP_AUTO_FIT;Zommer automatiquement sur la zone recadrée
+PREFERENCES_CROP_AUTO_FIT;Zoomer automatiquement sur la zone recadrée lorsque vous double-cliquez sur l'image de prévisualisation
PREFERENCES_CROP_GUIDES;Guides affichés en dehors de l'édition du recadrage
PREFERENCES_CROP_GUIDES_FRAME;Cadre
PREFERENCES_CROP_GUIDES_FULL;Original
@@ -1066,8 +1132,8 @@ PREFERENCES_GREYSC;Luminance Yb de la scène (%)
PREFERENCES_GREYSC18;Yb=18 CIE L#50
PREFERENCES_GREYSCA;Automatique
PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogramme dans le panneau de gauche
-PREFERENCES_HISTOGRAMWORKING;Utiliser le profil de travail pour l'histograme principal et le Navigateur
-PREFERENCES_HISTOGRAM_TOOLTIP;Si activé, le profil couleur de travail est utilisé pour les données d'histograme et le panneau Navigateur, sinon le profil de travail de sortie "gamma-corrigé" est utilisé.
+PREFERENCES_HISTOGRAMWORKING;Utiliser le profil de travail pour l'histogramme principal et le Navigateur
+PREFERENCES_HISTOGRAM_TOOLTIP;Si activé, le profil couleur de travail est utilisé pour les données d'histogramme et le panneau Navigateur, sinon le profil de travail de sortie "gamma-corrigé" est utilisé.
PREFERENCES_HLTHRESHOLD;Seuil pour le dépassement de domaine supérieur
PREFERENCES_ICCDIR;Dossier des profils ICC
PREFERENCES_IMG_RELOAD_NEEDED;Ces changements nécessitent un rechargement de l'image (ou l'ouverture d'une autre image) pour prendre effet.
@@ -1113,6 +1179,8 @@ PREFERENCES_PARSEDEXTADDHINT;Tapez une extension et cliquez ce bouton pour l'ajo
PREFERENCES_PARSEDEXTDELHINT;Supprime de la liste les extensions sélectionnées
PREFERENCES_PARSEDEXTDOWNHINT;Déplacer l'extension sélectionnée plus bas dans la liste.
PREFERENCES_PARSEDEXTUPHINT;Déplacer l'extension sélectionnée plus haut dans la liste.
+PREFERENCES_PERFORMANCE_THREADS;Unités d'exécution (Threads)
+PREFERENCES_PERFORMANCE_THREADS_LABEL;Nombre maximum d'unité d'exécution pour la Réduction de Bruit et les Niveaux d'Ondelettes (0 = Automatique)
PREFERENCES_PREVDEMO;Méthode de Dématriçage de l'Aperçu
PREFERENCES_PREVDEMO_FAST;Rapide
PREFERENCES_PREVDEMO_LABEL;Méthode de dématriçage utilisé pour l'aperçu à un zoom <100%:
@@ -1159,8 +1227,13 @@ PREFERENCES_TAB_COLORMGR;Gestion des couleurs
PREFERENCES_TAB_DYNAMICPROFILE;Règles de Profil Dynamique
PREFERENCES_TAB_GENERAL;Général
PREFERENCES_TAB_IMPROC;Traitement de l'image
+PREFERENCES_TAB_PERFORMANCE;Performance
PREFERENCES_TAB_SOUND;Sons
PREFERENCES_THEME;Thème
+PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Prévisualisation JPEG incluse
+PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image à montrer
+PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Rendu Neutre des données Raw
+PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;JPEG inclus si pleine taille, rendu Neutre des données Raw sinon
PREFERENCES_TP_LABEL;Panneau des outils:
PREFERENCES_TP_VSCROLLBAR;Cacher la barre de défilement verticale
PREFERENCES_TUNNELMETADATA;Copier les données Exif/IPTC/XMP tel quel dans le fichier de sortie
@@ -1277,6 +1350,8 @@ TP_BWMIX_MET;Méthode
TP_BWMIX_MET_CHANMIX;Mixeur de Canaux
TP_BWMIX_MET_DESAT;Désaturation
TP_BWMIX_MET_LUMEQUAL;Égaliseur de Luminance
+TP_BWMIX_MIXC;Mixeur de cannaux
+TP_BWMIX_NEUTRAL;Réinitialiser
TP_BWMIX_RGBLABEL;R: %1%% V: %2%% B: %3%% Total: %4%%
TP_BWMIX_RGBLABEL_HINT;Coefficients RVB finaux qui tiennent compte de toutes les options du mixeur\nTotal affiche la somme des valeurs RVB actuellement appliqué:\n- toujours 100% en mode relatif\n- supérieur (plus clair) ou inférieur (plus sombre) à 100% en mode absolu.
TP_BWMIX_RGB_TOOLTIP;Mixe les canaux RVB. Utilisez les Préréglages pour vous guider.\nAttention aux valeurs négatives qui peuvent causer des artefacts ou un comportement erratique.
@@ -1410,6 +1485,16 @@ TP_COLORTONING_LAB;Mixage Lab
TP_COLORTONING_LABEL;Virage Partiel
TP_COLORTONING_LABGRID;Grille de correction L*a*b*
TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nO: a=%3 b=%4
+TP_COLORTONING_LABREGIONS;Régions de correction L*a*b*
+TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2
+TP_COLORTONING_LABREGION_CHROMATICITYMASK;C
+TP_COLORTONING_LABREGION_HUEMASK;T
+TP_COLORTONING_LABREGION_LIGHTNESS;Luminosité
+TP_COLORTONING_LABREGION_LIGHTNESSMASK;L
+TP_COLORTONING_LABREGION_LIST_TITLE;Correction
+TP_COLORTONING_LABREGION_MASK;Masque
+TP_COLORTONING_LABREGION_SATURATION;Saturation
+TP_COLORTONING_LABREGION_SHOWMASK;Montrer le masque
TP_COLORTONING_LUMA;Luminance
TP_COLORTONING_LUMAMODE;Préserver la luminance
TP_COLORTONING_LUMAMODE_TOOLTIP;Si activé, lorsque vous changez la couleur (rouge, vert, cyan, bleu, etc.), la luminance de chaque pixel est préservé
@@ -1458,6 +1543,10 @@ TP_DARKFRAME_LABEL;Trame Noire
TP_DEFRINGE_LABEL;Aberration chromatique
TP_DEFRINGE_RADIUS;Rayon
TP_DEFRINGE_THRESHOLD;Seuil
+TP_DEHAZE_DEPTH;Profondeur
+TP_DEHAZE_LABEL;Élimination de la Brume
+TP_DEHAZE_SHOW_DEPTH_MAP;Montrer la Carte de Profondeur
+TP_DEHAZE_STRENGTH;Force
TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Multi-zones auto
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;Global automatique
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Essaie d'évaluer le bruit chroma\nFaites attention, cela calcul une moyenne, et est très subjectif !
@@ -1546,6 +1635,7 @@ TP_EXPOSURE_AUTOLEVELS;Niveaux Auto
TP_EXPOSURE_AUTOLEVELS_TIP;Bascule l'usage de Niveaux automatiques afin de régler automatiquement les valeurs basé sur l'analyse de l'image\nActive la Reconstruction des Hautes Lumières si nécessaire.
TP_EXPOSURE_BLACKLEVEL;Noir
TP_EXPOSURE_BRIGHTNESS;Luminosité
+TP_EXPOSURE_CLAMPOOG;Tronquer les couleurs hors gamut
TP_EXPOSURE_CLIP;Rognage %
TP_EXPOSURE_CLIP_TIP;La fraction de pixels que l'outil Niveaux Auto passera en dehors du domaine
TP_EXPOSURE_COMPRHIGHLIGHTS;Compression hautes lumières
@@ -1730,10 +1820,19 @@ TP_PREPROCESS_HOTPIXFILT;Filtrer les pixels chauds
TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Essaie de supprimer les pixels chauds
TP_PREPROCESS_LABEL;Traitement pre-dématriçage
TP_PREPROCESS_LINEDENOISE;Filtre de bruit de ligne
+TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
+TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Toutes
+TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontale
+TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontale seulement sur les lignes PDAF
+TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Verticale
TP_PREPROCESS_NO_FOUND;Aucun trouvé
+TP_PREPROCESS_PDAFLINESFILTER;Filtre de ligne PDAF
+TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Essaie de supprimer les bandes de bruit causées par les pixel PDAF sur le capteur, arrivant sur certains mirrorless Sony cameras avec des scènes en contre-jour avec un flare visible.
TP_PRSHARPENING_LABEL;Netteté post-redimensionnement
TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimentionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisé. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation.
TP_RAWCACORR_AUTO;Correction automatique
+TP_RAWCACORR_AUTOIT;Itérations
+TP_RAWCACORR_AVOIDCOLORSHIFT;Éviter les dérives couleurs
TP_RAWCACORR_CABLUE;Bleu
TP_RAWCACORR_CARED;Rouge
TP_RAWCACORR_CASTR;Force
@@ -1750,16 +1849,24 @@ TP_RAWEXPOS_PRESER;Préservation des HL
TP_RAWEXPOS_RGB;Rouge, Vert, Bleu
TP_RAWEXPOS_TWOGREEN;Lier les verts
TP_RAW_1PASSMEDIUM;1-Passe (Medium)
+TP_RAW_2PASS;1-passe+Fast
TP_RAW_3PASSBEST;3-Passes (Meilleur)
+TP_RAW_4PASS;3-passes+Fast
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
+TP_RAW_AMAZEVNG4;AMaZE+VNG4
+TP_RAW_BORDER;Bord
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;Amélioration de DCB
TP_RAW_DCBITERATIONS;Nombre d'itération de DCB
+TP_RAW_DCBVNG4;DCB+VNG4
TP_RAW_DMETHOD;Méthode
TP_RAW_DMETHOD_PROGRESSBAR;Dématriçage %1...
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Affinage du dématriçage...
TP_RAW_DMETHOD_TOOLTIP;Note: IGV et LMMSE sont dédiés aux images à haut ISO
+TP_RAW_DUALDEMOSAICAUTOCONTRAST;Seuil auto
+TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;Si la case est cochée (recommandé), RawTherapee calcul une valeur optimum basée sur les régions de "couleur unie" de l'image.\nS'il n'y en a pas ou que l'image est trop bruité, la valeur sera réglée à 0.\nPour régler la valeur manuellement, décochez la case d'abord (les valeurs raisonables dépendent de l'image).
+TP_RAW_DUALDEMOSAICCONTRAST;Seuil de contraste
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;Itérations pour la suppression\ndes fausses couleurs
TP_RAW_FAST;Fast
@@ -1778,6 +1885,9 @@ TP_RAW_NONE;Aucun (montre ce que voit le capteur)
TP_RAW_PIXELSHIFT;Pixel Shift
TP_RAW_PIXELSHIFTADAPTIVE;Détection adaptative
TP_RAW_PIXELSHIFTBLUR;Flouter le masque de mouvement
+TP_RAW_PIXELSHIFTDMETHOD;Méthode de dématriçage pour les mouvements
+TP_RAW_PIXELSHIFTEPERISO;Sensibilité
+TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;La valeur par défaut de 0 devrait bien fonctionner pour l'ISO de base.\nLes valeurs plus hautes augmentent la sensibilité de la détection de mouvement.\nChangez par petits incréments et observez le masque de mouvement se mettre à jour pendant votre ajustement.\nAugmentez la sensibilité pour les images sous-exposées ou à haut ISO.
TP_RAW_PIXELSHIFTEQUALBRIGHT;Égaliser la luminosité des sous-images
TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Égaliser par canal
TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Activé: Égalise les canaux RVB individuellement.\nDésactivé: Utilise le même facteur d'égalisation pour tous les canaux.
@@ -1813,6 +1923,7 @@ TP_RAW_PIXELSHIFTREDBLUEWEIGHT;Poid Rouge&Bleu
TP_RAW_PIXELSHIFTSHOWMOTION;Voir le masque de mouvement
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Voir uniquement le masque
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Affiche le masque sans l'image.
+TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Applique un masque vert montrant les régions contenant du mouvement.
TP_RAW_PIXELSHIFTSIGMA;Rayon de floutage
TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;Le rayon par défaut de 1.0 fonctionne généralement bien pour l'ISO de base.\nAugmentez cette valeur pour les images de haut ISO, 5.0 est un bon point de départ.\nContrôlez le masque de mouvement à chaque nouvelle valeur.
TP_RAW_PIXELSHIFTSMOOTH;Adoucir les transitions
@@ -1821,10 +1932,12 @@ TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;Facteur DevStd Bleu
TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;Facteur DevStd Vert
TP_RAW_PIXELSHIFTSTDDEVFACTORRED;Facteur DevStd Rouge
TP_RAW_RCD;RCD
+TP_RAW_RCDVNG4;RCD+VNG4
TP_RAW_SENSOR_BAYER_LABEL;Capteur à matrice de Bayer
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-passes donne les meilleurs résultats (recommendé pour les images de faible ISO).\n1-passe est presque indifférentiable de 3-passes pour les images à haut ISO et est plus rapide.
TP_RAW_SENSOR_XTRANS_LABEL;Capteur à matrice X-Trans
TP_RAW_VNG4;VNG4
+TP_RESIZE_ALLOW_UPSCALING;Autoriser l'Agrandissement
TP_RESIZE_APPLIESTO;S'applique à:
TP_RESIZE_CROPPEDAREA;La zone recadrée
TP_RESIZE_FITBOX;Boîte englobante
@@ -1943,6 +2056,7 @@ TP_SHARPENEDGE_LABEL;Bords
TP_SHARPENEDGE_PASSES;Itérations
TP_SHARPENEDGE_THREE;Luminance uniquement
TP_SHARPENING_AMOUNT;Quantité
+TP_SHARPENING_CONTRAST;Seuil de contraste
TP_SHARPENING_EDRADIUS;Rayon
TP_SHARPENING_EDTOLERANCE;Tolérance des bords
TP_SHARPENING_HALOCONTROL;Contrôle du halo
@@ -1958,9 +2072,16 @@ TP_SHARPENING_RLD_ITERATIONS;Itérations
TP_SHARPENING_THRESHOLD;Seuil
TP_SHARPENING_USM;Masque flou (USM)
TP_SHARPENMICRO_AMOUNT;Quantité
+TP_SHARPENMICRO_CONTRAST;Seuil de contraste
TP_SHARPENMICRO_LABEL;Microcontraste
TP_SHARPENMICRO_MATRIX;Matrice 3×3 au lieu de 5×5
TP_SHARPENMICRO_UNIFORMITY;Uniformité
+TP_SOFTLIGHT_LABEL;Lumière douce
+TP_SOFTLIGHT_STRENGTH;Force
+TP_TM_FATTAL_AMOUNT;Quantité
+TP_TM_FATTAL_ANCHOR;Ancre
+TP_TM_FATTAL_LABEL;Compression de Plage Dynamique
+TP_TM_FATTAL_THRESHOLD;Détail
TP_VIBRANCE_AVOIDCOLORSHIFT;Éviter les dérives de teinte
TP_VIBRANCE_CURVEEDITOR_SKINTONES;TT
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tons chair
@@ -2024,7 +2145,7 @@ TP_WAVELET_CHTYPE;Méthode de chrominance
TP_WAVELET_COLORT;Opacité Rouge-Vert
TP_WAVELET_COMPCONT;Contraste
TP_WAVELET_COMPGAMMA;Compression gamma
-TP_WAVELET_COMPGAMMA_TOOLTIP;Ajuster le gamma de l'image résiduelle vous permet d'équiilibrer les données de l'histograme.
+TP_WAVELET_COMPGAMMA_TOOLTIP;Ajuster le gamma de l'image résiduelle vous permet d'équiilibrer les données de l'histogramme.
TP_WAVELET_COMPTM;Compression tonale
TP_WAVELET_CONTEDIT;Courbe de contraste 'Après'
TP_WAVELET_CONTR;Gamut
@@ -2204,128 +2325,3 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: Alt-f
ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: +
ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value.
-!DYNPROFILEEDITOR_IMGTYPE_ANY;Any
-!DYNPROFILEEDITOR_IMGTYPE_HDR;HDR
-!DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift
-!DYNPROFILEEDITOR_IMGTYPE_STD;Standard
-!EXIFFILTER_IMAGETYPE;Image type
-!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
-!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
-!GENERAL_RESET;Reset
-!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
-!HISTORY_MSG_235;B&W - CM - Auto
-!HISTORY_MSG_237;B&W - CM
-!HISTORY_MSG_273;CT - Color Balance SMH
-!HISTORY_MSG_392;W - Residual - Color Balance
-!HISTORY_MSG_488;Dynamic Range Compression
-!HISTORY_MSG_489;DRC - Detail
-!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
-!HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
-!HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;CT - C mask
-!HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;CT - H mask
-!HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;CT - Lightness
-!HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;CT - L mask
-!HISTORY_MSG_COLORTONING_LABREGION_LIST;CT - List
-!HISTORY_MSG_COLORTONING_LABREGION_SATURATION;CT - Saturation
-!HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;CT - Show mask
-!HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
-!HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
-!HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
-!HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
-!HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
-!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Dual demosaic - Contrast threshold
-!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
-!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
-!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
-!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
-!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
-!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
-!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
-!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
-!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
-!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
-!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
-!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
-!HISTORY_MSG_RAWCACORR_COLORSHIFT;Raw CA Correction - Avoid color shift
-!HISTORY_MSG_RAW_BORDER;Raw border
-!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
-!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
-!HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
-!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
-!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
-!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
-!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
-!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
-!PARTIALPASTE_DEHAZE;Haze removal
-!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
-!PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA avoid color shift
-!PARTIALPASTE_RAW_BORDER;Raw border
-!PARTIALPASTE_SOFTLIGHT;Soft light
-!PARTIALPASTE_TM_FATTAL;Dynamic range compression
-!PREFERENCES_CACHECLEAR;Clear
-!PREFERENCES_CACHECLEAR_ALL;Clear all cached files:
-!PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles:
-!PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles:
-!PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched.
-!PREFERENCES_PERFORMANCE_THREADS;Threads
-!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
-!PREFERENCES_TAB_PERFORMANCE;Performance
-!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
-!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
-!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
-!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!TP_BWMIX_MIXC;Channel Mixer
-!TP_BWMIX_NEUTRAL;Reset
-!TP_COLORTONING_LABREGIONS;L*a*b* correction regions
-!TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2
-!TP_COLORTONING_LABREGION_CHROMATICITYMASK;C
-!TP_COLORTONING_LABREGION_HUEMASK;H
-!TP_COLORTONING_LABREGION_LIGHTNESS;Lightness
-!TP_COLORTONING_LABREGION_LIGHTNESSMASK;L
-!TP_COLORTONING_LABREGION_LIST_TITLE;Correction
-!TP_COLORTONING_LABREGION_MASK;Mask
-!TP_COLORTONING_LABREGION_SATURATION;Saturation
-!TP_COLORTONING_LABREGION_SHOWMASK;Show mask
-!TP_DEHAZE_DEPTH;Depth
-!TP_DEHAZE_LABEL;Haze Removal
-!TP_DEHAZE_SHOW_DEPTH_MAP;Show Depth Map
-!TP_DEHAZE_STRENGTH;Strength
-!TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors
-!TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
-!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
-!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
-!TP_RAWCACORR_AUTOIT;Iterations
-!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
-!TP_RAW_2PASS;1-pass+fast
-!TP_RAW_4PASS;3-pass+fast
-!TP_RAW_AMAZEVNG4;AMaZE+VNG4
-!TP_RAW_BORDER;Border
-!TP_RAW_DCBVNG4;DCB+VNG4
-!TP_RAW_DUALDEMOSAICAUTOCONTRAST;Auto threshold
-!TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;If the check-box is checked (recommended), RawTherapee calculates an optimum value based on flat regions in the image.\nIf there is no flat region in the image or the image is too noisy, the value will be set to 0.\nTo set the value manually, uncheck the check-box first (reasonable values depend on the image).
-!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
-!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
-!TP_RAW_PIXELSHIFTEPERISO;Sensitivity
-!TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nHigher values increase sensitivity of motion detection.\nChange in small steps and watch the motion mask while changing.\nIncrease sensitivity for underexposed or high ISO images.
-!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
-!TP_RAW_RCDVNG4;RCD+VNG4
-!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
-!TP_SHARPENING_CONTRAST;Contrast threshold
-!TP_SHARPENMICRO_CONTRAST;Contrast threshold
-!TP_SOFTLIGHT_LABEL;Soft Light
-!TP_SOFTLIGHT_STRENGTH;Strength
-!TP_TM_FATTAL_AMOUNT;Amount
-!TP_TM_FATTAL_ANCHOR;Anchor
-!TP_TM_FATTAL_LABEL;Dynamic Range Compression
-!TP_TM_FATTAL_THRESHOLD;Detail
diff --git a/rtdata/languages/default b/rtdata/languages/default
index a5c9976a4..02ded5378 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1060,7 +1060,7 @@ PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
PREFERENCES_CLUTSDIR;HaldCLUT directory
PREFERENCES_CMMBPC;Black point compensation
PREFERENCES_CROP;Crop editing
-PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop area
+PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop area when double clicking in the preview image
PREFERENCES_CROP_GUIDES;Guides shown when not editing the crop
PREFERENCES_CROP_GUIDES_FRAME;Frame
PREFERENCES_CROP_GUIDES_FULL;Original
@@ -1818,6 +1818,7 @@ TP_PRSHARPENING_LABEL;Post-Resize Sharpening
TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
TP_RAWCACORR_AUTO;Auto-correction
TP_RAWCACORR_AUTOIT;Iterations
+TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is checked.\nAuto-correction is conservative, means it often does not correct all Chromatic Aberration.\nTo correct the remaining Chromatic Aberration, you can use up to 5 iterations of automatic Chromatic Aberration correction.\nEach iteration will reduce the remaining Chromatic Aberration from the last iteration at the cost of additional processing time.
TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
TP_RAWCACORR_CABLUE;Blue
TP_RAWCACORR_CARED;Red
diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc
index b2fe436fd..2bc0e940e 100644
--- a/rtengine/histmatching.cc
+++ b/rtengine/histmatching.cc
@@ -216,6 +216,45 @@ void mappingToCurve(const std::vector &mapping, std::vector &curve)
curve.push_back(1.0);
curve.push_back(1.0);
+
+ // we assume we are matching an S-shaped curve, so try to avoid
+ // concavities in the upper part of the S
+ const auto getpos =
+ [](float x, float xa, float ya, float xb, float yb)
+ {
+ // line equation:
+ // (x - xa) / (xb - xa) = (y - ya) / (yb - ya)
+ return (x - xa) / (xb - xa) * (yb - ya) + ya;
+ };
+ idx = -1;
+ for (size_t i = curve.size()-1; i > 0; i -= 2) {
+ if (curve[i] <= 0.f) {
+ idx = i+1;
+ break;
+ }
+ }
+ if (idx >= 0 && size_t(idx) < curve.size()) {
+ // idx is the position of the first point in the upper part of the S
+ // for each 3 consecutive points (xa, ya), (x, y), (xb, yb) we check
+ // that y is above the point at x of the line between the other two
+ // if this is not the case, we remove (x, y) from the curve
+ while (size_t(idx+5) < curve.size()) {
+ float xa = curve[idx];
+ float ya = curve[idx+1];
+ float x = curve[idx+2];
+ float y = curve[idx+3];
+ float xb = curve[idx+4];
+ float yb = curve[idx+5];
+ float yy = getpos(x, xa, ya, xb, yb);
+ if (yy > y) {
+ // we have to remove (x, y) from the curve
+ curve.erase(curve.begin()+(idx+2), curve.begin()+(idx+4));
+ } else {
+ // move on to the next point
+ idx += 2;
+ }
+ }
+ }
if (curve.size() < 4) {
curve = { DCT_Linear }; // not enough points, fall back to linear
diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc
index 802365d74..9ac72be58 100644
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -447,7 +447,7 @@ void my_error_exit (j_common_ptr cinfo)
(*cinfo->err->output_message) (cinfo);
/* Return control to the setjmp point */
-#if defined( WIN32 ) && defined( __x86_64__ )
+#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
__builtin_longjmp(myerr->setjmp_buffer, 1);
#else
longjmp(myerr->setjmp_buffer, 1);
@@ -471,7 +471,7 @@ int ImageIO::loadJPEGFromMemory (const char* buffer, int bufsize)
jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */
-#if defined( WIN32 ) && defined( __x86_64__ )
+#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else
@@ -1134,7 +1134,7 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp)
jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */
-#if defined( WIN32 ) && defined( __x86_64__ )
+#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else
@@ -1252,7 +1252,7 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp)
unsigned char *row = new unsigned char [rowlen];
/* To avoid memory leaks we establish a new setjmp return context for my_error_exit to use. */
-#if defined( WIN32 ) && defined( __x86_64__ )
+#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else
diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc
index 2e2eea676..17ce4f343 100644
--- a/rtexif/canonattribs.cc
+++ b/rtexif/canonattribs.cc
@@ -567,6 +567,7 @@ public:
{6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP"},
{6, "Tokina AF 193-2 19-35mm f/3.5-4.5"},
{6, "Sigma 28-80mm f/3.5-5.6 II Macro"},
+ {6, "Sigma 28-300mm f/3.5-6.3 DG Macro"},
{7, "Canon EF 100-300mm f/5.6L"},
{8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens"},
{8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro"},
@@ -656,7 +657,9 @@ public:
{82, "Canon TS-E 135mm f/4L Macro"},
{94, "Canon TS-E 17mm f/4L"},
{95, "Canon TS-E 24mm f/3.5L II"},
- {103, "Samyang AF 14mm f/2.8 EF"},
+ {103, "Samyang AF 14mm f/2.8 EF or Rokinon Lens"},
+ {103, "Rokinon SP 14mm f/2.4"},
+ {103, "Rokinon AF 14mm f/2.8 EF"},
{124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"},
{125, "Canon TS-E 24mm f/3.5L"},
{126, "Canon TS-E 45mm f/2.8"},
@@ -733,7 +736,7 @@ public:
{160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"},
{160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"},
{160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"},
- {161, "Canon EF 28-70mm f/2.8L USM or Sigma or Tamron Lens"},
+ {161, "Canon EF 28-70mm f/2.8L USM or Other Lens"},
{161, "Sigma 24-70mm f/2.8 EX"},
{161, "Sigma 28-70mm f/2.8 EX"},
{161, "Sigma 24-60mm f/2.8 EX DG"},
@@ -741,6 +744,7 @@ public:
{161, "Tamron 90mm f/2.8"},
{161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
{161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
+ {161, "Tokina AT-X 24-70mm f/2.8 PRO FX (IF)"},
{162, "Canon EF 200mm f/2.8L USM"},
{163, "Canon EF 300mm f/4L"},
{164, "Canon EF 400mm f/5.6L"},
@@ -757,6 +761,7 @@ public:
{169, "Sigma 85mm f/1.4 EX DG HSM"},
{169, "Sigma 30mm f/1.4 EX DC HSM"},
{169, "Sigma 35mm f/1.4 DG HSM"},
+ {169, "Sigma 35mm f/1.5 FF High-Speed Prime | 017"},
{170, "Canon EF 200mm f/2.8L II USM"},
{171, "Canon EF 300mm f/4L USM"},
{172, "Canon EF 400mm f/5.6L USM or Sigma Lens"},
@@ -780,6 +785,9 @@ public:
{180, "Zeiss Milvus 50mm f/1.4"},
{180, "Zeiss Milvus 85mm f/1.4"},
{180, "Zeiss Otus 28mm f/1.4 ZE"},
+ {180, "Sigma 24mm f/1.5 FF High-Speed Prime | 017"},
+ {180, "Sigma 50mm f/1.5 FF High-Speed Prime | 017"},
+ {180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017"},
{181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens"},
{181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"},
{182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens"},
@@ -791,6 +799,7 @@ public:
{183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
{183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
{183, "Sigma 100-400mm f/5-6.3 DG OS HSM"},
+ {183, "Sigma 180mm f/3.5 APO Macro EX DG IF HSM"},
{184, "Canon EF 400mm f/2.8L USM + 2x"},
{185, "Canon EF 600mm f/4L IS USM"},
{186, "Canon EF 70-200mm f/4L USM"},
@@ -798,7 +807,8 @@ public:
{188, "Canon EF 70-200mm f/4L USM + 2x"},
{189, "Canon EF 70-200mm f/4L USM + 2.8x"},
{190, "Canon EF 100mm f/2.8 Macro USM"},
- {191, "Canon EF 400mm f/4 DO IS"},
+ {191, "Canon EF 400mm f/4 DO IS or Sigma Lens"},
+ {191, "Sigma 500mm f/4 DG OS HSM"},
{193, "Canon EF 35-80mm f/4-5.6 USM"},
{194, "Canon EF 80-200mm f/4.5-5.6 USM"},
{195, "Canon EF 35-105mm f/4.5-5.6 USM"},
@@ -808,6 +818,7 @@ public:
{198, "Canon EF 50mm f/1.4 USM or Zeiss Lens"},
{198, "Zeiss Otus 55mm f/1.4 ZE"},
{198, "Zeiss Otus 85mm f/1.4 ZE"},
+ {198, "Zeiss Milvus 25mm f/1.4"},
{199, "Canon EF 28-80mm f/3.5-5.6 USM"},
{200, "Canon EF 75-300mm f/4-5.6 USM"},
{201, "Canon EF 28-80mm f/3.5-5.6 USM"},
@@ -841,8 +852,10 @@ public:
{236, "Canon EF-S 60mm f/2.8 Macro USM"},
{237, "Canon EF 24-105mm f/4L IS USM"},
{238, "Canon EF 70-300mm f/4-5.6 IS USM"},
- {239, "Canon EF 85mm f/1.2L II USM"},
- {240, "Canon EF-S 17-55mm f/2.8 IS USM"},
+ {239, "Canon EF 85mm f/1.2L II USM or Rokinon Lens"},
+ {239, "Rokinon SP 85mm f/1.2"},
+ {240, "Canon EF-S 17-55mm f/2.8 IS USM or Sigma Lens"},
+ {240, "Sigma 17-50mm f/2.8 EX DC OS HSM"},
{241, "Canon EF 50mm f/1.2L USM"},
{242, "Canon EF 70-200mm f/4L IS USM"},
{243, "Canon EF 70-200mm f/4L IS USM + 1.4x"},
@@ -852,16 +865,23 @@ public:
{247, "Canon EF 14mm f/2.8L II USM"},
{248, "Canon EF 200mm f/2L IS USM or Sigma Lens"},
{248, "Sigma 24-35mm f/2 DG HSM | A"},
+ {248, "Sigma 135mm f/2 FF High-Speed Prime | 017"},
+ {248, "Sigma 24-35mm f/2.2 FF Zoom | 017"},
{249, "Canon EF 800mm f/5.6L IS USM"},
{250, "Canon EF 24mm f/1.4L II USM or Sigma Lens"},
{250, "Sigma 20mm f/1.4 DG HSM | A"},
+ {250, "Sigma 20mm f/1.5 FF High-Speed Prime | 017"},
{251, "Canon EF 70-200mm f/2.8L IS II USM"},
{252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"},
{253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"},
{254, "Canon EF 100mm f/2.8L Macro IS USM"},
{255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens"},
{255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
- {368, "Sigma 14-24mm f/2.8 DG HSM | A"},
+ {368, "Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens"},
+ {368, "Sigma 20mm f/1.4 DG HSM | A"},
+ {368, "Sigma 50mm f/1.4 DG HSM | A"},
+ {368, "Sigma 40mm f/1.4 DG HSM | A"},
+ {368, "Sigma 60-600mm f/4.5-6.3 DG OS HSM | S"},
{488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"},
{489, "Canon EF 70-300mm f/4-5.6L IS USM"},
{490, "Canon EF 8-15mm f/4L Fisheye USM"},
@@ -869,6 +889,9 @@ public:
{491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
{491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
{491, "Tamron 100-400mm f/4.5-6.3 Di VC USD (A035)"},
+ {491, "Tamron 70-210mm f/4 Di VC USD (A034)"},
+ {491, "Tamron 70-210mm f/4 Di VC USD (A034) + 1.4x"},
+ {491, "Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)"},
{492, "Canon EF 400mm f/2.8L IS II USM"},
{493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"},
{493, "Canon EF 24-105mm f/4L IS USM"},
@@ -887,11 +910,18 @@ public:
{508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"},
{747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"},
{747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
- {748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"},
+ {748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"},
+ {748, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x"},
+ {748, "Tamron 70-210mm f/4 Di VC USD (A034) + 2x"},
+ {749, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x"},
{750, "Canon EF 35mm f/1.4L II USM"},
{751, "Canon EF 16-35mm f/2.8L III USM"},
{752, "Canon EF 24-105mm f/4L IS II USM"},
{753, "Canon EF 85mm f/1.4L IS USM"},
+ {754, "Canon EF 70-200mm f/4L IS II USM"},
+ {757, "Canon EF 400mm f/2.8L IS III USM"},
+ {758, "Canon EF 600mm f/4L IS III USM"},
+ {1136, "Sigma 24-70mm f/2.8 DG OS HSM | Art 017"},
{4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"},
{4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"},
{4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
@@ -909,9 +939,14 @@ public:
{4156, "Canon EF 50mm f/1.8 STM"},
{4157, "Canon EF-M 18-150mm 1:3.5-6.3 IS STM"},
{4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"},
+ {4159, "Canon EF-M 32mm f/1.4 STM"},
{4160, "Canon EF-S 35mm f/2.8 Macro IS STM"},
{36910, "Canon EF 70-300mm f/4-5.6 IS II USM"},
{36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"},
+ {61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens"},
+ {61182, "Canon RF 50mm F1.2 L USM"},
+ {61182, "Canon RF 24-105mm F4 L IS USM"},
+ {61182, "Canon RF 28-70mm F2 L USM"},
{61491, "Canon CN-E 14mm T3.1 L F"},
{61492, "Canon CN-E 24mm T1.5 L F"},
{61494, "Canon CN-E 85mm T1.3 L F"},
@@ -1477,6 +1512,8 @@ public:
CAModelIDInterpreter ()
{
choices[1042] = "EOS M50 / Kiss M";
+ choices[2049] = "PowerShot SX740 HS";
+ choices[2053] = "PowerShot SX70 HS";
choices[16842752] = "PowerShot A30";
choices[17039360] = "PowerShot S300 / Digital IXUS 300 / IXY Digital 300";
choices[17170432] = "PowerShot A20";
@@ -1799,6 +1836,7 @@ public:
choices[2147484680] = "EOS 77D / 9000D";
choices[2147484695] = "EOS Rebel SL2 / 200D / Kiss X9";
choices[2147484706] = "EOS Rebel T100 / 4000D / 3000D";
+ choices[2147484708] = "EOR R";
choices[2147484722] = "EOS Rebel T7 / 2000D / 1500D / Kiss X90";
}
};
diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc
index fc0fc22db..e534f8123 100644
--- a/rtexif/nikonattribs.cc
+++ b/rtexif/nikonattribs.cc
@@ -850,7 +850,9 @@ const std::map NALensDataInterpreter::lenses = {
{"49 3C A6 A6 30 30 F2 02", "AF-S Nikkor 600mm f/4D IF-ED + TC-20E"},
{"4A 40 11 11 2C 0C 4D 02", "Samyang 8mm f/3.5 Fish-Eye CS"},
{"4A 48 1E 1E 24 0C 4D 02", "Samyang 12mm f/2.8 ED AS NCS Fish-Eye"},
+ {"4A 48 24 24 24 0C 4D 02", "Samyang 10mm f/2.8 ED AS NCS CS"},
{"4A 48 24 24 24 0C 4D 02", "Samyang AE 14mm f/2.8 ED AS IF UMC"},
+ {"4A 4C 24 24 1E 6C 4D 06", "Samyang 14mm f/2.4 Premium"},
{"4A 54 29 29 18 0C 4D 02", "Samyang 16mm f/2.0 ED AS UMC CS"},
{"4A 54 62 62 0C 0C 4D 02", "AF Nikkor 85mm f/1.4D IF"},
{"4A 60 36 36 0C 0C 4D 02", "Samyang 24mm f/1.4 ED AS UMC"},
@@ -910,7 +912,7 @@ const std::map NALensDataInterpreter::lenses = {
{"74 40 37 62 2C 34 78 06", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
{"75 40 3C 68 2C 3C 79 06", "AF Zoom-Nikkor 28-100mm f/3.5-5.6G"},
{"76 58 50 50 14 14 7A 02", "AF Nikkor 50mm f/1.8D"},
- {"77 44 60 98 34 3C 7B 0E", "Sigma 80-400mm f4.5-5.6 APO DG D OS"},
+ {"77 44 60 98 34 3C 7B 0E", "Sigma 80-400mm f/4.5-5.6 APO DG D OS"},
{"77 44 61 98 34 3C 7B 0E", "Sigma 80-400mm f/4.5-5.6 EX OS"},
{"77 48 5C 80 24 24 7B 0E", "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED"},
{"78 40 37 6E 2C 3C 7C 0E", "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED"},
@@ -953,6 +955,7 @@ const std::map NALensDataInterpreter::lenses = {
{"8B 4C 2D 44 14 14 4B 06", "Sigma 18-35mm f/1.8 DC HSM"},
{"8C 40 2D 53 2C 3C 8E 06", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
{"8D 44 5C 8E 34 3C 8F 0E", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
+ {"8D 48 6E 8E 24 24 4B 0E", "Sigma 120-300mm f/2.8 DG OS HSM Sports"},
{"8E 3C 2B 5C 24 30 4B 0E", "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"},
{"8F 40 2D 72 2C 3C 91 06", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"},
{"8F 48 2B 50 24 24 4B 0E", "Sigma 17-50mm f/2.8 EX DC OS HSM"},
@@ -963,7 +966,7 @@ const std::map NALensDataInterpreter::lenses = {
{"92 48 24 37 24 24 94 06", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"},
{"93 48 37 5C 24 24 95 06", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"},
{"94 40 2D 53 2C 3C 96 06", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"},
- {"94 48 7C 7C 24 24 4B 0E", "Sigma 180mm f/2.8 APO Macro EX DG OS"},
+ {"94 48 7C 7C 24 24 4B 0E", "Sigma APO Macro 180mm f/2.8 EX DG OS HSM"},
{"95 00 37 37 2C 2C 97 06", "PC-E Nikkor 24mm f/3.5D ED"},
{"95 4C 37 37 2C 2C 97 02", "PC-E Nikkor 24mm f/3.5D ED"},
{"96 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 II DG HSM"},
@@ -975,6 +978,7 @@ const std::map NALensDataInterpreter::lenses = {
{"99 40 29 62 2C 3C 9B 0E", "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED"},
{"99 48 76 76 24 24 4B 0E", "Sigma APO Macro 150mm f/2.8 EX DG OS HSM"},
{"9A 40 2D 53 2C 3C 9C 0E", "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G"},
+ {"9A 4C 50 50 14 14 9C 06", "Yongnuo YN50mm f/1.8N"},
{"9B 00 4C 4C 24 24 9D 06", "PC-E Micro Nikkor 45mm f/2.8D ED"},
{"9B 54 4C 4C 24 24 9D 02", "PC-E Micro Nikkor 45mm f/2.8D ED"},
{"9B 54 62 62 0C 0C 4B 06", "Sigma 85mm f/1.4 EX DG HSM"},
@@ -997,37 +1001,54 @@ const std::map NALensDataInterpreter::lenses = {
{"A1 54 55 55 0C 0C BC 06", "AF-S Nikkor 58mm f/1.4G"},
{"A2 40 2D 53 2C 3C BD 0E", "AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II"},
{"A2 48 5C 80 24 24 A4 0E", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
+ {"A3 38 5C 8E 34 40 CE 0E", "AF-P DX Nikkor 70-300mm f/4.5-6.3G ED"},
+ {"A3 38 5C 8E 34 40 CE 8E", "AF-P DX Nikkor 70-300mm f/4.5-6.3G ED VR"},
{"A3 3C 29 44 30 30 A5 0E", "AF-S Nikkor 16-35mm f/4G ED VR"},
{"A3 3C 5C 8E 30 3C 4B 0E", "Sigma 70-300mm f/4-5.6 DG OS"},
{"A4 40 2D 8E 2C 40 BF 0E", "AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR"},
{"A4 47 2D 50 24 34 4B 0E", "Sigma 18-50mm f/2.8-4.5 DC OS HSM"},
{"A4 48 5C 80 24 24 CF 0E", "AF-S Nikkor 70-200mm f/2.8E FL ED VR"},
+ {"A4 48 5C 80 24 24 CF 4E", "AF-S Nikkor 70-200mm f/2.8E FL ED VR"},
{"A4 54 37 37 0C 0C A6 06", "AF-S Nikkor 24mm f/1.4G ED"},
{"A5 40 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC OS HSM"},
{"A5 40 3C 8E 2C 3C A7 0E", "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR"},
{"A5 4C 44 44 14 14 C0 06", "AF-S Nikkor 35mm f/1.8G ED"},
{"A5 54 6A 6A 0C 0C D0 06", "AF-S Nikkor 105mm f/1.4E ED"},
{"A5 54 6A 6A 0C 0C D0 46", "AF-S Nikkor 105mm f/1.4E ED"},
+ {"A6 48 2F 2F 30 30 D1 06", "PC Nikkor 19mm f/4E ED"},
+ {"A6 48 2F 2F 30 30 D1 46", "PC Nikkor 19mm f/4E ED"},
{"A6 48 37 5C 24 24 4B 06", "Sigma 24-70mm f/2.8 IF EX DG HSM"},
- {"A6 48 8E 8E 24 24 A8 0E", "AF-S VR Nikkor 300mm f/2.8G IF-ED II"},
+ {"A6 48 8E 8E 24 24 A8 0E", "AF-S Nikkor 300mm f/2.8G IF-ED VR II"},
{"A6 48 98 98 24 24 C1 0E", "AF-S Nikkor 400mm f/2.8E FL ED VR"},
{"A7 3C 53 80 30 3C C2 0E", "AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II"},
+ {"A7 40 11 26 2C 34 D2 06", "AF-S Fisheye Nikkor 8-15mm f/3.5-4.5E ED"},
+ {"A7 40 11 26 2C 34 D2 46", "AF-S Fisheye Nikkor 8-15mm f/3.5-4.5E ED"},
{"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 0E", "AF-P DX Nikkor 10-20mm f/4.5-5.6G 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 80 98 30 30 AA 0E", "AF-S Zoom-Nikkor 200-400mm f/4G IF-ED VR 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"},
+ {"A9 48 7C 98 30 30 D4 0E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR"},
{"A9 48 7C 98 30 30 D4 4E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR"},
{"A9 4C 31 31 14 14 C4 06", "AF-S Nikkor 20mm f/1.8G ED"},
{"A9 54 80 80 18 18 AB 0E", "AF-S Nikkor 200mm f/2G ED VR II"},
{"AA 3C 37 6E 30 30 AC 0E", "AF-S Nikkor 24-120mm f/4G ED VR"},
+ {"AA 48 37 5C 24 24 C5 0E", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
{"AA 48 37 5C 24 24 C5 4E", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
+ {"AA 48 88 A4 3C 3C D5 0E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR + 1.4x TC"},
{"AA 48 88 A4 3C 3C D5 4E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR + 1.4x TC"},
{"AB 3C A0 A0 30 30 C6 4E", "AF-S Nikkor 500mm f/4E FL ED VR"},
- {"AC 38 53 8E 34 3C AE 0E", "AF-S DX VR Nikkor 55-300mm f/4.5-5.6G ED"},
+ {"AB 44 5C 8E 34 3C D6 0E", "AF-P Nikkor 70-300mm f/4.5-5.6E ED VR"},
+ {"AB 44 5C 8E 34 3C D6 CE", "AF-P Nikkor 70-300mm f/4.5-5.6E ED VR"},
+ {"AC 38 53 8E 34 3C AE 0E", "AF-S DX Nikkor 55-300mm f/4.5-5.6G ED VR"},
{"AC 3C A6 A6 30 30 C7 4E", "AF-S Nikkor 600mm f/4E FL ED VR"},
+ {"AC 54 3C 3C 0C 0C D7 06", "AF-S Nikkor 28mm f/1.4E ED"},
+ {"AC 54 3C 3C 0C 0C D7 46", "AF-S Nikkor 28mm f/1.4E ED"},
{"AD 3C 2D 8E 2C 3C AF 0E", "AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR"},
+ {"AD 3C A0 A0 3C 3C D8 0E", "AF-S Nikkor 500mm f/5.6E PF ED VR"},
+ {"AD 3C A0 A0 3C 3C D8 4E", "AF-S Nikkor 500mm f/5.6E PF ED VR"},
{"AD 48 28 60 24 30 C8 0E", "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR"},
{"AD 48 28 60 24 30 C8 4E", "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR"},
{"AE 3C 80 A0 3C 3C C9 0E", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
@@ -1039,7 +1060,7 @@ const std::map NALensDataInterpreter::lenses = {
{"B1 48 48 48 24 24 B3 06", "AF-S DX Micro Nikkor 40mm f/2.8G"},
{"B2 48 5C 80 30 30 B4 0E", "AF-S Nikkor 70-200mm f/4G ED VR"},
{"B3 4C 62 62 14 14 B5 06", "AF-S Nikkor 85mm f/1.8G"},
- {"B4 40 37 62 2C 34 B6 0E", "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
+ {"B4 40 37 62 2C 34 B6 0E", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED VR"},
{"B5 4C 3C 3C 14 14 B7 06", "AF-S Nikkor 28mm f/1.8G"},
{"B6 3C B0 B0 3C 3C B8 0E", "AF-S VR Nikkor 800mm f/5.6E FL ED"},
{"B6 3C B0 B0 3C 3C B8 4E", "AF-S VR Nikkor 800mm f/5.6E FL ED"},
@@ -1048,8 +1069,11 @@ const std::map NALensDataInterpreter::lenses = {
{"B8 40 2D 44 2C 34 BA 06", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
{"BF 3C 1B 1B 30 30 01 04", "Irix 11mm f/4 Firefly"},
{"BF 4E 26 26 1E 1E 01 04", "Irix 15mm f/2.4 Firefly"},
+ {"C1 48 24 37 24 24 4B 46", "Sigma 14-24mm f/2.8 DG HSM | A"},
+ {"C2 4C 24 24 14 14 4B 06", "Sigma 14mm f/1.8 DG HSM | A"},
{"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
{"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"},
+ {"C9 48 37 5C 24 24 4B 4E", "Sigma 24-70mm f/2.8 DG OS HSM | A"},
{"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"},
@@ -1058,7 +1082,10 @@ const std::map NALensDataInterpreter::lenses = {
{"DC 48 19 19 24 24 4B 06", "Sigma 10mm f/2.8 EX DC HSM Fisheye"},
{"DE 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 EX DG HSM"},
{"E0 3C 5C 8E 30 3C 4B 06", "Sigma 70-300mm f/4-5.6 APO DG Macro HSM"},
+ {"E0 40 2D 98 2C 41 DF 4E", "Tamron AF 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
+ {"E1 40 19 36 2C 35 DF 4E", "Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)"},
{"E1 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
+ {"E2 47 5C 80 24 24 DF 4E", "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
{"E3 40 76 A6 38 40 DF 4E", "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
{"E3 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
{"E4 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F017)"},
diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc
index 4d9a31b6f..0968271e5 100644
--- a/rtexif/pentaxattribs.cc
+++ b/rtexif/pentaxattribs.cc
@@ -937,6 +937,7 @@ public:
choices.insert (p_t (256 * 8 + 61, "HD PENTAX-D FA 28-105mm f/3.5-5.6 ED DC WR"));
choices.insert (p_t (256 * 8 + 62, "HD PENTAX-D FA 24-70mm f/2.8 ED SDM WR"));
choices.insert (p_t (256 * 8 + 63, "HD PENTAX-D FA 15-30mm f/2.8 ED SDM WR"));
+ choices.insert (p_t (256 * 8 + 64, "HD PENTAX-D FA* 50mm f/1.4 SDM AW"));
choices.insert (p_t (256 * 8 + 197, "HD PENTAX-DA 55-300mm f/4.5-6.3 ED PLM WR RE"));
choices.insert (p_t (256 * 8 + 198, "smc PENTAX-DA L 18-50mm f/4-5.6 DC WR RE"));
choices.insert (p_t (256 * 8 + 199, "HD PENTAX-DA 18-50mm f/4-5.6 DC WR RE"));
diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc
index 834d436f9..76ed788c2 100644
--- a/rtexif/sonyminoltaattribs.cc
+++ b/rtexif/sonyminoltaattribs.cc
@@ -818,6 +818,7 @@ public:
{2672, "Minolta AF 24-105mm f/3.5-4.5 (D)"},
{3046, "Metabones Canon EF Speed Booster"},
{4567, "Tokina 70-210mm f/4-5.6"},
+ {4570, "Tamron AF 35-135mm f/3.5-4.5"},
{4571, "Vivitar 70-210mm f/4.5-5.6"},
{4574, "2x Teleconverter or Tamron or Tokina Lens"},
{4574, "Tamron SP AF 90mm f/2.5"},
@@ -851,6 +852,7 @@ public:
{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 FE 24mm f/1.4 GM"},
{6553, "Sony FE 24-105mm f/4 G OSS"},
{6553, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
{6553, "Sony FE 55mm f/1.8 ZA"},
@@ -874,20 +876,26 @@ public:
{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 400mm f/2.8 GM OSS"},
{6553, "Sony E 18-135mm f/3.5-5.6 OSS"},
{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, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"},
+ {6553, "Sony FE 400mm f/2.8 GM OSS + 2X Teleconverter"},
{6553, "Samyang AF 50mm f/1.4 FE"},
{6553, "Samyang AF 14mm f/2.8 FE"},
+ {6553, "Samyang AF 24mm f/2.8"},
{6553, "Samyang AF 35mm f/2.8 FE"},
{6553, "Samyang AF 35mm f/1.4"},
{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"},
+ {6553, "Sigma 85mm f/1.4 DG HSM | A"},
{6553, "Sigma 16mm f/1.4 DC DN | C"},
+ {6553, "Sigma 70mm f/2.8 DG MACRO | A"},
{6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{6553, "Tamron 28-75mm f/2.8 Di III RXD"},
{6553, "Tokina Firin 20mm f/2 FE MF"},
@@ -897,6 +905,7 @@ public:
{6553, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{6553, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{6553, "Voigtlander NOKTON classic 35mm f/1.4"},
+ {6553, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"},
{6553, "Zeiss Touit 12mm f/2.8"},
{6553, "Zeiss Touit 32mm f/1.8"},
{6553, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -904,6 +913,7 @@ public:
{6553, "Zeiss Batis 85mm f/1.8"},
{6553, "Zeiss Batis 18mm f/2.8"},
{6553, "Zeiss Batis 135mm f/2.8"},
+ {6553, "Zeiss Batis 40mm f/2 CF"},
{6553, "Zeiss Loxia 50mm f/2"},
{6553, "Zeiss Loxia 35mm f/2"},
{6553, "Zeiss Loxia 21mm f/2.8"},
@@ -1029,6 +1039,7 @@ public:
{26721, "Minolta AF 24-105mm f/3.5-4.5 (D)"},
{30464, "Metabones Canon EF Speed Booster"},
{45671, "Tokina 70-210mm f/4-5.6"},
+ {45701, "Tamron AF 35-135mm f/3.5-4.5"},
{45711, "Vivitar 70-210mm f/4.5-5.6"},
{45741, "2x Teleconverter or Tamron or Tokina Lens"},
{45741, "Tamron SP AF 90mm f/2.5"},
@@ -1062,6 +1073,7 @@ public:
{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 FE 24mm f/1.4 GM"},
{65535, "Sony FE 24-105mm f/4 G OSS"},
{65535, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
{65535, "Sony FE 55mm f/1.8 ZA"},
@@ -1085,20 +1097,26 @@ public:
{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 400mm f/2.8 GM OSS"},
{65535, "Sony E 18-135mm f/3.5-5.6 OSS"},
{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, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"},
+ {65535, "Sony FE 400mm f/2.8 GM OSS + 2X Teleconverter"},
{65535, "Samyang AF 50mm f/1.4 FE"},
{65535, "Samyang AF 14mm f/2.8 FE"},
+ {65535, "Samyang AF 24mm f/2.8"},
{65535, "Samyang AF 35mm f/2.8 FE"},
{65535, "Samyang AF 35mm f/1.4"},
{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"},
+ {65535, "Sigma 85mm f/1.4 DG HSM | A"},
{65535, "Sigma 16mm f/1.4 DC DN | C"},
+ {65535, "Sigma 70mm f/2.8 DG MACRO | A"},
{65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{65535, "Tamron 28-75mm f/2.8 Di III RXD"},
{65535, "Tokina Firin 20mm f/2 FE MF"},
@@ -1108,6 +1126,7 @@ public:
{65535, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{65535, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{65535, "Voigtlander NOKTON classic 35mm f/1.4"},
+ {65535, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"},
{65535, "Zeiss Touit 12mm f/2.8"},
{65535, "Zeiss Touit 32mm f/1.8"},
{65535, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -1115,6 +1134,7 @@ public:
{65535, "Zeiss Batis 85mm f/1.8"},
{65535, "Zeiss Batis 18mm f/2.8"},
{65535, "Zeiss Batis 135mm f/2.8"},
+ {65535, "Zeiss Batis 40mm f/2 CF"},
{65535, "Zeiss Loxia 50mm f/2"},
{65535, "Zeiss Loxia 35mm f/2"},
{65535, "Zeiss Loxia 21mm f/2.8"},
@@ -1190,7 +1210,8 @@ public:
choices.insert (p_t (32791, "Sony E 16-70mm f/4 ZA OSS"));
choices.insert (p_t (32792, "Sony E 10-18mm f/4 OSS"));
choices.insert (p_t (32793, "Sony E PZ 16-50mm f/3.5-5.6 OSS"));
- choices.insert (p_t (32794, "Sony FE 35mm f/2.8 ZA"));
+ choices.insert (p_t (32794, "Sony FE 35mm f/2.8 ZA or Samyang AF 24mm f/2.8 FE"));
+ choices.insert (p_t (32794, "Samyang AF 24mm f/2.8 FE"));
choices.insert (p_t (32795, "Sony FE 24-70mm f/4 ZA OSS"));
choices.insert (p_t (32796, "Sony FE 85mm f/1.8"));
choices.insert (p_t (32797, "Sony E 18-200mm f/3.5-6.3 OSS LE"));
@@ -1200,6 +1221,7 @@ public:
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 (32804, "Sony FE 24mm f/1.4 GM"));
choices.insert (p_t (32805, "Sony FE 24-105mm f/4 G OSS"));
choices.insert (p_t (32807, "Sony E PZ 18-200mm f/3.5-6.3 OSS"));
choices.insert (p_t (32808, "Sony FE 55mm f/1.8 ZA"));
@@ -1223,12 +1245,15 @@ public:
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 (32831, "Sony FE 16-35mm f/2.8 GM"));
+ choices.insert (p_t (32848, "Sony FE 400mm f/2.8 GM OSS"));
choices.insert (p_t (32849, "Sony E 18-135mm f/3.5-5.6 OSS"));
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 (33079, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"));
+ choices.insert (p_t (33080, "Sony FE 400mm f/2.8 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"));
@@ -1236,6 +1261,7 @@ public:
choices.insert (p_t (49217, "Zeiss Batis 85mm f/1.8"));
choices.insert (p_t (49218, "Zeiss Batis 18mm f/2.8"));
choices.insert (p_t (49219, "Zeiss Batis 135mm f/2.8"));
+ choices.insert (p_t (49220, "Zeiss Batis 40mm f/2 CF"));
choices.insert (p_t (49232, "Zeiss Loxia 50mm f/2"));
choices.insert (p_t (49233, "Zeiss Loxia 35mm f/2"));
choices.insert (p_t (49234, "Zeiss Loxia 21mm f/2.8"));
@@ -1255,14 +1281,17 @@ public:
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 (50499, "Sigma 85mm f/1.4 DG HSM | A"));
choices.insert (p_t (50501, "Sigma 100-400mm f/5-6.3 DG OS HSM | C + MC-11"));
choices.insert (p_t (50503, "Sigma 16mm f/1.4 DC DN | C"));
+ choices.insert (p_t (50513, "Sigma 70mm f/2.8 DG MACRO | A"));
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 (50997, "Voigtlander NOKTON classic 35mm f/1.4"));
+ choices.insert (p_t (50999, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"));
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"));
choices.insert (p_t (51507, "Samyang AF 35mm f/1.4"));
diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc
index c028ee9e7..e5e0f759f 100644
--- a/rtgui/iccprofilecreator.cc
+++ b/rtgui/iccprofilecreator.cc
@@ -909,7 +909,7 @@ void ICCProfileCreator::savePressed()
sGamma = Glib::ustring::format(std::setw(3), std::fixed, std::setprecision(2), presetGamma);
sSlope = Glib::ustring::format(std::setw(6), std::fixed, std::setprecision(5), presetSlope);
fName = Glib::ustring::compose("RT%1_%2_%3.icc", profileVersion, sPrimariesAndIlluminant, sGammaPreset);
- profileDesc == sPrimariesPreset + sGammaPreset;
+ profileDesc = sPrimariesPreset + sGammaPreset;
}
sGammaSlopeParam = Glib::ustring::compose("g%1s%2!", sGamma, sSlope);
@@ -1025,6 +1025,11 @@ void ICCProfileCreator::savePressed()
if (illuminant == "D50") {
xyD = {0.3457, 0.3585, 1.0};//white D50 near LCMS values but not perfect...it's a compromise!!
}
+
+ if (illuminant == "stdA") {
+ xyD = {0.447573, 0.407440, 1.0};
+ }
+
} else {
if (v2except) {
@@ -1175,19 +1180,16 @@ void ICCProfileCreator::savePressed()
}
}
- if (illuminant == "stdA") {
- xyD = {0.447573, 0.407440, 1.0};
- }
- if (isD65) {
+ if (isD65 && illuminant == "DEF") {
xyD = {0.312700492, 0.329000939, 1.0};
}
- if (isD60) {
+ if (isD60 && illuminant == "DEF") {
xyD = {0.32168, 0.33767, 1.0};
}
- if (isD50) {
+ if (isD50 && illuminant == "DEF") {
xyD = {0.3457, 0.3585, 1.0};
}
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 1887bb7a5..96f49d73a 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -609,7 +609,12 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
crophb->pack_start(*Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": ")), Gtk::PACK_SHRINK, 4);
crophb->pack_start(*cropGuides);
cropvb->pack_start(*crophb);
- cropAutoFit = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_CROP_AUTO_FIT")));
+ Gtk::Label *cropAutoFitLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
+ cropAutoFitLabel->set_line_wrap(true);
+ setExpandAlignProperties(cropAutoFitLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
+ cropAutoFit = Gtk::manage(new Gtk::CheckButton());
+ setExpandAlignProperties(cropAutoFit, false, true, Gtk::ALIGN_START, Gtk::ALIGN_START);
+ cropAutoFit->add(*cropAutoFitLabel);
cropvb->pack_start(*cropAutoFit);
cropframe->add(*cropvb);
vbImageProcessing->pack_start(*cropframe, Gtk::PACK_SHRINK, 4);
@@ -1403,7 +1408,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
vbc->pack_start (*cacheGrid, Gtk::PACK_SHRINK, 4);
Gtk::Label* clearSafetyLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_SAFETY")));
- setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
clearSafetyLbl->set_line_wrap(true);
vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc
index b208f5509..2daeb102f 100644
--- a/rtgui/rawcacorrection.cc
+++ b/rtgui/rawcacorrection.cc
@@ -41,6 +41,7 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 5, 1, 2));
caAutoiterations->setAdjusterListener (this);
+ caAutoiterations->set_tooltip_markup(M("TP_RAWCACORR_AUTOIT_TOOLTIP"));
if (caAutoiterations->delay < options.adjusterMaxDelay) {
caAutoiterations->delay = options.adjusterMaxDelay;