diff --git a/.travis.yml b/.travis.yml
index 6ef54e62a..2bd00c412 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ notifications:
   irc:
     channels:
     - "chat.freenode.net#rawtherapee"
+    skip_join: true
     template:
     - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
   email:
diff --git a/rtdata/dcpprofiles/Canon EOS 6D.dcp b/rtdata/dcpprofiles/Canon EOS 6D.dcp
index 65919144c..3dc00a95f 100644
Binary files a/rtdata/dcpprofiles/Canon EOS 6D.dcp and b/rtdata/dcpprofiles/Canon EOS 6D.dcp differ
diff --git a/rtdata/dcpprofiles/Canon PowerShot G7 X.dcp b/rtdata/dcpprofiles/Canon PowerShot G7 X.dcp
index 3a6c7800f..bcfdfcdf4 100644
Binary files a/rtdata/dcpprofiles/Canon PowerShot G7 X.dcp and b/rtdata/dcpprofiles/Canon PowerShot G7 X.dcp differ
diff --git a/rtdata/dcpprofiles/Canon PowerShot S110.dcp b/rtdata/dcpprofiles/Canon PowerShot S110.dcp
index 7f310af24..9a372a36f 100644
Binary files a/rtdata/dcpprofiles/Canon PowerShot S110.dcp and b/rtdata/dcpprofiles/Canon PowerShot S110.dcp differ
diff --git a/rtdata/dcpprofiles/Fujifilm X-T1.dcp b/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Fujifilm X-T1.dcp
rename to rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp
index 5d6c48b28..5b448b7b1 100644
Binary files a/rtdata/dcpprofiles/Fujifilm X-T1.dcp and b/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp differ
diff --git a/rtdata/dcpprofiles/Pentax K10D.dcp b/rtdata/dcpprofiles/FUJIFILM X-T1.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Pentax K10D.dcp
rename to rtdata/dcpprofiles/FUJIFILM X-T1.dcp
index bad56c5d7..fb9ecff4d 100644
Binary files a/rtdata/dcpprofiles/Pentax K10D.dcp and b/rtdata/dcpprofiles/FUJIFILM X-T1.dcp differ
diff --git a/rtdata/dcpprofiles/Fujifilm X100T.dcp b/rtdata/dcpprofiles/FUJIFILM X100T.dcp
similarity index 90%
rename from rtdata/dcpprofiles/Fujifilm X100T.dcp
rename to rtdata/dcpprofiles/FUJIFILM X100T.dcp
index 1fa827c5d..b2823ccce 100644
Binary files a/rtdata/dcpprofiles/Fujifilm X100T.dcp and b/rtdata/dcpprofiles/FUJIFILM X100T.dcp differ
diff --git a/rtdata/dcpprofiles/Sony ILCE-6000.dcp b/rtdata/dcpprofiles/NIKON D7200.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Sony ILCE-6000.dcp
rename to rtdata/dcpprofiles/NIKON D7200.dcp
index 5ef8c4d31..742bd3ead 100644
Binary files a/rtdata/dcpprofiles/Sony ILCE-6000.dcp and b/rtdata/dcpprofiles/NIKON D7200.dcp differ
diff --git a/rtdata/dcpprofiles/NIKON D750.dcp b/rtdata/dcpprofiles/NIKON D750.dcp
new file mode 100644
index 000000000..6dcef8386
Binary files /dev/null and b/rtdata/dcpprofiles/NIKON D750.dcp differ
diff --git a/rtdata/dcpprofiles/Nikon D750.dcp b/rtdata/dcpprofiles/Nikon D750.dcp
deleted file mode 100644
index ad9cd5679..000000000
Binary files a/rtdata/dcpprofiles/Nikon D750.dcp and /dev/null differ
diff --git a/rtdata/dcpprofiles/Sony ILCE-7M2.dcp b/rtdata/dcpprofiles/OLYMPUS E-M10.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Sony ILCE-7M2.dcp
rename to rtdata/dcpprofiles/OLYMPUS E-M10.dcp
index 6d886e491..d10459c83 100644
Binary files a/rtdata/dcpprofiles/Sony ILCE-7M2.dcp and b/rtdata/dcpprofiles/OLYMPUS E-M10.dcp differ
diff --git a/rtdata/dcpprofiles/Pentax K-5 II.dcp b/rtdata/dcpprofiles/PENTAX K-5 II.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Pentax K-5 II.dcp
rename to rtdata/dcpprofiles/PENTAX K-5 II.dcp
index 6eef2206a..307a40689 100644
Binary files a/rtdata/dcpprofiles/Pentax K-5 II.dcp and b/rtdata/dcpprofiles/PENTAX K-5 II.dcp differ
diff --git a/rtdata/dcpprofiles/Pentax K-5.dcp b/rtdata/dcpprofiles/PENTAX K-5.dcp
similarity index 92%
rename from rtdata/dcpprofiles/Pentax K-5.dcp
rename to rtdata/dcpprofiles/PENTAX K-5.dcp
index 52fbb7d85..c3e496fab 100644
Binary files a/rtdata/dcpprofiles/Pentax K-5.dcp and b/rtdata/dcpprofiles/PENTAX K-5.dcp differ
diff --git a/rtdata/dcpprofiles/PENTAX K10D.dcp b/rtdata/dcpprofiles/PENTAX K10D.dcp
new file mode 100644
index 000000000..cda2456d0
Binary files /dev/null and b/rtdata/dcpprofiles/PENTAX K10D.dcp differ
diff --git a/rtdata/dcpprofiles/RICOH PENTAX K-1.dcp b/rtdata/dcpprofiles/RICOH PENTAX K-1.dcp
new file mode 100644
index 000000000..87028cba6
Binary files /dev/null and b/rtdata/dcpprofiles/RICOH PENTAX K-1.dcp differ
diff --git a/rtdata/dcpprofiles/RICOH PENTAX K-3.dcp b/rtdata/dcpprofiles/RICOH PENTAX K-3.dcp
new file mode 100644
index 000000000..f04e0b2ad
Binary files /dev/null and b/rtdata/dcpprofiles/RICOH PENTAX K-3.dcp differ
diff --git a/rtdata/dcpprofiles/Nikon D7200.dcp b/rtdata/dcpprofiles/SONY ILCE-6000.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Nikon D7200.dcp
rename to rtdata/dcpprofiles/SONY ILCE-6000.dcp
index 01e5cfa13..d0d1c3ae5 100644
Binary files a/rtdata/dcpprofiles/Nikon D7200.dcp and b/rtdata/dcpprofiles/SONY ILCE-6000.dcp differ
diff --git a/rtdata/dcpprofiles/Ricoh Pentax K-3.dcp b/rtdata/dcpprofiles/SONY ILCE-7M2.dcp
similarity index 89%
rename from rtdata/dcpprofiles/Ricoh Pentax K-3.dcp
rename to rtdata/dcpprofiles/SONY ILCE-7M2.dcp
index 1eead1a2b..b46343181 100644
Binary files a/rtdata/dcpprofiles/Ricoh Pentax K-3.dcp and b/rtdata/dcpprofiles/SONY ILCE-7M2.dcp differ
diff --git a/rtdata/dcpprofiles/YI TECHNOLOGY M1.dcp b/rtdata/dcpprofiles/YI TECHNOLOGY M1.dcp
new file mode 100644
index 000000000..d21ace365
Binary files /dev/null and b/rtdata/dcpprofiles/YI TECHNOLOGY M1.dcp differ
diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 3752bdd34..5fc720cfa 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -362,47 +362,23 @@ HISTORY_MSG_173;RS - Detall de la luminància
 HISTORY_NEWSNAPSHOT;Afegeix
 HISTORY_SNAPSHOT;Instantània
 HISTORY_SNAPSHOTS;Instantànies
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Tractament o títol de l'autor
-IPTCPANEL_AUTHORSPOSITIONHINT;Títol del(s) creador(s) de l'objecte (By-line Title).
-IPTCPANEL_CAPTION;Text descriptiu
-IPTCPANEL_CAPTIONHINT;Un text de descripció de les dades (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Autor de la descripció
-IPTCPANEL_CAPTIONWRITERHINT;Nom de qui ha escrit, editat o corregit la imatge o la descripció (Writer - Editor).
 IPTCPANEL_CATEGORY;Classificació
-IPTCPANEL_CATEGORYHINT;Classificació de la imatge, segons el proveïdor (Category).
 IPTCPANEL_CITY;Ciutat
-IPTCPANEL_CITYHINT;Ciutat d'origen de la imatge (City).
 IPTCPANEL_COPYHINT;Copiar dades actuals IPTC al portapapers
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Qualsevol notificació necessària sobre copyright (Copyright Notice).
 IPTCPANEL_COUNTRY;País
-IPTCPANEL_COUNTRYHINT;Nom del país o lloc on va ser creada la imatge (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Crèdit
 IPTCPANEL_CREDITHINT;Identitat del proveïdor de la imatge, no necessàriament el propietari/creador (Credit).
 IPTCPANEL_DATECREATED;Data de creació
-IPTCPANEL_DATECREATEDHINT;Data en què va ser creat el contingut intel·lectual de la imatge; Format: AAAAMMDD (Date Created).
 IPTCPANEL_EMBEDDED;Encastat
 IPTCPANEL_EMBEDDEDHINT;Restaurar les dades IPTC encastades al fitxer d'imatge
 IPTCPANEL_HEADLINE;Capçalera
-IPTCPANEL_HEADLINEHINT;Una nota publicable que és una sinopsi dels continguts de la imatge (Headline).
 IPTCPANEL_INSTRUCTIONS;Instruccions
-IPTCPANEL_INSTRUCTIONSHINT;Altres instruccions editorials sobre l'ús de la imatge (Special Instructions).
 IPTCPANEL_KEYWORDS;Paraules clau
-IPTCPANEL_KEYWORDSHINT;Paraules clau que faciliten la recerca de la imatge (Keywords).
 IPTCPANEL_PASTEHINT;Enganxa les dades IPTC del portapapers
-IPTCPANEL_PROVINCE;Regió
-IPTCPANEL_PROVINCEHINT;Regió/Estat d'origen de la imatge (Province-State).
 IPTCPANEL_RESET;Reinici
 IPTCPANEL_RESETHINT;Reinici perfil per omissió
 IPTCPANEL_SOURCE;Font
-IPTCPANEL_SOURCEHINT;Propietari original del contingut intel·lectual de la imatge (Source).
-IPTCPANEL_SUPPCATEGORIES;Classif. detallada
-IPTCPANEL_SUPPCATEGORIESHINT;Precisió sobre el tema de la imatge (Supplemental Categories).
 IPTCPANEL_TITLE;Títol
-IPTCPANEL_TITLEHINT;Referència breu de la imatge (Object Name).
-IPTCPANEL_TRANSREFERENCE;Refer. transmissió
-IPTCPANEL_TRANSREFERENCEHINT;Codi que indica el lloc de la transmissió original (Original Transmission Reference).
 MAIN_BUTTON_FULLSCREEN;Pantalla sencera
 MAIN_BUTTON_PREFERENCES;Preferències
 MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Afeg. imatge actual a la cua de procés.\nDrecera: <b>Ctrl+B</b>
@@ -733,8 +709,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;Més fi
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Neutral
 TP_DIRPYREQUALIZER_THRESHOLD;Llindar
 TP_DISTORTION_AMOUNT;Quantitat
-TP_DISTORTION_AUTO;Auto correcció de distorsió
-TP_DISTORTION_AUTO_TIP;(Experimental) Correc. automàtica de distorsió de lent per algunes càmeres (M4/3, algunes compactes DC, etc.)
 TP_DISTORTION_LABEL;Distorsió
 TP_EPD_EDGESTOPPING;Aturant a les vores
 TP_EPD_LABEL;Mapejant tons
@@ -803,7 +777,6 @@ TP_ICM_INPUTPROFILE;Perfil d'entrada
 TP_ICM_LABEL;Gestió de color
 TP_ICM_NOICM;No cap ICM: Sortida  sRGB
 TP_ICM_OUTPUTPROFILE;Perfil de sortida
-TP_ICM_SAVEREFERENCE;Desa com a imatge de ref. als perfils
 TP_ICM_TONECURVE;Usa la corba de to DCP.
 TP_ICM_TONECURVE_TOOLTIP;Habilita l'ús de corbes de to incloses en els perfils DCP.
 TP_ICM_WORKINGPROFILE;Perfil de treball
@@ -1308,6 +1281,31 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
 !MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronize the File Browser or Filmstrip with the Editor to reveal the thumbnail of the currently opened image, and clear any active filters.\nShortcut: <b>x</b>\n\nAs above, but without clearing active filters:\nShortcut: <b>y</b>\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1362,6 +1360,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1381,7 +1380,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1407,9 +1406,10 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
@@ -1420,7 +1420,10 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1695,6 +1698,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)"
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
@@ -1733,6 +1737,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolated
 !TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1863,7 +1868,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_RGBCURVES_LUMAMODE_TOOLTIP;<b>Luminosity mode</b> allows to vary the contribution of R, G and B channels to the luminosity of the image, without altering image color.
 !TP_SAVEDIALOG_OK_TIP;Shortcut: <b>Ctrl-Enter</b>
 !TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_WAVELET_1;Level 1
 !TP_WAVELET_2;Level 2
 !TP_WAVELET_3;Level 3
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 81226c2bf..64631d2b8 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -276,47 +276,23 @@ HISTORY_NEWSNAPSHOT;新建快照
 HISTORY_NEWSNAPSHOT_TOOLTIP;快捷键：<b>Alt-s</b>
 HISTORY_SNAPSHOT;快照
 HISTORY_SNAPSHOTS;系列快照
-IPTCPANEL_AUTHOR;作者
-IPTCPANEL_AUTHORSPOSITION;作者职位
-IPTCPANEL_AUTHORSPOSITIONHINT;作者头衔
-IPTCPANEL_CAPTION;标题
-IPTCPANEL_CAPTIONHINT;文字说明
-IPTCPANEL_CAPTIONWRITER;说明作者
-IPTCPANEL_CAPTIONWRITERHINT;参与创作人员
 IPTCPANEL_CATEGORY;类别
-IPTCPANEL_CATEGORYHINT;提供者所认为的作品类别
 IPTCPANEL_CITY;城市
-IPTCPANEL_CITYHINT;图片来自城市
 IPTCPANEL_COPYHINT;将IPTC设置复制到剪贴板
-IPTCPANEL_COPYRIGHT;版权
-IPTCPANEL_COPYRIGHTHINT;版权信息
 IPTCPANEL_COUNTRY;国家
-IPTCPANEL_COUNTRYHINT;图片来自国家
 IPTCPANEL_CREDIT;提供者
 IPTCPANEL_CREDITHINT;图片提供者，未必是作者
 IPTCPANEL_DATECREATED;创作日期
-IPTCPANEL_DATECREATEDHINT;图片创作日期，格式：年月日补零(YYYYMMDD)
 IPTCPANEL_EMBEDDED;内嵌
 IPTCPANEL_EMBEDDEDHINT;将IPTC数据重置为图片内嵌数据
 IPTCPANEL_HEADLINE;摘要
-IPTCPANEL_HEADLINEHINT;可发布的内容简介
 IPTCPANEL_INSTRUCTIONS;指令
-IPTCPANEL_INSTRUCTIONSHINT;写给编辑的特殊要求
 IPTCPANEL_KEYWORDS;关键词
-IPTCPANEL_KEYWORDSHINT;用于信息索引
 IPTCPANEL_PASTEHINT;粘贴剪贴板内的IPTC设置
-IPTCPANEL_PROVINCE;省份
-IPTCPANEL_PROVINCEHINT;图片来自省份
 IPTCPANEL_RESET;重置
 IPTCPANEL_RESETHINT;重置为默认配置
 IPTCPANEL_SOURCE;来源
-IPTCPANEL_SOURCEHINT;图片内容知识产权所有人
-IPTCPANEL_SUPPCATEGORIES;附加类别
-IPTCPANEL_SUPPCATEGORIESHINT;进一步细分类别
 IPTCPANEL_TITLE;标题
-IPTCPANEL_TITLEHINT;作品的名称
-IPTCPANEL_TRANSREFERENCE;传输基准
-IPTCPANEL_TRANSREFERENCEHINT;原始发送地点代码
 MAIN_BUTTON_FULLSCREEN;全屏幕
 MAIN_BUTTON_PREFERENCES;参数设置
 MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;将当前图片放入处理序列中\n快捷键: <b>Ctrl+b</b>
@@ -625,8 +601,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;最佳
 TP_DIRPYREQUALIZER_LUMANEUTRAL;自然
 TP_DIRPYREQUALIZER_THRESHOLD;阀值
 TP_DISTORTION_AMOUNT;程度
-TP_DISTORTION_AUTO;自动畸变矫正
-TP_DISTORTION_AUTO_TIP;自动进行一些相机的镜头畸变矫正
 TP_DISTORTION_LABEL;畸变
 TP_EPD_LABEL;色阶映射
 TP_EPD_SCALE;拉伸
@@ -695,7 +669,6 @@ TP_ICM_INPUTPROFILE;输入配置
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB配置
 TP_ICM_OUTPUTPROFILE;输出配置
-TP_ICM_SAVEREFERENCE;保存参考图片用于生成配置信息
 TP_ICM_TONECURVE;使用 DCP 色调曲线
 TP_ICM_WORKINGPROFILE;当前配置
 TP_IMPULSEDENOISE_LABEL;降低电磁干扰
@@ -1224,6 +1197,31 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
 !MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronize the File Browser or Filmstrip with the Editor to reveal the thumbnail of the currently opened image, and clear any active filters.\nShortcut: <b>x</b>\n\nAs above, but without clearing active filters:\nShortcut: <b>y</b>\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1290,6 +1288,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1319,7 +1318,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1354,9 +1353,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1372,7 +1372,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1634,6 +1637,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates
@@ -1673,6 +1677,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_ICM_INPUTCAMERA_TOOLTIP;Use a simple color matrix from dcraw, an enhanced RawTherapee version (whichever is available based on camera model) or one embedded in the DNG.
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1829,7 +1834,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_RETINEX_VIEW_TRAN;Transmission - Auto
 !TP_RETINEX_VIEW_TRAN2;Transmission - Fixed
 !TP_RETINEX_VIEW_UNSHARP;Unsharp mask
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
 !TP_SHARPENMICRO_UNIFORMITY;Uniformity
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 49ef3bc77..90933541f 100644
--- a/rtdata/languages/Chinese (Traditional)	
+++ b/rtdata/languages/Chinese (Traditional)	
@@ -176,47 +176,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;新建快照
 HISTORY_SNAPSHOT;快照
 HISTORY_SNAPSHOTS;系列快照
-IPTCPANEL_AUTHOR;Author
-IPTCPANEL_AUTHORSPOSITION;Author's position
-IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-IPTCPANEL_CAPTION;Caption
-IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Caption Writer
-IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor
 IPTCPANEL_CATEGORY;Category
-IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
 IPTCPANEL_CITY;City
-IPTCPANEL_CITYHINT;City of image origin (City).
 IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
 IPTCPANEL_COUNTRY;Country
-IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Credit
 IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
 IPTCPANEL_DATECREATED;Date Created
-IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file
 IPTCPANEL_HEADLINE;Headline
-IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
 IPTCPANEL_KEYWORDS;Keywords
-IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (keywords).
 IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Reset to profile default
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. Categories
-IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
 IPTCPANEL_TITLE;Title
-IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;參數設置
 MAIN_BUTTON_PUTTOQUEUE;Put to queue
 MAIN_BUTTON_SAVE;儲存圖片
@@ -405,7 +381,6 @@ TP_ICM_INPUTPROFILE;輸入配置
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB配置
 TP_ICM_OUTPUTPROFILE;輸出配置
-TP_ICM_SAVEREFERENCE;Save reference image for profiling
 TP_ICM_WORKINGPROFILE;當前配置
 TP_RESIZE_H;高:
 TP_RESIZE_HEIGHT;Height
@@ -960,6 +935,31 @@ TP_WBALANCE_TEMPERATURE;色溫
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1090,6 +1090,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1125,7 +1126,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1161,9 +1162,10 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1179,8 +1181,11 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1515,8 +1520,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1600,6 +1604,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1804,7 +1809,6 @@ TP_WBALANCE_TEMPERATURE;色溫
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 015dc1a7d..2b54e53d8 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -35,7 +35,7 @@
 #34 2015-07-09 updated by mkyral
 #35 2015-11-24 updated by mkyral
 #36 2016-10-18 updated by mkyral
-
+#37 2017-01-10 updated by mkyral
 ABOUT_TAB_BUILD;Verze
 ABOUT_TAB_CREDITS;Zásluhy
 ABOUT_TAB_LICENSE;Licence
@@ -129,7 +129,7 @@ FILEBROWSER_AUTODARKFRAME;Automatický tmavý snímek
 FILEBROWSER_AUTOFLATFIELD;Auto Flat Field
 FILEBROWSER_BROWSEPATHBUTTONHINT;Klikněte pro výběr cesty.
 FILEBROWSER_BROWSEPATHHINT;Vložte cestu pro procházení.\n\nKlávesové zkratky:\n<b>Ctrl-o</b> pro přepnutí do adresního řádku.\n<b>Enter</b>/ <b>Ctrl-Enter</b> pro procházení ;\n<b>Esc</b> pro zrušení změn.\n<b>Shift-Esc</b> pro zrušení přepnutí.\n\nZkratky pro cesty:\n<b>~</b>\t- domácí složka uživatele.\n<b>!</b>\t- složka s obrázky uživatele.
-FILEBROWSER_CACHE;Metipaměť
+FILEBROWSER_CACHE;Mezipaměť
 FILEBROWSER_CACHECLEARFROMFULL;Vymazat z mezipaměti - úplně
 FILEBROWSER_CACHECLEARFROMPARTIAL;Vymazat z mezipaměti - částečně
 FILEBROWSER_CLEARPROFILE;Smazat
@@ -204,7 +204,7 @@ FILEBROWSER_SHOWEDITEDHINT;Ukázat upravené obrázky.\nZkratka: <b>7</b>
 FILEBROWSER_SHOWEDITEDNOTHINT;Ukázat neupravené obrázky.\nZkratka: <b>6</b>
 FILEBROWSER_SHOWEXIFINFO;Zobrazit Exif informace.\n\nZkratky:\n<b>i</b> - režim více karet editoru,\n<b>Alt-i</b> - režim jedné karty editoru.
 FILEBROWSER_SHOWNOTTRASHHINT;Zobrazit pouze nesmazané obrázky.
-FILEBROWSER_SHOWORIGINALHINT;Zobrazí pouze originální  obrázky.\n\nPokud existuje několik obrázků se stejným názvem, ale rozdílnými příponami, bude jako originál vybrán ten, jehož přípona je nejvýše v seznamu příponve Volby > Prohlížeč souborů > Analyzované přípony.
+FILEBROWSER_SHOWORIGINALHINT;Zobrazí pouze originální  obrázky.\n\nPokud existuje několik obrázků se stejným názvem, ale rozdílnými příponami, bude jako originál vybrán ten, jehož přípona je nejvýše v seznamu přípon veVolby > Prohlížeč souborů > Analyzované přípony.
 FILEBROWSER_SHOWRANK1HINT;Ukázat obrázky hodnocené jednou hvězdičkou.\nZkratka: <b>1</b>
 FILEBROWSER_SHOWRANK2HINT;Ukázat obrázky hodnocené dvěma hvězdičkami.\nZkratka: <b>2</b>
 FILEBROWSER_SHOWRANK3HINT;Ukázat obrázky hodnocené třemi hvězdičkami.\nZkratka: <b>3</b>
@@ -713,47 +713,48 @@ HISTORY_NEWSNAPSHOT;Přidat
 HISTORY_NEWSNAPSHOT_TOOLTIP;Zkratka: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snímek
 HISTORY_SNAPSHOTS;Snímky
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Autorova pozice
-IPTCPANEL_AUTHORSPOSITIONHINT;Titul/pozice autora nebo autorů obrázku (By-line Title).
-IPTCPANEL_CAPTION;Popis
-IPTCPANEL_CAPTIONHINT;Textový popis dat (Popis - Shrnutí)
-IPTCPANEL_CAPTIONWRITER;Popisovač
-IPTCPANEL_CAPTIONWRITERHINT;Jméno osoby, která vložila, změnila nebo opravila obrázek nebo popis/shrnutí (Autor - Editor)
 IPTCPANEL_CATEGORY;Kategorie
-IPTCPANEL_CATEGORYHINT;Obsah obrázku dle názoru dodavatele (Kategorie).
+IPTCPANEL_CATEGORYHINT;Identifikuje předmět obrázku dle názoru dodavatele.
 IPTCPANEL_CITY;Město
-IPTCPANEL_CITYHINT;Místo vzniku obrázku (Město).
+IPTCPANEL_CITYHINT;Vložte jméno města, které je na na fotografii.
 IPTCPANEL_COPYHINT;Zkopíruj IPTC nastavení do schránky.
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Autorská práva (Copyright Notice).
+IPTCPANEL_COPYRIGHT;Autorská práva
+IPTCPANEL_COPYRIGHTHINT;Zadejte text upozorňující na autorská práva k obrázku, například: ©2008 Jane Doe.
 IPTCPANEL_COUNTRY;Země
-IPTCPANEL_COUNTRYHINT;Jméno země/lokace kde byl obrázek vytvořen (Země - Lokace).
+IPTCPANEL_COUNTRYHINT;Vložte jméno země, která je na na fotografii.
+IPTCPANEL_CREATOR;Vytvořil
+IPTCPANEL_CREATORHINT;Vložte jméno osoby, která tuto fotografii pořídila.
+IPTCPANEL_CREATORJOBTITLE;Pracovní pozice autora
+IPTCPANEL_CREATORJOBTITLEHINT;Vložte pracovní pozici osoby, která je zapsána v poli Vytvořil.
 IPTCPANEL_CREDIT;Zásluhy
-IPTCPANEL_CREDITHINT;Dodavatel obrázku, ne nutně vlastník/autor (Credit).
+IPTCPANEL_CREDITHINT;Komu mají být připsány zásluhy při publikaci.
 IPTCPANEL_DATECREATED;Datum vytvoření
-IPTCPANEL_DATECREATEDHINT;Datum kdy byl duševní obsah obrázku vytvořen; Formát: RRRRMMDD (Datum vytvoření).
+IPTCPANEL_DATECREATEDHINT;Vložte datum, kdy byla fotografie pořízena.
+IPTCPANEL_DESCRIPTION;Popis
+IPTCPANEL_DESCRIPTIONHINT;Vložte "titulek" popisující kdo, co a proč je na snímku. Toto může zahrnovat jména lidí a/nebo jejich roli v ději, který je na snímku.
+IPTCPANEL_DESCRIPTIONWRITER;Popsal
+IPTCPANEL_DESCRIPTIONWRITERHINT;Vložte jméno osoby, která vložila, změnila nebo opravila popis obrázku.
 IPTCPANEL_EMBEDDED;Uložené
 IPTCPANEL_EMBEDDEDHINT;Obnov IPTC data z obrázku.
 IPTCPANEL_HEADLINE;Nadpis
-IPTCPANEL_HEADLINEHINT;Zveřejnitelný krátký popis obrázku (Nadpis).
+IPTCPANEL_HEADLINEHINT;Vložte krátký publikovatelný popis nebo shrnutí obsahu obrázku.
 IPTCPANEL_INSTRUCTIONS;Instrukce
-IPTCPANEL_INSTRUCTIONSHINT;Další instrukce vztahující se k obrázku (Speciální instrukce).
+IPTCPANEL_INSTRUCTIONSHINT;Vložte informace o zákazech nebo jiných omezeních, které nejsou pokryty polem Autorská práva.
 IPTCPANEL_KEYWORDS;Klíčová slova
-IPTCPANEL_KEYWORDSHINT;Jednoslovná hesla popisující obrázek (Klíčová slova).
+IPTCPANEL_KEYWORDSHINT;Vložte klíčová slova, termíny nebo fráze vyjadřující předmět na obrázku.
 IPTCPANEL_PASTEHINT;Vložit IPTC nastavení ze schránky.
-IPTCPANEL_PROVINCE;Kraj
-IPTCPANEL_PROVINCEHINT;Kraj/stát kde byl obrázek vytvořen (Kraj-Stát).
+IPTCPANEL_PROVINCE;Kraj nebo stát
+IPTCPANEL_PROVINCEHINT;Vložte jméno kraje nebo státu, která je na na fotografii.
 IPTCPANEL_RESET;Obnovit
 IPTCPANEL_RESETHINT;Obnovit výchozí profil.
 IPTCPANEL_SOURCE;Zdroj
-IPTCPANEL_SOURCEHINT;Původní vlastník intelektuálního obsahu obrázku (Zdroj).
-IPTCPANEL_SUPPCATEGORIES;Dodat. kategorie
-IPTCPANEL_SUPPCATEGORIESHINT;Upřesňující popis obsahu obrázku (Dodatečné kategorie).
+IPTCPANEL_SOURCEHINT;Vložte nebo změňte jméno osoby nebo společnosti která je součástí dodavatelského řetězce, například osoba nebo entita od které jste tento obrázek získali.
+IPTCPANEL_SUPPCATEGORIES;Doplňující kategorie
+IPTCPANEL_SUPPCATEGORIESHINT;Upřesňující popis objektu na obrázku.
 IPTCPANEL_TITLE;Titulek
-IPTCPANEL_TITLEHINT;Zkrácený popis obrázku (Jméno obrázku).
-IPTCPANEL_TRANSREFERENCE;Trans. reference
-IPTCPANEL_TRANSREFERENCEHINT;Kód místa, odkud byl převzat originální obrázek (Original Transmission Reference).
+IPTCPANEL_TITLEHINT;Vložte krátké, popisné a lidsky čitelné jméno obrázku. Například název souboru.
+IPTCPANEL_TRANSREFERENCE;Číslo úlohy
+IPTCPANEL_TRANSREFERENCEHINT;Zadejte číslo nebo identifikátor potřebný v pracovním postupu nebo pro sledování.
 MAIN_BUTTON_FULLSCREEN;Celá obrazovka
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Přejít k dalšímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: <b>Shift-F4</b>\n\nPřejít k dalšímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Přejít k předchozímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: <b>Shift-F3</b>\n\nPřejít k předchozímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: <b>F3</b>
@@ -941,6 +942,7 @@ PREFERENCES_CLIPPINGIND;Indikace oříznutí
 PREFERENCES_CLUTSCACHE;Mezipaměť HaldCLUT
 PREFERENCES_CLUTSCACHE_LABEL;Maximální počet  přednačtených CLUTů
 PREFERENCES_CLUTSDIR;Složka HaldCLUT
+PREFERENCES_CMMBPC;Kompenzace černého bodu
 PREFERENCES_CURVEBBOXPOS;Pozice tlačítek pro kopírování a vložení křivky
 PREFERENCES_CURVEBBOXPOS_ABOVE;Nad
 PREFERENCES_CURVEBBOXPOS_BELOW;Pod
@@ -991,7 +993,7 @@ PREFERENCES_FLUOF7;Fluorescenční F7
 PREFERENCES_FLUOF11;Fluorescenční F11
 PREFERENCES_FORIMAGE;Pro ostatní fotografie
 PREFERENCES_FORRAW;Pro raw fotografie
-PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Stejná velikost náhledu v panelu Editoru a v Prohlížeči souborů
+PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Stejná velikost náhledu ve filmovém pásu a v Prohlížeči souborů
 PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Rozdílné velikosti náhledů znamenají delší dobu zpracování při přepínání mezi obrázkem v záložce Editoru a Prohlížečem souborů.
 PREFERENCES_GIMPPATH;GIMP instalační složka
 PREFERENCES_GREY;Yb svítivost výstupního zařízení (%)
@@ -1035,9 +1037,10 @@ PREFERENCES_MENUGROUPRANK;Skupina "Hodnocení"
 PREFERENCES_MENUOPTIONS;Volby místní nabídky
 PREFERENCES_METADATA;Metadata
 PREFERENCES_MIN;Velmi malá (100x115)
-PREFERENCES_MONBPC;Kompenzace černého bodu pro L*a*b*->Přizpůsobení pro monitor
-PREFERENCES_MONINTENT;Výchozí záměr monitoru
-PREFERENCES_MONPROFILE;Výchozí profil monitoru
+PREFERENCES_MONINTENT;Výchozí reprodukční záměr
+PREFERENCES_MONITOR;Monitor
+PREFERENCES_MONPROFILE;Výchozí barevný profil
+PREFERENCES_MONPROFILE_WARNOSX;Na MacOS je podporováno pouze sRGB.
 PREFERENCES_MULTITAB;Mód více karet editoru
 PREFERENCES_MULTITABDUALMON;Mód více karet editoru ve vlastním okně
 PREFERENCES_NAVGUIDEBRUSH;Barva vodítek navigátoru
@@ -1062,6 +1065,7 @@ PREFERENCES_PREVDEMO;Metoda demozajkování náhledu
 PREFERENCES_PREVDEMO_FAST;Rychlá
 PREFERENCES_PREVDEMO_LABEL;Metoda demozajkování pro náhled při přiblížení menším než 100%:
 PREFERENCES_PREVDEMO_SIDECAR;Stejná jako v PP3
+PREFERENCES_PRINTER;Tiskárna (obtah)
 PREFERENCES_PROFILEHANDLING;Řízení profilů zpracování
 PREFERENCES_PROFILELOADPR;Priorita nahrávání profilů zpracování
 PREFERENCES_PROFILEPRCACHE;Profil v mezipaměti
@@ -1070,6 +1074,8 @@ PREFERENCES_PROFILESAVECACHE;Ukládat parametry zpracování do mezipaměti
 PREFERENCES_PROFILESAVEINPUT;Ukládat parametry zpracování spolu se zdrojovým souborem
 PREFERENCES_PROFILE_NONE;Nic
 PREFERENCES_PROPERTY;Vlastnost
+PREFERENCES_PRTINTENT;Reprodukční záměr
+PREFERENCES_PRTPROFILE;Barevný profil
 PREFERENCES_PSPATH;Instalační složka Adobe Photoshop
 PREFERENCES_REMEMBERZOOMPAN;Zapamatovat si procento přiblížení a posun obrázku
 PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Zapamatovat si procento přiblížení a posun aktuálního obrázku a použít tyto hodnoty při otevírání nového obrázku.\n\nTato volba funguje pouze v režimu "Mód jedné karty editoru" a volba "Metoda demozajkování pro náhled při přiblížení menším než 100%" je nastavena na "Stejně jako v PP3".
@@ -1172,8 +1178,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Nejlepší komprese:\nJ:a:b 4:2:0\nh/v 2/2\nO polovinu s
 SAVEDLG_TIFFUNCOMPRESSED;Nekomprimovaný TIFF
 SAVEDLG_WARNFILENAME;Soubor bude pojmenován
 SHCSELECTOR_TOOLTIP;Klikněte pravým tlačítkem myši pro obnovení výchozí pozice těchto tří posuvníků.
-SOFTPROOF_GAMUTCHECK_TOOLTIP;Pokud je aktivní, indikuje šedou barvou pixely, které se dostaly mimo paletu výstupního profilu.
-SOFTPROOF_TOOLTIP;Jemně korekční\nPokud je aktivní. můžete simulovat vykreslení generované výstupním profilem nástroje ICM. Velmi užitečné pro simulaci tiskových výstupů.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Pokud je aktivní, budou pixely mimo barevnou paletu výstupního profilu označeny šedou barvou.
+SOFTPROOF_TOOLTIP;Jemně korekční\nPokud je aktivní, umožní vám simulovat vykreslení dle výstupního profilu ICM. Nejužitečnější pro simulaci tiskového výstupu.
 THRESHOLDSELECTOR_B;Dole
 THRESHOLDSELECTOR_BL;Dole vlevo
 THRESHOLDSELECTOR_BR;Dole vpravo
@@ -1222,7 +1228,7 @@ TP_BWMIX_MIXC;Míchání
 TP_BWMIX_NEUTRAL;Vrátit míchání
 TP_BWMIX_NEUTRAL_TIP;Vrátí všechny hodnoty (filtry, mixéry kanálů) na výchozí pozice.
 TP_BWMIX_RGBLABEL;R: %1%%   G: %2%%   B: %3%%   Celkem: %4%%
-TP_BWMIX_RGBLABEL_HINT;Výsledné RGB faktory po započtení všech mixérů\n"Celkem" zobrazí souček aktuálně aplikovaných RGB hodnot:\n- vždy 100% v relativním režimu\n- více (světlejší) nebo méně (tmavší) než 100% v absolutním režimu.
+TP_BWMIX_RGBLABEL_HINT;Výsledné RGB faktory po započtení všech mixérů\n"Celkem" zobrazí součet aktuálně aplikovaných RGB hodnot:\n- vždy 100% v relativním režimu\n- více (světlejší) nebo méně (tmavší) než 100% v absolutním režimu.
 TP_BWMIX_RGB_TOOLTIP;Mísení RGB kanálů. Jako vodítko můžete použít uložená přednastavení.\nPovšimněte si prosím, že záporné hodnoty mohou vést ke vzniku artefaktů nebo chybnému chování.
 TP_BWMIX_SETTING;Uložené předvolby
 TP_BWMIX_SETTING_TOOLTIP;Různá přednastavení (filmy, krajina, ...) nebo vlastní míchání kanálů.
@@ -1266,7 +1272,7 @@ TP_COLORAPP_ADAPTSCENE;Svítivost scény
 TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolutní jas scény prostředí(cd/m²).\n 1) Vypočítáno z Exifu:\nRychlost závěrky - citlivost - clona - expoziční korekce fotoaparátu.\n 2) Vypočítáno z hodnoty raw bílého bodu a expoziční kompenzace Rawtherapee.
 TP_COLORAPP_ADAPTVIEWING;Svítivost prohlížení (cd/m²)
 TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolutní jas prostředí prohlížení\n(obvykle 16cd/m²).
-TP_COLORAPP_ADAP_AUTO_TOOLTIP;Pokud je povoleno (doporučeno), RT vypočítá optimální hodnotu z Exif dat.\nPokud si přejete zadat hodnotu ručně, nejprve zrušte zatržení tohoto pole.
+TP_COLORAPP_ADAP_AUTO_TOOLTIP;Pokud je povoleno (doporučeno), RT vypočítá optimální hodnotu z Exif dat.\nPokud si přejete zadat hodnotu ručně, nejprve zrušte zatržení tohoto pole. 
 TP_COLORAPP_ALGO;Algoritmus
 TP_COLORAPP_ALGO_ALL;Vše
 TP_COLORAPP_ALGO_JC;Světlost + Barevnost (JC)
@@ -1274,7 +1280,7 @@ TP_COLORAPP_ALGO_JS;Světlost + Nasycení (JS)
 TP_COLORAPP_ALGO_QM;Jas a pestrobarevnost (QM)
 TP_COLORAPP_ALGO_TOOLTIP;Umožňuje vybrat mezi podmnožinou nebo všemi parametry.
 TP_COLORAPP_BADPIXSL;Filtr vypálených/mrtvých pixelů
-TP_COLORAPP_BADPIXSL_TOOLTIP;Potlačení vypálených/mrtvých (jasně zabarvených) pixelů.\n0 = Bez efektu\n1 = Medián\n2 = Gaussovo.\nPopřípadě obrázek upravte tak, aby jste se vyhnuli velmi tmavým stínům.\n\nTyto artefakty vznikají díky omezením CIECAM02.
+TP_COLORAPP_BADPIXSL_TOOLTIP;Potlačení vypálených/mrtvých (jasně zabarvených) pixelů.\n0 = Bez efektu\n1 = Medián\n2 = Gaussův.\nPopřípadě obrázek upravte tak, aby jste se vyhnuli velmi tmavým stínům.\n\nTyto artefakty vznikají díky omezením CIECAM02. 
 TP_COLORAPP_BRIGHT;Jas (O)
 TP_COLORAPP_BRIGHT_TOOLTIP;Jas v CIECAM02 bere v potaz svítivost bílé a rozdíly jasů mezi L*a*b* a RGB.
 TP_COLORAPP_CHROMA;Barevnost (C)
@@ -1409,7 +1415,7 @@ TP_DIRPYRDENOISE_CCCURVE;Křivka barevnosti
 TP_DIRPYRDENOISE_CHROMA;Barevnost - Hlavní
 TP_DIRPYRDENOISE_CHROMAFR;Barevnost
 TP_DIRPYRDENOISE_CTYPE;Metoda
-TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Ručně\nOvlivňuje celý obrázek.\nVolby redukce šumu nastavujete ručně.\n\nCelková automazika\nOvlivňuje celý obrázek.\nPro výpočet parametrů celkové redukce barevného šumu je použito 9 zón.\n\nVíce zónová automatika\nBez náhledu - funguje pouze při ukládání, přesto je možné pomocí funkce "Náhled" získat alespoň částečnou představu o výsledku, Nastavení jsou aplikována na centrální dlaždici.\nObrázek je rozdělen na dlaždice (V závislosti na velikosti obrázku jich bude 10 až 70) a pro každou dlaždici bude vypočítáno vhodné nastavení redukce barevného šumu.\n\nNáhled\nOvlivňuje celý obrázek.\nPro výpočet celkového nastavení redukce barevného šumu je použita viditelná část obrázku.
+TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Ručně\nOvlivňuje celý obrázek.\nVolby redukce šumu nastavujete ručně.\n\nCelková automatika\nOvlivňuje celý obrázek.\nPro výpočet parametrů celkové redukce barevného šumu je použito 9 zón.\n\nVíce zónová automatika\nBez náhledu - funguje pouze při ukládání, přesto je možné pomocí funkce "Náhled" získat alespoň částečnou představu o výsledku, Nastavení jsou aplikována na centrální dlaždici.\nObrázek je rozdělen na dlaždice (V závislosti na velikosti obrázku jich bude 10 až 70) a pro každou dlaždici bude vypočítáno vhodné nastavení redukce barevného šumu.\n\nNáhled\nOvlivňuje celý obrázek.\nPro výpočet celkového nastavení redukce barevného šumu je použita viditelná část obrázku.
 TP_DIRPYRDENOISE_CUR;Křivka
 TP_DIRPYRDENOISE_CURVEEDITOR_CC;Barevnost
 TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Zvýší (násobí) hodnoty všech barevných posuvníků.\nKřivka vám umožní nastavit sílu redukce barevného šumu jako funkci barvy. Například pro zvýšení účinku v oblastech s nízkým nasycení a snížení v oblastech s vysokým nasycením.
@@ -1471,8 +1477,7 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;Hodnota -100:  zaměřeno na pleťové tóny.\nH
 TP_DIRPYREQUALIZER_THRESHOLD;Práh
 TP_DIRPYREQUALIZER_TOOLTIP;Počet pokusů pro redukci artefaktů vzniklých přenosem barvy (odstín, barevnost a jas) pleti na zbytek obrázku.
 TP_DISTORTION_AMOUNT;Míra
-TP_DISTORTION_AUTO;Automatická korekce zkreslení
-TP_DISTORTION_AUTO_TIP;Automatická korekce zkreslení objektivu pro některé fotoaparáty (Micro 4/3, některé kompakty a jiné).
+TP_DISTORTION_AUTO_TIP;Automaticky opraví zkreslení objektivu v raw souborech podle vložených JPEG obrázků (pokud existují a byly automaticky opraveny fotoaparátem).
 TP_DISTORTION_LABEL;Korekce zkreslení
 TP_EPD_EDGESTOPPING;Zachování hran
 TP_EPD_GAMMA;Gama
@@ -1559,7 +1564,7 @@ TP_ICM_APPLYLOOKTABLE_TOOLTIP;Použije vloženou DCP tabulku vzhledu. Nastavení
 TP_ICM_BLENDCMSMATRIX;Smísení ICC světel s matici
 TP_ICM_BLENDCMSMATRIX_TOOLTIP;Povolit obnovení vypálených jasů při použití ICC profilů založených na LUT.
 TP_ICM_BPC;Kompenzace černého bodu
-TP_ICM_BPC_TOOLTIP;Povolte pokud chcete, aby se kanál svítivosti vešel do výstupního barevného prostoru s pevným bílým bodem
+TP_ICM_BPC_TOOLTIP;Pokud je povoleno, je kanál svítivosti přizpůsoben výstupnímu barevnému prostoru s pevným bílým bodem
 TP_ICM_DCPILLUMINANT;Osvětlení
 TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolované
 TP_ICM_DCPILLUMINANT_TOOLTIP;Vyberte které vložené DCP osvětlení se má použít. Ve výchozím stavu se použije "interpolované", což je mix mezi dvěma osvětleními založenými na vyvážení bílé. Nastavené je dostupné pouze v případě, že je povoleno dvojité DCP osvětlení s podporou interpolace.
@@ -1579,7 +1584,7 @@ TP_ICM_LABEL;Správa barev
 TP_ICM_NOICM;Bez ICM: sRGB výstup
 TP_ICM_OUTPUTPROFILE;Výstupní barevný prostor
 TP_ICM_PROFILEINTENT;Záměr reprodukce
-TP_ICM_SAVEREFERENCE;Uložit referenční obrázek pro profilování
+TP_ICM_SAVEREFERENCE;Uložit referenční obrázek
 TP_ICM_SAVEREFERENCE_APPLYWB;Aplikovat vyvážení bílé
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Obecně se vyvážení bílé aplikuje při ukládání obrázku pro vytvoření ICC profilů a neaplikuje při vytváření DCP profilů.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Uloží lineární TIFF obrázek před aplikováním vstupního profilu. Výsledek může být použit pro kalibraci a generování profilu fotoaparátu.
@@ -1685,7 +1690,7 @@ TP_RAW_LABEL;Demozajkování
 TP_RAW_LMMSEITERATIONS;Kroky rozšíření LMMSE
 TP_RAW_LMMSE_TOOLTIP;Přidá gamu (krok 1) - přidá mediány (kroky 2, až 4) a následně přidá (kroky 5 a 6) vyčištění artefaktů a vylepšení poměru signálu a šumu.
 TP_RAW_SENSOR_BAYER_LABEL;Snímač s Bayerovou maskou
-TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Tří průchodová dává lepší výsledky (doporučeno pro fotky s níským ISO).\nJednoprůchodová je téměř k nerozeznání od tří průchodové pro vysoké ISO a je rychlejší.
+TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Tří průchodová dává lepší výsledky (doporučeno pro fotky s nízkým ISO).\nJednoprůchodová je téměř k nerozeznání od tří průchodové pro vysoké ISO a je rychlejší.
 TP_RAW_SENSOR_XTRANS_LABEL;Senzory s X-Trans maticí
 TP_RESIZE_APPLIESTO;Aplikovat na:
 TP_RESIZE_CROPPEDAREA;Oblast ořezu
@@ -1746,7 +1751,7 @@ TP_RETINEX_MAP;Metoda masky
 TP_RETINEX_MAP_GAUS;Gaussova maska
 TP_RETINEX_MAP_MAPP;Ostrá maska (částečná vlnka)
 TP_RETINEX_MAP_MAPT;Ostrá maska (kompletní vlnka)
-TP_RETINEX_MAP_METHOD_TOOLTIP;Použít masku generovanou Gaussovou funkcí výše (poloměr, metoda) pro omezení halo efektu a artefaktů.\n\nPouze křivka: na masku je aplikována diagonální křivka kontrastu.\nPozor na artefakty!\n\nGaussova maska: originální maska je upravena Gaussovým rozostřením.\nRychlé.\n\nOstrá maska: na originální masku se použije vlnka.\nPomalé.
+TP_RETINEX_MAP_METHOD_TOOLTIP;Použít masku výše generovanou Gaussovou funkcí (Poloměr, Metoda) k omezení halo efektu a artefaktů.\n\nPouze křivka: použije na masku diagonální křivku kontrastu .\nPozor na vznik artefaktů!\n\nGaussova maska: vygeneruje a použije gaussově rozostřenou originální masku.\nRychlé.\n\nOstrá maska: vygeneruje a použije vlnkovou transformaci nad originální maskou.\nPomalé.
 TP_RETINEX_MAP_NONE;Žádná
 TP_RETINEX_MEDIAN;Přenos filtru mediánu
 TP_RETINEX_METHOD;Metoda
@@ -1776,7 +1781,7 @@ TP_RETINEX_VARIANCE;Kontrast
 TP_RETINEX_VARIANCE_TOOLTIP;Nízká odchylka zvyšuje místní kontrast a nasycení, ale může vést ke vzniku artefaktů.
 TP_RETINEX_VIEW;Zpracování
 TP_RETINEX_VIEW_MASK;Maska
-TP_RETINEX_VIEW_METHOD_TOOLTIP;Běžné - běžné zobrazení.\nMaska -  zobrazí masku.\nNeostrá maska - zobrazí obrázek s neostrou maskou s velkým poloměrem.\nPřenos - Auto/Pevný - zobrazí soubor mapy přenosu před jakoukoli úpravou kontrastu a jasu.\n\nUpozornění: maska neodpovídá realitě. Je zesílena, aby byla lépe vidět.
+TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normální displej.\nMaska - Maska displeje.\nNeostrá maska - Zobrazí obrázek s vysokým poloměrem neostré masky.\nPřenos - Automatický/Pevný - Zobrazí mapu přenosu souboru, před jakoukoli akcí s jasem a kontrastem.\n\nUpozornění: maska neodpovídá realitě, ale je, pro zvýšení názornosti, zesílena.
 TP_RETINEX_VIEW_NONE;Běžné
 TP_RETINEX_VIEW_TRAN;Přenos - Automatický
 TP_RETINEX_VIEW_TRAN2;Přenos - Pevný
@@ -1818,7 +1823,6 @@ TP_SHARPENING_RLD_AMOUNT;Míra
 TP_SHARPENING_RLD_DAMPING;Útlum
 TP_SHARPENING_RLD_ITERATIONS;Počet průchodů
 TP_SHARPENING_THRESHOLD;Práh
-TP_SHARPENING_TOOLTIP;S CIECAM02 očekávejte mírně odlišný efekt. Pokud pozorujete rozdíly, upravte dle potřeby.
 TP_SHARPENING_USM;Maskování rozostření
 TP_SHARPENMICRO_AMOUNT;Kvantita
 TP_SHARPENMICRO_LABEL;Mikrokontrast
@@ -1865,7 +1869,7 @@ TP_WAVELET_B2;Zůstatek
 TP_WAVELET_BACKGROUND;Pozadí
 TP_WAVELET_BACUR;Křivka
 TP_WAVELET_BALANCE;Vyvážení kontrastu d/v-h
-TP_WAVELET_BALANCE_TOOLTIP;Změní vyvážení mezi směry vlnky: svisle-vodorovně a uhlopříčně.\nPokud je aktivován kontrast, barevnost nebo zbytkové tónové mapování je efekt díky vyvážení zesílen.
+TP_WAVELET_BALANCE_TOOLTIP;Změní vyvážení mezi směry vlnky: svisle-vodorovně a úhlopříčně.\nPokud je aktivován kontrast, barevnost nebo zbytkové tónové mapování je efekt díky vyvážení zesílen.
 TP_WAVELET_BALCHRO;Vyvážení barev
 TP_WAVELET_BALCHRO_TOOLTIP;Pokud je povoleno, křivka nebo posuvníky "Vyvážení kontrastu" ovlivňují i vyvážení barev.
 TP_WAVELET_BANONE;Nic
@@ -1896,7 +1900,7 @@ TP_WAVELET_CONTRAST_MINUS;Kontrast -
 TP_WAVELET_CONTRAST_PLUS;Kontrast +
 TP_WAVELET_CONTRA_TOOLTIP;Změní kontrast zůstatku obrazu.
 TP_WAVELET_CTYPE;Ovládání barevnosti
-TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Mění lokální kontrast jako funkci originálního lokálního kontrastu(úsečka).\nNízké hodnoty na úsečce představují malý lokální kontrast (skutečné hodnoty okolo10..20).\n50% z úsečky představuje průměrný lokální kontrast (skutečné hodnoty okolo 100..300).\n66% z úsečky představuje představuje standardní odchylku lokálního kontrastu (skutečné hodnoty okolo 300..800).\n100% z úsečky představuje maximální lokální kontrast (skutečné hodnoty okolo 3000..8000).
+TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Mění lokální kontrast jako funkci originálního lokálního kontrastu(úsečka).\nNízké hodnoty na úsečce představují malý lokální kontrast (skutečné hodnoty okolo 10..20).\n50% z úsečky představuje průměrný lokální kontrast (skutečné hodnoty okolo 100..300).\n66% z úsečky představuje představuje standardní odchylku lokálního kontrastu (skutečné hodnoty okolo 300..800).\n100% z úsečky představuje maximální lokální kontrast (skutečné hodnoty okolo 3000..8000).
 TP_WAVELET_CURVEEDITOR_CH;Kontrast úrovní=f(Barevnost)
 TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Mění kontrast každé úrovně jako funkci odstínu.\nDejte pozor, abyste nepřepsali změny udělané v podnástroji Paleta nástroje Odstín.\nZměny křivky se projeví pouze v případě, že posuvníky kontrastu úrovní vlnky nejsou nastaveny na nulu.
 TP_WAVELET_CURVEEDITOR_CL;L
@@ -2064,4 +2068,3 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: <b>Alt</b>-<b>f</b
 ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit obrázek obrazovce\nZkratka: <b>f</b>
 ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: <b>+</b>
 ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
-
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 3a008127b..1aa0d3788 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Tilføj...
 HISTORY_SNAPSHOT;Snapshot
 HISTORY_SNAPSHOTS;Snapshots
-IPTCPANEL_AUTHOR;Forfatter
-IPTCPANEL_AUTHORSPOSITION;Forfatterens stilling
-IPTCPANEL_AUTHORSPOSITIONHINT;Stillingsbetegnelse for skaberen eller skaberne af objektet (byline titel).
-IPTCPANEL_CAPTION;Billedtekst
-IPTCPANEL_CAPTIONHINT;En beskrivelse af informationerne i tekstform.
-IPTCPANEL_CAPTIONWRITER;Skribent på billedtekst
-IPTCPANEL_CAPTIONWRITERHINT;Navnet på den person, der har været indblandet i at skrive, redigere eller korrekturlæse billedet eller billedteksten.
 IPTCPANEL_CATEGORY;Kategori
-IPTCPANEL_CATEGORYHINT;Identificerer billedets emne efter skaberens mening.
 IPTCPANEL_CITY;By
-IPTCPANEL_CITYHINT;Byen, hvor billedet er taget..
 IPTCPANEL_COPYHINT;Kopier IPTC-indstillinger til udklipsholder.
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Enhver nødvendig copyright-oplysning.
 IPTCPANEL_COUNTRY;Land
-IPTCPANEL_COUNTRYHINT;Navnet på det land, hvor billedet blev taget.
 IPTCPANEL_CREDIT;Anerkendelse
 IPTCPANEL_CREDITHINT;Identificerer den, der stiller billedet til rådighed, ikke nødvendigvis ejeren/skaberen.
 IPTCPANEL_DATECREATED;Dato skabt
-IPTCPANEL_DATECREATEDHINT;Den dato, hvor det intellektuelle indhold i billedet blev skabt; Format: ÅÅÅÅMMDD (Date Created).
 IPTCPANEL_EMBEDDED;Indlejret
 IPTCPANEL_EMBEDDEDHINT;Genskab til indlejrede IPTC-data i billedfilen
 IPTCPANEL_HEADLINE;Overskrift
-IPTCPANEL_HEADLINEHINT;En indførsel, som kan udgives og giver en opsummering af billedets indhold.
 IPTCPANEL_INSTRUCTIONS;Instruktioner
-IPTCPANEL_INSTRUCTIONSHINT;Andre redaktionelle instruktioner angående billedets brug.
 IPTCPANEL_KEYWORDS;Søgeord
-IPTCPANEL_KEYWORDSHINT;Bruges til at angive særlige søgbare ord.
 IPTCPANEL_PASTEHINT;Indsæt IPTC-indstillinger fra udklipsholder
-IPTCPANEL_PROVINCE;Provins
-IPTCPANEL_PROVINCEHINT;Provinsen/delstaten, hvor billedet stammer fra.
 IPTCPANEL_RESET;Genskab
 IPTCPANEL_RESETHINT;Genskab til profilstandard
 IPTCPANEL_SOURCE;Kilde
-IPTCPANEL_SOURCEHINT;Den originale ejer af billedets intellektuelle indhold.
-IPTCPANEL_SUPPCATEGORIES;Suppl. katergorier
-IPTCPANEL_SUPPCATEGORIESHINT;Yderligere angivelse af billedets emne.
 IPTCPANEL_TITLE;Titel
-IPTCPANEL_TITLEHINT;En kort beskrivelse af billedet.
-IPTCPANEL_TRANSREFERENCE;Overleveringsreference
-IPTCPANEL_TRANSREFERENCEHINT;En kode, der repræsenterer placeringen for den originale overlevering.
 MAIN_BUTTON_PREFERENCES;Indstillinger
 MAIN_BUTTON_SAVE;Gem billede
 MAIN_BUTTON_SENDTOEDITOR;Send til redigeringsprogram
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Input profil
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB output
 TP_ICM_OUTPUTPROFILE;Output profil
-TP_ICM_SAVEREFERENCE;Gem referencebillede til profilering
 TP_ICM_WORKINGPROFILE;Arbejdsprofil
 TP_RAW_DMETHOD;Metode
 TP_RAW_FALSECOLOR;Antal trin til undertrykkelse af forkert farve
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 8d1c44b60..13da1e9fc 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -29,6 +29,10 @@
 #28 2016-03-19 Erweiterung/Korrekturen (TooWaBoo) RT4.2.880
 #29 2016-05-24 Erweiterung/Korrekturen (TooWaBoo) RT4.2.1005
 #30 2016-09-30 Erweiterung/Korrekturen (TooWaBoo) RT4.2.1234
+#31 2016-12-01 Erweiterung/Korrekturen (TooWaBoo) RT4.2.1408
+#32 2016-12-29 Erweiterung/Korrekturen (TooWaBoo) RT4.2.1464
+#33 2017-01-04 Erweiterung/Korrekturen/Soft-Proofing (TooWaBoo) RT4.2.1477
+#34 2017-01-07 IPTC (TooWaBoo) RT4.2.1492
 
 ABOUT_TAB_BUILD;Version
 ABOUT_TAB_CREDITS;Danksagungen
@@ -65,7 +69,7 @@ CURVEEDITOR_TOOLTIPSAVE;Kurve speichern
 CURVEEDITOR_TYPE;Typ:
 DIRBROWSER_FOLDERS;Ordner
 EDITWINDOW_TITLE;Bildbearbeitung
-EDIT_OBJECT_TOOLTIP;Schaltet das Einstellungswerkzeug im Vorschaubild ein/aus
+EDIT_OBJECT_TOOLTIP;Schaltet das Einstellungswerkzeug\nim Vorschaubild ein/aus
 EDIT_PIPETTE_TOOLTIP;Um einen Punkt der Kurve hinzuzufügen, halten Sie die Strg-Taste gedrückt und klicken mit der linke Maustaste auf die gewünschte Stelle in der Vorschau.\nUm den Punkt anzupassen, halten Sie die Strg-Taste gedrückt und klicken Sie mit der linken Maustaste auf den entsprechenden Bereich in der Vorschau. Dann lassen Sie die Strg-Taste los (es sei denn, Sie möchten eine Feineinstellung vornehmen) und bewegen die Maus bei gedrückter linker Maustaste nach oben oder unten, um den Punkt auf der Kurve zu bewegen.
 EXIFFILTER_APERTURE;Blende
 EXIFFILTER_CAMERA;Kamera
@@ -110,8 +114,8 @@ EXPORT_BYPASS_SHARPENMICRO;Mikrokontrast überspringen
 EXPORT_BYPASS_SH_HQ;Schatten/Lichter überspringen\n(Schärfemaske)
 EXPORT_FASTEXPORTOPTIONS;<b>Schnell-Export - Einstellungen</b>
 EXPORT_INSTRUCTIONS;Die Einstellungen zum schnellen Export\nerlauben es, zeit- und ressourcenintensive\nEntwicklungsschritte zu überspringen und dafür\ndie Warteschlangenverarbeitung mit\nschnellen Export-Einstellungen auszuführen.\nDieses Vorgehen wird zur schnelleren\nGenerierung von gering aufgelösten Bildern\nempfohlen, falls es auf die Geschwindigkeit\nankommt oder für ein oder mehrere Bilder\nandere Ausgabegrößen gewünscht werden,\nohne Änderungen an deren gespeicherten\nParameter vornehmen zu müssen.
-EXPORT_MAXHEIGHT;Maximale Höhe: 
-EXPORT_MAXWIDTH;Maximale Breite:  
+EXPORT_MAXHEIGHT;Maximale Höhe:
+EXPORT_MAXWIDTH;Maximale Breite:
 EXPORT_PUTTOQUEUEFAST; Zur Warteschlange “Schneller Export“ hinzufügen
 EXPORT_RAW_DMETHOD;Demosaikmethode
 EXTPROGTARGET_1;RAW
@@ -210,9 +214,9 @@ FILEBROWSER_SHOWTRASHHINT;Inhalt des Papierkorbs anzeigen\nTaste: <b>Strg</b> +
 FILEBROWSER_SHOWUNCOLORHINT;Nur unmarkierte Bilder anzeigen\nTaste: <b>Alt</b> + <b>0</b>
 FILEBROWSER_SHOWUNRANKHINT;Nur unbewertete Bilder anzeigen\nTaste: <b>0</b>
 FILEBROWSER_STARTPROCESSING;Verarbeitung starten
-FILEBROWSER_STARTPROCESSINGHINT;Verarbeitung und Speichern der Bilder in der Warteschlange starten.\nTaste: <b>Strg</b> + <b>s</b>
+FILEBROWSER_STARTPROCESSINGHINT;Verarbeitung und Speicherung der\nBilder starten.\nTaste: <b>Strg</b> + <b>s</b>
 FILEBROWSER_STOPPROCESSING;Verarbeitung stoppen
-FILEBROWSER_STOPPROCESSINGHINT;Verarbeitung der Bilder stoppen\nTaste: <b>Strg</b> + <b>s</b>
+FILEBROWSER_STOPPROCESSINGHINT;Verarbeitung der Bilder abbrechen.\nTaste: <b>Strg</b> + <b>s</b>
 FILEBROWSER_THUMBSIZE;Miniaturbildgröße
 FILEBROWSER_TOOLTIP_STOPPROCESSING;Bei neuem Job die Verarbeitung automatisch starten
 FILEBROWSER_UNRANK_TOOLTIP;Bewertung entfernen\nTaste: <b>Umschalt</b> + <b>0</b>
@@ -237,7 +241,7 @@ GENERAL_DISABLE;Deaktivieren
 GENERAL_DISABLED;Deaktiviert
 GENERAL_ENABLE;Aktivieren
 GENERAL_ENABLED;Aktiviert
-GENERAL_FILE;Datei: 
+GENERAL_FILE;Datei:
 GENERAL_LANDSCAPE;Quer
 GENERAL_NA;n/a
 GENERAL_NO;Nein
@@ -249,13 +253,13 @@ GENERAL_SAVE;Speichern
 GENERAL_UNCHANGED;(Unverändert)
 GENERAL_WARNING;Warnung
 HISTOGRAM_TOOLTIP_B;Blau-Histogramm ein-/ausblenden
-HISTOGRAM_TOOLTIP_BAR;RGB-Anzeigeleiste ein-/ausblenden\n\nZum Fixieren/Lösen der Anzeige muss mit der rechten Maustaste ins Bildfenster geklickt werden
+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
 HISTOGRAM_TOOLTIP_FULL;Skaliertes Histogramm ein/ausschalten
 HISTOGRAM_TOOLTIP_G;Grün-Histogramm ein-/ausblenden
 HISTOGRAM_TOOLTIP_L;CIELab-Luminanz-Histogramm ein-/ausblenden
 HISTOGRAM_TOOLTIP_R;Rot-Histogramm ein-/ausblenden
-HISTOGRAM_TOOLTIP_RAW;Zwischen normalen Histogrammen und\nRAW-Histogrammen umschalten
+HISTOGRAM_TOOLTIP_RAW;Zwischen normalen Histogrammen und\nRAW-Histogrammen umschalten.
 HISTORY_CHANGED;Geändert
 HISTORY_CUSTOMCURVE;Benutzerdefiniert
 HISTORY_DELSNAPSHOT;Entfernen
@@ -267,7 +271,7 @@ HISTORY_MSG_3;(Profil geändert)
 HISTORY_MSG_4;(Historie durchsuchen)
 HISTORY_MSG_5;(Belichtung) - Helligkeit
 HISTORY_MSG_6;(Belichtung) - Kontrast
-HISTORY_MSG_7;(Belichtung) - Schwarzwert
+HISTORY_MSG_7;(Belichtung)\nSchwarzwert
 HISTORY_MSG_8;(Belichtung)\nBelichtungskorrektur
 HISTORY_MSG_9;(Belichtung)\nLichterkompression
 HISTORY_MSG_10;(Belichtung)\nSchattenkompression
@@ -283,7 +287,7 @@ HISTORY_MSG_19;(L*a*b*) - L-Kurve
 HISTORY_MSG_20;(Schärfung)
 HISTORY_MSG_21;(Schärfung) - USM\nRadius
 HISTORY_MSG_22;(Schärfung) - USM\nIntensität
-HISTORY_MSG_23;(Schärfung) - USM\nSchwellenwert
+HISTORY_MSG_23;(Schärfung) - USM\nSchwelle
 HISTORY_MSG_24;(Schärfung) - USM\nNur Kanten schärfen
 HISTORY_MSG_25;(Schärfung) - USM\nKantenschärfung\nRadius
 HISTORY_MSG_26;(Schärfung) - USM\nKantenschärfung\nKantentoleranz
@@ -348,7 +352,7 @@ HISTORY_MSG_84;(Objektivkorrektur)\nPerspektive
 HISTORY_MSG_85;(Objektivkorrektur)\nProfil
 HISTORY_MSG_86;(RGB-Kurven)\nHelligkeitsmodus
 HISTORY_MSG_87;(Impulsrauschred.)
-HISTORY_MSG_88;(Impulsrauschred.)\nSchwellenwert
+HISTORY_MSG_88;(Impulsrauschred.)\nSchwelle
 HISTORY_MSG_89;(Rauschreduzierung)
 HISTORY_MSG_90;(Rauschreduzierung)\nLuminanz
 HISTORY_MSG_91;(Rauschreduzierung)\nChrominanz (Master)
@@ -367,8 +371,8 @@ HISTORY_MSG_103;(HSV) - Dynamik (V)
 HISTORY_MSG_104;(HSV)
 HISTORY_MSG_105;(Farbsaum entfernen)
 HISTORY_MSG_106;(Farbsaum entfernen)\nRadius
-HISTORY_MSG_107;(Farbsaum entfernen)\nSchwellenwert
-HISTORY_MSG_108;(Belichtung)\nLichterkompression\nSchwellenwert
+HISTORY_MSG_107;(Farbsaum entfernen)\nSchwelle
+HISTORY_MSG_108;(Belichtung)\nLichterkompression\nSchwelle
 HISTORY_MSG_109;(Skalieren) - Begrenzungsrahmen
 HISTORY_MSG_110;(Skalieren) - Anwenden auf:
 HISTORY_MSG_111;(L*a*b*) - Farbverschiebung\nvermeiden
@@ -417,7 +421,7 @@ HISTORY_MSG_153;(Dynamik)\nGesättigte Töne
 HISTORY_MSG_154;(Dynamik)\nHautfarbtöne schützen
 HISTORY_MSG_155;(Dynamik)\nFarbverschiebungen\nvermeiden
 HISTORY_MSG_156;(Dynamik)\nPastell und gesättigte\nTöne koppeln
-HISTORY_MSG_157;(Dynamik)\nPastell/gesättigte Töne\nSchwellenwert
+HISTORY_MSG_157;(Dynamik)\nPastell/gesättigte Töne\nSchwelle
 HISTORY_MSG_158;(Dynamikkompression)\nIntensität
 HISTORY_MSG_159;(Dynamikkompression)\nKantenschutz
 HISTORY_MSG_160;(Dynamikkompression)\nFaktor
@@ -461,14 +465,14 @@ HISTORY_MSG_197;(CIECAM02) - Farbkurve
 HISTORY_MSG_198;(CIECAM02) - Farbkurve\nModus
 HISTORY_MSG_199;(CIECAM02) - Ausgabe-\nHistogramm anzeigen
 HISTORY_MSG_200;(CIECAM02)\nDynamikkompression
-HISTORY_MSG_201;(Rauschreduzierung)\nDelta-Chrominanz\nRot/Grün
-HISTORY_MSG_202;(Rauschreduzierung)\nDelta-Chrominanz\nBlau/Gelb
+HISTORY_MSG_201;(Rauschreduzierung)\nDelta-Chrominanz\nRot / Grün
+HISTORY_MSG_202;(Rauschreduzierung)\nDelta-Chrominanz\nBlau / Gelb
 HISTORY_MSG_203;(Rauschreduzierung)\nMethode
 HISTORY_MSG_204;(Sensor Bayer-Matrix)\nFarbinterpolation\nLMMSE-Verbesserung
-HISTORY_MSG_205;(CIECAM02)\nBetrachtungsbed.\nHot/Bad-Pixelfilter
+HISTORY_MSG_205;(CIECAM02)\nBetrachtungsbed.\nHot / Bad-Pixelfilter
 HISTORY_MSG_206;(CIECAM02) - Szene\nAuto-Leuchtstärke
 HISTORY_MSG_207;(Farbsaum entfernen)\nFarbtonkurve
-HISTORY_MSG_208;(Weißabgleich)\nBlau/Rot-Korrektur
+HISTORY_MSG_208;(Weißabgleich)\nBlau / Rot-Korrektur
 HISTORY_MSG_210;(Grauverlaufsfilter)\nRotationswinkel
 HISTORY_MSG_211;(Grauverlaufsfilter)
 HISTORY_MSG_212;(Vignettierungsfilter)\nIntensität
@@ -508,7 +512,7 @@ HISTORY_MSG_245;(Objektivkorrektur)\nVignettierung - Zentrum
 HISTORY_MSG_246;(L*a*b*) - CL-Kurve
 HISTORY_MSG_247;(L*a*b*) - LH-Kurve
 HISTORY_MSG_248;(L*a*b*) - HH-Kurve
-HISTORY_MSG_249;(Detailebenenkontrast)\nSchwellenwert
+HISTORY_MSG_249;(Detailebenenkontrast)\nSchwelle
 HISTORY_MSG_250;(Rauschreduzierung)\nVerbesserung
 HISTORY_MSG_251;(Schwarz/Weiß)\nAlgorithmus
 HISTORY_MSG_252;(Detailebenenkontrast)\nHautfarbtöne schützen
@@ -522,15 +526,15 @@ HISTORY_MSG_259;(Farbanpassungen)\nDeckkraftkurve
 HISTORY_MSG_260;(Farbanpassungen)\na*[b*]-Transparenz
 HISTORY_MSG_261;(Farbanpassungen)\nMethode
 HISTORY_MSG_262;(Farbanpassungen)\nb*-Transparenz
-HISTORY_MSG_263;(Farbanpassungen)\nSchatten - Blau/Rot
-HISTORY_MSG_264;(Farbanpassungen)\nSchatten - Cyan/Grün
-HISTORY_MSG_265;(Farbanpassungen)\nSchatten - Gelb/Blau
-HISTORY_MSG_266;(Farbanpassungen)\nMitten - Blau/Rot
-HISTORY_MSG_267;(Farbanpassungen)\nMitten - Cyan/Grün
-HISTORY_MSG_268;(Farbanpassungen)\nMitten - Gelb/Blau
-HISTORY_MSG_269;(Farbanpassungen)\nLichter - Blau/Rot
-HISTORY_MSG_270;(Farbanpassungen)\nLichter - Cyan/Grün
-HISTORY_MSG_271;(Farbanpassungen)\nLichter - Gelb/Blau
+HISTORY_MSG_263;(Farbanpassungen)\nSchatten - Blau / Rot
+HISTORY_MSG_264;(Farbanpassungen)\nSchatten - Cyan / Grün
+HISTORY_MSG_265;(Farbanpassungen)\nSchatten - Gelb / Blau
+HISTORY_MSG_266;(Farbanpassungen)\nMitten - Blau / Rot
+HISTORY_MSG_267;(Farbanpassungen)\nMitten - Cyan / Grün
+HISTORY_MSG_268;(Farbanpassungen)\nMitten - Gelb / Blau
+HISTORY_MSG_269;(Farbanpassungen)\nLichter - Blau / Rot
+HISTORY_MSG_270;(Farbanpassungen)\nLichter - Cyan / Grün
+HISTORY_MSG_271;(Farbanpassungen)\nLichter - Gelb / Blau
 HISTORY_MSG_272;(Farbanpassungen)\nFarbausgleich
 HISTORY_MSG_273;(Farbanpassungen)\nZurücksetzen
 HISTORY_MSG_274;(Farbanpassungen)\nSättigung Schatten
@@ -541,7 +545,7 @@ HISTORY_MSG_278;(Farbanpassungen)\nLuminanz schützen
 HISTORY_MSG_279;(Farbanpassungen)\nSchatten
 HISTORY_MSG_280;(Farbanpassungen)\nLichter
 HISTORY_MSG_281;(Farbanpassungen)\nSättigung schützen\nIntensität
-HISTORY_MSG_282;(Farbanpassungen)\nSättigung schützen\nSchwellenwert
+HISTORY_MSG_282;(Farbanpassungen)\nSättigung schützen\nSchwelle
 HISTORY_MSG_283;(Farbanpassungen)\nIntensität
 HISTORY_MSG_284;(Farbanpassungen)\nSättigung schützen\nAutomatisch
 HISTORY_MSG_285;(Rauschreduzierung)\nMedianmethode
@@ -571,7 +575,7 @@ HISTORY_MSG_308;(Wavelet) - Einstellungen\nVerarbeitungsrichtung
 HISTORY_MSG_309;(Wavelet)\nKantenschärfung\nDetails
 HISTORY_MSG_310;(Wavelet) - Restbild\nHimmelsfarbtöne\nschützen
 HISTORY_MSG_311;(Wavelet) - Einstellungen\nAnzahl der Ebenen
-HISTORY_MSG_312;(Wavelet) - Restbild\nSchatten Schwellenwert
+HISTORY_MSG_312;(Wavelet) - Restbild\nSchatten Schwelle
 HISTORY_MSG_313;(Wavelet) - Farbe\nEbenengrenze
 HISTORY_MSG_314;(Wavelet) - Gamut\nArtefakte reduzieren
 HISTORY_MSG_315;(Wavelet) - Restbild\nKontrast
@@ -588,14 +592,14 @@ HISTORY_MSG_325;(Wavelet) - Farbe\nGesättigte Farben
 HISTORY_MSG_326;(Wavelet) - Farbe\nChrominanzethode
 HISTORY_MSG_327;(Wavelet) - Kontrast\nAnwenden auf
 HISTORY_MSG_328;(Wavelet) - Farbe\nFarb-Kontrast-\nVerknüpfung
-HISTORY_MSG_329;(Wavelet) - Tönung\nDeckkraft Rot/Grün
-HISTORY_MSG_330;(Wavelet) - Tönung\nDeckkraft Blau/Gelb
+HISTORY_MSG_329;(Wavelet) - Tönung\nDeckkraft Rot / Grün
+HISTORY_MSG_330;(Wavelet) - Tönung\nDeckkraft Blau / Gelb
 HISTORY_MSG_331;(Wavelet)\nKontrastebenen\nExtra
 HISTORY_MSG_332;(Wavelet)- -Einstellungen\nKachelgröße
 HISTORY_MSG_333;(Wavelet) - Restbild\nSchatten
 HISTORY_MSG_334;(Wavelet) - Restbild\nBuntheit
 HISTORY_MSG_335;(Wavelet) - Restbild\nLichter
-HISTORY_MSG_336;(Wavelet) - Restbild\nLichter Schwellenwert
+HISTORY_MSG_336;(Wavelet) - Restbild\nLichter Schwelle
 HISTORY_MSG_337;(Wavelet) - Restbild\nHimmelsfarbton
 HISTORY_MSG_338;(Wavelet)\nKantenschärfung\nRadius
 HISTORY_MSG_339;(Wavelet)\nKantenschärfung\nIntensität
@@ -614,11 +618,11 @@ HISTORY_MSG_351;(Wavelet) - Restbild\nHH-Kurve
 HISTORY_MSG_352;(Wavelet) - Einstellungen\nHintergrund
 HISTORY_MSG_353;(Wavelet)\nKantenschärfung\nGradientenempfindlichkeit
 HISTORY_MSG_354;(Wavelet)\nKantenschärfung\nErweiterter Algorithmus
-HISTORY_MSG_355;(Wavelet)\nKantenschärfung\nSchwellenwert niedrig
-HISTORY_MSG_356;(Wavelet)\nKantenschärfung\nSchwellenwert hoch
+HISTORY_MSG_355;(Wavelet)\nKantenschärfung\nSchwelle niedrig
+HISTORY_MSG_356;(Wavelet)\nKantenschärfung\nSchwelle hoch
 HISTORY_MSG_357;(Wavelet)\nRauschreduzierung\nSchärfung verknüpfen
 HISTORY_MSG_358;(Wavelet) - Gamut\nKontrastkurve
-HISTORY_MSG_359;(Vorverarbeitung)\nHot/Dead-Pixel-Filter\nSchwellenwert
+HISTORY_MSG_359;(Vorverarbeitung)\nHot / Dead-Pixel-Filter\nSchwelle
 HISTORY_MSG_360;(Dynamikkompression)\nGamma
 HISTORY_MSG_361;(Wavelet) - Endretusche\nFarbausgleich
 HISTORY_MSG_362;(Wavelet) - Restbild\nKompression
@@ -633,7 +637,7 @@ HISTORY_MSG_370;(Wavelet) - Endretusche\nLokale Kontrastkurve
 HISTORY_MSG_371;(Skalieren) - Schärfen
 HISTORY_MSG_372;(Skalieren) - Schärfen\nUSM - Radius
 HISTORY_MSG_373;(Skalieren) - Schärfen\nUSM - Intensität
-HISTORY_MSG_374;(Skalieren) - Schärfen\nUSM - Schwellenwert
+HISTORY_MSG_374;(Skalieren) - Schärfen\nUSM - Schwelle
 HISTORY_MSG_375;(Skalieren) - Schärfen\nUSM - Nur Kanten\nschärfen
 HISTORY_MSG_376;(Skalieren) - Schärfen\nUSM - Kantenschärfung\nRadius
 HISTORY_MSG_377;(Skalieren) - Schärfen\nUSM - Kantentoleranz
@@ -645,12 +649,12 @@ HISTORY_MSG_382;(Skalieren) - Schärfen\nRLD - Intensität
 HISTORY_MSG_383;(Skalieren) - Schärfen\nRLD - Dämpfung
 HISTORY_MSG_384;(Skalieren) - Schärfen\nRLD - Iterationen
 HISTORY_MSG_385;(Wavelet) - Restbild\nFarbausgleich
-HISTORY_MSG_386;(Wavelet) - Restbild\nFarbausgleich\nLichter Grün/Cyan
-HISTORY_MSG_387;(Wavelet) - Restbild\nFarbausgleich\nLichter Blau/Gelb
-HISTORY_MSG_388;(Wavelet) - Restbild\nFarbausgleich\nMitten Grün/Cyan
-HISTORY_MSG_389;(Wavelet) - Restbild\nFarbausgleich\nMitten Blau/Gelb
-HISTORY_MSG_390;(Wavelet) - Restbild\nFarbausgleich\nSchatten Grün/Cyan
-HISTORY_MSG_391;(Wavelet) - Restbild\nFarbausgleich\nSchatten Blau/Gelb
+HISTORY_MSG_386;(Wavelet) - Restbild\nFarbausgleich\nLichter Grün / Cyan
+HISTORY_MSG_387;(Wavelet) - Restbild\nFarbausgleich\nLichter Blau / Gelb
+HISTORY_MSG_388;(Wavelet) - Restbild\nFarbausgleich\nMitten Grün / Cyan
+HISTORY_MSG_389;(Wavelet) - Restbild\nFarbausgleich\nMitten Blau / Gelb
+HISTORY_MSG_390;(Wavelet) - Restbild\nFarbausgleich\nSchatten Grün / Cyan
+HISTORY_MSG_391;(Wavelet) - Restbild\nFarbausgleich\nSchatten Blau / Gelb
 HISTORY_MSG_392;(Wavelet) - Restbild\nFarbausgleich
 HISTORY_MSG_393;(Farbmanagement)\nEingangsfarbprofil\nDCP - Look-Tabelle
 HISTORY_MSG_394;(Farbmanagement)\nEingangsfarbprofil\nDCP - Basisbelichtung
@@ -677,13 +681,13 @@ HISTORY_MSG_414;(Retinex) - Einstellungen\nKorrekturen\nLuminanz(L) - L*a*b*
 HISTORY_MSG_415;(Retinex) - Einstellungen\nTransmission\nTransmissionskurve
 HISTORY_MSG_416;(Retinex)
 HISTORY_MSG_417;(Retinex) - Einstellungen\nTransmission\nMedianfilter
-HISTORY_MSG_418;(Retinex) - Einstellungen\nTransmission\nSchwellenwert
+HISTORY_MSG_418;(Retinex) - Einstellungen\nTransmission\nSchwelle
 HISTORY_MSG_419;(Retinex) - Farbraum
 HISTORY_MSG_420;(Retinex) - Einstellungen\nHSL-Kurve
 HISTORY_MSG_421;(Retinex) - Einstellungen\nKorrekturen\nGammakorrektur
 HISTORY_MSG_422;(Retinex) - Einstellungen\nGamma
 HISTORY_MSG_423;(Retinex) - Einstellungen\nGammasteigung
-HISTORY_MSG_424;(Retinex) - Einstellungen\nHL-Schwellenwert
+HISTORY_MSG_424;(Retinex) - Einstellungen\nHL-Schwelle
 HISTORY_MSG_425;(Retinex) - Einstellungen\nBasis-Logarithmus
 HISTORY_MSG_426;(Retinex) - Einstellungen\nKorrekturen - Farbton (H)
 HISTORY_MSG_427;Ausgabe-Rendering-Intent
@@ -702,57 +706,59 @@ HISTORY_MSG_439;(Retinex) - Vorschau
 HISTORY_MSG_440;(Detailebenenkontrast)\nProzessreihenfolge
 HISTORY_MSG_441;(Retinex) - Einstellungen\nVerstärkung und Ausgleich\nTransmissionsverstärkung
 HISTORY_MSG_442;(Retinex) - Einstellungen\nTransmission - Skalierung
+HISTORY_MSG_443;(Farbmanagement)\nAusgabeprofil\nSchwarzpunkt-Kompensation
 HISTORY_NEWSNAPSHOT;Hinzufügen
 HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: <b>Alt</b> + <b>s</b>
 HISTORY_SNAPSHOT;Schnappschuss
 HISTORY_SNAPSHOTS;Schnappschüsse
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Position des\nAutors
-IPTCPANEL_AUTHORSPOSITIONHINT;Titel des Autors oder der Autoren (By-line Title)
-IPTCPANEL_CAPTION;Bildbeschreibung
-IPTCPANEL_CAPTIONHINT;Beschreibung des Bildinhaltes (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Autor der\nBildbeschreibung
-IPTCPANEL_CAPTIONWRITERHINT;Name der Person die beim Bild mitgewirkt hat (Writer - Editor)
 IPTCPANEL_CATEGORY;Kategorie
-IPTCPANEL_CATEGORYHINT;3-stelliger Code, der die Kategorie des Bildes beschreibt (Category).
+IPTCPANEL_CATEGORYHINT;Beschreibt das Thema des Bildes nach\nMeinung des Anbieters.
 IPTCPANEL_CITY;Stadt
-IPTCPANEL_CITYHINT;Aufnahmeort: Stadt (City)
-IPTCPANEL_COPYHINT;IPTC-Werte in die Zwischenablage kopieren
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Urheberrechtshinweis (Copyright Notice)
+IPTCPANEL_CITYHINT;Tragen Sie den Namen der Stadt ein, in dem\ndieses Bild aufgenommen wurde.
+IPTCPANEL_COPYHINT;IPTC-Werte in die Zwischenablage kopieren.
+IPTCPANEL_COPYRIGHT;Urheberrechtsvermerk
+IPTCPANEL_COPYRIGHTHINT;Enthält jeglichen notwendigen Urheberrechtsvermerk wie\nz.B. © Copyright 2014 Erika Mustermann, all rights reserved.
 IPTCPANEL_COUNTRY;Land
-IPTCPANEL_COUNTRYHINT;Aufnahmeort: Land (Country - Primary Location Name)
-IPTCPANEL_CREDIT;Bildrechte
-IPTCPANEL_CREDITHINT;Identifiziert den Anbieter des Bildes, es muss nicht der Eigentümer sein (Credit)
-IPTCPANEL_DATECREATED;Erstellt am
-IPTCPANEL_DATECREATEDHINT;Erstellungsdatum des Bildes\nFormat: JJJJMMTT
+IPTCPANEL_COUNTRYHINT;Tragen Sie den Namen des Landes ein, in dem\ndieses Bild aufgenommen wurde.
+IPTCPANEL_CREATOR;Ersteller
+IPTCPANEL_CREATORHINT;Tragen Sie den Namen der Person ein,\ndie dieses Bild erstellt hat.
+IPTCPANEL_CREATORJOBTITLE;Berufsbezeichnung des Erstellers
+IPTCPANEL_CREATORJOBTITLEHINT;Geben Sie die Berufsbezeichnung der Person ein,\ndie im Feld Ersteller aufgeführt ist.
+IPTCPANEL_CREDIT;Danksagung
+IPTCPANEL_CREDITHINT;Geben Sie ein, wer aufgeführt werden muss,\nwenn das Bild veröffentlicht wird.
+IPTCPANEL_DATECREATED;Erstellungsdatum
+IPTCPANEL_DATECREATEDHINT;Geben Sie das Erstellungdatum des Bildes ein.
+IPTCPANEL_DESCRIPTION;Beschreibung
+IPTCPANEL_DESCRIPTIONHINT;Beschreiben Sie kurz "Wer", "Was" und "Warum",\nwas passiert in dem Bild und welche Rolle\nspielen die dargestellten Personen.
+IPTCPANEL_DESCRIPTIONWRITER;Verfasser der Beschreibung
+IPTCPANEL_DESCRIPTIONWRITERHINT;Tragen Sie den Namen der Person ein, die beim\nSchreiben, Ändern oder Korrigieren der Bildbe-\nschreibung involviert war.
 IPTCPANEL_EMBEDDED;Eingebettet
 IPTCPANEL_EMBEDDEDHINT;Setzt auf die im Bild eingebetteten IPTC-Daten zurück.
-IPTCPANEL_HEADLINE;Bildtitel
-IPTCPANEL_HEADLINEHINT;Eine Beschreibung über den Inhalt des Bildes. Kann auch als Überschrift dienen.
-IPTCPANEL_INSTRUCTIONS;Hinweise
-IPTCPANEL_INSTRUCTIONSHINT;Besondere Hinweise bezüglich der Nutzung des Bildes (Special Instructions)
-IPTCPANEL_KEYWORDS;Schlagwörter
-IPTCPANEL_KEYWORDSHINT;Stichwörter für das spätere Wiederfinden der Bilder (Keywords)
+IPTCPANEL_HEADLINE;Überschrift
+IPTCPANEL_HEADLINEHINT;Tragen Sie eine kurze veröffentlichbare\nSynopsis, oder eine Zusammenfassung\ndes Bildinhalts ein.
+IPTCPANEL_INSTRUCTIONS;Anweisungen
+IPTCPANEL_INSTRUCTIONSHINT;Geben Sie weitere redaktionelle Anweisungen bezüglich\ndes Gebrauchs des Bildes ein, wie z. B. Sperrfristen,\nNutzungsbeschränkungen oder Warnungen, die nicht\nschon im Urheberrechtsvermerk aufgeführt sind.
+IPTCPANEL_KEYWORDS;Stichwörter
+IPTCPANEL_KEYWORDSHINT;Geben Sie beliebig viele Schlüsselwörter\nvon Ausdrücken oder Phrasen ein, um das\nThema des Bildes zu beschreiben.
 IPTCPANEL_PASTEHINT;IPTC-Werte aus der Zwischenablage einfügen
-IPTCPANEL_PROVINCE;Provinz
-IPTCPANEL_PROVINCEHINT;Aufnahmeort: Provinz (Province-State)
+IPTCPANEL_PROVINCE;Bundesland / Kanton
+IPTCPANEL_PROVINCEHINT;Tragen Sie den Namen des Bundeslandes / Kanton\nein, in dem dieses Bild aufgenommen wurde.
 IPTCPANEL_RESET;Zurücksetzen
 IPTCPANEL_RESETHINT;Auf die im Profil gespeicherten Werte zurücksetzen
 IPTCPANEL_SOURCE;Quelle
-IPTCPANEL_SOURCEHINT;Der ursprüngliche Eigentümer des Bildes (Source)
-IPTCPANEL_SUPPCATEGORIES;Zusätzliche\nKategorien
-IPTCPANEL_SUPPCATEGORIESHINT;Zusätzliche wählbare Bildoptimierungen
+IPTCPANEL_SOURCEHINT;Tragen Sie den Namen einer Person oder einer\nFirma ein, von der Sie das Bild erhalten haben\nund die eine wesentliche Rolle in der Lieferkette\nspielt.
+IPTCPANEL_SUPPCATEGORIES;Weitere Kategorien
+IPTCPANEL_SUPPCATEGORIESHINT;Weitere Kategorien um das Thema\ndes Bildes genauer zu spezifizieren.
 IPTCPANEL_TITLE;Titel
-IPTCPANEL_TITLEHINT;Kurztitel des Bildes (Object Name)
-IPTCPANEL_TRANSREFERENCE;Übertragungs-\nreferenz
-IPTCPANEL_TRANSREFERENCEHINT;Ein Code, der den ursprünglichen Ort der Übertragung definiert (Original Transmission Reference)
+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.
 MAIN_BUTTON_FULLSCREEN;Vollbild\nTaste: <b>F11</b>
-MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigiert zum nächsten Miniaturbild in der Dateiverwaltung oder Filmstreifen bezogen auf das ausgewählte Miniaturbild.\nTaste: <b>F4</b>\n\nNavigiert zum nächsten Miniaturbild in der Dateiverwaltung oder Filmstreifen bezogen auf auf das im Editor geöffnete Bild.\nTaste: <b>Umschalt</b> + <b>F4 </b>
-MAIN_BUTTON_NAVPREV_TOOLTIP;Navigiert zum vorherigen Miniaturbild in der Dateiverwaltung oder Filmstreifen bezogen auf das ausgewählte Miniaturbild.\nTaste: <b>F3</b>\n\nNavigiert zum vorherigen Miniaturbild in der Dateiverwaltung oder Filmstreifen bezogen auf auf das im Editor geöffnete Bild.\nTaste: <b>Umschalt</b> + <b>F3 </b>
-MAIN_BUTTON_NAVSYNC_TOOLTIP;Selektiert das Miniaturbild des aktuell geöffneten Bildes in der Dateiverwaltung und des Filmstreifens. Es werden alle aktiven Filter gelöscht.\nTaste: <b>x</b>\n\nWie oben, jedoch ohne Löschung aktiver Filter. Das Miniaturbild des geöffneten Bildes wird nicht angezeigt, wenn es herausgefiltert wurde.\nTaste: <b>y</b>
+MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: <b>F4</b>\n\nNavigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: <b>Umschalt</b> + <b>F4 </b>
+MAIN_BUTTON_NAVPREV_TOOLTIP;Navigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: <b>F3</b>\n\nNavigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: <b>Umschalt</b> + <b>F3 </b>
+MAIN_BUTTON_NAVSYNC_TOOLTIP;Selektiert das Miniaturbild des aktuell geöffneten\nBildes in der Dateiverwaltung und des Filmstreifens.\nEs werden alle aktiven Filter gelöscht.\nTaste: <b>x</b>\n\nWie oben, jedoch ohne Löschung aktiver Filter. Das\nMiniaturbild des geöffneten Bildes wird nicht angezeigt,\nwenn es herausgefiltert wurde.\nTaste: <b>y</b>
 MAIN_BUTTON_PREFERENCES;Einstellungen
-MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Bild in Warteschlange hinzufügen\nTaste: <b>Strg</b> + <b>b</b>
+MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Bild zur Warteschlange hinzufügen\nTaste: <b>Strg</b> + <b>b</b>
 MAIN_BUTTON_SAVE_TOOLTIP;Bild speichern\nTaste: <b>Strg</b> + <b>s</b>
 MAIN_BUTTON_SENDTOEDITOR;Bild im externen Editor öffnen
 MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Bild im externen Editor öffnen\nTaste: <b>Strg</b> + <b>e</b>
@@ -804,12 +810,12 @@ MAIN_TAB_WAVELET_TOOLTIP;Taste: <b>Alt</b> + <b>w</b>
 MAIN_TOOLTIP_BACKCOLOR0;Hintergrundfarbe der Vorschau basierend auf dem: <b>Oberflächendesign</b>\nTaste: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR1;Hintergrundfarbe der Vorschau: <b>Schwarz\n</b>Taste: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR2;Hintergrundfarbe der Vorschau: <b>Weiß</b>\nTaste: <b>9</b>
-MAIN_TOOLTIP_BEFOREAFTERLOCK;Vorher-Ansicht <b>Sperren</b>/<b>Entsperren</b>\n\n<b>Gesperrt</b>: Friert die Vorher-Ansicht ein, so dass sich die Gesamtwirkung mehrerer Bearbeitungsschritte beurteilen lässt.\n\n<b>Entsperrt</b>: Die Vorher-Ansicht hinkt dem aktuellen Bild immer einen Bearbeitungsschritt hinterher.
+MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Vorher-Ansicht:</b> Sperren / Entsperren\n\n<b>Gesperrt</b>: Friert die Vorher-Ansicht ein, so\ndass sich die Gesamtwirkung mehrerer\nBearbeitungsschritte beurteilen lässt.\n\n<b>Entsperrt</b>: Die Vorher-Ansicht hinkt dem\naktuellen Bild immer einen Bearbeitungs-\nschritt hinterher.
 MAIN_TOOLTIP_HIDEHP;Linkes Bedienfeld ein-/ausblenden\nTaste: <b>l</b>
 MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten\nTaste: <b>&lt;</b>
 MAIN_TOOLTIP_INDCLIPPEDS;Anzeige zu dunkler Bereiche ein-/ausschalten\nTaste: <b>&gt;</b>
 MAIN_TOOLTIP_PREVIEWB;Vorschau Blau-Kanal\nTaste: <b>b</b>
-MAIN_TOOLTIP_PREVIEWFOCUSMASK;Vorschau Fokusmaske\nTaste: <b>Umschalt</b> + <b>f</b>\n\nPräziser bei Bildern mit geringer Tiefenschärfe, niedrigem Rauschen und bei hoher Vergrößerung.
+MAIN_TOOLTIP_PREVIEWFOCUSMASK;Vorschau Fokusmaske\nTaste: <b>Umschalt</b> + <b>f</b>\n\nPräziser bei Bildern mit geringer Tiefenschärfe,\nniedrigem Rauschen und bei hoher Vergrößerung.
 MAIN_TOOLTIP_PREVIEWG;Vorschau Grün-Kanal\nTaste: <b>g</b>
 MAIN_TOOLTIP_PREVIEWL;Vorschau Helligkeit\nTaste: <b>v</b>\n\n0.299·R + 0.587·G + 0.114·B
 MAIN_TOOLTIP_PREVIEWR;Vorschau Rot-Kanal\nTaste: <b>r</b>
@@ -817,7 +823,7 @@ MAIN_TOOLTIP_QINFO;Bildinformationen ein-/ausblenden\nTaste: <b>i</b>
 MAIN_TOOLTIP_SHOWHIDELP1;Linkes Bedienfeld ein-/ausblenden\nTaste: <b>l</b>
 MAIN_TOOLTIP_SHOWHIDERP1;Rechtes Bedienfeld ein-/ausblenden\nTaste: <b>Alt</b> + <b>l</b>
 MAIN_TOOLTIP_SHOWHIDETP1;Oberes Bedienfeld ein-/ausblenden\nTaste: <b>Umschalt</b> + <b>l</b>
-MAIN_TOOLTIP_THRESHOLD;Schwellenwert
+MAIN_TOOLTIP_THRESHOLD;Schwelle
 MAIN_TOOLTIP_TOGGLE;Vorher/Nachher-Ansicht ein-/ausschalten\nTaste: <b>Umschalt</b> + <b>b</b>
 MONITOR_PROFILE_SYSTEM;Systemvorgabe
 NAVIGATOR_B;B:
@@ -834,28 +840,28 @@ NAVIGATOR_XY_FULL;Breite = %1, Höhe = %2
 NAVIGATOR_XY_NA;x: --, y: --
 OPTIONS_DEFIMG_MISSING;Die Standard-Profile für <b>Nicht-RAW-Bilder</b> wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet.
 OPTIONS_DEFRAW_MISSING;Die Standard-Profile für <b>RAW-Bilder</b> wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet.
-PARTIALPASTE_BASICGROUP;Grundeinstellungen
+PARTIALPASTE_BASICGROUP;Basisparameter
 PARTIALPASTE_CACORRECTION;Farbsaum entfernen
 PARTIALPASTE_CHANNELMIXER;RGB-Kanalmixer
 PARTIALPASTE_CHANNELMIXERBW;Schwarz/Weiß
 PARTIALPASTE_COARSETRANS;Drehen / Spiegeln
 PARTIALPASTE_COLORAPP;CIE Color Appearance Model 2002
-PARTIALPASTE_COLORGROUP;Farbeinstellungen
+PARTIALPASTE_COLORGROUP;Farbparameter
 PARTIALPASTE_COLORTONING;Farbanpassungen
 PARTIALPASTE_COMMONTRANSFORMPARAMS;Auto-Füllen
-PARTIALPASTE_COMPOSITIONGROUP;Gestaltungseinstellungen
+PARTIALPASTE_COMPOSITIONGROUP;Gestaltungsparameter
 PARTIALPASTE_CROP;Ausschnitt
 PARTIALPASTE_DARKFRAMEAUTOSELECT;Dunkelbild: Automatische Auswahl
 PARTIALPASTE_DARKFRAMEFILE;Dunkelbild: Datei
 PARTIALPASTE_DEFRINGE;Farbsaum entfernen (Defringe)
-PARTIALPASTE_DETAILGROUP;Detaileinstellungen
+PARTIALPASTE_DETAILGROUP;Detailparameter
 PARTIALPASTE_DIALOGLABEL;Selektives Einfügen des Bearbeitungsprofils
 PARTIALPASTE_DIRPYRDENOISE;Rauschreduzierung
 PARTIALPASTE_DIRPYREQUALIZER;Detailebenenkontrast
 PARTIALPASTE_DISTORTION;Verzeichnungskorrektur
 PARTIALPASTE_EPD;Dynamikkompression
 PARTIALPASTE_EQUALIZER;Anzahl der Ebenen
-PARTIALPASTE_EVERYTHING;Alle Einstellungen aktivieren / deaktivieren
+PARTIALPASTE_EVERYTHING;Alle Parameter aktivieren / deaktivieren
 PARTIALPASTE_EXIFCHANGES;Änderungen an Exif-Daten
 PARTIALPASTE_EXPOSURE;Belichtung
 PARTIALPASTE_FILMSIMULATION;Filmsimulation
@@ -911,7 +917,7 @@ PREFERENCES_AUTLISMAX;Max.-Durchschnitt aller Kacheln
 PREFERENCES_AUTLISSTD;Hoch
 PREFERENCES_AUTLISVLOW;Keine
 PREFERENCES_AUTLOW;Niedrig
-PREFERENCES_AUTOMONPROFILE;Autom. das für den aktuellen Monitor festgelegte Profil verwenden
+PREFERENCES_AUTOMONPROFILE;Automatisch das für den aktuellen Monitor festgelegte Profil verwenden.
 PREFERENCES_AUTSTD;Standard
 PREFERENCES_BATCH_PROCESSING;Stapelverarbeitung
 PREFERENCES_BEHADDALL;Alle hinzufügen
@@ -934,6 +940,7 @@ PREFERENCES_CLIPPINGIND;Anzeige zu heller/dunkler Bereiche
 PREFERENCES_CLUTSCACHE;HaldCLUT-Zwischenspeicher
 PREFERENCES_CLUTSCACHE_LABEL;Maximale Anzahl CLUTs im Zwischenspeicher
 PREFERENCES_CLUTSDIR;HaldCLUT-Verzeichnis
+PREFERENCES_CMMBPC;Schwarzpunkt-Kompensation
 PREFERENCES_CURVEBBOXPOS;Position der Kurven-Buttons
 PREFERENCES_CURVEBBOXPOS_ABOVE;Oben
 PREFERENCES_CURVEBBOXPOS_BELOW;Unten
@@ -988,20 +995,20 @@ PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Gleiche Miniaturbildgröße in der Dateiver
 PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Unterschiedliche Miniaturbildgrößen benötigen mehr Verarbeitungszeit beim Wechsel zwischen der Dateiverwaltung und dem Editor
 PREFERENCES_GIMPPATH;GIMP Installationsverzeichnis
 PREFERENCES_GREY;Yb-Luminanz (%) des Ausgabegerätes
-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_GREY23;Yb=23 CIE L#55
-PREFERENCES_GREY30;Yb=30 CIE L#60
-PREFERENCES_GREY40;Yb=40 CIE L#70
+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_GREY23;Yb = 23 CIE L#55
+PREFERENCES_GREY30;Yb = 30 CIE L#60
+PREFERENCES_GREY40;Yb = 40 CIE L#70
 PREFERENCES_GREYSC;Szenen-Yb-Luminanz (%)
-PREFERENCES_GREYSC18;Yb=18 CIE L#49
+PREFERENCES_GREYSC18;Yb = 18 CIE L#49
 PREFERENCES_GREYSCA;Automatisch
 PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogramm linksseitig
 PREFERENCES_HISTOGRAMWORKING;Das Arbeitsprofil zur Darstellung des Haupthistogramms verwenden
-PREFERENCES_HISTOGRAM_TOOLTIP;Wenn aktiviert wird das Arbeitsprofil für die Darstellung des Haupthistogramms, andernfalls das des gammakorrigierten Ausgangsprofil, verwendet.
-PREFERENCES_HLTHRESHOLD;Lichter - Schwellenwert
+PREFERENCES_HISTOGRAM_TOOLTIP;Wenn aktiviert wird das Arbeitsprofil für die Darstellung des\nHaupthistogramms, andernfalls das des gammakorrigierten\nAusgangsprofil, verwendet.
+PREFERENCES_HLTHRESHOLD;Lichter - Schwelle
 PREFERENCES_ICCDIR;ICC-Profile-Verzeichnis
 PREFERENCES_IMG_RELOAD_NEEDED;Änderungen werden nur auf neu geöffnete Bilder angewendet
 PREFERENCES_IMPROCPARAMS;Standard-Bildverarbeitungsparameter
@@ -1029,7 +1036,9 @@ PREFERENCES_MENUOPTIONS;Menüoptionen
 PREFERENCES_METADATA;Metadaten
 PREFERENCES_MIN;Mini (100x115)
 PREFERENCES_MONINTENT;Standard-Rendering-Intent
-PREFERENCES_MONPROFILE;Standard-Monitor-Profil
+PREFERENCES_MONITOR;Monitor
+PREFERENCES_MONPROFILE;Standardfarbprofil
+PREFERENCES_MONPROFILE_WARNOSX;Aufgrund einer macOS-Limitierung wird nur sRGB unterstützt.
 PREFERENCES_MULTITAB;Multi-Reitermodus
 PREFERENCES_MULTITABDUALMON;Multi-Reitermodus (auf zweitem Monitor, wenn verfügbar)
 PREFERENCES_NAVGUIDEBRUSH;Farbe der Navigationshilfe
@@ -1037,7 +1046,7 @@ PREFERENCES_NAVIGATIONFRAME;Navigation
 PREFERENCES_NOISE;Rauschreduzierung
 PREFERENCES_OUTDIR;Ausgabeverzeichnis
 PREFERENCES_OUTDIRFOLDER;In dieses Verzeichnis speichern
-PREFERENCES_OUTDIRFOLDERHINT;Alle Dateien ausgewähltem Verzeichnis speichern.
+PREFERENCES_OUTDIRFOLDERHINT;Alle Dateien im ausgewählten Verzeichnis speichern.
 PREFERENCES_OUTDIRTEMPLATE;Dynamisches Verzeichnis verwenden
 PREFERENCES_OUTDIRTEMPLATEHINT;Die folgenden Variablen können verwendet werden:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ..., <b>%r</b>, <b>%s1</b>, <b>%s2</b>, ...\n\nDiese Variablen beinhalten bestimmte Teile des Verzeichnispfades, in welchem sich das Bild befindet, oder Attribute des Bildes.\n\nWenn zum Beispiel <b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b> geöffnet wurde, dann haben die Variablen den folgenden Inhalt:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31</i>\n<b>%p2</b> = <i>/home/tom/photos</i>\n<b>%p3</b> = <i>/home/tom</i>\n<b>%p4</b> = <i>/home</i>\n\nWenn Sie die Ausgabedatei in dasselbe Verzeichnis wie das Originalbild speichern wollen, dann wählen Sie:\n<b>%p1/%f</b>\n\nWenn Sie die Ausgabedatei in ein Unterverzeichnis mit dem Namen "<i>converted</i>" schreiben wollen, dann wählen Sie:\n<b>%p1/converted/%f</b>\n\nWenn Sie die Ausgabedatei im Verzeichnispfad "<i>/home/tom/photos/converted</i>" speichern wollen, dort jedoch in einem mit dem Namen des Ursprungsverzeichnisses betitelten Unterverzeichnis, dann wählen Sie:\n<b>%p2/converted/%d1/%f</b>\n\nDie Variable <b>%r</b> enthält die Bewertung des Bildes.
 PREFERENCES_OVERLAY_FILENAMES;Bildinformationen überlagern die Miniaturbilder in der Dateiverwaltung
@@ -1054,6 +1063,7 @@ PREFERENCES_PREVDEMO;Farbinterpolation
 PREFERENCES_PREVDEMO_FAST;Schnell
 PREFERENCES_PREVDEMO_LABEL;Demosaikmethode für 100%-Ansicht
 PREFERENCES_PREVDEMO_SIDECAR;Wie im Bildverarbeitungsprofil vorgegeben
+PREFERENCES_PRINTER;Drucker (Soft-Proofing)
 PREFERENCES_PROFILEHANDLING;Behandlung der Bearbeitungsprofile
 PREFERENCES_PROFILELOADPR;Priorität der Profile beim Laden
 PREFERENCES_PROFILEPRCACHE;Bearbeitungsprofil im Zwischenspeicher
@@ -1062,12 +1072,15 @@ PREFERENCES_PROFILESAVECACHE;Verarbeitungsparameter im Zwischenspeicher speicher
 PREFERENCES_PROFILESAVEINPUT;Verarbeitungsparameter zusammen mit Datei speichern (Sidecar)
 PREFERENCES_PROFILE_NONE;Kein Farbprofil
 PREFERENCES_PROPERTY;Eigenschaft
+PREFERENCES_PRTINTENT;Rendering-Intent
+PREFERENCES_PRTPROFILE;Farbprofil
 PREFERENCES_PSPATH;Adobe Photoshop Installationsverzeichnis
 PREFERENCES_REMEMBERZOOMPAN;Zoom und Bildposition merken
-PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Öffnen eines neuen Bildes mit den Zoom- und Positionswerten des vorangegangenen Bildes.\n\nFunktioniert nur unter folgenden Bedingungen:\nEin-Reitermodus aktiv\n“Demosaikmethode für 100%-Ansicht“ muss auf “Wie im Bildverarbeitungsprofil vorgegeben“ eingestellt sein.
+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_SELECTFONT;Schriftart
+PREFERENCES_SELECTFONT_COLPICKER;Schriftart für den Farbwähler
 PREFERENCES_SELECTLANG;Sprache
 PREFERENCES_SELECTTHEME;Oberflächendesign (erfordert Neustart)
 PREFERENCES_SERIALIZE_TIFF_READ;TIFF-Bilder
@@ -1078,7 +1091,7 @@ PREFERENCES_SHOWBASICEXIF;Exif-Daten anzeigen
 PREFERENCES_SHOWDATETIME;Datum und Uhrzeit anzeigen
 PREFERENCES_SHOWEXPOSURECOMPENSATION;Belichtungskorrektur anfügen
 PREFERENCES_SHOWFILMSTRIPTOOLBAR;Toolbar oberhalb des Filmstreifens anzeigen
-PREFERENCES_SHTHRESHOLD;Schatten - Schwellenwert
+PREFERENCES_SHTHRESHOLD;Schatten - Schwelle
 PREFERENCES_SIMPLAUT;Werkzeugmodus
 PREFERENCES_SINGLETAB;Ein-Reitermodus
 PREFERENCES_SINGLETABVERTAB;Ein-Reitermodus (vertikale Reiter)
@@ -1116,7 +1129,7 @@ PROFILEPANEL_GLOBALPROFILES;Standardprofile
 PROFILEPANEL_LABEL;Bearbeitungsprofile
 PROFILEPANEL_LOADDLGLABEL;Bearbeitungsparameter laden...
 PROFILEPANEL_LOADPPASTE;Zu ladende Parameter
-PROFILEPANEL_MODE_TIP;Ist der Button aktiviert, werden Teilprofile als vollständige Profile geladen. Fehlende Parameter werden durch Standardwerte aufgefüllt.
+PROFILEPANEL_MODE_TIP;Ist der Button aktiviert, werden Teilprofile\nals vollständige Profile geladen.\nFehlende Parameter werden durch\nStandardwerte aufgefüllt.
 PROFILEPANEL_MYPROFILES;Meine Profile
 PROFILEPANEL_PASTEPPASTE;Einzufügende Parameter
 PROFILEPANEL_PCUSTOM;Benutzerdefiniert
@@ -1125,10 +1138,10 @@ PROFILEPANEL_PINTERNAL;Neutral
 PROFILEPANEL_PLASTSAVED;Zuletzt gespeichert
 PROFILEPANEL_SAVEDLGLABEL;Bearbeitungsprofil speichern...
 PROFILEPANEL_SAVEPPASTE;Zu speichernde Parameter
-PROFILEPANEL_TOOLTIPCOPY;Profil in Zwischenablage kopieren\n\nStrg-Taste beim Anklicken gedrückt halten, um zu kopierende Parameter auszuwählen.
-PROFILEPANEL_TOOLTIPLOAD;Profil aus Datei laden\n\nStrg-Taste beim Anklicken gedrückt halten,\num zu ladende Parameter auszuwählen
-PROFILEPANEL_TOOLTIPPASTE;Profil aus Zwischenablage einfügen\n\nStrg-Taste beim Anklicken gedrückt halten, um einzufügende Parameter auszuwählen.
-PROFILEPANEL_TOOLTIPSAVE;Profil speichern\n\nStrg-Taste beim Anklicken gedrückt halten,\num zu speichernde Parameter auszuwählen
+PROFILEPANEL_TOOLTIPCOPY;Profil in Zwischenablage kopieren\n\nStrg-Taste beim Klicken festhalten, um\nzu kopierende Parameter auszuwählen.
+PROFILEPANEL_TOOLTIPLOAD;Profil aus Datei laden\n\nStrg-Taste beim Klicken festhalten, um\nzu ladende Parameter auszuwählen.
+PROFILEPANEL_TOOLTIPPASTE;Profil aus Zwischenablage einfügen\n\nStrg-Taste beim Klicken festhalten, um\neinzufügende Parameter auszuwählen.
+PROFILEPANEL_TOOLTIPSAVE;Profil speichern\n\nStrg-Taste beim Klicken festhalten, um\nzu speichernde Parameter auszuwählen.
 PROGRESSBAR_LOADING;Lade Bild...
 PROGRESSBAR_LOADINGTHUMBS;Lade Miniaturbilder...
 PROGRESSBAR_LOADJPEG;Lade JPEG...
@@ -1163,14 +1176,17 @@ SAVEDLG_SUBSAMP_TOOLTIP;Beste Kompression: 4:2:0\nAusgeglichen: 4:2:2\nBeste Qua
 SAVEDLG_TIFFUNCOMPRESSED;Unkomprimiertes TIFF
 SAVEDLG_WARNFILENAME;Die Datei wird gespeichert als
 SHCSELECTOR_TOOLTIP;Um die 3 Regler zurückzusetzen, rechte Maustaste klicken.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Wenn eingeschaltet, werden die Pixel, die\naußerhalb des Gamut-Farbbereichs liegen,\nin Grau angezeigt.
+SOFTPROOF_TOOLTIP;<b>Soft-Proofing:</b>\n\nWenn eingeschaltet, wird das Rendern mit dem\nAusgabefarbprofil simuliert.\nVorzugsweise für die Simulation der Druckausgabe.
 THRESHOLDSELECTOR_B;Unten
 THRESHOLDSELECTOR_BL;Unten-Links
 THRESHOLDSELECTOR_BR;Unten-Rechts
-THRESHOLDSELECTOR_HINT;<b>Umschalt</b>-Taste halten, um individuelle Kontrollpunkte zu verschieben.
+THRESHOLDSELECTOR_HINT;<b>Umschalt</b>-Taste halten, um individuelle\nKontrollpunkte zu verschieben.
 THRESHOLDSELECTOR_T;Oben
 THRESHOLDSELECTOR_TL;Oben-Links
 THRESHOLDSELECTOR_TR;Oben-Rechts
-TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: <b>c</b>\n\nZum Verschieben des Ausschnitts muss die Umschalttaste gedrückt gehalten werden
+TOOLBAR_TOOLTIP_COLORPICKER;<b>Farbwähler</b>\n\nWenn eingeschaltet:\n- Mit der linken Maustaste können Sie einen Farbwähler setzen.\n- Zum Verschieben, linke Maustaste festhalten.\n- Umschalttaste + Rechts-Klick entfernt alle Farbwähler.\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
+TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: <b>c</b>\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
 TOOLBAR_TOOLTIP_HAND;Hand-Werkzeug\nTaste: <b>h</b>
 TOOLBAR_TOOLTIP_STRAIGHTEN;Ausrichten / Drehen\nTaste: <b>s</b>\n\nRichtet das Bild entlang einer Leitlinie aus.
 TOOLBAR_TOOLTIP_WB;Weißabgleich manuell setzen\nTaste: <b>w</b>
@@ -1181,13 +1197,13 @@ TP_BWMIX_ALGO_TOOLTIP;<b>Linear</b> liefert ein lineares Ergebnis\n<b>Spezialeff
 TP_BWMIX_AUTOCH;Auto
 TP_BWMIX_AUTOCH_TIP;Automatische Berechnung der RGB-Werte.
 TP_BWMIX_CC_ENABLED;Komplemantärfarbe anpassen
-TP_BWMIX_CC_TOOLTIP;Aktiviert die automatische Anpassung der Komplementärfarbe im ROYGCBPM-Modus
+TP_BWMIX_CC_TOOLTIP;Aktiviert die automatische Anpassung der\nKomplementärfarbe im ROYGCBPM-Modus
 TP_BWMIX_CHANNEL;Luminanzequalizer
 TP_BWMIX_CURVEEDITOR1;“Bevor“-Kurve
 TP_BWMIX_CURVEEDITOR2;“Danach“-Kurve
-TP_BWMIX_CURVEEDITOR_AFTER_TOOLTIP;Die Tonwertkurve wird NACH der Schwarz/Weiß-Konvertierung angewendet.
-TP_BWMIX_CURVEEDITOR_BEFORE_TOOLTIP;Die Tonwertkurve wird VOR der Schwarz/Weiß-Konvertierung angewendet.
-TP_BWMIX_CURVEEDITOR_LH_TOOLTIP;Luminanz als Funktion des Farbtons L=f(H). Zu hohe Werte können zu Artefakten führen.
+TP_BWMIX_CURVEEDITOR_AFTER_TOOLTIP;Die Tonwertkurve wird NACH der Schwarz/Weiß-\nKonvertierung angewendet.
+TP_BWMIX_CURVEEDITOR_BEFORE_TOOLTIP;Die Tonwertkurve wird VOR der Schwarz/Weiß-\nKonvertierung angewendet.
+TP_BWMIX_CURVEEDITOR_LH_TOOLTIP;Luminanz als Funktion des Farbtons L = f(H).\nZu hohe Werte können zu Artefakten führen.
 TP_BWMIX_FILTER;Farbfilter
 TP_BWMIX_FILTER_BLUE;Blau
 TP_BWMIX_FILTER_BLUEGREEN;Blau-Grün
@@ -1213,7 +1229,7 @@ TP_BWMIX_RGBLABEL;R: %1%%   G: %2%%   B: %3%%  Gesamt: %4%%
 TP_BWMIX_RGBLABEL_HINT;RGB-Faktoren\n\nGesamt: Summe aller RGB-Werte.\n- immer 100% im Modus Relativ\n- höher (heller), oder niedriger (dunkler) 100% im Modus Absolut
 TP_BWMIX_RGB_TOOLTIP;Mischen Sie die Kanäle. Verwenden Sie die Vorgaben zur Orientierung.\nNegative Werte können zu Artefakten führen.
 TP_BWMIX_SETTING;Voreinstellung
-TP_BWMIX_SETTING_TOOLTIP;Voreinstellungen für den Kanalmixer (Film, Landschaft, ...). 
+TP_BWMIX_SETTING_TOOLTIP;Voreinstellungen für den Kanalmixer (Film, Landschaft, ...).
 TP_BWMIX_SET_HIGHCONTAST;Hoher Kontrast
 TP_BWMIX_SET_HIGHSENSIT;Hohe Empfindlichkeit
 TP_BWMIX_SET_HYPERPANCHRO;Hyper-Panchromatisch
@@ -1240,7 +1256,7 @@ TP_CACORRECTION_RED;Rot
 TP_CBDL_AFT;Nach Schwarz / Weiß
 TP_CBDL_BEF;Vor Schwarz / Weiß
 TP_CBDL_METHOD;Prozessreihenfolge
-TP_CBDL_METHOD_TOOLTIP;Wählen Sie, ob der Detailebenenkontrast nach dem Schwarz/Weiß-Werkzeug abgearbeitet wird (ermöglicht das Arbeiten im L*a*b*-Farbraum), oder vor ihm (ermöglicht das Arbeiten im RGB-Farbraum).
+TP_CBDL_METHOD_TOOLTIP;Wählen Sie, ob der Detailebenenkontrast nach\ndem Schwarz/Weiß-Werkzeug abgearbeitet wird\n(ermöglicht das Arbeiten im L*a*b*-Farbraum),\noder vor ihm (ermöglicht das Arbeiten im RGB-\nFarbraum).
 TP_CHMIXER_BLUE;Blau-Kanal
 TP_CHMIXER_GREEN;Grün-Kanal
 TP_CHMIXER_LABEL;RGB-Kanalmixer
@@ -1254,28 +1270,28 @@ TP_COLORAPP_ADAPTSCENE;Leuchtstärke (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_TOOLTIP;Absolute Luminanz der Betrachtungsumgebung\n(normalerweise 16cd/m²)
-TP_COLORAPP_ADAP_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), werden die optimalen Werte aus den Exif-Daten automatisch berechnet.
+TP_COLORAPP_ADAP_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), werden die optimalen\nWerte aus den Exif-Daten automatisch berechnet.
 TP_COLORAPP_ALGO;Algorithmus
 TP_COLORAPP_ALGO_ALL;Alle
 TP_COLORAPP_ALGO_JC;Helligkeit + Buntheit (JH)
 TP_COLORAPP_ALGO_JS;Helligkeit + Sättigung (JS)
 TP_COLORAPP_ALGO_QM;Helligkeit + Farbigkeit (QM)
-TP_COLORAPP_ALGO_TOOLTIP;Auswahl zwischen Parameter-Teilmengen und allen Parametern
-TP_COLORAPP_BADPIXSL;Hot/Bad-Pixelfilter
-TP_COLORAPP_BADPIXSL_TOOLTIP;Unterdrückt “Hot/Bad“-Pixel\n\n0 = keine Auswirkung\n1 = Mittel\n2 = Gaussian
+TP_COLORAPP_ALGO_TOOLTIP;Auswahl zwischen Parameter-Teilmengen\nund allen Parametern
+TP_COLORAPP_BADPIXSL;Hot / Bad-Pixelfilter
+TP_COLORAPP_BADPIXSL_TOOLTIP;Unterdrückt “Hot / Bad“-Pixel\n\n0 = keine Auswirkung\n1 = Mittel\n2 = Gaussian
 TP_COLORAPP_BRIGHT;Helligkeit (Q)
 TP_COLORAPP_BRIGHT_TOOLTIP;Helligkeit in CIECAM02 berücksichtigt die Weißintensität und unterscheidet sich von L*a*b* und RGB-Helligkeit
 TP_COLORAPP_CHROMA;Buntheit (H)
 TP_COLORAPP_CHROMA_M;Farbigkeit (M)
-TP_COLORAPP_CHROMA_M_TOOLTIP;Die Farbigkeit in CIECAM02 unterscheidet sich von L*a*b*- und RGB-Farbigkeit
+TP_COLORAPP_CHROMA_M_TOOLTIP;Die Farbigkeit in CIECAM02 unterscheidet sich\nvon L*a*b*- und RGB-Farbigkeit
 TP_COLORAPP_CHROMA_S;Sättigung (S)
-TP_COLORAPP_CHROMA_S_TOOLTIP;Sättigung in CIECAM02 unterscheidet sich von L*a*b* und RGB Sättigung
-TP_COLORAPP_CHROMA_TOOLTIP;Buntheit in CIECAM02 unterscheidet sich von L*a*b* und RGB-Buntheit
+TP_COLORAPP_CHROMA_S_TOOLTIP;Sättigung in CIECAM02 unterscheidet sich\nvon L*a*b* und RGB Sättigung
+TP_COLORAPP_CHROMA_TOOLTIP;Buntheit in CIECAM02 unterscheidet sich\nvon L*a*b* und RGB-Buntheit
 TP_COLORAPP_CIECAT_DEGREE;CAT02 Adaptation
 TP_COLORAPP_CONTRAST;Kontrast (J)
 TP_COLORAPP_CONTRAST_Q;Kontrast (Q)
-TP_COLORAPP_CONTRAST_Q_TOOLTIP;Kontrast (Q) in CIECAM02 unterscheidet sich vom L*a*b*- und RGB-Kontrast
-TP_COLORAPP_CONTRAST_TOOLTIP;Kontrast (J) in CIECAM02 unterscheidet sich vom L*a*b*- und RGB-Kontrast
+TP_COLORAPP_CONTRAST_Q_TOOLTIP;Kontrast (Q) in CIECAM02 unterscheidet sich\nvom L*a*b*- und RGB-Kontrast
+TP_COLORAPP_CONTRAST_TOOLTIP;Kontrast (J) in CIECAM02 unterscheidet sich\nvom L*a*b*- und RGB-Kontrast
 TP_COLORAPP_CURVEEDITOR1;Tonwertkurve 1
 TP_COLORAPP_CURVEEDITOR1_TOOLTIP;Zeigt das Histogramm von L (L*a*b*) vor CIECAM02.\nWenn "CIECAM02-Ausgabe-Histogramm in Kurven anzeigen" aktiviert ist, wird das Histogramm von J oder Q nach CIECAM02-Anpassungen angezeigt.\n\nJ und Q werden nicht im Haupt-Histogramm angezeigt.\nFür die endgültige Ausgabe verwenden Sie das Haupt-Histogramm.
 TP_COLORAPP_CURVEEDITOR2;Tonwertkurve 2
@@ -1283,8 +1299,8 @@ TP_COLORAPP_CURVEEDITOR2_TOOLTIP;Gleiche Verwendung wie bei der zweiten Belichtu
 TP_COLORAPP_CURVEEDITOR3;Farbkurve
 TP_COLORAPP_CURVEEDITOR3_TOOLTIP;Korrigiert Buntheit, Sättigung oder Farbigkeit.\n\nZeigt das Histogramm der Chromatizität (L*a*b* ) VOR den CIECAM02-Änderungen an.\nWenn "CIECAM02-Ausgabe-Histogramm in Kurven anzeigen" aktiviert ist, wird das Histogramm von C, S oder M NACH den CIECAM02-Änderungen angezeigt.\n\nC, S und M werden nicht im Haupt-Histogramm angezeigt.\nFür die endgültige Ausgabe verwenden Sie das Haupt-Histogramm.
 TP_COLORAPP_DATACIE;CIECAM02-Ausgabe-Histogramm in\nKurven anzeigen
-TP_COLORAPP_DATACIE_TOOLTIP;Wenn aktiviert, zeigen die Histogramme der CIECAM02-Kurven die angenäherten Werte/Bereiche für <b>J oder Q</b> und <b>C, S oder M</b> NACH den CIECAM02-Anpassungen an. Das betrifft nicht das Haupt-Histogramm.\n\nWenn deaktiviert, zeigen die Histogramme der CIECAM02-Kurven die L*a*b*-Werte VOR den CIECAM02-Anpassungen an.
-TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Wenn aktiviert (emfohlen), berechnet RT einen optimalen Wert der von CAT02 und CIECAM02 verwendet wird.\nUm den Wert manuell zu setzen, muss die Option deaktiviert sein (Werte über 64 sind empfohlen).
+TP_COLORAPP_DATACIE_TOOLTIP;Wenn aktiviert, zeigen die Histogramme\nder CIECAM02-Kurven die angenäherten\nWerte/Bereiche für <b>J oder Q</b> und <b>C, S oder M</b>\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_GAMUT;Gamutkontrolle (L*a*b*)
 TP_COLORAPP_GAMUT_TOOLTIP;Gamutkontrolle im L*a*b*-Modus erlauben.
@@ -1295,9 +1311,9 @@ TP_COLORAPP_LABEL_CAM02;Bildanpassungen
 TP_COLORAPP_LABEL_SCENE;Umgebungsbedingungen (Szene)
 TP_COLORAPP_LABEL_VIEWING;Betrachtungsbedingungen
 TP_COLORAPP_LIGHT;Helligkeit (J)
-TP_COLORAPP_LIGHT_TOOLTIP;Helligkeit in CIECAM02 unterscheidet sich von L*a*b* und RGB Helligkeit
+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;<b>Weißabgleich [RT] + [Ausgabe]:</b>\nRT's Weißabgleich wird für die Szene verwendet, CIECAM02 auf D50 gesetzt und der Weißabgleich des Ausgabegerätes kann unter <i>Einstellungen > Farb-Management</i> eingestellt werden.\n\n<b>Weißabgleich [RT+CAT02] + [Ausgabe]:</b>\nRT's Weißabgleich wird für CAT02 verwendet und der Weißabgleich des Ausgabegerätes kann unter <i>Einstellungen > Farb-Management</i> eingestellt werden.
+TP_COLORAPP_MODEL_TOOLTIP;<b>Weißabgleich [RT] + [Ausgabe]:</b>\nRT's Weißabgleich wird für die Szene verwendet,\nCIECAM02 auf D50 gesetzt und der Weißabgleich\ndes Ausgabegerätes kann unter:\n<i>Einstellungen > Farb-Management</i>\neingestellt werden.\n\n<b>Weißabgleich [RT+CAT02] + [Ausgabe]:</b>\nRT's Weißabgleich wird für CAT02 verwendet und\nder Weißabgleich des Ausgabegerätes kann unter\n<i>Einstellungen > Farb-Management</i>\neingestellt werden.
 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--
@@ -1307,9 +1323,9 @@ TP_COLORAPP_SURROUND_AVER;Durchschnitt
 TP_COLORAPP_SURROUND_DARK;Dunkel
 TP_COLORAPP_SURROUND_DIM;Gedimmt
 TP_COLORAPP_SURROUND_EXDARK;Extrem Dunkel (Cutsheet)
-TP_COLORAPP_SURROUND_TOOLTIP;Verändert Töne und Farben unter Berücksichtigung der Betrachtungsbedingungen des Ausgabegerätes.\n\n<b>Durchschnitt:</b>\nDurchschnittliche Lichtumgebung (standard)\nDas Bild wird nicht angepasst\n\n<b>Gedimmt:</b>\nGedimmte Umgebung (TV)\ndas Bild wird leicht dunkel\n\n<b>Dunkel:</b>\nDunkle Umgebung (Projektor)\nDas Bild wird dunkler\n\n<b>Extrem Dunkel:</b>\nExtrem Dunkle Umgebung\nDas Bild wird sehr dunkel
+TP_COLORAPP_SURROUND_TOOLTIP;Verändert Töne und Farben unter Berücksichtigung der\nBetrachtungsbedingungen des Ausgabegerätes.\n\n<b>Durchschnitt:</b>\nDurchschnittliche Lichtumgebung (Standard).\nDas Bild wird nicht angepasst.\n\n<b>Gedimmt:</b>\nGedimmte Umgebung (TV). Das Bild wird leicht dunkel.\n\n<b>Dunkel:</b>\nDunkle Umgebung (Projektor). Das Bild wird dunkler.\n\n<b>Extrem dunkel:</b>\nExtrem dunkle Umgebung. Das Bild wird sehr dunkel.
 TP_COLORAPP_SURSOURCE;Dunkle Umgebung
-TP_COLORAPP_SURSOURCE_TOOLTIP;Kann verwendet werden, wenn das Quellbild einen schwarzen Rahmen besitzt.
+TP_COLORAPP_SURSOURCE_TOOLTIP;Kann verwendet werden, wenn das Quellbild\neinen schwarzen Rahmen besitzt.
 TP_COLORAPP_TCMODE_BRIGHTNESS;Helligkeit (Q)
 TP_COLORAPP_TCMODE_CHROMA;Buntheit (H)
 TP_COLORAPP_TCMODE_COLORF;Farbigkeit (M)
@@ -1328,7 +1344,7 @@ TP_COLORTONING_BALANCE;Farbausgleich
 TP_COLORTONING_BY;o C/L
 TP_COLORTONING_CHROMAC;Deckkraft
 TP_COLORTONING_COLOR;Farbe
-TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Buntheitsdeckkraft als Funktion der Luminanz oB=f(L)
+TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Buntheitsdeckkraft als Funktion der Luminanz oB = f(L)
 TP_COLORTONING_HIGHLIGHT;Lichter
 TP_COLORTONING_HUE;Farbton
 TP_COLORTONING_LAB;L*a*b*-Überlagerung
@@ -1337,7 +1353,7 @@ TP_COLORTONING_LUMA;Luminanz
 TP_COLORTONING_LUMAMODE;Luminanz schützen
 TP_COLORTONING_LUMAMODE_TOOLTIP;Wenn aktiviert, wird die Luminanz der Farben Rot, Grün, Cyan, Blau... geschützt.
 TP_COLORTONING_METHOD;Methode
-TP_COLORTONING_METHOD_TOOLTIP;L*a*b*-Überlagerung, RGB-Regler und RGB-Kurven verwenden eine interpolierte Farbüberlagerung.\n\nFarbausgleich (Schatten/Mitten/Lichter) und Sättigung (2-Farben) verwenden direkte Farben.
+TP_COLORTONING_METHOD_TOOLTIP;L*a*b*-Überlagerung, RGB-Regler und RGB-Kurven\nverwenden eine interpolierte Farbüberlagerung.\n\nFarbausgleich (Schatten/Mitten/Lichter) und Sättigung\n(2-Farben) verwenden direkte Farben.
 TP_COLORTONING_MIDTONES;Mitten
 TP_COLORTONING_NEUTRAL;Regler zurücksetzen
 TP_COLORTONING_NEUTRAL_TIP;Alle Werte auf Standard zurücksetzen\n(Schatten, Mitten, Lichter)
@@ -1346,7 +1362,7 @@ TP_COLORTONING_RGBCURVES;RGB-Kurven
 TP_COLORTONING_RGBSLIDERS;RGB-Regler
 TP_COLORTONING_SA;Sättigung schützen
 TP_COLORTONING_SATURATEDOPACITY;Intensität
-TP_COLORTONING_SATURATIONTHRESHOLD;Schwellenwert
+TP_COLORTONING_SATURATIONTHRESHOLD;Schwelle
 TP_COLORTONING_SHADOWS;Schatten
 TP_COLORTONING_SPLITCO;Schatten/Mitten/Lichter
 TP_COLORTONING_SPLITCOCO;Farbausgleich (Schatten/Mitten/Lichter)
@@ -1356,7 +1372,7 @@ TP_COLORTONING_STRENGTH;Intensität
 TP_COLORTONING_TWO2;Spezial-Farbe (2 Farben)
 TP_COLORTONING_TWOALL;Spezial-Farbe
 TP_COLORTONING_TWOBY;Spezial a* und b*
-TP_COLORTONING_TWOCOLOR_TOOLTIP;Standardfarbe:\nLinearer Verlauf, a* = b*.\n\nSpezial-Farbe:\nLinearer Verlauf, a* = b*, aber nicht verbunden\n\nSpezial a* und b*:\nLinearer Verlauf, nicht verbunden, mit unterschiedlichen Kurven für a* und b*. Bevorzugt für spezielle Effekte.\n\nSpezial-Farbe (2 Farben):\nBesser vorhersehbar
+TP_COLORTONING_TWOCOLOR_TOOLTIP;Standardfarbe:\nLinearer Verlauf, a* = b*.\n\nSpezial-Farbe:\nLinearer Verlauf, a* = b*, aber nicht verbunden\n\nSpezial a* und b*:\nLinearer Verlauf, nicht verbunden, mit unterschiedlichen\nKurven für a* und b*. Bevorzugt für spezielle Effekte.\n\nSpezial-Farbe (2 Farben):\nBesser vorhersehbar
 TP_COLORTONING_TWOSTD;Standardfarbe
 TP_CROP_FIXRATIO;Format
 TP_CROP_GTDIAGONALS;Diagonalregel
@@ -1380,7 +1396,7 @@ TP_DARKFRAME_AUTOSELECT;Automatische Auswahl
 TP_DARKFRAME_LABEL;Dunkelbild
 TP_DEFRINGE_LABEL;Farbsaum entfernen (Defringe)
 TP_DEFRINGE_RADIUS;Radius
-TP_DEFRINGE_THRESHOLD;Schwellenwert
+TP_DEFRINGE_THRESHOLD;Schwelle
 TP_DIRPYRDENOISE_3X3;3×3
 TP_DIRPYRDENOISE_3X3_SOFT;3×3 weich
 TP_DIRPYRDENOISE_5X5;5×5
@@ -1391,21 +1407,21 @@ TP_DIRPYRDENOISE_ABM;Nur Farbe
 TP_DIRPYRDENOISE_AUT;Automatisch Global
 TP_DIRPYRDENOISE_AUTO;Automatisch Global
 TP_DIRPYRDENOISE_AUTO_TOOLTIP;Bewertung des Farbrauschens.\nDie Bewertung ist ungenau und sehr subjektiv!
-TP_DIRPYRDENOISE_BLUE;Delta-Chrominanz Blau/Gelb
-TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Benutzerdefiniert:\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
+TP_DIRPYRDENOISE_BLUE;Delta-Chrominanz Blau / Gelb
+TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;<b>Benutzerdefiniert:</b>\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\n<b>Automatisch Global:</b>\nEs werden 9 Zonen für die Berechnung der Chrominanz-\nRauschreduzierung verwendet.\n\n<b>Vorschau:</b>\nNur der sichbare Teil des Bildes wird für die Berechnung\nder Chrominanz-Rauschreduzierung verwendet.
 TP_DIRPYRDENOISE_CCCURVE;Chrominanzkurve
 TP_DIRPYRDENOISE_CHROMA;Chrominanz (Master)
 TP_DIRPYRDENOISE_CHROMAFR;Chrominanz
 TP_DIRPYRDENOISE_CTYPE;Methode
-TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Benutzerdefiniert:\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nAuto-Multizonen:\nKeine Voransicht - wird erst beim Speichern angewendet.\nAbhängig von der Bildgröße, wird das Bild in ca. 10 bis 70 Kacheln aufgeteilt. Für jede Kachel wird die Chrominanz-Rauschreduzierung individuell berechnet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
+TP_DIRPYRDENOISE_CTYPE_TOOLTIP;<b>Benutzerdefiniert:</b>\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\n<b>Automatisch Global:</b>\nEs werden 9 Zonen für die Berechnung der Chrominanz-\nRauschreduzierung verwendet.\n\n<b>Auto-Multizonen:</b>\nKeine Voransicht - wird erst beim Speichern angewendet.\nAbhängig von der Bildgröße, wird das Bild in ca. 10 bis 70\nKacheln aufgeteilt. Für jede Kachel wird die Chrominanz-\nRauschreduzierung individuell berechnet.\n\n<b>Vorschau:</b>\nNur der sichbare Teil des Bildes wird für die Berechnung\nder Chrominanz-Rauschreduzierung verwendet.
 TP_DIRPYRDENOISE_CUR;Kurve
 TP_DIRPYRDENOISE_CURVEEDITOR_CC;Farbe
-TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Erhöht den Wert aller Chrominanz-Regler und regelt die Chrominanz-Rauschreduzierung als Funktion der Chromatizität. Die Intensität kann über Kontrollpunkte für schwach bis intensiv gesättigte Farben unterschiedlich eingestellt werden.
+TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Erhöht den Wert aller Chrominanz-Regler und\nregelt die Chrominanz-Rauschreduzierung als\nFunktion der Chromatizität. Die Intensität kann über\nKontrollpunkte für schwach bis intensiv gesättigte\nFarben unterschiedlich eingestellt werden.
 TP_DIRPYRDENOISE_CURVEEDITOR_L_TOOLTIP;Moduliert die Wirkung der Luminanz-Rauschreduzierung
 TP_DIRPYRDENOISE_ENH;Erweiterter Modus
 TP_DIRPYRDENOISE_ENH_TOOLTIP;Erhöht die Qualität der Rauschreduzierung auf Kosten einer um 20% erhöhten Verarbeitungszeit.
 TP_DIRPYRDENOISE_GAMMA;Gamma
-TP_DIRPYRDENOISE_GAMMA_TOOLTIP;Mit Gamma kann die Intensität der Rauschreduzierung über den Farbbereich variiert werden. Bei kleinen Werten sind nur dunkle Farbtöne betroffen, bei größeren Werten wird der Effekt auf hellere Töne ausgeweitet.
+TP_DIRPYRDENOISE_GAMMA_TOOLTIP;Mit Gamma kann die Intensität der\nRauschreduzierung über den Farbbereich\nvariiert werden. Bei kleinen Werten sind\nnur dunkle Farbtöne betroffen, bei\ngrößeren Werten wird der Effekt auf\nhellere Töne ausgeweitet.
 TP_DIRPYRDENOISE_LAB;L*a*b*
 TP_DIRPYRDENOISE_LABEL;Rauschreduzierung
 TP_DIRPYRDENOISE_LABM;L*a*b*
@@ -1423,31 +1439,31 @@ TP_DIRPYRDENOISE_MEDMETHOD;Medianmethode
 TP_DIRPYRDENOISE_MEDTYPE;Mediantyp
 TP_DIRPYRDENOISE_METHOD;Methode
 TP_DIRPYRDENOISE_METHOD11;Qualität
-TP_DIRPYRDENOISE_METHOD11_TOOLTIP;Einstellung der Qualität der Rauschreduzierung. Die Einstellung “Hoch“ verbessert die Rauschreduzierung auf Kosten der Verarbeitungszeit.
-TP_DIRPYRDENOISE_METHOD_TOOLTIP;Für RAW-Bilder kann entweder die RGB- oder L*a*b*-Methode verwendet werden.\n\nFür andere Bilder wird unabhängig von der Auswahl immer die L*a*b*-Methode verwendet.
-TP_DIRPYRDENOISE_METM_TOOLTIP;Bei der Methode “Nur Luminanz“ und “L*a*b*“, wird der Medianfilter nach den Waveletschritten verarbeitet.\nBei RGB wird der Medianfilter am Ende der Rauschreduzierung verarbeitet.
-TP_DIRPYRDENOISE_MET_TOOLTIP;Einen Medianfilter mit der gewünschten Fenstergröße auswählen. Je größer das Fenster, umso länger dauert die Verarbeitungszeit.\n\n3×3 weich: Nutzt 5 Pixel in einem 3×3-Pixelfenster.\n3×3: Nutzt 9 Pixel in einem 3×3-Pixelfenster.\n5×5 weich: Nutzt 13 Pixel in einem 5×5-Pixelfenster.\n5×5: Nutzt 25 Pixel in einem 5×5-Pixelfenster.\n7×7: Nutzt 49 Pixel in einem 7×7-Pixelfenster.\n9×9: Nutzt 81 Pixel in einem 9×9-Pixelfenster.\n\nManchmal ist das Ergebnis mit einem kleineren Fenster und mehreren Iterationen besser, als mit einem größeren und nur einer Iteration.
-TP_DIRPYRDENOISE_NOISELABEL;Rauschen: Mittelwert=%1  Hoch=%2
+TP_DIRPYRDENOISE_METHOD11_TOOLTIP;Einstellung der Qualität der Rauschreduzierung.\nDie Einstellung “Hoch“ verbessert die Rausch-\nreduzierung auf Kosten der Verarbeitungszeit.
+TP_DIRPYRDENOISE_METHOD_TOOLTIP;Für RAW-Bilder kann entweder die RGB-\noder L*a*b*-Methode verwendet werden.\n\nFür andere Bilder wird unabhängig von der\nAuswahl immer die L*a*b*-Methode verwendet.
+TP_DIRPYRDENOISE_METM_TOOLTIP;Bei der Methode “Nur Luminanz“ und “L*a*b*“,\nwird der Medianfilter nach den Waveletschritten\nverarbeitet.\nBei RGB wird der Medianfilter am Ende der\nRauschreduzierung verarbeitet.
+TP_DIRPYRDENOISE_MET_TOOLTIP;Einen Medianfilter mit der gewünschten Fenstergröße auswählen.\nJe größer das Fenster, umso länger dauert die Verarbeitungszeit.\n\n3×3 weich: Nutzt 5 Pixel in einem 3×3-Pixelfenster.\n3×3: Nutzt 9 Pixel in einem 3×3-Pixelfenster.\n5×5 weich: Nutzt 13 Pixel in einem 5×5-Pixelfenster.\n5×5: Nutzt 25 Pixel in einem 5×5-Pixelfenster.\n7×7: Nutzt 49 Pixel in einem 7×7-Pixelfenster.\n9×9: Nutzt 81 Pixel in einem 9×9-Pixelfenster.\n\nManchmal ist das Ergebnis mit einem kleineren Fenster und mehreren Iterationen besser, als mit einem größeren und nur einer Iteration.
+TP_DIRPYRDENOISE_NOISELABEL;Rauschen: Mittelwert = %1  Hoch = %2
 TP_DIRPYRDENOISE_NOISELABELEMPTY;Rauschen: Mittelwert = ---   Hoch = ---
-TP_DIRPYRDENOISE_NRESID_TOOLTIP;Zeigt das Restrauschen des sichtbaren Bildbereichs in der 100%-Ansicht an.\n\n<50: Sehr wenig Rauschen\n50 - 100: Wenig Rauschen\n100 - 300: Durchschnittliches Rauschen\n>300: Hohes Rauschen\n\nDie Werte unterscheiden sich im L*a*b*- und RGB-Modus. Die RGB-Werte sind ungenauer, da der RGB-Modus Luminanz und Chrominanz nicht komplett trennt.
+TP_DIRPYRDENOISE_NRESID_TOOLTIP;Zeigt das Restrauschen des sichtbaren Bildbereichs\nin der 100%-Ansicht an.\n\n<50: Sehr wenig Rauschen\n50 - 100: Wenig Rauschen\n100 - 300: Durchschnittliches Rauschen\n>300: Hohes Rauschen\n\nDie Werte unterscheiden sich im L*a*b*- und RGB-Modus.\nDie RGB-Werte sind ungenauer, da der RGB-Modus\nLuminanz und Chrominanz nicht komplett trennt.
 TP_DIRPYRDENOISE_PASSES;Medianiterationen
-TP_DIRPYRDENOISE_PASSES_TOOLTIP;Manchmal führt ein kleines 3×3-Fenster mit mehreren Iterationen zu besseren Ergebnissen als ein 7×7-Fenster mit nur einer Iteration.
+TP_DIRPYRDENOISE_PASSES_TOOLTIP;Manchmal führt ein kleines 3×3-Fenster mit\nmehreren Iterationen zu besseren Ergebnissen\nals ein 7×7-Fenster mit nur einer Iteration.
 TP_DIRPYRDENOISE_PON;Auto-Multizonen
 TP_DIRPYRDENOISE_PRE;Vorschau
 TP_DIRPYRDENOISE_PREV;Vorschau
-TP_DIRPYRDENOISE_PREVLABEL;Vorschaugröße=%1, Zentrum: Px=%2  Py=%2
-TP_DIRPYRDENOISE_RED;Delta-Chrominanz Rot/Grün
+TP_DIRPYRDENOISE_PREVLABEL;Vorschaugröße = %1, Zentrum: Px = %2  Py = %2
+TP_DIRPYRDENOISE_RED;Delta-Chrominanz Rot / Grün
 TP_DIRPYRDENOISE_RGB;RGB
 TP_DIRPYRDENOISE_RGBM;RGB
 TP_DIRPYRDENOISE_SHAL;Standard
 TP_DIRPYRDENOISE_SHALBI;Hoch
 TP_DIRPYRDENOISE_SLI;Regler
-TP_DIRPYRDENOISE_TILELABEL;Kachelgröße=%1 Zentrum: Tx=%2  Ty=%2
+TP_DIRPYRDENOISE_TILELABEL;Kachelgröße = %1 Zentrum: Tx = %2  Ty = %2
 TP_DIRPYREQUALIZER_ALGO;Hautfarbtonbereich
 TP_DIRPYREQUALIZER_ALGO_TOOLTIP;Fein: Ist näher an den Hautfarbtönen und minimiert den Einfluss auf andere Farben.\n\nGrob: Minimiert Artefakte.
 TP_DIRPYREQUALIZER_ARTIF;Artefakte reduzieren
 TP_DIRPYREQUALIZER_HUESKIN;Hautfarbton
-TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;Wenn Sie den Bereich signifikant nach Links oder Rechts verschieben müssen, ist der Weißabgleich nicht richtig gewählt.\n\nWählen Sie den eingeschlossenen Bereich so eng wie möglich, um den Einfluss auf benachbarte Farben zu verhindern.
+TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;Wenn Sie den Bereich signifikant nach Links\noder Rechts verschieben müssen, ist der\nWeißabgleich nicht richtig gewählt.\nWählen Sie den eingeschlossenen Bereich so\neng wie möglich, um den Einfluss auf benachbarte\nFarben zu verhindern.
 TP_DIRPYREQUALIZER_LABEL;Detailebenenkontrast
 TP_DIRPYREQUALIZER_LUMACOARSEST;Grob
 TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS;Kontrast -
@@ -1456,11 +1472,10 @@ TP_DIRPYREQUALIZER_LUMAFINEST;Fein
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Neutral
 TP_DIRPYREQUALIZER_SKIN;Hautfarbtöne schützen
 TP_DIRPYREQUALIZER_SKIN_TOOLTIP;-100: Nur Farben innerhalb des Bereichs werden verändert.\n0: Alle Farben werden gleich behandelt.\n+100: Nur Farben außerhalb des Bereichs werden verändert.
-TP_DIRPYREQUALIZER_THRESHOLD;Schwellenwert
-TP_DIRPYREQUALIZER_TOOLTIP;Verringert Artefakte an den Übergängen zwischen Hautfarbtöne und dem Rest des Bildes.
+TP_DIRPYREQUALIZER_THRESHOLD;Schwelle
+TP_DIRPYREQUALIZER_TOOLTIP;Verringert Artefakte an den Übergängen\nzwischen Hautfarbtöne und dem Rest\ndes Bildes.
 TP_DISTORTION_AMOUNT;Intensität
-TP_DISTORTION_AUTO;Autom. Verzeichnungskorrektur
-TP_DISTORTION_AUTO_TIP;Objektivverzeichnungen automatisch korrigieren (nur für bestimmte Kameras, z.B. Micro 4/3, einige Kompaktkameras, usw.)
+TP_DISTORTION_AUTO_TIP;Korrigiert die Verzeichnung in RAW-Bildern durch Vergleich mit dem eingebetten JPEG, falls dieses existiert und die Verzeichnung durch die Kamera korrigiert wurde.
 TP_DISTORTION_LABEL;Verzeichnungskorrektur
 TP_EPD_EDGESTOPPING;Kantenschutz
 TP_EPD_GAMMA;Gamma
@@ -1470,13 +1485,13 @@ TP_EPD_SCALE;Faktor
 TP_EPD_STRENGTH;Intensität
 TP_EPD_TOOLTIP;Dynamikkompression ist mit dem L*a*b*- und CIECAM02-Modus möglich.\n\nFür den CIECAM02-Modus müssen folgende Optionen aktiviert sein:\n1. CIECAM02\n2. Algorithmus = Helligkeit + Farbigkeit (QM)\n3. Dynamikkompression mittels CIECAM02-Helligkeit (Q)
 TP_EXPOSURE_AUTOLEVELS;Auto
-TP_EXPOSURE_AUTOLEVELS_TIP;Automatische Belichtungseinstellung basierend auf Bildanalyse
+TP_EXPOSURE_AUTOLEVELS_TIP;Automatische Belichtungseinstellung\nbasierend auf Bildanalyse.
 TP_EXPOSURE_BLACKLEVEL;Schwarzwert
 TP_EXPOSURE_BRIGHTNESS;Helligkeit
 TP_EXPOSURE_CLIP;Clip %:
-TP_EXPOSURE_CLIP_TIP;Anteil der Pixel, die sich bei automatischer Belichtungseinstellung im Bereich der Spitzlichter und Schatten befinden sollen
+TP_EXPOSURE_CLIP_TIP;Anteil der Pixel, die sich bei automatischer\nBelichtungseinstellung im Bereich der\nSpitzlichter und Schatten befinden sollen.
 TP_EXPOSURE_COMPRHIGHLIGHTS;Lichterkompression
-TP_EXPOSURE_COMPRHIGHLIGHTSTHRESHOLD;Lichterkompression Schwellenwert
+TP_EXPOSURE_COMPRHIGHLIGHTSTHRESHOLD;Lichterkompression Schwelle
 TP_EXPOSURE_COMPRSHADOWS;Schattenkompression
 TP_EXPOSURE_CONTRAST;Kontrast
 TP_EXPOSURE_CURVEEDITOR1;Tonwertkurve 1
@@ -1507,7 +1522,7 @@ TP_FLATFIELD_BT_HORIZONTAL;Horizontal
 TP_FLATFIELD_BT_VERTHORIZ;Vertikal + Horizontal
 TP_FLATFIELD_BT_VERTICAL;Vertikal
 TP_FLATFIELD_CLIPCONTROL;Kontrolle zu heller Bereiche
-TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Verhindert das Abschneiden der Lichter. Wenn vor dem Anwenden des Weißbildes schon abgeschnittene Lichter vorhanden sind, kann es zu einem Farbstich kommen.
+TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Verhindert das Abschneiden der Lichter. Wenn\nvor dem Anwenden des Weißbildes schon\nabgeschnittene Lichter vorhanden sind, kann\nes zu einem Farbstich kommen.
 TP_FLATFIELD_LABEL;Weißbild
 TP_GAMMA_CURV;Gamma
 TP_GAMMA_FREE;Freies Gamma
@@ -1529,7 +1544,7 @@ TP_GRADIENT_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen
 TP_HLREC_BLEND;Überlagerung
 TP_HLREC_CIELAB;CIELab-Überlagerung
 TP_HLREC_COLOR;Farbübertragung
-TP_HLREC_ENA_TOOLTIP;Wird bei Verwendung der automatischen Belichtungskorrektur möglicherweise aktiviert
+TP_HLREC_ENA_TOOLTIP;Wird bei Verwendung der automatischen\nBelichtungskorrektur möglicherweise\naktiviert.
 TP_HLREC_LABEL;Lichter rekonstruieren
 TP_HLREC_LUMINANCE;Luminanz wiederherstellen
 TP_HLREC_METHOD;Methode:
@@ -1539,25 +1554,27 @@ TP_HSVEQUALIZER_LABEL;Farbton (H) / Sättigung (S) / Dynamik (V)
 TP_HSVEQUALIZER_SAT;S
 TP_HSVEQUALIZER_VAL;V
 TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Basisbelichtung
-TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Den eingebetteten DCP-Basisbelichtungsausgleich anwenden. Die Einstellung ist nur verfügbar wenn sie vom Eingangsfarbprofil unterstützt wird.
+TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Die eingebettete DCP-Basisbelichtung verwenden.\nDie Einstellung ist nur verfügbar wenn sie vom\nEingangsfarbprofil unterstützt wird.
 TP_ICM_APPLYHUESATMAP;Basistabelle
-TP_ICM_APPLYHUESATMAP_TOOLTIP;Die eingebettete DCP-Basistabelle anwenden. Die Einstellung ist nur verfügbar wenn sie vom Eingangsfarbprofil unterstützt wird.
+TP_ICM_APPLYHUESATMAP_TOOLTIP;Die eingebettete DCP-Basistabelle verwenden.\nDie Einstellung ist nur verfügbar wenn sie vom\nEingangsfarbprofil unterstützt wird.
 TP_ICM_APPLYLOOKTABLE;“Look“-Tabelle
-TP_ICM_APPLYLOOKTABLE_TOOLTIP;Die eingebettete DCP-“Look“-Tabelle anwenden. Die Einstellung ist nur verfügbar wenn sie vom Eingangsfarbprofil unterstützt wird.
+TP_ICM_APPLYLOOKTABLE_TOOLTIP;Die eingebettete DCP-“Look“-Tabelle verwenden.\nDie Einstellung ist nur verfügbar wenn sie vom\nEingangsfarbprofil unterstützt wird.
 TP_ICM_BLENDCMSMATRIX;ICC Lichter mit Matrix überlagern
 TP_ICM_BLENDCMSMATRIX_TOOLTIP;Stellt bei Verwendung von LUT-basierten ICC-Profilen die Lichter wieder her.
+TP_ICM_BPC;Schwarzpunkt-Kompensation
+TP_ICM_BPC_TOOLTIP;Wenn eingeschaltet, wird der Helligkeitskanal mit einem festen Weißpunkt an den Farbraum angeglichen.
 TP_ICM_DCPILLUMINANT;Illumination
 TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpoliert
-TP_ICM_DCPILLUMINANT_TOOLTIP;DCP-Illumination auswählen.\nVorgabe ist Interpoliert. Die Einstellung ist nur verfügbar wenn sie vom Eingangsfarbprofil unterstützt wird.
+TP_ICM_DCPILLUMINANT_TOOLTIP;DCP-Illumination auswählen. Vorgabe ist\nInterpoliert. Die Einstellung ist nur verfügbar\nwenn sie vom Eingangsfarbprofil unterstützt\nwird.
 TP_ICM_INPUTCAMERA;Kamera-Standard
 TP_ICM_INPUTCAMERAICC;Kameraspezifisches Profil
-TP_ICM_INPUTCAMERAICC_TOOLTIP;Verwendet RawTherapees kameraspezifisches DCP/ICC-Eingangsfarbprofil, welches präziser als eine einfache Matrix ist
-TP_ICM_INPUTCAMERA_TOOLTIP;Benutzt eine einfache Farbmatrix von DCRAW, eine erweiterte RawTherapee-Version oder eine aus einem DNG.
+TP_ICM_INPUTCAMERAICC_TOOLTIP;Verwendet RawTherapees kameraspezifisches\nDCP/ICC-Eingangsfarbprofil, welches präziser als\neine einfache Matrix ist
+TP_ICM_INPUTCAMERA_TOOLTIP;Benutzt eine einfache Farbmatrix von DCRAW,\neine erweiterte RawTherapee-Version oder eine\naus einem DNG.
 TP_ICM_INPUTCUSTOM;DCP/ICC-Profil
 TP_ICM_INPUTCUSTOM_TOOLTIP;Eigenes DCP/ICC-Farbprofil verwenden
 TP_ICM_INPUTDLGLABEL;DCP/ICC-Profil wählen...
 TP_ICM_INPUTEMBEDDED;Eingebettetes Profil verwenden
-TP_ICM_INPUTEMBEDDED_TOOLTIP;Farbprofil verwenden, das in Nicht-RAW-Bildern eingebettet ist
+TP_ICM_INPUTEMBEDDED_TOOLTIP;Farbprofil verwenden, das in Nicht-RAW-Bildern\neingebettet ist
 TP_ICM_INPUTNONE;Kein Profil
 TP_ICM_INPUTNONE_TOOLTIP;Kein Eingangsfarbprofil verwenden
 TP_ICM_INPUTPROFILE;Eingangsfarbprofil
@@ -1565,17 +1582,17 @@ TP_ICM_LABEL;Farbmanagement
 TP_ICM_NOICM;Kein ICM: sRGB-Ausgabe
 TP_ICM_OUTPUTPROFILE;Ausgabeprofil
 TP_ICM_PROFILEINTENT;Rendering Intent
-TP_ICM_SAVEREFERENCE;Referenzbild für Profil speichern
+TP_ICM_SAVEREFERENCE;Referenzbild speichern
 TP_ICM_SAVEREFERENCE_APPLYWB;Weißabgleich anwenden
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Um ICC-Profile zu erstellen, den Weißabgleich beim Speichern anwenden. Um DCP-Profile zu erstellen, den Weißabgleich NICHT beim Speichern anwenden.
-TP_ICM_SAVEREFERENCE_TOOLTIP;Speichert das lineare TIFF-Bild bevor das Eingangsfarbprofil angewendet wird. Das Ergebnis kann zu Kalibrierungsaufgaben und zum Erstellen von Kameraprofilen verwendet werden.
+TP_ICM_SAVEREFERENCE_TOOLTIP;Speichert das lineare TIFF-Bild bevor das\nEingangsfarbprofil angewendet wird. Das\nErgebnis kann zu Kalibrierungsaufgaben\nund zum Erstellen von Kameraprofilen\nverwendet werden.
 TP_ICM_TONECURVE;Tonwertkurve
-TP_ICM_TONECURVE_TOOLTIP;Eingebettete DCP-Tonwertkurve verwenden. Die Einstellung ist nur verfügbar wenn sie vom Eingangsfarbprofil unterstützt wird.
+TP_ICM_TONECURVE_TOOLTIP;Eingebettete DCP-Tonwertkurve verwenden.\nDie Einstellung ist nur verfügbar wenn sie\nvom Eingangsfarbprofil unterstützt wird.
 TP_ICM_WORKINGPROFILE;Arbeitsfarbraum
 TP_IMPULSEDENOISE_LABEL;Impulsrauschreduzierung
-TP_IMPULSEDENOISE_THRESH;Schwellenwert
+TP_IMPULSEDENOISE_THRESH;Schwelle
 TP_LABCURVE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
-TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Anpassung der Farben an den Arbeitsfarbraum und Anwendung der Munsellkorrektur.
+TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Anpassung der Farben an den Arbeitsfarbraum\nund Anwendung der Munsellkorrektur.
 TP_LABCURVE_BRIGHTNESS;Helligkeit
 TP_LABCURVE_CHROMATICITY;Chromatizität
 TP_LABCURVE_CHROMA_TOOLTIP;Für Schwarz/Weiß setzen Sie die Chromatizität auf -100.
@@ -1594,23 +1611,23 @@ TP_LABCURVE_CURVEEDITOR_CC_RANGE1;Neutral
 TP_LABCURVE_CURVEEDITOR_CC_RANGE2;Matt
 TP_LABCURVE_CURVEEDITOR_CC_RANGE3;Pastell
 TP_LABCURVE_CURVEEDITOR_CC_RANGE4;Gesättigt
-TP_LABCURVE_CURVEEDITOR_CC_TOOLTIP;Chromatizität als Funktion der Chromatizität C=f(C)
+TP_LABCURVE_CURVEEDITOR_CC_TOOLTIP;Chromatizität als Funktion der Chromatizität C = f(C)
 TP_LABCURVE_CURVEEDITOR_CH;CH
-TP_LABCURVE_CURVEEDITOR_CH_TOOLTIP;Chromatizität als Funktion des Farbtons C=f(H)
+TP_LABCURVE_CURVEEDITOR_CH_TOOLTIP;Chromatizität als Funktion des Farbtons C = f(H)
 TP_LABCURVE_CURVEEDITOR_CL;CL
-TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Chromatizität als Funktion der Luminanz C=f(L)
+TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Chromatizität als Funktion der Luminanz C = f(L)
 TP_LABCURVE_CURVEEDITOR_HH;HH
-TP_LABCURVE_CURVEEDITOR_HH_TOOLTIP;Farbton als Funktion des Farbtons H=f(H)
+TP_LABCURVE_CURVEEDITOR_HH_TOOLTIP;Farbton als Funktion des Farbtons H = f(H)
 TP_LABCURVE_CURVEEDITOR_LC;LC
-TP_LABCURVE_CURVEEDITOR_LC_TOOLTIP;Luminanz als Funktion der Chromatizität L=f(C)
+TP_LABCURVE_CURVEEDITOR_LC_TOOLTIP;Luminanz als Funktion der Chromatizität L = f(C)
 TP_LABCURVE_CURVEEDITOR_LH;LH
-TP_LABCURVE_CURVEEDITOR_LH_TOOLTIP;Luminanz als Funktion des Farbtons L=f(H)
-TP_LABCURVE_CURVEEDITOR_LL_TOOLTIP;Luminanz als Funktion der Luminanz L=f(L)
+TP_LABCURVE_CURVEEDITOR_LH_TOOLTIP;Luminanz als Funktion des Farbtons L = f(H)
+TP_LABCURVE_CURVEEDITOR_LL_TOOLTIP;Luminanz als Funktion der Luminanz L = f(L)
 TP_LABCURVE_LABEL;L*a*b* - Anpassungen
 TP_LABCURVE_LCREDSK;LC-Kurve auf Hautfarbtöne beschränken
-TP_LABCURVE_LCREDSK_TIP;Wenn aktiviert, wird die LC-Kurve auf Hautfarbtöne beschränkt.\nWenn deaktiviert, wird die LC-Kurve auf alle Farbtöne angewendet.
+TP_LABCURVE_LCREDSK_TIP;Wenn aktiviert, wird die LC-Kurve auf\nHautfarbtöne beschränkt.\nWenn deaktiviert, wird die LC-Kurve auf\nalle Farbtöne angewendet.
 TP_LABCURVE_RSTPROTECTION;Hautfarbtöne schützen
-TP_LABCURVE_RSTPRO_TOOLTIP;Kann mit dem Chromatizitätsregler und der CC-Kurve verwendet werden.
+TP_LABCURVE_RSTPRO_TOOLTIP;Kann mit dem Chromatizitätsregler und\nder CC-Kurve verwendet werden.
 TP_LENSGEOM_AUTOCROP;Auto-Schneiden
 TP_LENSGEOM_FILL;Auto-Füllen
 TP_LENSGEOM_LABEL;Objektivkorrekturen
@@ -1619,7 +1636,7 @@ TP_LENSPROFILE_USECA;CA korrigieren
 TP_LENSPROFILE_USEDIST;Verzeichnung korrigieren
 TP_LENSPROFILE_USEVIGN;Vignettierung korrigieren
 TP_NEUTRAL;Zurücksetzen
-TP_NEUTRAL_TIP;Belichtungseinstellungen auf neutrale Werte zurücksetzen
+TP_NEUTRAL_TIP;Belichtungseinstellungen auf\nneutrale Werte zurücksetzen
 TP_PCVIGNETTE_FEATHER;Bereich
 TP_PCVIGNETTE_FEATHER_TOOLTIP;Bereich:\n0 = nur Bildecken\n50 = halbe Strecke zum Mittelpunkt\n100 = bis zum Mittelpunkt
 TP_PCVIGNETTE_LABEL;Vignettierungsfilter
@@ -1631,7 +1648,7 @@ TP_PERSPECTIVE_HORIZONTAL;Horizontal
 TP_PERSPECTIVE_LABEL;Perspektive
 TP_PERSPECTIVE_VERTICAL;Vertikal
 TP_PFCURVE_CURVEEDITOR_CH;Farbton
-TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Regelt die Intensität der Farbsaumentfernung nach Farben. Je höher die Kurve desto stärker ist der Effekt.
+TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Regelt die Intensität der Farbsaumentfernung\nnach Farben. Je höher die Kurve desto stärker\nist der Effekt.
 TP_PREPROCESS_DEADPIXFILT;Dead-Pixel-Filter
 TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Entfernt tote Pixel
 TP_PREPROCESS_GREENEQUIL;Grün-Ausgleich
@@ -1641,7 +1658,7 @@ TP_PREPROCESS_LABEL;Vorverarbeitung
 TP_PREPROCESS_LINEDENOISE;Zeilenrauschfilter
 TP_PREPROCESS_NO_FOUND;Nichts gefunden
 TP_PRSHARPENING_LABEL;Nach Skalierung schärfen
-TP_PRSHARPENING_TOOLTIP;Schärft das Bild nach der Größenänderung. Funktioniert nur mit der Methode „Lanczos“. Das Ergebnis wird nicht in RawTherapee angezeigt.\nWeitere Informationen finden Sie in „RawPedia“.
+TP_PRSHARPENING_TOOLTIP;Schärft das Bild nach der Größenänderung.\nFunktioniert nur mit der Methode “Lanczos“.\nDas Ergebnis wird nicht in RawTherapee\nangezeigt.\n\nWeitere Informationen finden Sie auf “RawPedia“.
 TP_RAWCACORR_AUTO;Automatische Korrektur
 TP_RAWCACORR_CABLUE;Blau
 TP_RAWCACORR_CARED;Rot
@@ -1663,15 +1680,15 @@ TP_RAW_DCBITERATIONS;Anzahl der DCB-Iterationen
 TP_RAW_DMETHOD;Methode
 TP_RAW_DMETHOD_PROGRESSBAR;%1 verarbeitet
 TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaikoptimierung
-TP_RAW_DMETHOD_TOOLTIP;Hinweis: IGV und LMMSE ist speziell für Bilder mit hohen ISO-Werten reserviert und verbessert die Rauschreduzierung.
+TP_RAW_DMETHOD_TOOLTIP;Hinweis: IGV und LMMSE ist speziell für Bilder\nmit hohen ISO-Werten reserviert und verbessert\ndie Rauschreduzierung.
 TP_RAW_FALSECOLOR;Falschfarbenunterdrückung
-TP_RAW_HD;Schwellenwert
-TP_RAW_HD_TOOLTIP;Je niedriger der Wert, umso empfindlicher reagiert die “Hot/Dead-Pixel-Erkennung“. Ist die Empfindlichkeit zu hoch, können Artefakte entstehen. Erhöhen Sie in diesem Fall den Schwellenwert, bis die Artefakte verschwinden.
+TP_RAW_HD;Schwelle
+TP_RAW_HD_TOOLTIP;Je niedriger der Wert, umso empfindlicher reagiert\ndie “Hot / Dead-Pixel-Erkennung“.\nIst die Empfindlichkeit zu hoch, können Artefakte\nentstehen. Erhöhen Sie in diesem Fall die Schwelle,\nbis die Artefakte verschwinden.
 TP_RAW_LABEL;Farbinterpolation
 TP_RAW_LMMSEITERATIONS;LMMSE-Verbesserungsstufen
-TP_RAW_LMMSE_TOOLTIP;Fügt Gamma (Stufe 1), Median (Stufe 2-4) und Optimierung (Stufe 5-6) zur Minimierung von Artefakten hinzu und verbessert das Signalrauschverhältnis.
+TP_RAW_LMMSE_TOOLTIP;Fügt Gamma (Stufe 1), Median (Stufe 2-4)\nund Optimierung (Stufe 5-6) zur Minimierung\nvon Artefakten hinzu und verbessert das\nSignalrauschverhältnis.
 TP_RAW_SENSOR_BAYER_LABEL;Sensor mit Bayer-Matrix
-TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Mit “3-pass“ erzielt man die besten Ergebnisse (empfohlen bei Bildern mit niedrigen ISO-Werten).\n\nBei hohen ISO-Werten unterscheidet sich “1-pass“ kaum gegenüber “3-pass“, ist aber deutlich schneller.
+TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Mit “3-pass“ erzielt man die besten Ergebnisse\n(empfohlen bei Bildern mit niedrigen ISO-Werten).\n\nBei hohen ISO-Werten unterscheidet sich “1-pass“\nkaum gegenüber “3-pass“, ist aber deutlich schneller.
 TP_RAW_SENSOR_XTRANS_LABEL;Sensor mit X-Trans-Matrix
 TP_RESIZE_APPLIESTO;Anwenden auf:
 TP_RESIZE_CROPPEDAREA;Ausschnitt
@@ -1691,18 +1708,18 @@ TP_RETINEX_CONTEDIT_HSL;HSL-Kurve
 TP_RETINEX_CONTEDIT_LAB;Luminanz (L) L*a*b*
 TP_RETINEX_CONTEDIT_LH;Farbton (H)
 TP_RETINEX_CONTEDIT_MAP;Maskenkurve
-TP_RETINEX_CURVEEDITOR_CD;L=f(L)
-TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminanz in Abhängigkeit der Luminanz.\nKorrigiert direkt die RAW-Daten, um Halos und Artefakte zu verringern.
-TP_RETINEX_CURVEEDITOR_LH;Intensität=f(H)
-TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Intensität in Abhängigkeit des Farbtons (H)\nBei der Retinex-Methode "Spitzlichter" wirken sich die Änderungen auch auf die Chromakorrektur aus.
-TP_RETINEX_CURVEEDITOR_MAP;L=f(L)
-TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;Die Kurve kann entweder alleine, oder mit der Gaußschen- oder Waveletmaske angewendet werden.\nArtefakte beachten!
+TP_RETINEX_CURVEEDITOR_CD;L = f(L)
+TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminanz in Abhängigkeit der Luminanz.\nKorrigiert direkt die RAW-Daten, um Halos\nund Artefakte zu verringern.
+TP_RETINEX_CURVEEDITOR_LH;Intensität = f(H)
+TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Intensität in Abhängigkeit des Farbtons (H)\nBei der Retinex-Methode "Spitzlichter" wirken sich die\nÄnderungen auch auf die Chromakorrektur aus.
+TP_RETINEX_CURVEEDITOR_MAP;L = f(L)
+TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;Die Kurve kann entweder alleine, mit der\nGaußschen- oder Waveletmaske angewendet\nwerden. Artefakte beachten!
 TP_RETINEX_EQUAL;Korrekturen
 TP_RETINEX_FREEGAMMA;Gamma
 TP_RETINEX_GAIN;Kontrast
 TP_RETINEX_GAINOFFS;Verstärkung und Ausgleich (Helligkeit)
 TP_RETINEX_GAINTRANSMISSION;Transmissionsverstärkung
-TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Ändert die Helligkeit durch Verstärken oder\nReduzieren der Transmissionskarte.
+TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Ändert die Helligkeit durch Verstärkung oder\nAbschwächung der Transmissionskarte.
 TP_RETINEX_GAIN_TOOLTIP;Wirkt sich auf das verarbeitete Bild aus. Wird für schwarze oder weiße Pixel verwendet und hilft das Histogramm auszugleichen.
 TP_RETINEX_GAMMA;Gammakorrektur
 TP_RETINEX_GAMMA_FREE;Benutzerdefiniert
@@ -1710,20 +1727,20 @@ TP_RETINEX_GAMMA_HIGH;Hoch
 TP_RETINEX_GAMMA_LOW;Niedrig
 TP_RETINEX_GAMMA_MID;Mittel
 TP_RETINEX_GAMMA_NONE;Keine
-TP_RETINEX_GAMMA_TOOLTIP;Stellt Farbtöne vor und nach der Retinexverarbeitung durch eine Gammakorrektur wieder her.
+TP_RETINEX_GAMMA_TOOLTIP;Stellt Farbtöne vor und nach der Retinexverarbeitung\ndurch eine Gammakorrektur wieder her.
 TP_RETINEX_GRAD;Transmission Gradient
 TP_RETINEX_GRADS;Intensität Gradient
-TP_RETINEX_GRADS_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 wird die Intensität reduziert und umgekehrt.
-TP_RETINEX_GRAD_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 werden Skalierung und Schwellenwert reduziert und umgekehrt.
+TP_RETINEX_GRADS_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 wird die Intensität reduziert, bei &lt; 0 erhöht.
+TP_RETINEX_GRAD_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 werden Skalierung und Schwelle reduziert,\nbei &lt; 0 erhöht.
 TP_RETINEX_HIGH;Lichter
 TP_RETINEX_HIGHLIG;Spitzlichter
-TP_RETINEX_HIGHLIGHT;Spitzlichter Schwellenwert
+TP_RETINEX_HIGHLIGHT;Spitzlichter Schwelle
 TP_RETINEX_HIGHLIGHT_TOOLTIP;Benötigt unter Umständen Korrekturen der Einstellungen "Benachbarte Pixel" und "Weißpunkt" unter dem Reiter "RAW".
 TP_RETINEX_HSLSPACE_LIN;HSL-Linear
 TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmisch
 TP_RETINEX_ITER;Iterationen
 TP_RETINEX_ITERF;Dynamikkompression
-TP_RETINEX_ITER_TOOLTIP;Simuliert eine Dynamikkompression.\nHöhere Werte erhöhen die Prozessorzeit.
+TP_RETINEX_ITER_TOOLTIP;Simuliert eine Dynamikkompression.\nHöhere Werte erhöhen die Verarbei-\ntungszeit.
 TP_RETINEX_LABEL;Retinex (Bildschleier entfernen)
 TP_RETINEX_LABEL_MASK;Maske
 TP_RETINEX_LABSPACE;L*a*b*
@@ -1732,37 +1749,37 @@ TP_RETINEX_MAP;Methode
 TP_RETINEX_MAP_GAUS;Gaußschenmaske
 TP_RETINEX_MAP_MAPP;Schärfemaske (Teil-Wavelet)
 TP_RETINEX_MAP_MAPT;Schärfemaske (Wavelet)
-TP_RETINEX_MAP_METHOD_TOOLTIP;Keine: Wendet die Maske, die mit der gaußschen Funktion (Radius, Methode) erstellt wurde an, um Halos und Artefakte zu reduzieren.\n\nNur Kurve: Wendet eine diagonale Kontrastkurve auf die Maske an.\nArtefakte beachten.\n\nGaußschenmaske: Wendet eine gaußsche Unschärfe auf die originale Maske an.\n(Schnell)\n\nSchärfemaske: Wendet ein Wavelet auf die originale Maske an.\n(Langsam)
+TP_RETINEX_MAP_METHOD_TOOLTIP;<b>Keine:</b> Wendet die Maske, die mit der gaußschen\nFunktion (Radius, Methode) erstellt wurde an,\num Halos und Artefakte zu reduzieren.\n\n<b>Nur Kurve:</b> Wendet eine diagonale Kontrastkurve\nauf die Maske an. (Artefakte beachten)\n\n<b>Gaußschenmaske:</b> Wendet eine gaußsche Unschärfe\nauf die originale Maske an. (Schnell)\n\n<b>Schärfemaske:</b> Wendet ein Wavelet auf die originale\nMaske an. (Langsam)
 TP_RETINEX_MAP_NONE;Keine
 TP_RETINEX_MEDIAN;Medianfilter
 TP_RETINEX_METHOD;Methode
-TP_RETINEX_METHOD_TOOLTIP;"Schatten" wirkt sich auf dunkle Bereiche aus.\n"Schatten &amp; Lichter" wirkt sich auf dunkle und helle Bereiche aus.\n"Lichter" wirkt sich auf helle Bereiche aus.\n"Spitzlichter" wirkt sich auf sehr helle Bereiche aus und reduziert Magenta-Falschfarben.
-TP_RETINEX_MLABEL;Schleierreduzierung: Min=%1 Max=%2
-TP_RETINEX_MLABEL_TOOLTIP;Sollte nahe bei Min=0 und Max=32768 sein
+TP_RETINEX_METHOD_TOOLTIP;<b>Schatten</b> wirkt sich auf dunkle Bereiche aus.\n\n<b>Schatten &amp; Lichter</b> wirkt sich auf dunkle und helle Bereiche aus.\n\n<b>Lichter</b> wirkt sich auf helle Bereiche aus.\n\n<b>Spitzlichter</b> wirkt sich auf sehr helle Bereiche aus und reduziert\nMagenta-Falschfarben.
+TP_RETINEX_MLABEL;Schleierred: Min = %1, Max = %2
+TP_RETINEX_MLABEL_TOOLTIP;Sollte nahe bei Min = 0 und Max = 32768 sein
 TP_RETINEX_NEIGHBOR;Radius
 TP_RETINEX_NEUTRAL;Zurücksetzen
-TP_RETINEX_NEUTRAL_TIP;Setzt alle Regler und Kurven auf ihre Standardwerte zurück.
+TP_RETINEX_NEUTRAL_TIP;Setzt alle Regler und Kurven\nauf ihre Standardwerte zurück.
 TP_RETINEX_OFFSET;Ausgleich (Helligkeit)
 TP_RETINEX_SCALES;Gaußscher Gradient
-TP_RETINEX_SCALES_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 werden Skalierung und Radius reduziert und umgekehrt.
+TP_RETINEX_SCALES_TOOLTIP;Steht der Regler auf 0 sind alle Iterationen identisch.\nBei > 0 werden Skalierung und Radius reduziert,\nbei &lt; 0 erhöht.
 TP_RETINEX_SETTINGS;Einstellungen
 TP_RETINEX_SKAL;Skalierung
 TP_RETINEX_SLOPE;Gammasteigung
 TP_RETINEX_STRENGTH;Intensität
-TP_RETINEX_THRESHOLD;Schwellenwert
+TP_RETINEX_THRESHOLD;Schwelle
 TP_RETINEX_THRESHOLD_TOOLTIP;Limitiert den Bereich der Transmissionskurve.
-TP_RETINEX_TLABEL;T: Min=%1 Max=%2 Mittel=%3 Sigma=%4
-TP_RETINEX_TLABEL2;T: Tmin=%1 Tmax=%2
+TP_RETINEX_TLABEL;T: Min = %1, Max = %2\nT: Mittel = %3, Sigma = %4
+TP_RETINEX_TLABEL2;T: Tmin = %1, Tmax = %2
 TP_RETINEX_TLABEL_TOOLTIP;Ergebnis der Transmissionskurve: Min, Max, Mittel und Sigma\nMin und Max hat Einfluss auf die Abweichung.\n\nTmin = Kleinster Wert der Transmissionskurve\nTmax = Größter Wert der Transmissionskurve
 TP_RETINEX_TRANF;Transmission
 TP_RETINEX_TRANSMISSION;Transmissionskurve
-TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission in Abhängigkeit der Transmission.\nx-Achse: Transmission negativer Werte (Min), Mittel und positiver Werte (Max).\ny-Achse: Verstärkung oder Reduzierung.
+TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission in Abhängigkeit der Transmission.\n\n<b>x-Achse:</b> Transmission negativer Werte (Min),\nMittel und positiver Werte (Max).\n\n<b>y-Achse:</b> Verstärkung oder Abschwächung.
 TP_RETINEX_UNIFORM;Schatten & Lichter
 TP_RETINEX_VARIANCE;Kontrast
-TP_RETINEX_VARIANCE_TOOLTIP;Niedrige Werte erhöhen den lokalen Kontrast und die Sättigung, können aber zu Artefakten führen.
+TP_RETINEX_VARIANCE_TOOLTIP;Niedrige Werte erhöhen den lokalen\nKontrast und die Sättigung, können\naber zu Artefakten führen.
 TP_RETINEX_VIEW;Vorschau
 TP_RETINEX_VIEW_MASK;Maske
-TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard: Normale Anzeige\n\nMaske: Zeigt die Maske an\n\nUnschärfemaske: Zeigt das Bild mit einem großen Unschärfemaskenradius an.\n\nTransmission-Auto/Fest: Zeigt die Transmissionskarte vor der Anwendung von Kontrast und Helligkeit an\n\nACHTUNG: Die Maske zeigt nicht das Endergebnis, sondern verstärkt den Effekt um ihn besser beurteilen zu können.
+TP_RETINEX_VIEW_METHOD_TOOLTIP;<b>Standard:</b> Normale Anzeige\n\n<b>Maske:</b> Zeigt die Maske an\n\n<b>Unschärfemaske:</b> Zeigt das Bild mit einem großen\nUnschärfemaskenradius an.\n\n<b>Transmission-Auto / Fest:</b> Zeigt die Transmissionskarte\nvor der Anwendung von Kontrast und Helligkeit an.\n\n<b>ACHTUNG:</b> Die Maske zeigt nicht das Endergebnis, sondern\nverstärkt den Effekt um ihn besser beurteilen zu können.
 TP_RETINEX_VIEW_NONE;Standard
 TP_RETINEX_VIEW_TRAN;Transmission - Auto
 TP_RETINEX_VIEW_TRAN2;Transmission - Fest
@@ -1803,8 +1820,7 @@ TP_SHARPENING_RLD;RL-Dekonvolution
 TP_SHARPENING_RLD_AMOUNT;Intensität
 TP_SHARPENING_RLD_DAMPING;Dämpfung
 TP_SHARPENING_RLD_ITERATIONS;Iterationen
-TP_SHARPENING_THRESHOLD;Schwellenwert
-TP_SHARPENING_TOOLTIP;Ergibt einen leicht geänderten Effekt, wenn CIECAM02 verwendet wird.
+TP_SHARPENING_THRESHOLD;Schwelle
 TP_SHARPENING_USM;Unschärfemaskierung
 TP_SHARPENMICRO_AMOUNT;Intensität
 TP_SHARPENMICRO_LABEL;Mikrokontrast
@@ -1813,17 +1829,17 @@ TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
 TP_VIBRANCE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
 TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
 TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Hautfarbtöne
-TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Rot/Violett
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Rot / Violett
 TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE2;Rot
-TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE3;Rot/Gelb
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE3;Rot / Gelb
 TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE4;Gelb
-TP_VIBRANCE_CURVEEDITOR_SKINTONES_TOOLTIP;Farbton als Funktion des Farbtons H=f(H)
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_TOOLTIP;Farbton als Funktion des Farbtons H = f(H)
 TP_VIBRANCE_LABEL;Dynamik
 TP_VIBRANCE_PASTELS;Pastelltöne
 TP_VIBRANCE_PASTSATTOG;Pastell und gesättigte Töne koppeln
 TP_VIBRANCE_PROTECTSKINS;Hautfarbtöne schützen
-TP_VIBRANCE_PSTHRESHOLD;Schwellenwert - Pastell/gesättigte Töne
-TP_VIBRANCE_PSTHRESHOLD_SATTHRESH;Sättigung Schwellenwert
+TP_VIBRANCE_PSTHRESHOLD;Schwelle - Pastell / gesättigte Töne
+TP_VIBRANCE_PSTHRESHOLD_SATTHRESH;Sättigung Schwelle
 TP_VIBRANCE_PSTHRESHOLD_TOOLTIP;Die vertikale Achse steht für die Pastell (unten) und gesättigte Töne (oben).\nDie horizontale Achse entspricht dem Sättigungsbereich.
 TP_VIBRANCE_PSTHRESHOLD_WEIGTHING;Gewichtung des Übergangs pastell/gesättigt
 TP_VIBRANCE_SATURATED;Gesättigte Töne
@@ -1853,12 +1869,12 @@ TP_WAVELET_BACUR;Kurve
 TP_WAVELET_BALANCE;Kontrastausgleich d/v-h
 TP_WAVELET_BALANCE_TOOLTIP;Verändert die Gewichtung zwischen den Wavelet-Richtungen vertikal,  horizontal und diagonal.\n\nSind Kontrast-, Farb- oder Restbild-Dynamikkompression aktiviert, wird die Wirkung aufgrund des Ausgleichs verstärkt.
 TP_WAVELET_BALCHRO;Farbausgleich
-TP_WAVELET_BALCHRO_TOOLTIP;Wenn aktiviert, beeinflusst der Kontrastausgleich auch den Farbausgleich.
+TP_WAVELET_BALCHRO_TOOLTIP;Wenn aktiviert, beeinflusst der Kontrastausgleich\nauch den Farbausgleich.
 TP_WAVELET_BANONE;Keine
 TP_WAVELET_BASLI;Regler
 TP_WAVELET_BATYPE;Kontrastmethode
 TP_WAVELET_CBENAB;Farbausgleich
-TP_WAVELET_CB_TOOLTIP;Farbausgleich mit getrennten Reglern für Schatten, Mitten und Lichter aktivieren.
+TP_WAVELET_CB_TOOLTIP;Farbausgleich mit getrennten Reglern für\nSchatten, Mitten und Lichter aktivieren.
 TP_WAVELET_CCURVE;Lokale Kontrastkurve
 TP_WAVELET_CH1;Gesamter Farbbereich
 TP_WAVELET_CH2;Gesättigte/Pastellfarben
@@ -1870,10 +1886,10 @@ TP_WAVELET_CHRO_TOOLTIP;Waveletebene (n) die, die Grenze zwischen gesättigten u
 TP_WAVELET_CHR_TOOLTIP;Farbton als Funktion des Kontrasts und der Farb-Kontrast-Verknüpfung
 TP_WAVELET_CHSL;Regler
 TP_WAVELET_CHTYPE;Chrominanzmethode
-TP_WAVELET_COLORT;Deckkraft Rot/Grün
+TP_WAVELET_COLORT;Deckkraft Rot / Grün
 TP_WAVELET_COMPCONT;Kontrast
 TP_WAVELET_COMPGAMMA;Gammakompression
-TP_WAVELET_COMPGAMMA_TOOLTIP;Das Anpassen des Gammawerts des Restbildes ermöglicht das Angleichen der Daten und des Histogramms
+TP_WAVELET_COMPGAMMA_TOOLTIP;Das Anpassen des Gammawerts des\nRestbildes ermöglicht das Angleichen\nder Daten und des Histogramms.
 TP_WAVELET_COMPTM;Dynamik
 TP_WAVELET_CONTEDIT;“Danach“-Kontrastkurve
 TP_WAVELET_CONTR;Gamut
@@ -1882,13 +1898,13 @@ TP_WAVELET_CONTRAST_MINUS;Kontrast -
 TP_WAVELET_CONTRAST_PLUS;Kontrast +
 TP_WAVELET_CONTRA_TOOLTIP;Ändert den Kontrast des Restbildes
 TP_WAVELET_CTYPE;Chrominanzkontrolle
-TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Lokaler Kontrast als Funktion des ursprünglichen Kontrasts.\n\nNiedrige Werte: Wenig lokaler Kontrast (Werte zwischen 10 - 20)\n\n50%: Durchschnittlicher lokaler Kontrast (Werte zwischen 100 - 300)\n\n66%: Standardabweichung des Lokalen Kontrasts (Werte zwischen 300 - 800)\n\n100%: Maximaler lokaler Kontrast (Werte zwischen 3000 - 8000)
+TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Lokaler Kontrast als Funktion des ursprünglichen Kontrasts.\n\n<b>Niedrige Werte:</b> Wenig lokaler Kontrast (Werte zwischen 10 - 20)\n<b>50%:</b> Durchschnittlicher lokaler Kontrast (Werte zwischen 100 - 300)\n<b>66%:</b> Standardabweichung des Lokalen Kontrasts (Werte zwischen 300 - 800)\n<b>100%:</b> Maximaler lokaler Kontrast (Werte zwischen 3000 - 8000)\n
 TP_WAVELET_CURVEEDITOR_CH;Kontrast = f(H)
-TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Kontrast als Funktion des Farbtons.\nAchten Sie darauf, dass Sie die Werte beim Gamut-Farbton nicht überschreiben\n\nDie Kurve hat nur Auswirkung, wenn die Wavelet-Kontrastregler nicht auf “0“ stehen.
+TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Kontrast als Funktion des Farbtons.\nAchten Sie darauf, dass Sie die Werte beim\nGamut-Farbton nicht überschreiben\n\nDie Kurve hat nur Auswirkung, wenn die Wavelet-\nKontrastregler nicht auf “0“ stehen.
 TP_WAVELET_CURVEEDITOR_CL;L
-TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Wendet eine Kontrasthelligkeitskurve am Ende der Waveletverarbeitung an.
+TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Wendet eine Kontrasthelligkeitskurve\nam Ende der Waveletverarbeitung an.\n
 TP_WAVELET_CURVEEDITOR_HH;HH
-TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Farbton als Funktion des Farbtons H=f(H)
+TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Farbton als Funktion des Farbtons H = f(H)
 TP_WAVELET_DALL;Alle Richtungen
 TP_WAVELET_DAUB;Kantenperformance
 TP_WAVELET_DAUB2;D2 - niedrig
@@ -1896,7 +1912,7 @@ TP_WAVELET_DAUB4;D4 - Standard
 TP_WAVELET_DAUB6;D6 - Standard Plus
 TP_WAVELET_DAUB10;D10 - mittel
 TP_WAVELET_DAUB14;D14 - hoch
-TP_WAVELET_DAUB_TOOLTIP;Ändert den Daubechies-Koeffizienten:\nD4 = Standard\nD14 = Häufig bestes Ergebnis auf Kosten von ca. 10% längerer Verarbeitungszeit.\n\nVerbessert die Kantenerkennung sowie die Qualität der ersten Waveletebene. Jedoch hängt die Qualität nicht ausschließlich mit diesem Koeffizienten zusammen und kann je nach Bild und Einsatz variieren.
+TP_WAVELET_DAUB_TOOLTIP;Ändert den Daubechies-Koeffizienten:\nD4 = Standard\nD14 = Häufig bestes Ergebnis auf Kosten\nvon ca. 10% längerer Verarbeitungszeit.\n\nVerbessert die Kantenerkennung sowie die Qualität\nder ersten Waveletebene. Jedoch hängt die Qualität\nnicht ausschließlich mit diesem Koeffizienten zusammen\nund kann je nach Bild und Einsatz variieren.
 TP_WAVELET_DONE;Vertikal
 TP_WAVELET_DTHR;Diagonal
 TP_WAVELET_DTWO;Horizontal
@@ -1906,16 +1922,16 @@ TP_WAVELET_EDGCONT_TOOLTIP;Verschieben der Punkte nach links, verringert den Kon
 TP_WAVELET_EDGE;Kantenschärfung
 TP_WAVELET_EDGEAMPLI;Grundverstärkung
 TP_WAVELET_EDGEDETECT;Gradientenempfindlichkeit
-TP_WAVELET_EDGEDETECTTHR;Schwellenwert niedrig (Rauschen)
-TP_WAVELET_EDGEDETECTTHR2;Schwellenwert hoch (Erkennung)
-TP_WAVELET_EDGEDETECTTHR_TOOLTIP;Schwellenwert der Kantenerkennung für feine Details. Verhindert die Schärfung von Rauschen.
-TP_WAVELET_EDGEDETECT_TOOLTIP;Verschieben des Reglers nach rechts erhöht die Kantenempfindlichkeit. Die Einstellung wirkt sich auf den lokalen Kontrast, Kanteneinstellungen und Rauschen aus.
+TP_WAVELET_EDGEDETECTTHR;Schwelle niedrig (Rauschen)
+TP_WAVELET_EDGEDETECTTHR2;Schwelle hoch (Erkennung)
+TP_WAVELET_EDGEDETECTTHR_TOOLTIP;Schwelle der Kantenerkennung für feine Details.\nVerhindert die Schärfung von Rauschen.
+TP_WAVELET_EDGEDETECT_TOOLTIP;Verschieben des Reglers nach rechts erhöht die\nKantenempfindlichkeit. Die Einstellung wirkt sich\nauf den lokalen Kontrast, Kanteneinstellungen und\nRauschen aus.
 TP_WAVELET_EDGESENSI;Kantenempfindlichkeit
-TP_WAVELET_EDGREINF_TOOLTIP;Reduziert oder verstärkt die Kantenschärfung der ersten Ebene. Wird die Schärfung verstärkt, wird bei der zweiten Ebene die Schärfung reduziert und umgekehrt. Alle anderen Ebenen werden nicht beeinflusst.
+TP_WAVELET_EDGREINF_TOOLTIP;Reduziert oder verstärkt die Kantenschärfung der\nersten Ebene. Wird die Schärfung verstärkt, wird\nbei der zweiten Ebene die Schärfung reduziert und\numgekehrt. Alle anderen Ebenen werden nicht\nbeeinflusst.
 TP_WAVELET_EDGTHRESH;Details
-TP_WAVELET_EDGTHRESH_TOOLTIP;Verschieben des Reglers nach rechts verstärkt die Kantenschärfung der ersten Waveletebene und reduziert sie für die anderen Ebenen.\n\nNegative Werte können zu Artefakten führen.
+TP_WAVELET_EDGTHRESH_TOOLTIP;Verschieben des Reglers nach rechts verstärkt\ndie Kantenschärfung der ersten Waveletebene\nund reduziert sie für die anderen Ebenen.\n\nNegative Werte können zu Artefakten führen.
 TP_WAVELET_EDRAD;Radius
-TP_WAVELET_EDRAD_TOOLTIP;Der Radius unterscheidet sich von dem in den üblichen Schärfungswerkzeugen. Der Wert wird mit jeder Ebene über eine komplexe Funktion verglichen. Ein Wert von “0“ zeigt deshalb immer noch eine Auswirkung.
+TP_WAVELET_EDRAD_TOOLTIP;Der Radius unterscheidet sich von dem in\nden üblichen Schärfungswerkzeugen. Der\nWert wird mit jeder Ebene über eine komplexe\nFunktion verglichen. Ein Wert von “0“ zeigt\ndeshalb immer noch eine Auswirkung.
 TP_WAVELET_EDSL;Regler
 TP_WAVELET_EDTYPE;Lokale Kontrastmethode
 TP_WAVELET_EDVAL;Intensität
@@ -1925,9 +1941,9 @@ TP_WAVELET_HIGHLIGHT;Lichter-Luminanzbereich
 TP_WAVELET_HS1;Gesamter Luminanzbereich
 TP_WAVELET_HS2;Schatten/Lichter
 TP_WAVELET_HUESKIN;Hautfarbton
-TP_WAVELET_HUESKIN_TOOLTIP;Wenn Sie den Bereich signifikant nach Links oder Rechts verschieben müssen, ist der Weißabgleich nicht richtig gewählt.\nWählen Sie den eingeschlossenen Bereich so eng wie möglich, um den Einfluss auf benachbarte Farben zu verhindern.
+TP_WAVELET_HUESKIN_TOOLTIP;Wenn Sie den Bereich signifikant nach Links\noder Rechts verschieben müssen, ist der\nWeißabgleich nicht richtig gewählt.\nWählen Sie den eingeschlossenen Bereich so\neng wie möglich, um den Einfluss auf benachbarte\nFarben zu verhindern.
 TP_WAVELET_HUESKY;Himmelsfarbton
-TP_WAVELET_HUESKY_TOOLTIP;Wenn Sie den Bereich signifikant nach Links oder Rechts verschieben müssen, ist der Weißabgleich nicht richtig gewählt.\nWählen Sie den eingeschlossenen Bereich so eng wie möglich, um den Einfluss auf benachbarte Farben zu verhindern.
+TP_WAVELET_HUESKY_TOOLTIP;Wenn Sie den Bereich signifikant nach Links\noder Rechts verschieben müssen, ist der\nWeißabgleich nicht richtig gewählt.\nWählen Sie den eingeschlossenen Bereich so\neng wie möglich, um den Einfluss auf benachbarte\nFarben zu verhindern.
 TP_WAVELET_ITER;Delta-Kontrastausgleich
 TP_WAVELET_ITER_TOOLTIP;Links: Erhöht die niedrigen und reduziert die hohen Ebenen.\nRechts: Reduziert die niedrigen und erhöht die hohen Ebenen.
 TP_WAVELET_LABEL;Wavelet
@@ -1951,7 +1967,7 @@ TP_WAVELET_LOWLIGHT;Schatten-Luminanzbereich
 TP_WAVELET_MEDGREINF;Erste Ebene
 TP_WAVELET_MEDI;Artefakte in blauem Himmel reduzieren
 TP_WAVELET_MEDILEV;Kantenerkennung
-TP_WAVELET_MEDILEV_TOOLTIP;Wenn Sie die Kantenerkennung aktivieren, sollten Sie folgende Einstellungen anpassen:\n\n1. Niedrige Kontrastebenen deaktivieren um Artefakte zu vermeiden.\n2. Hohe Werte bei der Gradientenempfindlichkeit einstellen.\n\nSie können die Intensität mit der Wavelet-Rauschreduzierung anpassen.
+TP_WAVELET_MEDILEV_TOOLTIP;Wenn Sie die Kantenerkennung aktivieren, sollten Sie folgende\nEinstellungen anpassen:\n\n1. Niedrige Kontrastebenen deaktivieren um Artefakte zu vermeiden.\n2. Hohe Werte bei der Gradientenempfindlichkeit einstellen.\n\nSie können die Intensität mit der Wavelet-Rauschreduzierung anpassen.
 TP_WAVELET_NEUTRAL;Neutral
 TP_WAVELET_NOIS;Rauschreduzierung
 TP_WAVELET_NOISE;Rauschreduzierung
@@ -1959,11 +1975,11 @@ TP_WAVELET_NPHIGH;Hoch
 TP_WAVELET_NPLOW;Niedrig
 TP_WAVELET_NPNONE;Keine
 TP_WAVELET_NPTYPE;Benachbarte Pixel
-TP_WAVELET_NPTYPE_TOOLTIP;Dieser Algorithmus verwendet ein Pixel und acht seiner Nachbarn. Sind die Unterschiede gering, werden die Kanten geschärft.
-TP_WAVELET_OPACITY;Deckkraft Blau/Gelb
+TP_WAVELET_NPTYPE_TOOLTIP;Dieser Algorithmus verwendet ein Pixel und acht\nseiner Nachbarn. Sind die Unterschiede gering,\nwerden die Kanten geschärft.
+TP_WAVELET_OPACITY;Deckkraft Blau / Gelb
 TP_WAVELET_OPACITYW;Kontrastausgleichskurve
 TP_WAVELET_OPACITYWL;Lokale Kontrastkurve
-TP_WAVELET_OPACITYWL_TOOLTIP;Wendet eine lokale Kontrastkurve am Ende der Wavelet-Verarbeitung an.\n\nLinks stellt den niedrigsten, rechts den höchsten Kontrast dar.
+TP_WAVELET_OPACITYWL_TOOLTIP;Wendet eine lokale Kontrastkurve am\nEnde der Wavelet-Verarbeitung an.\n\nLinks stellt den niedrigsten, rechts den\nhöchsten Kontrast dar.\n
 TP_WAVELET_PASTEL;Pastellfarben
 TP_WAVELET_PROC;Verarbeitung
 TP_WAVELET_RE1;Schärfung verstärken
@@ -1982,19 +1998,19 @@ TP_WAVELET_SKY_TOOLTIP;-100: Nur Farben innerhalb des Bereichs werden verändert
 TP_WAVELET_STREN;Intensität
 TP_WAVELET_STRENGTH;Intensität
 TP_WAVELET_SUPE;Extra
-TP_WAVELET_THR;Schatten Schwellenwert
+TP_WAVELET_THR;Schatten Schwelle
 TP_WAVELET_THRESHOLD;Lichterebenen
 TP_WAVELET_THRESHOLD2;Schattenebenen
-TP_WAVELET_THRESHOLD2_TOOLTIP;Legt die Ebene der Untergrenze (9 minus Wert) für den Schatten-Luminanzbereich fest. Der maximal mögliche Wert wird vom Wert der Lichterebenen begrenzt.\n\nBeeinflussbare Ebenen: Untergrenze bis Ebene 9
-TP_WAVELET_THRESHOLD_TOOLTIP;Legt die Ebene der Obergrenze für den Lichter-Luminanzbereich fest. Der Wert begrenzt die maximal möglichen Schattenebenen.\n\nBeeinflussbare Ebenen: Ebene 1 bis Obergrenze
-TP_WAVELET_THRH;Lichter Schwellenwert
+TP_WAVELET_THRESHOLD2_TOOLTIP;Legt die Ebene der Untergrenze (9 minus Wert)\nfür den Schatten-Luminanzbereich fest. Der\nmaximal mögliche Wert wird vom Wert der Lichter-\nebenen begrenzt.\n\nBeeinflussbare Ebenen: Untergrenze bis Ebene 9
+TP_WAVELET_THRESHOLD_TOOLTIP;Legt die Ebene der Obergrenze für den Lichter\n-Luminanzbereich fest. Der Wert begrenzt die\nmaximal möglichen Schattenebenen.\n\nBeeinflussbare Ebenen: Ebene 1 bis Obergrenze
+TP_WAVELET_THRH;Lichter Schwelle
 TP_WAVELET_TILESBIG;Große Kacheln
 TP_WAVELET_TILESFULL;Ganzes Bild
 TP_WAVELET_TILESIZE;Kachelgröße
 TP_WAVELET_TILESLIT;Kleine Kacheln
-TP_WAVELET_TILES_TOOLTIP;“Ganzes Bild“ (empfohlen) liefert eine bessere Qualität.\n“Kacheln“ benötigen weniger Speicher und sind nur für Computer mit wenig RAM zu empfehlen.
+TP_WAVELET_TILES_TOOLTIP;“Ganzes Bild“ (empfohlen) liefert eine bessere Qualität.\n“Kacheln“ benötigen weniger Speicher und ist nur für\nComputer mit wenig RAM zu empfehlen.
 TP_WAVELET_TMSTRENGTH;Intensität
-TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Intensität der Dynamik- oder Kontrastkompression des Restbildes. Ist der Wert ungleich 0, werden die Intensitäts- und Gammaregler des Dynamikkompressions-Werkzeugs im Belichtungsreiter deaktiviert.
+TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Intensität der Dynamik- oder\nKontrastkompression des Restbildes. Ist der\nWert ungleich 0, werden die Intensitäts- und\nGammaregler des Dynamikkompressions-\nWerkzeugs im Belichtungsreiter deaktiviert.
 TP_WAVELET_TMTYPE;Kompression
 TP_WAVELET_TON;Tönung
 TP_WBALANCE_AUTO;Automatisch
@@ -2002,8 +2018,8 @@ TP_WBALANCE_CAMERA;Kamera
 TP_WBALANCE_CLOUDY;Bewölkt
 TP_WBALANCE_CUSTOM;Benutzerdefiniert
 TP_WBALANCE_DAYLIGHT;Tageslicht (sonnig)
-TP_WBALANCE_EQBLUERED;Blau/Rot-Korrektur
-TP_WBALANCE_EQBLUERED_TOOLTIP;Ändert das normale Verhalten des Weißabgleichs durch Änderung der Blau/Rot-Korrektur.\n\nDas kann hilfreich sein, wenn die Aufnahmebedingen:\na) weit weg von der Standardbeleuchtung sind (z.B. unter Wasser)\n\nb) abweichend zu einer Kalibrierung sind.\n\nc) nicht zum ICC-Profil passen.
+TP_WBALANCE_EQBLUERED;Blau / Rot-Korrektur
+TP_WBALANCE_EQBLUERED_TOOLTIP;Ändert das normale Verhalten des Weißabgleichs durch Änderung\nder Blau / Rot-Korrektur.\n\nDas kann hilfreich sein, wenn die Aufnahmebedingen:\na) weit weg von der Standardbeleuchtung sind (z.B. unter Wasser)\nb) abweichend zu einer Kalibrierung sind.\nc) nicht zum ICC-Profil passen.
 TP_WBALANCE_FLASH55;Leica
 TP_WBALANCE_FLASH60;Standard, Canon, Pentax, Olympus
 TP_WBALANCE_FLASH65;Nikon, Panasonic, Sony, Minolta
@@ -2051,15 +2067,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: <b>f</b>
 ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: <b>+</b>
 ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
 
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!HISTORY_MSG_443;Output Black Point Compensation
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
-!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
-!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
-!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen enabled:\nClick in the preview with left mouse button to add a color picker\nDrag it around while pressing the left mouse button\nDelete the color picker with a right mouse button click\nDelete all color pickers with Shift + Right mouse button click\nRight click away from any color picker to go back to the Hand tool
-!TP_ICM_BPC;Black Point Compensation
-!TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 4b7e2979f..af9988062 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -36,7 +36,9 @@ PREFERENCES_ICCDIR;Directory containing colour profiles
 PREFERENCES_INTENT_ABSOLUTE;Absolute Colourimetric
 PREFERENCES_INTENT_RELATIVE;Relative Colourimetric
 PREFERENCES_MENUGROUPLABEL;Group "Colour label"
+PREFERENCES_MONPROFILE;Default colour profile
 PREFERENCES_NAVGUIDEBRUSH;Navigator guide colour
+PREFERENCES_PRTPROFILE;Colour profile
 PREFERENCES_SELECTFONT_COLPICKER;Select Colour Picker's font
 PREFERENCES_TAB_COLORMGR;Colour Management
 SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colours from the output profile.
@@ -760,47 +762,48 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !HISTORY_SNAPSHOT;Snapshot
 !HISTORY_SNAPSHOTS;Snapshots
-!IPTCPANEL_AUTHOR;Author
-!IPTCPANEL_AUTHORSPOSITION;Author's position
-!IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-!IPTCPANEL_CAPTION;Caption
-!IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract).
-!IPTCPANEL_CAPTIONWRITER;Caption writer
-!IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor).
 !IPTCPANEL_CATEGORY;Category
-!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITY;City
-!IPTCPANEL_CITYHINT;City of image origin (City).
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard.
-!IPTCPANEL_COPYRIGHT;Copyright
-!IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
 !IPTCPANEL_COUNTRY;Country
-!IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
-!IPTCPANEL_CREDIT;Credit
-!IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_CREDIT;Credit line
+!IPTCPANEL_CREDITHINT;Enter who should be credited when this image is published.
 !IPTCPANEL_DATECREATED;Date created
-!IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: YYYYMMDD (Date Created).
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
 !IPTCPANEL_EMBEDDED;Embedded
 !IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file.
 !IPTCPANEL_HEADLINE;Headline
-!IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
 !IPTCPANEL_INSTRUCTIONS;Instructions
-!IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
 !IPTCPANEL_KEYWORDS;Keywords
-!IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
 !IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard.
-!IPTCPANEL_PROVINCE;Province
-!IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
 !IPTCPANEL_RESET;Reset
 !IPTCPANEL_RESETHINT;Reset to profile default.
 !IPTCPANEL_SOURCE;Source
-!IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-!IPTCPANEL_SUPPCATEGORIES;Suppl. categories
-!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
 !IPTCPANEL_TITLE;Title
-!IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-!IPTCPANEL_TRANSREFERENCE;Trans. reference
-!IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of the original transmission (Original Transmission Reference).
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -978,6 +981,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1027,7 +1031,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_FLUOF11;Fluorescent F11
 !PREFERENCES_FORIMAGE;For non-raw photos
 !PREFERENCES_FORRAW;For raw photos
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GIMPPATH;GIMP installation directory
 !PREFERENCES_GREY;Output device's Yb luminance (%)
@@ -1067,9 +1071,9 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVIGATIONFRAME;Navigation
@@ -1093,6 +1097,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILEHANDLING;Processing Profile Handling
 !PREFERENCES_PROFILELOADPR;Processing profile loading priority
 !PREFERENCES_PROFILEPRCACHE;Profile in cache
@@ -1101,6 +1106,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
 !PREFERENCES_PSPATH;Adobe Photoshop installation directory
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
@@ -1466,8 +1472,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DISTORTION_AMOUNT;Amount
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_DISTORTION_LABEL;Distortion Correction
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
@@ -1561,7 +1566,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_ICM_NOICM;No ICM: sRGB Output
 !TP_ICM_OUTPUTPROFILE;Output Profile
 !TP_ICM_PROFILEINTENT;Rendering Intent
-!TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1794,7 +1799,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_SHARPENING_RLD_DAMPING;Damping
 !TP_SHARPENING_RLD_ITERATIONS;Iterations
 !TP_SHARPENING_THRESHOLD;Threshold
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENING_USM;Unsharp Mask
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 3691fc6d4..7a1d87a4a 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -680,47 +680,48 @@
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !HISTORY_SNAPSHOT;Snapshot
 !HISTORY_SNAPSHOTS;Snapshots
-!IPTCPANEL_AUTHOR;Author
-!IPTCPANEL_AUTHORSPOSITION;Author's position
-!IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-!IPTCPANEL_CAPTION;Caption
-!IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract).
-!IPTCPANEL_CAPTIONWRITER;Caption writer
-!IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor).
 !IPTCPANEL_CATEGORY;Category
-!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITY;City
-!IPTCPANEL_CITYHINT;City of image origin (City).
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard.
-!IPTCPANEL_COPYRIGHT;Copyright
-!IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
 !IPTCPANEL_COUNTRY;Country
-!IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
-!IPTCPANEL_CREDIT;Credit
-!IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_CREDIT;Credit line
+!IPTCPANEL_CREDITHINT;Enter who should be credited when this image is published.
 !IPTCPANEL_DATECREATED;Date created
-!IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: YYYYMMDD (Date Created).
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
 !IPTCPANEL_EMBEDDED;Embedded
 !IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file.
 !IPTCPANEL_HEADLINE;Headline
-!IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
 !IPTCPANEL_INSTRUCTIONS;Instructions
-!IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
 !IPTCPANEL_KEYWORDS;Keywords
-!IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
 !IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard.
-!IPTCPANEL_PROVINCE;Province
-!IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
 !IPTCPANEL_RESET;Reset
 !IPTCPANEL_RESETHINT;Reset to profile default.
 !IPTCPANEL_SOURCE;Source
-!IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-!IPTCPANEL_SUPPCATEGORIES;Suppl. categories
-!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
 !IPTCPANEL_TITLE;Title
-!IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-!IPTCPANEL_TRANSREFERENCE;Trans. reference
-!IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of the original transmission (Original Transmission Reference).
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -908,6 +909,7 @@
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -958,7 +960,7 @@
 !PREFERENCES_FLUOF11;Fluorescent F11
 !PREFERENCES_FORIMAGE;For non-raw photos
 !PREFERENCES_FORRAW;For raw photos
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GIMPPATH;GIMP installation directory
 !PREFERENCES_GREY;Output device's Yb luminance (%)
@@ -1002,9 +1004,10 @@
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1029,6 +1032,7 @@
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILEHANDLING;Processing Profile Handling
 !PREFERENCES_PROFILELOADPR;Processing profile loading priority
 !PREFERENCES_PROFILEPRCACHE;Profile in cache
@@ -1037,6 +1041,8 @@
 !PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_PSPATH;Adobe Photoshop installation directory
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
@@ -1438,8 +1444,7 @@
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
 !TP_DISTORTION_AMOUNT;Amount
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_DISTORTION_LABEL;Distortion Correction
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
@@ -1546,7 +1551,7 @@
 !TP_ICM_NOICM;No ICM: sRGB Output
 !TP_ICM_OUTPUTPROFILE;Output Profile
 !TP_ICM_PROFILEINTENT;Rendering Intent
-!TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1785,7 +1790,6 @@
 !TP_SHARPENING_RLD_DAMPING;Damping
 !TP_SHARPENING_RLD_ITERATIONS;Iterations
 !TP_SHARPENING_THRESHOLD;Threshold
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENING_USM;Unsharp Mask
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 24bd6c21d..f9763dadb 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -573,47 +573,23 @@ HISTORY_NEWSNAPSHOT;Agregar
 HISTORY_NEWSNAPSHOT_TOOLTIP;Atajo: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Instantánea
 HISTORY_SNAPSHOTS;Instantáneas
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Tratamiento o título del autor
-IPTCPANEL_AUTHORSPOSITIONHINT;Título o cargo del creador o de los creadores del objeto.
-IPTCPANEL_CAPTION;Leyenda
-IPTCPANEL_CAPTIONHINT;<b>Descripción</b> textual de la información (Leyenda).
-IPTCPANEL_CAPTIONWRITER;Autor de la leyenda
-IPTCPANEL_CAPTIONWRITERHINT;Nombre de la persona que escribió, modificó o corrigió la imagen o leyenda/resumen.
 IPTCPANEL_CATEGORY;Categoría
-IPTCPANEL_CATEGORYHINT;Identificador del tema de la imagen según el proveedor (Categoría).
 IPTCPANEL_CITY;Ciudad
-IPTCPANEL_CITYHINT;Ciudad Origen de la imagen.
 IPTCPANEL_COPYHINT;Copiar ajustes IPTC al portapapeles
-IPTCPANEL_COPYRIGHT;Derechos de autor
-IPTCPANEL_COPYRIGHTHINT;Cualquier aviso/nota necesario sobre los derechos de autor.
 IPTCPANEL_COUNTRY;País
-IPTCPANEL_COUNTRYHINT;Nombre de la Ciudad/Locación principal donde la imagen fue creada.
 IPTCPANEL_CREDIT;Créditos
 IPTCPANEL_CREDITHINT;Identifica el proveedor de la imagen, que no necesariamente el dueño o creador.
 IPTCPANEL_DATECREATED;Fecha de creación
-IPTCPANEL_DATECREATEDHINT;Fecha de creación del contenido intelectual de la imagen; Formato: AAAAMMDD.
 IPTCPANEL_EMBEDDED;Incrustado
 IPTCPANEL_EMBEDDEDHINT;Restablecer a los datos IPTC incrustados en el archivo de la imagen
 IPTCPANEL_HEADLINE;Encabezado
-IPTCPANEL_HEADLINEHINT;Una anotación publicable que provee una sinopsis de los contenidos de la imagen.
 IPTCPANEL_INSTRUCTIONS;Instrucciones
-IPTCPANEL_INSTRUCTIONSHINT;Otras instrucciones editoriales sobre el uso de la imagen (Términos de uso).
 IPTCPANEL_KEYWORDS;Palabras clave
-IPTCPANEL_KEYWORDSHINT;Palabras clave que facilitan la búsqueda de la imagen.
 IPTCPANEL_PASTEHINT;Pegar ajustes IPTC desde el portapapeles
-IPTCPANEL_PROVINCE;Estado/Provincia
-IPTCPANEL_PROVINCEHINT;Origen de la imagen: Estado/Provincia (Province-State).
 IPTCPANEL_RESET;Restablecer
 IPTCPANEL_RESETHINT;Restablecer a los ajustes predeterminados del perfil.
 IPTCPANEL_SOURCE;Fuente
-IPTCPANEL_SOURCEHINT;Propietario original del contenido intelectual de la imagen (Source).
-IPTCPANEL_SUPPCATEGORIES;Categorías suplementarias
-IPTCPANEL_SUPPCATEGORIESHINT;Datos adicionales del tema de la imagen.
 IPTCPANEL_TITLE;Título
-IPTCPANEL_TITLEHINT;Descripción breve de la imagen.
-IPTCPANEL_TRANSREFERENCE;Ref. Transm. original
-IPTCPANEL_TRANSREFERENCEHINT;Código representando el lugar de la transmisión original.
 MAIN_BUTTON_FULLSCREEN;Pantalla completa
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Navegar hasta la imagen Siguiente a la que está abierta en el editor:\n<b>Shift-F4</b>\n\nPara navegar hasta la imagen Siguiente a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\n<b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Navegar hasta la imagen Anterior a la que está abierta en el editor:\n<b>Shift-F3</b>\n\nPara navegar hasta la imagen Anterior a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\n<b>F3</b>
@@ -1204,8 +1180,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;A -100 se focalizan los tonos de piel.\nA 0 todo
 TP_DIRPYREQUALIZER_THRESHOLD;Umbral
 TP_DIRPYREQUALIZER_TOOLTIP;Reduce los elementos extraños producidos en la transición entre los colores de piel (matiz, crominancia, luminancia) y el resto de la imagen.
 TP_DISTORTION_AMOUNT;Cantidad
-TP_DISTORTION_AUTO;Auto corrección de distorsión
-TP_DISTORTION_AUTO_TIP;(Experimental) Corrige automáticamente la distorsión de la lente para algunas cámaras (Micro 4/3, algunas compactas DC, etc.)
 TP_DISTORTION_LABEL;Corrección de Distorsión
 TP_EPD_EDGESTOPPING;Parada en los bordes
 TP_EPD_LABEL;Mapeo tonal
@@ -1299,7 +1273,6 @@ TP_ICM_INPUTPROFILE;Perfil de entrada
 TP_ICM_LABEL;Gestión de color
 TP_ICM_NOICM;Sin ICM: Salida sRGB
 TP_ICM_OUTPUTPROFILE;Perfil de salida
-TP_ICM_SAVEREFERENCE;Guardar como referencia para el perfilado
 TP_ICM_SAVEREFERENCE_TOOLTIP;Guardar la imagen TIFF lineal antes de aplicar el perfil de entrada. El resultado puede ser utilizado para fines de calibración y la generación de un perfil de cámara.
 TP_ICM_TONECURVE;Usar la curva tonal en DCP
 TP_ICM_TONECURVE_TOOLTIP;Activa el uso de las curvas de tono que pueden contener los perfiles DCP. Este ajuste es posible solo si el DCP seleccionado contiene una curva tonal.
@@ -1701,6 +1674,31 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
 !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: <b>Alt-w</b>
@@ -1728,6 +1726,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !PREFERENCES_CIEART_FRAME;CIECAM02-Specific Settings
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1736,7 +1735,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1752,9 +1751,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
 !PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
@@ -1764,7 +1764,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1830,6 +1833,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !TP_DIRPYRDENOISE_SLI;Slider
 !TP_DIRPYRDENOISE_TILELABEL;Tile size=%1, Center: Tx=%2  Ty=%3
 !TP_DIRPYREQUALIZER_ARTIF;Reduce artifacts
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1843,6 +1847,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_LABCURVE_CURVEEDITOR_CC;CC
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index 8399eb268..fb1b452dc 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Argazki berria
 HISTORY_SNAPSHOT;Argazkia
 HISTORY_SNAPSHOTS;Argazkiak
-IPTCPANEL_AUTHOR;Author
-IPTCPANEL_AUTHORSPOSITION;Author's position
-IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-IPTCPANEL_CAPTION;Caption
-IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Caption Writer
-IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor)
 IPTCPANEL_CATEGORY;Category
-IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
 IPTCPANEL_CITY;City
-IPTCPANEL_CITYHINT;City of image origin (City).
 IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
 IPTCPANEL_COUNTRY;Country
-IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Credit
 IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
 IPTCPANEL_DATECREATED;Date Created
-IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file
 IPTCPANEL_HEADLINE;Headline
-IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
 IPTCPANEL_KEYWORDS;Keywords
-IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
 IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Reset to profile default
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. Categories
-IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
 IPTCPANEL_TITLE;Title
-IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;Ezarpenak
 MAIN_BUTTON_SAVE;Irudia gorde
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Sarrerako profila
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;ICM-rik ez: sRGB irteera
 TP_ICM_OUTPUTPROFILE;Irteera profila
-TP_ICM_SAVEREFERENCE;Save reference image for profiling
 TP_ICM_WORKINGPROFILE;Lan profila
 TP_RAW_DMETHOD;Metodoa
 TP_RAW_FALSECOLOR;Okerreko kolore ezabaketa atalak
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 6dadfaf06..933164ad1 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -637,47 +637,23 @@ HISTORY_NEWSNAPSHOT;Ajouter
 HISTORY_NEWSNAPSHOT_TOOLTIP;Raccourci: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Capture
 HISTORY_SNAPSHOTS;Captures
-IPTCPANEL_AUTHOR;Auteur
-IPTCPANEL_AUTHORSPOSITION;Statut de l'auteur
-IPTCPANEL_AUTHORSPOSITIONHINT;Statut du ou des créateurs de l'objet (By-line Title).
-IPTCPANEL_CAPTION;Légende
-IPTCPANEL_CAPTIONHINT;Une description explicite de la donnée (Légende - Résumé)
-IPTCPANEL_CAPTIONWRITER;Auteur de la légende
-IPTCPANEL_CAPTIONWRITERHINT;Le nom de la personne ayant rédigé, édité ou corrigé l'image ou la légende/résumé (Auteur - Editeur).
 IPTCPANEL_CATEGORY;Catégorie
-IPTCPANEL_CATEGORYHINT;Identifie le sujet de l'image selon l'avis du fournisseur (Catégorie).
 IPTCPANEL_CITY;Ville
-IPTCPANEL_CITYHINT;Ville d'origine de l'image (Ville).
 IPTCPANEL_COPYHINT;Copie les réglages IPTC dans le presse-papier
-IPTCPANEL_COPYRIGHT;Droit de copie
-IPTCPANEL_COPYRIGHTHINT;Toute remarque nécessaire de droit de copie (Remarque droit de copie).
 IPTCPANEL_COUNTRY;Pays
-IPTCPANEL_COUNTRYHINT;Le nom du pays de la ville principale où l'image a été créée (Pays - Nom de la ville principale).
 IPTCPANEL_CREDIT;Crédit
 IPTCPANEL_CREDITHINT;Identifie le fournisseur de l'image, pas nécessairement le propriétaire/créateur (Crédit).
 IPTCPANEL_DATECREATED;Date de création
-IPTCPANEL_DATECREATEDHINT;La date de création du contenu intellectuel de l'image; Format: AAAAMMJJ (Date de création).
 IPTCPANEL_EMBEDDED;Incorporés
 IPTCPANEL_EMBEDDEDHINT;Réinitialise selon les données IPTC incorporées dans le fichier image
 IPTCPANEL_HEADLINE;Titre
-IPTCPANEL_HEADLINEHINT;Une entrée publiable fournissant un synopsis du contenu de l'image (Titre).
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Autres instructions éditoriales concernant l'utilisation de l'image (Instructions spéciales).
 IPTCPANEL_KEYWORDS;Mots clés
-IPTCPANEL_KEYWORDSHINT;Utilisé pour spécifier des mots clés de recherches (Mots clés).
 IPTCPANEL_PASTEHINT;Colle les réglages IPTC du presse-papier
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;La province/état d'où est issue l'image (Province-Etat).
 IPTCPANEL_RESET;Réinitialisation
 IPTCPANEL_RESETHINT;Réinitialise selon le profil par défaut
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;Le propriétaire intellectuel du contenu de l'image (Source).
-IPTCPANEL_SUPPCATEGORIES;Catégories suppl.
-IPTCPANEL_SUPPCATEGORIESHINT;Précise un peu plus le sujet de l'image (Catégories supplémentaires).
 IPTCPANEL_TITLE;Titre
-IPTCPANEL_TITLEHINT;Raccourcis de référence de l'image (Nom de l'objet).
-IPTCPANEL_TRANSREFERENCE;Réf. transmission
-IPTCPANEL_TRANSREFERENCEHINT;Un code représentant le lieux de la transmission initiale (Référence de transmission initiale).
 MAIN_BUTTON_FULLSCREEN;Plein écran
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigue à l'image Suivante relativement à l'image ouverte dans l'Éditeur\nRaccourci: <b>Shift-F4</b>\n\nPour naviguer à l'image Suivante relativement à la vignette sélectionnée dans le Navigateur de fichiers\nRaccourci: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Navigue à l'image Précédente relativement à l'image ouverte dans l'Éditeur\nRaccourci: <b>Shift-F3</b>\n\nPour naviguer à l'image Précédente relativement à la vignette sélectionnée dans le Navigateur de fichiers\nRaccourci: <b>F3</b>
@@ -861,6 +837,7 @@ PREFERENCES_CLIPPINGIND;Indication du dépassement de plage dynamique
 PREFERENCES_CLUTSCACHE;Cache HaldCLUT
 PREFERENCES_CLUTSCACHE_LABEL;Nombre maximum de chache CLUT
 PREFERENCES_CLUTSDIR;Dossier HaldCLUT
+PREFERENCES_CMMBPC;Compensation du point noir
 PREFERENCES_CURVEBBOXPOS;Position des boutons copier/coller des courbes
 PREFERENCES_CURVEBBOXPOS_ABOVE;Au-dessus
 PREFERENCES_CURVEBBOXPOS_BELOW;En-dessous
@@ -926,8 +903,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 profile de travail pour l'histograme principal et le Navigateur
-PREFERENCES_HISTOGRAM_TOOLTIP;Si activé, le profile 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'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_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.
@@ -955,7 +932,8 @@ PREFERENCES_MENUGROUPRANK;Classement
 PREFERENCES_MENUOPTIONS;Options du menu
 PREFERENCES_METADATA;Metadonnées
 PREFERENCES_MIN;Mini (100x115)
-PREFERENCES_MONBPC;Compensation du Point Noir pour la transformation L*a*b*->Moniteur
+PREFERENCES_MONINTENT;Intention de rendu par défaut
+PREFERENCES_MONPROFILE_WARNOSX;Due à des limitations de macOS, seul sRGB est supporté.
 PREFERENCES_MULTITAB;Éditeurs multiple
 PREFERENCES_MULTITABDUALMON;Éditeurs multiple, si possible sur un second moniteur
 PREFERENCES_NAVGUIDEBRUSH;Couleur du cadre dans le Navigateur
@@ -985,6 +963,8 @@ PREFERENCES_PROFILEPRFILE;Profil accolé au fichier d'entrée
 PREFERENCES_PROFILESAVECACHE;Enregistrer la paramètres de traitement dans le Cache
 PREFERENCES_PROFILESAVEINPUT;Enregistrer la paramètres de traitement accolé au fichier d'entrée
 PREFERENCES_PROPERTY;Propriété
+PREFERENCES_PRTINTENT;Intention de rendu
+PREFERENCES_PRTPROFILE;Profil couleur
 PREFERENCES_PSPATH;Dossier d'installation d'Adobe Photoshop
 PREFERENCES_REMEMBERZOOMPAN;Se souvenir de niveau de zoom et de la position de l'image
 PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Retient le niveau de zoom et la position de l'image courante lors de l'ouverture d'une nouvelle image.\n\nCette option ne fonctionne que dans le mode "Éditeur unique" et quand "Méthode de dématriçage utilisé pour l'aperçu à un zoom <100%" is set to "Idem PP3".
@@ -1085,8 +1065,8 @@ SAVEDLG_SUBSAMP_3;Meilleure qualité
 SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé
 SAVEDLG_WARNFILENAME;Le fichier sera nommé
 SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs
-SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profile de sortie
-SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, simule le rendu généré par le profiles de sortie de l'outil ICM. Particulièrement utile pour simuler le rendu en sortie d'imprimante.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profil de sortie
+SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, simule le rendu généré par le profile de sortie de l'outil ICM. Particulièrement utile pour simuler le rendu en sortie d'imprimante.
 THRESHOLDSELECTOR_B;Bas
 THRESHOLDSELECTOR_BL;Bas-gauche
 THRESHOLDSELECTOR_BR;Bas-droite
@@ -1371,8 +1351,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;A -100, les tons chairs sont ciblés.\nA 0 tous
 TP_DIRPYREQUALIZER_THRESHOLD;Seuil
 TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts due to the transitions between the color (hue, chroma, luma) of the skin and the rest of the image.
 TP_DISTORTION_AMOUNT;Quantité
-TP_DISTORTION_AUTO;Correction auto de la distorsion
-TP_DISTORTION_AUTO_TIP;(Experimental) Corrige la distorsion de l'objectif automatiquement pour certains APN (M4/3, quelques compacts, etc.)
 TP_DISTORTION_LABEL;Distorsion
 TP_EPD_EDGESTOPPING;Arrêt des bords
 TP_EPD_GAMMA;Gamma
@@ -1463,7 +1441,7 @@ TP_ICM_DCPILLUMINANT;Illuminant
 TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolé
 TP_ICM_DCPILLUMINANT_TOOLTIP;Sélectionne quel illuminant DCP inclus utiliser. La valeur par défaut est "Interpolé", qui est un mix entre les 2 profils inclus basé sur la Balance des Blancs choisie. Ce paramètre n'est actif que si un fichier DCP Bi-Illuminant avec support de l'interpolation est choisi.
 TP_ICM_INPUTCAMERA;Celui de l'appareil photo
-TP_ICM_INPUTCAMERAICC;Sél. auto du profile de l'APN
+TP_ICM_INPUTCAMERAICC;Sél. auto du profil de l'APN
 TP_ICM_INPUTCAMERAICC_TOOLTIP;Utilise les profils d'entrée DCP ou ICC spécifiques à RawTherapee, qui sont plus précis qu'une simple matrice.\nDisponible pour certains appareils photo, ces profils sont stoqués dans le dossier /iccprofiles/input.\nCelui dont le nom de fichier correspond au champ EXIF "Modèle" (de l'appareil) est automatiquement sélectionné.
 TP_ICM_INPUTCAMERA_TOOLTIP;Par ordre de préférence, utilise les matrices de couleur incluses dans le fichier RAW, les matrices de couleur simple fournies par RawTherapee ou celles de DCRaw
 TP_ICM_INPUTCUSTOM;Personnel
@@ -1477,7 +1455,6 @@ TP_ICM_INPUTPROFILE;Profil d'entrée
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Pas d'ICM: sortie sRGB
 TP_ICM_OUTPUTPROFILE;Profil de sortie
-TP_ICM_SAVEREFERENCE;Utiliser l'image comme profil de référence
 TP_ICM_SAVEREFERENCE_APPLYWB;Appliquer la balance des blancs
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Généralement, applique la balance des blancs lors de l'enregistrement d'images pour créer des profils ICC, et n'applique pas la balance des blancs pour créer des profils DCP.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Sauvegarde une image TIFF linéaire avant que le profil d'entrée ne soit appliqué. Le résultat peut être utilisé à des fins de calibrage, pour générer un profil APN.
@@ -1925,14 +1902,40 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 !HISTORY_MSG_440;CbDL - Method
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MONITOR_PROFILE_SYSTEM;System default
 !PARTIALPASTE_PRSHARPENING;Post-resize sharpening
 !PARTIALPASTE_RETINEX;Retinex
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
 !PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
 !PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
@@ -1950,8 +1953,10 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 !TP_DIRPYRDENOISE_MET_TOOLTIP;Apply a median filter of the desired window size. The larger the window's size, the longer it takes.\n\n3×3 soft: treats 5 pixels in a 3×3 pixel window.\n3×3: treats 9 pixels in a 3×3 pixel window.\n5×5 soft: treats 13 pixels in a 5×5 pixel window.\n5×5: treats 25 pixels in a 5×5 pixel window.\n7×7: treats 49 pixels in a 7×7 pixel window.\n9×9: treats 81 pixels in a 9×9 pixel window.\n\nSometimes it is possible to achieve higher quality running several iterations with a smaller window size than one iteration with a larger one.
 !TP_DIRPYRDENOISE_PASSES;Median iterations
 !TP_DIRPYRDENOISE_PASSES_TOOLTIP;Applying three median filter iterations with a 3×3 window size often leads to better results than using one median filter iteration with a 7×7 window size.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_NEUTRAL;Reset
 !TP_RAWCACORR_CASTR;Strength
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 5adbda9f6..f57acf41a 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Νέο στιγμιότυπο
 HISTORY_SNAPSHOT;Στιγμιότυπο
 HISTORY_SNAPSHOTS;Στιγμιότυπα
-IPTCPANEL_AUTHOR;Συγγραφέας
-IPTCPANEL_AUTHORSPOSITION;Θέση δημιουργού
-IPTCPANEL_AUTHORSPOSITIONHINT;Τίτλος που αποδίδεται από τον/τους δημιουργό/γους (Ανα γραμμή τίτλος).
-IPTCPANEL_CAPTION;Λεζάντα
-IPTCPANEL_CAPTIONHINT;Μια λεκτική περιγραφή των στοιχείων (Λεζάντα - Περίληψη).
-IPTCPANEL_CAPTIONWRITER;Συγγραφέας λεζάντας
-IPTCPANEL_CAPTIONWRITERHINT;Το όνομα του προσώπου που ασχολήθηκε με την συγγραφή, επεξεργασία ή διόρθωση της εικόνας ή λεζάντας/περίληψης (Συγγραφέας - Επιμελητής).
 IPTCPANEL_CATEGORY;Κατηγορία
-IPTCPANEL_CATEGORYHINT;Ταυτοποιεί το θέμα της εικόνας βάση της άποψης του παροχέα (Κατηγορία).
 IPTCPANEL_CITY;Πόλη
-IPTCPANEL_CITYHINT;Πόλη προέλευσης εικόνας (Πόλη).
 IPTCPANEL_COPYHINT;Αντιγραφή ρυθμίσεων IPTC στην περιοχή αποκομμάτων
-IPTCPANEL_COPYRIGHT;Πνευματική ιδιοκτησία
-IPTCPANEL_COPYRIGHTHINT;Όποιο απαραίτητο σχόλιο περι πνευματικής ιδιοκτησίας (Σχόλια περι πνευματική ιδιοκτησία).
 IPTCPANEL_COUNTRY;Χώρα
-IPTCPANEL_COUNTRYHINT;Χώρα/αρχική τοποθεσία δημιουργίας εικόνας (Χώρα/αρχική τοποθεσία).
 IPTCPANEL_CREDIT;Εύσημα
 IPTCPANEL_CREDITHINT;Ταυτοποιεί τον παροχέα της εικόνας, όχι απραίτητα δημιουργό/ιδιοκτήτη (Εύσημα).
 IPTCPANEL_DATECREATED;Ημερομηνία δημιουργίας
-IPTCPANEL_DATECREATEDHINT;Η ημερομηνία δημιουργίας του πνευματικού περιεχομένου; Τύπος: JJJJMMTT (Ημερομηνία δημιουργίας).
 IPTCPANEL_EMBEDDED;Ενσωματωμένο
 IPTCPANEL_EMBEDDEDHINT;Επαναφορά στοιχείων IPTC αρχείου εικόνας
 IPTCPANEL_HEADLINE;Επικεφαλίδα
-IPTCPANEL_HEADLINEHINT;Ένας δημοσιεύσιμος τίτλος που παρέχει μια σύνοψη των περιεχομένων της εικόνας (Επικεφαλίδα).
 IPTCPANEL_INSTRUCTIONS;Οδηγίες
-IPTCPANEL_INSTRUCTIONSHINT;Άλλες οδηγίες επιμέλειας που αφορούν την χρήση της εικόνας (Ειδικίες οδηγίες).
 IPTCPANEL_KEYWORDS;Λέξεις-κλειδιά
-IPTCPANEL_KEYWORDSHINT;Χρησιμοποιούνται ενδεικτικά ως λέξεις ανάκτησης(Λέξεις-κλειδιά).
 IPTCPANEL_PASTEHINT;Επικόλληση ρυθμίσεων IPTC από την περιοχή αποκομμάτων
-IPTCPANEL_PROVINCE;Επαρχία
-IPTCPANEL_PROVINCEHINT;Επαρχία/Πολιτεία/Νομός προέλευσης της εικόνας (Επαρχία/Πολιτεία/Νομός).
 IPTCPANEL_RESET;Επαναφορά
 IPTCPANEL_RESETHINT;Επαναφορά προεπιλεγμένου προφίλ
 IPTCPANEL_SOURCE;Πηγή
-IPTCPANEL_SOURCEHINT;Αυθεντικός ιδιοκτήτης πνευματικού περιεχομένου της εικόνας (Πηγή).
-IPTCPANEL_SUPPCATEGORIES;Συμπληρ. Κατηγορίες
-IPTCPANEL_SUPPCATEGORIESHINT;Προσδιορίζουν επιπλέον το θέμα της εικόνας (Συμπληρωματικές κατηγορίες).
 IPTCPANEL_TITLE;Τίτλος
-IPTCPANEL_TITLEHINT;Μια σύντομη αναφορά για την εικόνα (Όνομα αντικειμένου).
-IPTCPANEL_TRANSREFERENCE;Κωδικός αυθεντικής μετάδοσης
-IPTCPANEL_TRANSREFERENCEHINT;Ένας κωδικός που αντιπροσωπέυει την τοποθεσία αυθεντικής μετάδοσης (Κωδικός Αυθεντικής Μετάδοσης).
 MAIN_BUTTON_PREFERENCES;Ρυθμίσεις
 MAIN_BUTTON_SAVE;Αποθήκευση εικόνας
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Προφίλ εισαγωγής
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB output
 TP_ICM_OUTPUTPROFILE;Προφίλ εξόδου
-TP_ICM_SAVEREFERENCE;Αποθήκευση εικόνας ως αναφορά για δημιουργία προφίλ.
 TP_ICM_WORKINGPROFILE;Παρόν προφίλ
 TP_RAW_DMETHOD;Μέθοδος
 TP_RAW_FALSECOLOR;Βήματα καταστολής σφαλμένων χρωμάτων
@@ -955,6 +930,31 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1087,6 +1087,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1122,7 +1123,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1158,9 +1159,10 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1176,8 +1178,11 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1512,8 +1517,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1597,6 +1601,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1802,7 +1807,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index a8a387782..0ed0c41bf 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;תצלום חדש
 HISTORY_SNAPSHOT;תצלום
 HISTORY_SNAPSHOTS;תצלומים
-IPTCPANEL_AUTHOR;Author
-IPTCPANEL_AUTHORSPOSITION;Author's position
-IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-IPTCPANEL_CAPTION;Caption
-IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Caption Writer
-IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor).
 IPTCPANEL_CATEGORY;Category
-IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
 IPTCPANEL_CITY;City
-IPTCPANEL_CITYHINT;City of image origin (City).
 IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
 IPTCPANEL_COUNTRY;Country
-IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Credit
 IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
 IPTCPANEL_DATECREATED;Date Created
-IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file
 IPTCPANEL_HEADLINE;Headline
-IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
 IPTCPANEL_KEYWORDS;Keywords
-IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
 IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Reset to profile default
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. Categories
-IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
 IPTCPANEL_TITLE;Title
-IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;העדפויות
 MAIN_BUTTON_SAVE;שמור צילום
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;פרופיל ייבוא
 TP_ICM_LABEL;ניהול צבע
 TP_ICM_NOICM;sRGBללא ניהול צבע - ייצוא ב
 TP_ICM_OUTPUTPROFILE;פרופיל ייצוא
-TP_ICM_SAVEREFERENCE;Save reference image for profiling
 TP_ICM_WORKINGPROFILE;פרופיל עבודה
 TP_RAW_DMETHOD;שיטה
 TP_RAW_FALSECOLOR;דחיית צבע מסולף
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index f6241e8dd..613a29301 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -474,47 +474,23 @@ HISTORY_NEWSNAPSHOT;Aggiungi
 HISTORY_NEWSNAPSHOT_TOOLTIP;Scorciatoia: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Istantanea
 HISTORY_SNAPSHOTS;Istantanee
-IPTCPANEL_AUTHOR;Autore
-IPTCPANEL_AUTHORSPOSITION;Qualifica dell'Autore
-IPTCPANEL_AUTHORSPOSITIONHINT;Titolo del creatore o creatori dell'opera (By-line Title).
-IPTCPANEL_CAPTION;Didascalia
-IPTCPANEL_CAPTIONHINT;Una descrizione testuale dei dati (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Autore della didascalia
-IPTCPANEL_CAPTIONWRITERHINT;Il nome della persona impegnata nella scrittura, modifica o correzione dell'immagine o della descrizione riassuntiva (Writer - Editor).
 IPTCPANEL_CATEGORY;Categoria
-IPTCPANEL_CATEGORYHINT;Identifica il soggetto dell'immagine secondo l'opinione del fornitore (Category).
 IPTCPANEL_CITY;Città
-IPTCPANEL_CITYHINT;Città di origine dell'immagine (City).
 IPTCPANEL_COPYHINT;Copia le impostazioni IPTC negli appunti
-IPTCPANEL_COPYRIGHT;Diritto d'autore
-IPTCPANEL_COPYRIGHTHINT;Qualsiasi annotazione necessaria riguardante il diritto d'autore (Copyright Notice).
 IPTCPANEL_COUNTRY;Stato
-IPTCPANEL_COUNTRYHINT;Il nome dello stato/confederazione in cui l'immagine è stata creata (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Riconoscimento
 IPTCPANEL_CREDITHINT;Identifica il fornitore dell'immagine, non necessariamente il possessore/creatore (Credit).
 IPTCPANEL_DATECREATED;Data di creazione
-IPTCPANEL_DATECREATEDHINT;La data in cui è stato creato il contenuto intellettuale dell'immagine; Formato: AAAAMMGG (Date Created).
 IPTCPANEL_EMBEDDED;Incorporato
 IPTCPANEL_EMBEDDEDHINT;Ripristina i dati IPTC incorporati nel file d'immagine
 IPTCPANEL_HEADLINE;Intestazione
-IPTCPANEL_HEADLINEHINT;Una didascalia pubblicabile che esprime una sinossi del contenuto dell'immagine (Headline).
 IPTCPANEL_INSTRUCTIONS;Istruzioni
-IPTCPANEL_INSTRUCTIONSHINT;Altre istruzioni editoriali riguardanti l'uso dell'immagine (Special Instructions).
 IPTCPANEL_KEYWORDS;Parole Chiave
-IPTCPANEL_KEYWORDSHINT;Usate per indicare parole emblematiche al fine di recuperare informazioni specifiche (Keywords).
 IPTCPANEL_PASTEHINT;Incolla le impostazioni IPTC dagli appunti
-IPTCPANEL_PROVINCE;Provincia
-IPTCPANEL_PROVINCEHINT;La provincia/regione da cui l'immagine proviene (Province-State).
 IPTCPANEL_RESET;Ripristina
 IPTCPANEL_RESETHINT;Ripristina il profilo predefinito
 IPTCPANEL_SOURCE;Origine
-IPTCPANEL_SOURCEHINT;Il possessore originario del contenuto intellettuale rappresentato nell'immagine (Source).
-IPTCPANEL_SUPPCATEGORIES;Categorie agg.
-IPTCPANEL_SUPPCATEGORIESHINT;Ulteriore miglioramento del soggetto dell'immagine (Supplemental Categories).
 IPTCPANEL_TITLE;Titolo
-IPTCPANEL_TITLEHINT;Un'abbreviazione che alluda all'immagine (Object Name).
-IPTCPANEL_TRANSREFERENCE;Riferimento Trasm.
-IPTCPANEL_TRANSREFERENCEHINT;Un codice che rappresenta l'ubicazione da cui è avvenuta la trasmissione originaria (Original Transmission Reference).
 MAIN_BUTTON_FULLSCREEN;Schermo intero
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Passa all'immagine successiva rispetto all'immagine aperta per la Modifica\nScorciatoia: <b>Shift-F4</b>\n\nPer passare all'immagine successiva rispetto alla miniatura selezionata nel Navigatore o nel Rullino:\nScorciatoia: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Passa all'immagine precedente rispetto all'immagine aperta per la Modifica\nScorciatoia: <b>Shift-F3</b>\n\nPer passare all'immagine precedente rispetto alla miniatura selezionata nel Navigatore o nel Rullino:\nScorciatoia: <b>F3</b>
@@ -1056,8 +1032,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;A -100 i toni della pelle sono elaborati.\nA 0 t
 TP_DIRPYREQUALIZER_THRESHOLD;Soglia
 TP_DIRPYREQUALIZER_TOOLTIP;Tenta di ridurre gli artefatti dovuti alle transizioni tra colori (tonalità, croma, luma) dell'incarnato e del resto dell'immagine
 TP_DISTORTION_AMOUNT;Quantità
-TP_DISTORTION_AUTO; Autocorrezione Distorsione
-TP_DISTORTION_AUTO_TIP;Corregge la distorsione delle ottiche automaticamente per alcune fotocamere (Micro 4/3, alcune compatte, ecc.)
 TP_DISTORTION_LABEL;Distorsione
 TP_EPD_EDGESTOPPING;Blocco ai Bordi
 TP_EPD_LABEL;Tone Mapping
@@ -1144,7 +1118,6 @@ TP_ICM_INPUTPROFILE;Profilo di ingresso
 TP_ICM_LABEL;Gestione Colore
 TP_ICM_NOICM;Nessun ICM: uscita in sRGB
 TP_ICM_OUTPUTPROFILE;Profilo di Uscita
-TP_ICM_SAVEREFERENCE;Salva riferimento per la profilazione
 TP_ICM_SAVEREFERENCE_TOOLTIP;Salva l'immagine TIFF lineare prima che sia applicato il profilo colore. Il risultato può essere utilizzato per la calibrazione e generazione del profilo della fotocamera.
 TP_ICM_TONECURVE;Usa la curva tono del DCP
 TP_ICM_TONECURVE_TOOLTIP;Utilizza le curve tono incluse nel DCP. Questa opzione è abilitata solo se il DCP selezionato possiede una curva tono.
@@ -1574,6 +1547,31 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
@@ -1598,6 +1596,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1607,7 +1606,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
 !PREFERENCES_FILMSIMULATION;Film Simulation
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1623,9 +1622,10 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
 !PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
@@ -1635,7 +1635,10 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1750,6 +1753,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_DIRPYRDENOISE_SLI;Slider
 !TP_DIRPYRDENOISE_TILELABEL;Tile size=%1, Center: Tx=%2  Ty=%3
 !TP_DIRPYREQUALIZER_ARTIF;Reduce artifacts
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1770,6 +1774,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_NEUTRAL;Reset
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index b13b2bd81..0ba1b52e4 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -669,47 +669,23 @@ HISTORY_NEWSNAPSHOT;追加
 HISTORY_NEWSNAPSHOT_TOOLTIP;ショートカット: <b>Alt-s</b>
 HISTORY_SNAPSHOT;スナップショット
 HISTORY_SNAPSHOTS;スナップショット
-IPTCPANEL_AUTHOR;作成者
-IPTCPANEL_AUTHORSPOSITION;作成者の肩書
-IPTCPANEL_AUTHORSPOSITIONHINT;作成者の肩書または作品の作成者(署名 タイトル).
-IPTCPANEL_CAPTION;キャプション、説明文
-IPTCPANEL_CAPTIONHINT;データのテキストによる説明 (説明--要約)
-IPTCPANEL_CAPTIONWRITER;説明記入者
-IPTCPANEL_CAPTIONWRITERHINT;画像を編集修正する人、または説明/要約の執筆に係わる人の名前 (作家--編集者).
 IPTCPANEL_CATEGORY;カテゴリ
-IPTCPANEL_CATEGORYHINT;提供者の見解で画像の主題を決めます (カテゴリ).
 IPTCPANEL_CITY;都市
-IPTCPANEL_CITYHINT;撮影された都市 (市町村).
 IPTCPANEL_COPYHINT;IPTC設定をクリップボードにコピー
-IPTCPANEL_COPYRIGHT;著作権
-IPTCPANEL_COPYRIGHTHINT;著作権表示 (著作権情報).
 IPTCPANEL_COUNTRY;撮影国
-IPTCPANEL_COUNTRYHINT;国名、/画像が撮影・作成された国 (国--撮影国).
 IPTCPANEL_CREDIT;クレジット
 IPTCPANEL_CREDITHINT;所有者/作成者に限らず、画像の提供元の識別 (クレジット).
 IPTCPANEL_DATECREATED;作成日
-IPTCPANEL_DATECREATEDHINT;画像の知的内容が作成された日付; フォーマット: JJJJMMTT (作成日).
 IPTCPANEL_EMBEDDED;埋め込み
 IPTCPANEL_EMBEDDEDHINT;画像に埋め込まれたIPTCデータにリセット
 IPTCPANEL_HEADLINE;見出し
-IPTCPANEL_HEADLINEHINT;画像の内容の概要を示す記入項目 (タイトル).
 IPTCPANEL_INSTRUCTIONS;編集注記
-IPTCPANEL_INSTRUCTIONSHINT;画像の使用に関するその他の特記事項 (編集注記).
 IPTCPANEL_KEYWORDS;キーワード
-IPTCPANEL_KEYWORDSHINT;情報検索に使用する単語 (キーワード).
 IPTCPANEL_PASTEHINT;IPTC設定をクリップボードから貼り付け
-IPTCPANEL_PROVINCE;州・都道府県
-IPTCPANEL_PROVINCEHINT;撮影された地域/州・都道府県(地域--州・都道府県).
 IPTCPANEL_RESET;リセット
 IPTCPANEL_RESETHINT;デフォルトのプロファイルにリセット
 IPTCPANEL_SOURCE;ソース
-IPTCPANEL_SOURCEHINT;画像の著作権保有者 (ソース).
-IPTCPANEL_SUPPCATEGORIES;カテゴリ補助
-IPTCPANEL_SUPPCATEGORIESHINT;さらに細かく画像の主題 (カテゴリ補助).
 IPTCPANEL_TITLE;タイトル
-IPTCPANEL_TITLEHINT;画像のタイトルを簡略に (タイトル).
-IPTCPANEL_TRANSREFERENCE;送信証明
-IPTCPANEL_TRANSREFERENCEHINT;オリジナルの送信証明の位置を表すコード (オリジナル 送信証明).
 MAIN_BUTTON_FULLSCREEN;フルスクリーン
 MAIN_BUTTON_NAVNEXT_TOOLTIP;エディタで開いている画像に対応する次の画像に移動します\nショートカット: <b>Shift-F4</b>\n\nファイルブラウザで選択したサムネイルに対応する次の画像に移動するには\nショートカット: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;エディタで開いている画像に対応する前の画像に移動します\nショートカット: <b>Shift-F3</b>\n\nファイルブラウザで選択したサムネイルに対応する前の画像に移動するには\nショートカット: <b>F3</b>
@@ -1399,8 +1375,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;-100　肌色トーンの調整が目的にな
 TP_DIRPYREQUALIZER_THRESHOLD;しきい値
 TP_DIRPYREQUALIZER_TOOLTIP;肌色（色相、色度、明度）と他の色の間の遷移でアーティファクトが発生するのを軽減します
 TP_DISTORTION_AMOUNT;適用量
-TP_DISTORTION_AUTO;自動歪曲収差補正
-TP_DISTORTION_AUTO_TIP;(試用) 自動レンズ収差補正 (M4/3, 一部のコンデジ, etc.)
 TP_DISTORTION_LABEL;歪曲収差補正
 TP_EPD_EDGESTOPPING;エッジ停止
 TP_EPD_GAMMA;ガンマ
@@ -1503,7 +1477,6 @@ TP_ICM_INPUTPROFILE;入力プロファイル
 TP_ICM_LABEL;カラー・マネジメント
 TP_ICM_NOICM;No ICM: sRGB 出力
 TP_ICM_OUTPUTPROFILE;出力プロファイル
-TP_ICM_SAVEREFERENCE;プロファイリングを参照する画像を保存
 TP_ICM_SAVEREFERENCE_APPLYWB;ホワイトバランスを適用
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;一般的に、ICCプロファイルを作成するための画像を保存する際に適用するホワイトバランスです、DCPプロファイルを作成する時は適用しません。
 TP_ICM_SAVEREFERENCE_TOOLTIP;入力プロファイルが適用される前のリニアなTIFF画像を保存します。キャリブレーション目的やカメラプロファイルの作成などに使います。
@@ -1952,16 +1925,46 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MONITOR_PROFILE_SYSTEM;System default
 !PARTIALPASTE_PRSHARPENING;Post-resize sharpening
 !PARTIALPASTE_RETINEX;Retinex
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_CMMBPC;Black point compensation
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
 !PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
@@ -1980,10 +1983,12 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 !TP_DIRPYRDENOISE_9X9;9×9
 !TP_DIRPYRDENOISE_MET_TOOLTIP;Apply a median filter of the desired window size. The larger the window's size, the longer it takes.\n\n3×3 soft: treats 5 pixels in a 3×3 pixel window.\n3×3: treats 9 pixels in a 3×3 pixel window.\n5×5 soft: treats 13 pixels in a 5×5 pixel window.\n5×5: treats 25 pixels in a 5×5 pixel window.\n7×7: treats 49 pixels in a 7×7 pixel window.\n9×9: treats 81 pixels in a 9×9 pixel window.\n\nSometimes it is possible to achieve higher quality running several iterations with a smaller window size than one iteration with a larger one.
 !TP_DIRPYRDENOISE_PASSES_TOOLTIP;Applying three median filter iterations with a 3×3 window size often leads to better results than using one median filter iteration with a 7×7 window size.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_NEUTRAL;Reset
 !TP_RAWCACORR_CASTR;Strength
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index c756e6741..bb9c63ea4 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Izmērmaiņa ieslēgta
 HISTORY_NEWSNAPSHOT;Jauna grāmtzīme
 HISTORY_SNAPSHOT;Grāmtzīme
 HISTORY_SNAPSHOTS;Grāmtzīmes
-IPTCPANEL_AUTHOR;Autors
-IPTCPANEL_AUTHORSPOSITION;Autora amats
-IPTCPANEL_AUTHORSPOSITIONHINT;Objekta radītāja amapts (By-line Title).
-IPTCPANEL_CAPTION;Virsraksts
-IPTCPANEL_CAPTIONHINT;Datu tekstveida apraksts (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Virsraksta autors
-IPTCPANEL_CAPTIONWRITERHINT;Personas vārfds, kura ir iesaistīta attēla, virsraksta vai kopsavilkuma rakstīšanā, rediģēšanā vai labošānā (Writer - Editor)
 IPTCPANEL_CATEGORY;Kategorija
-IPTCPANEL_CATEGORYHINT;Attēla radītājs identificē attēla subjektu (Category).
 IPTCPANEL_CITY;Pilsēta
-IPTCPANEL_CITYHINT;Attēla izcelsmes pilsēta (City).
 IPTCPANEL_COPYHINT;Kopēt IPTC iestatījumus uz starpliku
-IPTCPANEL_COPYRIGHT;Autortiesības
-IPTCPANEL_COPYRIGHTHINT;Jebkāds nepieciešamais brīdinājums par autortiesībām (Copyright Notice).
 IPTCPANEL_COUNTRY;Valsts
-IPTCPANEL_COUNTRYHINT;Attēla sākotnējās izveidošanas valsts (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Pateicība
 IPTCPANEL_CREDITHINT;Identificē attēla sniedzēju, nav obligāti radītājs vai īpašnieks (Credit).
 IPTCPANEL_DATECREATED;Izveidošanas datums
-IPTCPANEL_DATECREATEDHINT;Attēla intelektuālā satura radīšanas datums; Formāts: ggggmmdd (Date Created).
 IPTCPANEL_EMBEDDED;Iegultais
 IPTCPANEL_EMBEDDEDHINT;Attiestatīt uz attēla iegultajiem IPTC datiem
 IPTCPANEL_HEADLINE;Konspekts
-IPTCPANEL_HEADLINEHINT;Publicējams raksts, kas satur attēla konspektu (Headline).
 IPTCPANEL_INSTRUCTIONS;Norādījumi
-IPTCPANEL_INSTRUCTIONSHINT;Citi redaktora norādījumi par attēla lietošanu (Special Instructions).
 IPTCPANEL_KEYWORDS;Atslēgvārdi
-IPTCPANEL_KEYWORDSHINT;Norāda vārdus specifiskas informācijas iegūšanai (Keywords).
 IPTCPANEL_PASTEHINT;Ielīmēt IPTC iestatījumus no starplikas
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;Attēla izcelsmes valsts vai province (Province-State).
 IPTCPANEL_RESET;Atiestate
 IPTCPANEL_RESETHINT;Atiestatīt uz profila noklusējumu
 IPTCPANEL_SOURCE;Avots
-IPTCPANEL_SOURCEHINT;Attēla intelektuālā īpašuma īpašnieks (Source).
-IPTCPANEL_SUPPCATEGORIES;Apakškategorija
-IPTCPANEL_SUPPCATEGORIESHINT;Precizē attēla subjektu (Supplemental Categories).
 IPTCPANEL_TITLE;Nosaukums
-IPTCPANEL_TITLEHINT;Attēla saīsināts nosaukums (Object Name).
-IPTCPANEL_TRANSREFERENCE;Pārneses atsauce
-IPTCPANEL_TRANSREFERENCEHINT;Kods, kas norāda uz attēla sākotnējas pārneses vietu (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;Iestatījumi
 MAIN_BUTTON_SAVE;Saglabāt attēlu
 MAIN_BUTTON_SENDTOEDITOR;Sūtīt uz redaktoru
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Ievades profils
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Bez ICM: sRGB izvade
 TP_ICM_OUTPUTPROFILE;Izvades profils
-TP_ICM_SAVEREFERENCE;Saglabāt atsauces attēlu profila izveidei
 TP_ICM_WORKINGPROFILE;Darba profils
 TP_RAW_DMETHOD;Metode
 TP_RAW_FALSECOLOR;Neīsto krāsu slāpēšanas soļi
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 7d6f6be3a..b2ae35fbe 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -348,47 +348,23 @@ HISTORY_MSG_165;RGB görbék - B
 HISTORY_NEWSNAPSHOT;Új
 HISTORY_SNAPSHOT;Pillanatkép
 HISTORY_SNAPSHOTS;Pillanatképek
-IPTCPANEL_AUTHOR;Szerző
-IPTCPANEL_AUTHORSPOSITION;Szerző titulusa
-IPTCPANEL_AUTHORSPOSITIONHINT;A kép létrehozójának munkaköre illetve titulusa (By-line Title)
-IPTCPANEL_CAPTION;Leírás
-IPTCPANEL_CAPTIONHINT;A kép szöveges leírása (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Író
-IPTCPANEL_CAPTIONWRITERHINT;A leírást és az adatok rögzítését/szerkesztését/javítását végző személy neve (Writer - Editor)
 IPTCPANEL_CATEGORY;Kategória
-IPTCPANEL_CATEGORYHINT;A kép témáját azonosítja (Category)
 IPTCPANEL_CITY;Város
-IPTCPANEL_CITYHINT;A város, ahonnan a kép származik (City)
 IPTCPANEL_COPYHINT;IPTC beállítások másolása a vágólapra
-IPTCPANEL_COPYRIGHT;Szerzői jog
-IPTCPANEL_COPYRIGHTHINT;Szerzői joggal kapcsolatos megjegyzések (Copyright Notice)
 IPTCPANEL_COUNTRY;Ország
-IPTCPANEL_COUNTRYHINT;Az ország, ahonnan a kép származik (Country - Primary Location Name)
 IPTCPANEL_CREDIT;Rendelkező
 IPTCPANEL_CREDITHINT;A kép kibocsájtójának neve (nem feltétlenül a szerző) (Credit)
 IPTCPANEL_DATECREATED;Dátum
-IPTCPANEL_DATECREATEDHINT;A kép rögzítésének dátuma; formátum: ééééhhnn (Date Created)
 IPTCPANEL_EMBEDDED;Beágyazott
 IPTCPANEL_EMBEDDEDHINT;A betöltött képbe ágyazott információk kiolvasása
 IPTCPANEL_HEADLINE;Főcím
-IPTCPANEL_HEADLINEHINT;A kép témájának összegzése (Headline)
 IPTCPANEL_INSTRUCTIONS;Útmutatás
-IPTCPANEL_INSTRUCTIONSHINT;Egyéb, a képre vonatkozó szerkesztési útmutatás (Special Instructions)
 IPTCPANEL_KEYWORDS;Kulcsszavak
-IPTCPANEL_KEYWORDSHINT;Kategorizáláshoz/szűréshez használatos, a képre vonatkozó kulcsszavak (Keywords)
 IPTCPANEL_PASTEHINT;IPTC beállítások beillesztése a vágólapról
-IPTCPANEL_PROVINCE;Régió
-IPTCPANEL_PROVINCEHINT;A megye/állam/régió, ahonnan a kép származik (Province-State)
 IPTCPANEL_RESET;Visszaállítás
 IPTCPANEL_RESETHINT;Visszatérés az aktuális profil alapértékéhez
 IPTCPANEL_SOURCE;Forrás
-IPTCPANEL_SOURCEHINT;A kép szellemi tartalmának eredeti tulajdonosa (Source)
-IPTCPANEL_SUPPCATEGORIES;További kategóriák
-IPTCPANEL_SUPPCATEGORIESHINT;A kép finomabb, részletesebb kategorizálását teszi lehetővé (Supplemental Categories)
 IPTCPANEL_TITLE;Címke
-IPTCPANEL_TITLEHINT;A kép rövid azonosítója (Object Name)
-IPTCPANEL_TRANSREFERENCE;Továbbítás helye
-IPTCPANEL_TRANSREFERENCEHINT;A továbbítás helyének megjelölése (Original Transmission Reference)
 MAIN_BUTTON_FULLSCREEN;Teljes képernyő
 MAIN_BUTTON_PREFERENCES;Beállítások
 MAIN_BUTTON_PUTTOQUEUE;Feldolgozási sorba helyez
@@ -697,8 +673,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;Finom részletek
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Semleges
 TP_DIRPYREQUALIZER_THRESHOLD;Küszöb
 TP_DISTORTION_AMOUNT;Erősség
-TP_DISTORTION_AUTO;    Automatikus torzításhelyreállítás
-TP_DISTORTION_AUTO_TIP;(Kísérleti) Objektív torzításának automatikus helyreállítása egyes fényképezőgépeknél (pl. M4/3, néhány digitális kompakt, stb...)
 TP_DISTORTION_LABEL;Torzítás
 TP_EPD_EDGESTOPPING;Éleknél megállás
 TP_EPD_LABEL;Tónustérképezés
@@ -759,7 +733,6 @@ TP_ICM_INPUTPROFILE;Bemeneti színprofil
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Nincs színkezelés: sRGB kimenet
 TP_ICM_OUTPUTPROFILE;Kimeneti színprofil
-TP_ICM_SAVEREFERENCE;Referenciakép mentése profilkalibráláshoz
 TP_ICM_WORKINGPROFILE;Feldolgozási színprofil
 TP_IMPULSEDENOISE_LABEL;Pontzaj-csökkentés
 TP_IMPULSEDENOISE_THRESH;Küszöb
@@ -1237,6 +1210,31 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
 !MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronize the File Browser or Filmstrip with the Editor to reveal the thumbnail of the currently opened image, and clear any active filters.\nShortcut: <b>x</b>\n\nAs above, but without clearing active filters:\nShortcut: <b>y</b>\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1298,6 +1296,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1317,7 +1316,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1344,9 +1343,10 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
@@ -1357,7 +1357,10 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1648,6 +1651,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)"
 !TP_EXPOSURE_CURVEEDITOR1;Tone curve 1
@@ -1695,6 +1699,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolated
 !TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1856,7 +1861,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_RGBCURVES_LUMAMODE_TOOLTIP;<b>Luminosity mode</b> allows to vary the contribution of R, G and B channels to the luminosity of the image, without altering image color.
 !TP_SAVEDIALOG_OK_TIP;Shortcut: <b>Ctrl-Enter</b>
 !TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
 !TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones
 !TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Red/Purple
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index bf47b01ad..adb37a61f 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -685,47 +685,23 @@ HISTORY_NEWSNAPSHOT;Nieuw
 HISTORY_NEWSNAPSHOT_TOOLTIP;Sneltoets: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Nieuw
 HISTORY_SNAPSHOTS;Snapshots
-IPTCPANEL_AUTHOR;Auteur
-IPTCPANEL_AUTHORSPOSITION;Positie van de maker
-IPTCPANEL_AUTHORSPOSITIONHINT;Titel van de maker(s) van het object (By-line Title)
-IPTCPANEL_CAPTION;Omschrijving
-IPTCPANEL_CAPTIONHINT;Tekstuele omschrijving van de data (Omschrijving - abstract)
-IPTCPANEL_CAPTIONWRITER;Maker van de omschrijving
-IPTCPANEL_CAPTIONWRITERHINT;De naam van de persoon betrokken bij het schrijven, bewerken of corrigeren van de foto of omschrijving (Schrijver - Editor)
 IPTCPANEL_CATEGORY;Categorie
-IPTCPANEL_CATEGORYHINT;Beschrijft het onderwerp van de foto volgens de mening van de maker (Categorie)
 IPTCPANEL_CITY;Plaats
-IPTCPANEL_CITYHINT;Plaats van de opname (Plaats)
 IPTCPANEL_COPYHINT;Kopieer IPTC-instellingen naar klembord
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Eventuele vereiste copyright-meldingen (Copyright-melding)
 IPTCPANEL_COUNTRY;Land
-IPTCPANEL_COUNTRYHINT;De naam van het land/primaire locatie waar de foto werd genomen (Land - Primaire locatienaam)
 IPTCPANEL_CREDIT;Credit
 IPTCPANEL_CREDITHINT;Naam van de leverancier van de foto, niet noodzakelijkerwijs de eigenaar/maker (Credit)
 IPTCPANEL_DATECREATED;Opnamedatum
-IPTCPANEL_DATECREATEDHINT;Datum waarop de foto werd genomen; formaat: JJJJMMDD (Opnamedatum)
 IPTCPANEL_EMBEDDED;Ingebed
 IPTCPANEL_EMBEDDEDHINT;Keer terug naar IPTC-data die in de foto zijn opgeslagen
 IPTCPANEL_HEADLINE;Titel
-IPTCPANEL_HEADLINEHINT;Samenvatting van de inhoud van de foto (Titel)
 IPTCPANEL_INSTRUCTIONS;Instructies
-IPTCPANEL_INSTRUCTIONSHINT;Andere instructies mbt. beeldgebruik (Speciale Instructies)
 IPTCPANEL_KEYWORDS;Sleutelwoorden
-IPTCPANEL_KEYWORDSHINT;Gebruikt om sleutelwoorden mee te geven tbv. zoekdoeleinden (Sleutelwoorden)
 IPTCPANEL_PASTEHINT;Plak IPTC-instellingen van klembord
-IPTCPANEL_PROVINCE;Provincie
-IPTCPANEL_PROVINCEHINT;De provincie/staat/departement waar de foto werd genomen (Provincie-Staat)
 IPTCPANEL_RESET;Standaardwaarden
 IPTCPANEL_RESETHINT;Terug naar standaardwaarden
 IPTCPANEL_SOURCE;Bron
-IPTCPANEL_SOURCEHINT;De oorspronkelijke eigenaar van de foto (Bron)
-IPTCPANEL_SUPPCATEGORIES;Extra categorieën
-IPTCPANEL_SUPPCATEGORIESHINT;Verdere verfijning van het onderwerp van de foto (Extra categorieën)
 IPTCPANEL_TITLE;Titel
-IPTCPANEL_TITLEHINT;Een korte referentienaam voor de foto (Objectnaam)
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;Een code die de locatie van de oorspronkelijke transmissie representeert (Original Transmission Reference)
 MAIN_BUTTON_FULLSCREEN;Volledig scherm
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigeer naar de volgende afbeelding relatief ten opzichte van de geopende afbeelding in de Editor\nSneltoets: <b>Shift-F4</b>\n\nNavigeer naar de volgende afbeelding relatief ten opzichte van de miniatuur geselecteerd in de Bestandsnavigator\nSneltoets: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Navigeer naar de vorige afbeelding relatief ten opzichte van de geopende afbeelding in de Editor\nSneltoets: <b>Shift-F3</b> \n\nNavigeer naar de vorige afbeelding relatief ten opzichte van de miniatuur geselecteerd in de Bestandsnavigator\nSneltoets: <b>F3</b>
@@ -1008,7 +984,6 @@ PREFERENCES_MENUOPTIONS;Menu-opties
 PREFERENCES_METADATA;Metadata
 PREFERENCES_MIN;Mini (100x115)
 PREFERENCES_MONINTENT;Standaard monitor weergave
-PREFERENCES_MONPROFILE;Standaard monitor profiel
 PREFERENCES_MULTITAB;Multi-tab: elke foto opent in nieuw tabvenster
 PREFERENCES_MULTITABDUALMON;Multi-tab, indien beschikbaar op tweede monitor
 PREFERENCES_NAVGUIDEBRUSH;Navigator randkleur
@@ -1431,8 +1406,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;Bij -100 huidtinten worden gewijzigd.\nBij 0 all
 TP_DIRPYREQUALIZER_THRESHOLD;Drempel
 TP_DIRPYREQUALIZER_TOOLTIP;Probeert artefacten te verminderen die het gevolg zijn van kleurverschuiving  van de huidtinten(hue, chroma, luma) en de rest van de afbeelding
 TP_DISTORTION_AMOUNT;Hoeveelheid
-TP_DISTORTION_AUTO; Automatische correctie lensvervorming
-TP_DISTORTION_AUTO_TIP;(Experimenteel) Automatische correctie lensvervorming voor sommige camera's (M4/3, enkele compacts, etc.)
 TP_DISTORTION_LABEL;Corrigeer lensvervorming
 TP_EPD_EDGESTOPPING;Randen
 TP_EPD_GAMMA;Gamma
@@ -1538,7 +1511,6 @@ TP_ICM_LABEL;Kleurbeheer
 TP_ICM_NOICM;Geen ICM: sRGB-uitvoer
 TP_ICM_OUTPUTPROFILE;Uitvoerprofiel
 TP_ICM_PROFILEINTENT;Rendering weergave
-TP_ICM_SAVEREFERENCE;Bewaar referentiefoto tbv. profiling
 TP_ICM_SAVEREFERENCE_APPLYWB;Toepassen witbalans
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Gebruik witbalans bij het opslaan van afbeeldingen voor het maken van ICC profielen. Gebruik geen witbalans bij het maken van DCP profielen.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Sla de lineaire TIFF afbeelding op voordat het invoer profiel is toegepast. Het resultaat kan worden gebruikt voor calibratie en het genereren van een camera profiel.
@@ -2032,7 +2004,38 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
+!PREFERENCES_CMMBPC;Black point compensation
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
 !SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
 !SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2046,8 +2049,10 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_DIRPYRDENOISE_9X9;9×9
 !TP_DIRPYRDENOISE_MET_TOOLTIP;Apply a median filter of the desired window size. The larger the window's size, the longer it takes.\n\n3×3 soft: treats 5 pixels in a 3×3 pixel window.\n3×3: treats 9 pixels in a 3×3 pixel window.\n5×5 soft: treats 13 pixels in a 5×5 pixel window.\n5×5: treats 25 pixels in a 5×5 pixel window.\n7×7: treats 49 pixels in a 7×7 pixel window.\n9×9: treats 81 pixels in a 9×9 pixel window.\n\nSometimes it is possible to achieve higher quality running several iterations with a smaller window size than one iteration with a larger one.
 !TP_DIRPYRDENOISE_PASSES_TOOLTIP;Applying three median filter iterations with a 3×3 window size often leads to better results than using one median filter iteration with a 7×7 window size.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_RETINEX_GAINOFFS;Gain and Offset (brightness)
 !TP_RETINEX_GAINTRANSMISSION;Gain transmission
 !TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce transmission map to achieve luminance.\nAbscissa: transmission -min from 0, mean, and values (max).\nOrdinate: gain.
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 166edeff1..40ed600c9 100644
--- a/rtdata/languages/Norsk BM	
+++ b/rtdata/languages/Norsk BM	
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Nytt b.m
 HISTORY_SNAPSHOT;Bokmerke
 HISTORY_SNAPSHOTS;Bokmerker
-IPTCPANEL_AUTHOR;Oppretter
-IPTCPANEL_AUTHORSPOSITION;Oppretterens tittel
-IPTCPANEL_AUTHORSPOSITIONHINT;Beskrivelse av oppretterens tittel (By-line Title).
-IPTCPANEL_CAPTION;Billdetekst
-IPTCPANEL_CAPTIONHINT;Tekstbeskrivelse av bildets innhold (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Bildetekst forfatter
-IPTCPANEL_CAPTIONWRITERHINT;Navnet på personen som har opprettet, redigert eller korrigeret bildeteksten (Writer - Editor).
 IPTCPANEL_CATEGORY;Kategori
-IPTCPANEL_CATEGORYHINT;Brukes til å beskrive innholdet i bildet ifølge kategorien (Category).
 IPTCPANEL_CITY;By
-IPTCPANEL_CITYHINT;Bildets  opprinnelsesby (City).
 IPTCPANEL_COPYHINT;Kopier IPTC innstillinger til utklippstavlen
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Eventuelle copyright tilføyelser (Copyright Notice).
 IPTCPANEL_COUNTRY;Land
-IPTCPANEL_COUNTRYHINT;Navnet på landet/primære område hvor bildet er tatt (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Kreditering
 IPTCPANEL_CREDITHINT;Identifisere oppretteren av bildet, ikke nødvendivis den samme som eieren (Credit).
 IPTCPANEL_DATECREATED;Opptakelsesdato
-IPTCPANEL_DATECREATEDHINT;Datoen bildet ble tatt; Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Intern IPTC data
 IPTCPANEL_EMBEDDEDHINT;Nullstil til de IPTC data som finnes internt i bildefilen
 IPTCPANEL_HEADLINE;Overskrift
-IPTCPANEL_HEADLINEHINT;En kort beskrivelse av innholdet av bildet (Headline).
 IPTCPANEL_INSTRUCTIONS;Instruksjoner
-IPTCPANEL_INSTRUCTIONSHINT;Andre instuksjoner som omhandler bruken av bildet (Special Instructions).
 IPTCPANEL_KEYWORDS;Nøkkelord
-IPTCPANEL_KEYWORDSHINT;Brukes til å beskrive spesifikke nøkkelord (Keywords).
 IPTCPANEL_PASTEHINT;Innsett IPTC innstillinger fra utklipstavlen
-IPTCPANEL_PROVINCE;Provins
-IPTCPANEL_PROVINCEHINT;Billedets opprinnelsesprovins/-stat (Province-State).
 IPTCPANEL_RESET;Nullstil
 IPTCPANEL_RESETHINT;Nullstil til standard profil
 IPTCPANEL_SOURCE;Kilde
-IPTCPANEL_SOURCEHINT;Den originale eier af bildets innhold (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. kategorier
-IPTCPANEL_SUPPCATEGORIESHINT;Ytterlige beskrivelser av innholdet i bildet (Supplemental Categories).
 IPTCPANEL_TITLE;Bildetittel
-IPTCPANEL_TITLEHINT;En kort beskrivelse av bildet (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;En kode som representerer stedet for original transmisjon (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;Innstillinger
 MAIN_BUTTON_SAVE;Lagre bilde
 MAIN_BUTTON_SENDTOEDITOR;Send til editor
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Inngangprofil
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Ingen ICM: sRGB-profil
 TP_ICM_OUTPUTPROFILE;Utgangsprofil
-TP_ICM_SAVEREFERENCE;Lagre referansebilde til profil
 TP_ICM_WORKINGPROFILE;Arbeidsprofil
 TP_RAW_DMETHOD;Metode
 TP_RAW_FALSECOLOR;Falsk fargefortrengningsverdi
@@ -955,6 +930,31 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1087,6 +1087,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1122,7 +1123,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1158,9 +1159,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1176,8 +1178,11 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1512,8 +1517,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1597,6 +1601,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1802,7 +1807,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index e0bad2dff..bbe23f2fd 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -521,47 +521,23 @@ HISTORY_NEWSNAPSHOT;Nowa migawka
 HISTORY_NEWSNAPSHOT_TOOLTIP;Skrót: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Migawka
 HISTORY_SNAPSHOTS;Migawki
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Stanowisko
-IPTCPANEL_AUTHORSPOSITIONHINT;Stanowisko lub funkcja autora lub autorów dzieła (By-line Title).
-IPTCPANEL_CAPTION;Tytuł
-IPTCPANEL_CAPTIONHINT;Tekstowy opis treści (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Autor opisu
-IPTCPANEL_CAPTIONWRITERHINT;Imię i nazwisko osoby biorące udział w opracowywaniu, edytowanie lub korygowania obrazu lub opisu (Writer - Editor).
 IPTCPANEL_CATEGORY;Kategoria
-IPTCPANEL_CATEGORYHINT;Identyfikuje temat zdjęcia w opinii jego dostawcy (Category).
 IPTCPANEL_CITY;Miasto
-IPTCPANEL_CITYHINT;Miasto w którym wykonano zdjęcie (City).
 IPTCPANEL_COPYHINT;Kopiuje ustawienia IPTC do schowka
-IPTCPANEL_COPYRIGHT;Prawa autorskie
-IPTCPANEL_COPYRIGHTHINT;Ważne uwagi o prawach autorskich (Copyright Notice).
 IPTCPANEL_COUNTRY;Kraj
-IPTCPANEL_COUNTRYHINT;Nazwa kraju lub lokalizacji, gdzie zostało wykonane zdjęcie (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Zasługa
 IPTCPANEL_CREDITHINT;Identyfikuje dostawcę zdjęcia, niekoniecznie właściciela lub autora (Credit).
 IPTCPANEL_DATECREATED;Data utworzenia
-IPTCPANEL_DATECREATEDHINT;Data powstania intelektualnej treści zdjęcia. Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Osadzony
 IPTCPANEL_EMBEDDEDHINT;Resetuje dane IPTC do domyślnych ustawień osadzonych w orginalnym zdjęciu
 IPTCPANEL_HEADLINE;Nagłówek
-IPTCPANEL_HEADLINEHINT;Gotowy do opublikowania wpis streszczający zawratość zdjęcia (Headline).
 IPTCPANEL_INSTRUCTIONS;Instrukcje
-IPTCPANEL_INSTRUCTIONSHINT;Inne wskazówki redakcyjne dotyczące korzystania z obrazu (Special Instructions).
 IPTCPANEL_KEYWORDS;Słowa kluczowe
-IPTCPANEL_KEYWORDSHINT;Wskazuje konkretne treści możliwe do odszukania (Keywords).
 IPTCPANEL_PASTEHINT;Wstawia ustawienia IPTC ze schowka
-IPTCPANEL_PROVINCE;Stan, województwo, dystrykt itd.
-IPTCPANEL_PROVINCEHINT;Województwo, gmina, stan gdzie zostało wykonane zdjęcie (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Resetuje do domyślnych ustawień profilu
 IPTCPANEL_SOURCE;Źródło
-IPTCPANEL_SOURCEHINT;Pierwotny właściciel treści intelektualnych zdjęcia (Source).
-IPTCPANEL_SUPPCATEGORIES;Dodatkowe kategorie tematyczne
-IPTCPANEL_SUPPCATEGORIESHINT;Doprecyzowuje kategorie tematyczne zdjęcia (Supplemental Categories).
 IPTCPANEL_TITLE;Tytuł
-IPTCPANEL_TITLEHINT;Skrócony temat odniesienia zdjęcia (Object Name).
-IPTCPANEL_TRANSREFERENCE;Kod ident. zlecenie
-IPTCPANEL_TRANSREFERENCEHINT;Numer badź kod identyfikujący zlecenie utworzony zazwyczaj przez fotografa przy transmisji umożliwiający śledzenie obrazu w obiegu.
 MAIN_BUTTON_FULLSCREEN;Pełen ekran
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Przejdź do następnego zdjęcia względem zdjęcia otwartego w Edytorze.\nSkrót: <b>Shift-F4</b>\n\nAby przejść do następnego zdjęcia względem miniaturki wybranej w Nawigatorze Zdjęć:\nSkrót: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Przejdź do poprzedniego zdjęcia wzgledem zdjęcia otwartego w Edytorze.\nSkrót: <b>Shift-F3</b> \n\nAby przejść do poprzedniego zdjęcia względem miniaturki wybranej w Nawigatorze Zdjęć:\nSkrót: <b>F3</b>
@@ -1159,8 +1135,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;Przy -100 oddziaływanie efektu odbywa się wył
 TP_DIRPYREQUALIZER_THRESHOLD;Próg
 TP_DIRPYREQUALIZER_TOOLTIP;Zapobiega artefaktom w strefach przejścia pomiędzy odcieniom skóry (hue, chrominancja, luminancja) a pozostałym odcieniom.
 TP_DISTORTION_AMOUNT;Siła
-TP_DISTORTION_AUTO;Automatyczna korekcja dystorsji
-TP_DISTORTION_AUTO_TIP;(Eksperymentalne) Automatyczna korekcja dystorsji obiektywu dla niektórych aparatów (M4/3, kompakty DC, itp.)
 TP_DISTORTION_LABEL;Dystorsja
 TP_EPD_EDGESTOPPING;Wyszukiwanie krawędzi
 TP_EPD_LABEL;Tone Mapping
@@ -1255,7 +1229,6 @@ TP_ICM_INPUTPROFILE;Profil wejściowy
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Brak ICM: Wyjście sRGB
 TP_ICM_OUTPUTPROFILE;Profil wyjściowy
-TP_ICM_SAVEREFERENCE;Zapisz obraz wzorcowy dla profilowania
 TP_ICM_SAVEREFERENCE_TOOLTIP;Zapisz liniowy obraz TIFF zanim profil wejściowy zostanie zastosowany. Obraz ten można użyć do kalibracji oraz do wytworzenia profilu aparatu.
 TP_ICM_TONECURVE;Użyj krzywą tonalną z DCP
 TP_ICM_TONECURVE_TOOLTIP;Włącz aby użyć krzywą tonalną znajdującą się w profilu DCP. Opcja ta jest tylko aktywna jeśli profil DCP zawiera krzywą tonalną.
@@ -1658,6 +1631,31 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
@@ -1676,6 +1674,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !PREFERENCES_CIEART_FRAME;CIECAM02-Specific Settings
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1684,7 +1683,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1700,9 +1699,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
 !PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
@@ -1712,7 +1712,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1778,6 +1781,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_DIRPYRDENOISE_SLI;Slider
 !TP_DIRPYRDENOISE_TILELABEL;Tile size=%1, Center: Tx=%2  Ty=%3
 !TP_DIRPYREQUALIZER_ARTIF;Reduce artifacts
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1791,6 +1795,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_NEUTRAL;Reset
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index a3675ab7b..fd1205a7d 100644
--- a/rtdata/languages/Polish (Latin Characters)	
+++ b/rtdata/languages/Polish (Latin Characters)	
@@ -521,47 +521,23 @@ HISTORY_NEWSNAPSHOT;Nowa migawka
 HISTORY_NEWSNAPSHOT_TOOLTIP;Skrot: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Migawka
 HISTORY_SNAPSHOTS;Migawki
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Stanowisko
-IPTCPANEL_AUTHORSPOSITIONHINT;Stanowisko lub funkcja autora lub autorow dziela (By-line Title).
-IPTCPANEL_CAPTION;Tytul
-IPTCPANEL_CAPTIONHINT;Tekstowy opis tresci (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Autor opisu
-IPTCPANEL_CAPTIONWRITERHINT;Imie i nazwisko osoby biorace udzial w opracowywaniu, edytowanie lub korygowania obrazu lub opisu (Writer - Editor).
 IPTCPANEL_CATEGORY;Kategoria
-IPTCPANEL_CATEGORYHINT;Identyfikuje temat zdjecia w opinii jego dostawcy (Category).
 IPTCPANEL_CITY;Miasto
-IPTCPANEL_CITYHINT;Miasto w ktorym wykonano zdjecie (City).
 IPTCPANEL_COPYHINT;Kopiuje ustawienia IPTC do schowka
-IPTCPANEL_COPYRIGHT;Prawa autorskie
-IPTCPANEL_COPYRIGHTHINT;Wazne uwagi o prawach autorskich (Copyright Notice).
 IPTCPANEL_COUNTRY;Kraj
-IPTCPANEL_COUNTRYHINT;Nazwa kraju lub lokalizacji, gdzie zostalo wykonane zdjecie (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Zasluga
 IPTCPANEL_CREDITHINT;Identyfikuje dostawce zdjecia, niekoniecznie wlasciciela lub autora (Credit).
 IPTCPANEL_DATECREATED;Data utworzenia
-IPTCPANEL_DATECREATEDHINT;Data powstania intelektualnej tresci zdjecia. Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Osadzony
 IPTCPANEL_EMBEDDEDHINT;Resetuje dane IPTC do domyslnych ustawien osadzonych w orginalnym zdjeciu
 IPTCPANEL_HEADLINE;Naglowek
-IPTCPANEL_HEADLINEHINT;Gotowy do opublikowania wpis streszczajacy zawratosc zdjecia (Headline).
 IPTCPANEL_INSTRUCTIONS;Instrukcje
-IPTCPANEL_INSTRUCTIONSHINT;Inne wskazowki redakcyjne dotyczace korzystania z obrazu (Special Instructions).
 IPTCPANEL_KEYWORDS;Slowa kluczowe
-IPTCPANEL_KEYWORDSHINT;Wskazuje konkretne tresci mozliwe do odszukania (Keywords).
 IPTCPANEL_PASTEHINT;Wstawia ustawienia IPTC ze schowka
-IPTCPANEL_PROVINCE;Stan, wojewodztwo, dystrykt itd.
-IPTCPANEL_PROVINCEHINT;Wojewodztwo, gmina, stan gdzie zostalo wykonane zdjecie (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Resetuje do domyslnych ustawien profilu
 IPTCPANEL_SOURCE;Zrodlo
-IPTCPANEL_SOURCEHINT;Pierwotny wlasciciel tresci intelektualnych zdjecia (Source).
-IPTCPANEL_SUPPCATEGORIES;Dodatkowe kategorie tematyczne
-IPTCPANEL_SUPPCATEGORIESHINT;Doprecyzowuje kategorie tematyczne zdjecia (Supplemental Categories).
 IPTCPANEL_TITLE;Tytul
-IPTCPANEL_TITLEHINT;Skrocony temat odniesienia zdjecia (Object Name).
-IPTCPANEL_TRANSREFERENCE;Kod ident. zlecenie
-IPTCPANEL_TRANSREFERENCEHINT;Numer badz kod identyfikujacy zlecenie utworzony zazwyczaj przez fotografa przy transmisji umozliwiajacy sledzenie obrazu w obiegu.
 MAIN_BUTTON_FULLSCREEN;Pelen ekran
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Przejdz do nastepnego zdjecia wzgledem zdjecia otwartego w Edytorze.\nSkrot: <b>Shift-F4</b>\n\nAby przejsc do nastepnego zdjecia wzgledem miniaturki wybranej w Nawigatorze Zdjec:\nSkrot: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Przejdz do poprzedniego zdjecia wzgledem zdjecia otwartego w Edytorze.\nSkrot: <b>Shift-F3</b> \n\nAby przejsc do poprzedniego zdjecia wzgledem miniaturki wybranej w Nawigatorze Zdjec:\nSkrot: <b>F3</b>
@@ -1159,8 +1135,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;Przy -100 oddzialywanie efektu odbywa sie wylacz
 TP_DIRPYREQUALIZER_THRESHOLD;Prog
 TP_DIRPYREQUALIZER_TOOLTIP;Zapobiega artefaktom w strefach przejscia pomiedzy odcieniom skory (hue, chrominancja, luminancja) a pozostalym odcieniom.
 TP_DISTORTION_AMOUNT;Sila
-TP_DISTORTION_AUTO;Automatyczna korekcja dystorsji
-TP_DISTORTION_AUTO_TIP;(Eksperymentalne) Automatyczna korekcja dystorsji obiektywu dla niektorych aparatow (M4/3, kompakty DC, itp.)
 TP_DISTORTION_LABEL;Dystorsja
 TP_EPD_EDGESTOPPING;Wyszukiwanie krawedzi
 TP_EPD_LABEL;Tone Mapping
@@ -1255,7 +1229,6 @@ TP_ICM_INPUTPROFILE;Profil wejsciowy
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Brak ICM: Wyjscie sRGB
 TP_ICM_OUTPUTPROFILE;Profil wyjsciowy
-TP_ICM_SAVEREFERENCE;Zapisz obraz wzorcowy dla profilowania
 TP_ICM_SAVEREFERENCE_TOOLTIP;Zapisz liniowy obraz TIFF zanim profil wejsciowy zostanie zastosowany. Obraz ten mozna uzyc do kalibracji oraz do wytworzenia profilu aparatu.
 TP_ICM_TONECURVE;Uzyj krzywa tonalna z DCP
 TP_ICM_TONECURVE_TOOLTIP;Wlacz aby uzyc krzywa tonalna znajdujaca sie w profilu DCP. Opcja ta jest tylko aktywna jesli profil DCP zawiera krzywa tonalna.
@@ -1658,6 +1631,31 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
@@ -1676,6 +1674,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !PREFERENCES_CIEART_FRAME;CIECAM02-Specific Settings
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1684,7 +1683,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1700,9 +1699,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
 !PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
@@ -1712,7 +1712,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1778,6 +1781,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !TP_DIRPYRDENOISE_SLI;Slider
 !TP_DIRPYRDENOISE_TILELABEL;Tile size=%1, Center: Tx=%2  Ty=%3
 !TP_DIRPYREQUALIZER_ARTIF;Reduce artifacts
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1791,6 +1795,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_NEUTRAL;Reset
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index d7a4af77d..4643008f1 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Redimensionamento habilitado
 HISTORY_NEWSNAPSHOT;Adicionar
 HISTORY_SNAPSHOT;Snapshot
 HISTORY_SNAPSHOTS;Snapshots
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Posição do autor
-IPTCPANEL_AUTHORSPOSITIONHINT;Título do criador ou criadores do objeto.
-IPTCPANEL_CAPTION;Legenda
-IPTCPANEL_CAPTIONHINT;Uma descrição dos dados em forma de texto.
-IPTCPANEL_CAPTIONWRITER;Autor da Legenda
-IPTCPANEL_CAPTIONWRITERHINT;o nome da pessoa envolvida na escrita, edição ou correção da imagem ou legenda/resumo.
 IPTCPANEL_CATEGORY;Categoria
-IPTCPANEL_CATEGORYHINT;Identifica o assunto da imagem (Categoria).
 IPTCPANEL_CITY;Cidade
-IPTCPANEL_CITYHINT;Cidade de origem da imagem.
 IPTCPANEL_COPYHINT;Copiar configurações IPTC da área de transferência
-IPTCPANEL_COPYRIGHT;Direios autorais (Copyright).
-IPTCPANEL_COPYRIGHTHINT;qualquer informação necessário sobre os direitos autorais.
 IPTCPANEL_COUNTRY;País
-IPTCPANEL_COUNTRYHINT;O nome do país onde a imagem foi criada.
 IPTCPANEL_CREDIT;Créditos
 IPTCPANEL_CREDITHINT;Identifica o provedor da imagem, nçao necessariamente o proprietário/criador.
 IPTCPANEL_DATECREATED;Data de criação
-IPTCPANEL_DATECREATEDHINT;A data em que o conteúdo intelectual da imagem foi criado; Formato: AAAAMMDD.
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Restaura para IPTC os dados encaixados na imagem
 IPTCPANEL_HEADLINE;Título
-IPTCPANEL_HEADLINEHINT;Uma entrada publicável que com uma sinopse dos conteúdos da imagem.
 IPTCPANEL_INSTRUCTIONS;Instruções
-IPTCPANEL_INSTRUCTIONSHINT;Outras instruções editorias sobre o uso da imagem.
 IPTCPANEL_KEYWORDS;Palavras-chave
-IPTCPANEL_KEYWORDSHINT;Utilizado para indicar informações especificas.
 IPTCPANEL_PASTEHINT;colar configurações IPTC da área de transferência
-IPTCPANEL_PROVINCE;Província
-IPTCPANEL_PROVINCEHINT;o Estado/província de origem da imagem.
 IPTCPANEL_RESET;Restaurar
 IPTCPANEL_RESETHINT;Restaurar paara o padrão do perfil
 IPTCPANEL_SOURCE;Fonte
-IPTCPANEL_SOURCEHINT;o proprietário original do contepudo intelectual da imagem.
-IPTCPANEL_SUPPCATEGORIES; Categorias Adicionais
-IPTCPANEL_SUPPCATEGORIESHINT;Mais informações sobre o assunto da imagem.
 IPTCPANEL_TITLE;Título
-IPTCPANEL_TITLEHINT;Uma referência rápida da imagem.
-IPTCPANEL_TRANSREFERENCE;Trans. Referência
-IPTCPANEL_TRANSREFERENCEHINT;Um código representando a localização da transmissão original.
 MAIN_BUTTON_PREFERENCES;Preferências
 MAIN_BUTTON_SAVE;Salvar Imagem
 MAIN_BUTTON_SENDTOEDITOR;Enviar ao Editor
@@ -396,7 +372,6 @@ TP_ICM_INPUTPROFILE;Perfil de entrada
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Sem ICM: Saída sRGB 
 TP_ICM_OUTPUTPROFILE;Perfil de Saída
-TP_ICM_SAVEREFERENCE;Salvar imagem de referência para perfis
 TP_ICM_WORKINGPROFILE;Perfil Utilizado
 TP_RAW_DMETHOD;Método
 TP_RAW_FALSECOLOR;Supressão de cor falsa
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index c42c45e44..120d17530 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -469,47 +469,23 @@ HISTORY_NEWSNAPSHOT;Добавить
 HISTORY_NEWSNAPSHOT_TOOLTIP;Горячая клавиша: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Снимок
 HISTORY_SNAPSHOTS;Снимки
-IPTCPANEL_AUTHOR;Автор
-IPTCPANEL_AUTHORSPOSITION;Позиция автора
-IPTCPANEL_AUTHORSPOSITIONHINT;Название автора или авторов объекта (By-line Title).
-IPTCPANEL_CAPTION;Подпись
-IPTCPANEL_CAPTIONHINT;Текстовое описание данных (Caption - Abstract)
-IPTCPANEL_CAPTIONWRITER;Автор подписи
-IPTCPANEL_CAPTIONWRITERHINT;Имя человека, участвовавшего в создании, изменении или редактировании изображения либо подписи (Writer - Editor).
 IPTCPANEL_CATEGORY;Категория
-IPTCPANEL_CATEGORYHINT;Устанавливает тему изображения (Category)
 IPTCPANEL_CITY;Город
-IPTCPANEL_CITYHINT;Город (City).
 IPTCPANEL_COPYHINT;Копировать данные IPTC в буфер обмена
-IPTCPANEL_COPYRIGHT;Авторские права
-IPTCPANEL_COPYRIGHTHINT;Любые предупреждения об авторских правах (Copyright Notice).
 IPTCPANEL_COUNTRY;Страна
-IPTCPANEL_COUNTRYHINT;Название страны/начального местоположения (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Поддержка
 IPTCPANEL_CREDITHINT;Лица и организации, осуществляющие какую либо поддержку изображения (Credit).
 IPTCPANEL_DATECREATED;Дата создания
-IPTCPANEL_DATECREATEDHINT;Дата создания интеллектуального содержания изображения; Формат: ГГГГММДД (Date Created).
 IPTCPANEL_EMBEDDED;Встроенный
 IPTCPANEL_EMBEDDEDHINT;Сбросить данные IPTC, встроенные в файл изображения
 IPTCPANEL_HEADLINE;Заголовок
-IPTCPANEL_HEADLINEHINT;Подходящий для публикации краткий обзор содержимого изображения (Headline).
 IPTCPANEL_INSTRUCTIONS;Инструкции
-IPTCPANEL_INSTRUCTIONSHINT;Прочие редакторские инструкции об использовании изображения (Special Instructions).
 IPTCPANEL_KEYWORDS;Ключевые слова
-IPTCPANEL_KEYWORDSHINT;Ключевые слова, используемые для поиска (Keywords).
 IPTCPANEL_PASTEHINT;Вставить данные IPTC из буфера обмена
-IPTCPANEL_PROVINCE;Провинция
-IPTCPANEL_PROVINCEHINT;Провинция/штат (Province-State).
 IPTCPANEL_RESET;Сбросить
 IPTCPANEL_RESETHINT;Сбросить профиль на значения по умолчанию
 IPTCPANEL_SOURCE;Источник
-IPTCPANEL_SOURCEHINT;Первоначальный владелец интеллектуального содержания изображения (Source).
-IPTCPANEL_SUPPCATEGORIES;Доп. категории
-IPTCPANEL_SUPPCATEGORIESHINT;Дополнительные уточнения темы изображения (Supplemental Categories).
 IPTCPANEL_TITLE;Название
-IPTCPANEL_TITLEHINT;Простое описание изображения (Object Name).
-IPTCPANEL_TRANSREFERENCE;Код поддержки
-IPTCPANEL_TRANSREFERENCEHINT;Код, облегчающий отслеживание изображения при передаче в обработку на сторону (Original Transmission Reference).
 MAIN_BUTTON_FULLSCREEN;Полный экран
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Перейти к следующему изображению относительно открытого в редакторе\nГорячая клавиша: <b>Shift+F4</b>\n\nПерейти к следущему изображению относительно выбранного в файловом браузере\nгорячая клавиша <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Перейти к предыдущему изображению относительно открытого в редакторе\nгорячая клавиша: <b>Shift+F4</b>\n\nПерейти к предыдущему изображению относительно выбранного в файловом браузере\nгорячая клавиша <b>F4</b>
@@ -993,8 +969,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;Мелкие
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Нейтральн
 TP_DIRPYREQUALIZER_THRESHOLD;Порог
 TP_DISTORTION_AMOUNT;Величина
-TP_DISTORTION_AUTO;Автоматическая коррекция
-TP_DISTORTION_AUTO_TIP;(Экспериментально) Автоматическая коррекция дисторсии на некоторых камерах (M4/3, некоторые компактные камеры и т.д.)
 TP_DISTORTION_LABEL;Дисторсия
 TP_EPD_EDGESTOPPING;Определение контуров
 TP_EPD_LABEL;Тональная компрессия
@@ -1080,7 +1054,6 @@ TP_ICM_INPUTPROFILE;Входной профиль
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Без ICM: sRGB на выходе
 TP_ICM_OUTPUTPROFILE;Выходной профиль
-TP_ICM_SAVEREFERENCE;Сохранить для профилирования
 TP_ICM_SAVEREFERENCE_TOOLTIP;Сохранить линейный TIFF файл перед применением входного профиля. Результат может использоваться для калибровки и создания профиля камеры.
 TP_ICM_TONECURVE;Использовать тональную кривую DCP
 TP_ICM_TONECURVE_TOOLTIP;Использовать встроенную тональную кривую DCP. Настройка включается только в том случае, если выбранный DCP содержит тональную кривую.
@@ -1517,6 +1490,31 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
@@ -1552,6 +1550,7 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1561,7 +1560,7 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
 !PREFERENCES_FILMSIMULATION;Film Simulation
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1579,9 +1578,10 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
@@ -1592,7 +1592,10 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1751,6 +1754,7 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1772,6 +1776,7 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_NEUTRAL;Reset
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 4540da0b3..6797ab195 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -460,47 +460,23 @@ HISTORY_NEWSNAPSHOT_TOOLTIP;Пречица: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Снимак
 HISTORY_SNAPSHOTS;Снимак
 HRESHOLDSELECTOR_BL;Доле-лево
-IPTCPANEL_AUTHOR;Аутор
-IPTCPANEL_AUTHORSPOSITION;Звање аутора
-IPTCPANEL_AUTHORSPOSITIONHINT;Звање једног или више аутора (једно по реди).
-IPTCPANEL_CAPTION;Назив
-IPTCPANEL_CAPTIONHINT;Кратак опис дела (наслов — абстракт).
-IPTCPANEL_CAPTIONWRITER;Писац наслова
-IPTCPANEL_CAPTIONWRITERHINT;Име особе које је укључена у писање, уређивање или исправљање слике/назица/апстракта (писац — уредник).
 IPTCPANEL_CATEGORY;Категорија
-IPTCPANEL_CATEGORYHINT;Одређује шта се налази на слици (категорија).
 IPTCPANEL_CITY;Град
-IPTCPANEL_CITYHINT;Град у коме је слика настало (град).
 IPTCPANEL_COPYHINT;Коппирај ИПТЦ пшодешавања у оставу
-IPTCPANEL_COPYRIGHT;Ауторска права
-IPTCPANEL_COPYRIGHTHINT;Белешка о ауторским правима над делом (белешка о ауторским правима).
 IPTCPANEL_COUNTRY;Држава
-IPTCPANEL_COUNTRYHINT;Име државе/основног места где је настала слика (држава — назив места).
 IPTCPANEL_CREDIT;Заслуге
 IPTCPANEL_CREDITHINT;Указује да онај ко издаје слику не мора бити аутор/власник (Заслуге).
 IPTCPANEL_DATECREATED;Датум настанка
-IPTCPANEL_DATECREATEDHINT;Датум када је стављено власништво над интелектуални садржај слике; Формат: ГГГГММДД (датум настанка).
 IPTCPANEL_EMBEDDED;Угњежђено
 IPTCPANEL_EMBEDDEDHINT;Врати поља на ИПТЦ податке угњежђене у слику
 IPTCPANEL_HEADLINE;Наслов
-IPTCPANEL_HEADLINEHINT;Назив који указује на везу са садржајем слике и под којим се она издаје (наслов).
 IPTCPANEL_INSTRUCTIONS;Упутства
-IPTCPANEL_INSTRUCTIONSHINT;Остала упутства уредника везана за употребу слике (специјална упутства).
 IPTCPANEL_KEYWORDS;Кључне речи
-IPTCPANEL_KEYWORDSHINT;Речи које указују на разне податке о слици (кључне речи).
 IPTCPANEL_PASTEHINT;Убаци ИПТЦ подешавања из оставе
-IPTCPANEL_PROVINCE;Покрајина
-IPTCPANEL_PROVINCEHINT;Покрајина/држава где је настала слика (провинција — држава).
 IPTCPANEL_RESET;Врати
 IPTCPANEL_RESETHINT;Поставља подразумеване вредности профила
 IPTCPANEL_SOURCE;Извор
-IPTCPANEL_SOURCEHINT;Првобитни власник иннтелектуалног садржаја на слици (извор).
-IPTCPANEL_SUPPCATEGORIES;Доп. категорије
-IPTCPANEL_SUPPCATEGORIESHINT;Додатно одређује мотив на слици (додатне категорије).
 IPTCPANEL_TITLE;Натпис
-IPTCPANEL_TITLEHINT;Кратни назив слике (име објекта).
-IPTCPANEL_TRANSREFERENCE;Реф. преноса
-IPTCPANEL_TRANSREFERENCEHINT;Код којји представља место првобитног преноса (референца првог преноса).
 MAIN_BUTTON_FULLSCREEN;Цео екран
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Шаље вас на наредну слику у односу на отворену у прозору за уређивање.\nПречица: <b>Shift-F4</b>\n\nТакође, омогућа вам да идете на наредну слику у односу на тренутно изабрану у разгледачу или филмској траци.\nПречица: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Шаље вас на претходну слику у односу на отворену у прозору за уређивање.\nПречица: <b>Shift-F3</b>\n\nnТакође, омогућа вам да идете на наредну слику у односу на тренутно изабрану у разгледачу или филмској траци.\nПречица: <b>F3</b>
@@ -1100,8 +1076,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;фино
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Неутрално
 TP_DIRPYREQUALIZER_THRESHOLD;Праг
 TP_DISTORTION_AMOUNT;Количина
-TP_DISTORTION_AUTO;Сам исправи изобличења
-TP_DISTORTION_AUTO_TIP;(Експериментално) Аутоматски исправља изобличења неких апарата (М4/3, неки компакти, и др.)
 TP_DISTORTION_LABEL;Изобличења
 TP_EPD_EDGESTOPPING;Изоштравање ивице
 TP_EPD_LABEL;Мапирање тонова
@@ -1207,7 +1181,6 @@ TP_ICM_INPUTPROFILE;Улазни профил
 TP_ICM_LABEL;ИЦМ
 TP_ICM_NOICM;No ICM: sRGB излаз
 TP_ICM_OUTPUTPROFILE;Излазни профил
-TP_ICM_SAVEREFERENCE;Сачувај слику као референцу за профил
 TP_ICM_SAVEREFERENCE_TOOLTIP;Сачувај линеарну TIFF слику пре примене улазног профила. Резултат може да се користи за калибрацију и израду профила фото-апарата.
 TP_ICM_TONECURVE;Користи DCP криву тонова
 TP_ICM_TONECURVE_TOOLTIP;Употребљава уграђену DCP криву тонова. Ово подешавање је омогућено само ако изабрани DCP има криву тонова.
@@ -1684,6 +1657,31 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
 !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: <b>Alt-w</b>
@@ -1718,6 +1716,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1727,7 +1726,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
 !PREFERENCES_FILMSIMULATION;Film Simulation
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1745,9 +1744,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
@@ -1758,7 +1758,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1884,6 +1887,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1906,6 +1910,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
 !TP_ICM_INPUTCAMERAICC_TOOLTIP;Use RawTherapee's camera-specific DCP or ICC input color profiles. These profiles are more precise than simpler matrix ones. They are not available for all cameras. These profiles are stored in the /iccprofiles/input and /dcpprofiles folders and are automatically retrieved based on a file name matching to the exact model name of the camera.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index e469a3cd7..1a86a552a 100644
--- a/rtdata/languages/Serbian (Latin Characters)	
+++ b/rtdata/languages/Serbian (Latin Characters)	
@@ -460,47 +460,23 @@ HISTORY_NEWSNAPSHOT_TOOLTIP;Prečica: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snimak
 HISTORY_SNAPSHOTS;Snimak
 HRESHOLDSELECTOR_BL;Dole-levo
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Zvanje autora
-IPTCPANEL_AUTHORSPOSITIONHINT;Zvanje jednog ili više autora (jedno po redi).
-IPTCPANEL_CAPTION;Naziv
-IPTCPANEL_CAPTIONHINT;Kratak opis dela (naslov — abstrakt).
-IPTCPANEL_CAPTIONWRITER;Pisac naslova
-IPTCPANEL_CAPTIONWRITERHINT;Ime osobe koje je uključena u pisanje, uređivanje ili ispravljanje slike/nazica/apstrakta (pisac — urednik).
 IPTCPANEL_CATEGORY;Kategorija
-IPTCPANEL_CATEGORYHINT;Određuje šta se nalazi na slici (kategorija).
 IPTCPANEL_CITY;Grad
-IPTCPANEL_CITYHINT;Grad u kome je slika nastalo (grad).
 IPTCPANEL_COPYHINT;Koppiraj IPTC pšodešavanja u ostavu
-IPTCPANEL_COPYRIGHT;Autorska prava
-IPTCPANEL_COPYRIGHTHINT;Beleška o autorskim pravima nad delom (beleška o autorskim pravima).
 IPTCPANEL_COUNTRY;Država
-IPTCPANEL_COUNTRYHINT;Ime države/osnovnog mesta gde je nastala slika (država — naziv mesta).
 IPTCPANEL_CREDIT;Zasluge
 IPTCPANEL_CREDITHINT;Ukazuje da onaj ko izdaje sliku ne mora biti autor/vlasnik (Zasluge).
 IPTCPANEL_DATECREATED;Datum nastanka
-IPTCPANEL_DATECREATEDHINT;Datum kada je stavljeno vlasništvo nad intelektualni sadržaj slike; Format: GGGGMMDD (datum nastanka).
 IPTCPANEL_EMBEDDED;Ugnježđeno
 IPTCPANEL_EMBEDDEDHINT;Vrati polja na IPTC podatke ugnježđene u sliku
 IPTCPANEL_HEADLINE;Naslov
-IPTCPANEL_HEADLINEHINT;Naziv koji ukazuje na vezu sa sadržajem slike i pod kojim se ona izdaje (naslov).
 IPTCPANEL_INSTRUCTIONS;Uputstva
-IPTCPANEL_INSTRUCTIONSHINT;Ostala uputstva urednika vezana za upotrebu slike (specijalna uputstva).
 IPTCPANEL_KEYWORDS;Ključne reči
-IPTCPANEL_KEYWORDSHINT;Reči koje ukazuju na razne podatke o slici (ključne reči).
 IPTCPANEL_PASTEHINT;Ubaci IPTC podešavanja iz ostave
-IPTCPANEL_PROVINCE;Pokrajina
-IPTCPANEL_PROVINCEHINT;Pokrajina/država gde je nastala slika (provincija — država).
 IPTCPANEL_RESET;Vrati
 IPTCPANEL_RESETHINT;Postavlja podrazumevane vrednosti profila
 IPTCPANEL_SOURCE;Izvor
-IPTCPANEL_SOURCEHINT;Prvobitni vlasnik inntelektualnog sadržaja na slici (izvor).
-IPTCPANEL_SUPPCATEGORIES;Dop. kategorije
-IPTCPANEL_SUPPCATEGORIESHINT;Dodatno određuje motiv na slici (dodatne kategorije).
 IPTCPANEL_TITLE;Natpis
-IPTCPANEL_TITLEHINT;Kratni naziv slike (ime objekta).
-IPTCPANEL_TRANSREFERENCE;Ref. prenosa
-IPTCPANEL_TRANSREFERENCEHINT;Kod kojji predstavlja mesto prvobitnog prenosa (referenca prvog prenosa).
 MAIN_BUTTON_FULLSCREEN;Ceo ekran
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Šalje vas na narednu sliku u odnosu na otvorenu u prozoru za uređivanje.\nPrečica: <b>Shift-F4</b>\n\nTakođe, omoguća vam da idete na narednu sliku u odnosu na trenutno izabranu u razgledaču ili filmskoj traci.\nPrečica: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Šalje vas na prethodnu sliku u odnosu na otvorenu u prozoru za uređivanje.\nPrečica: <b>Shift-F3</b>\n\nnTakođe, omoguća vam da idete na narednu sliku u odnosu na trenutno izabranu u razgledaču ili filmskoj traci.\nPrečica: <b>F3</b>
@@ -1100,8 +1076,6 @@ TP_DIRPYREQUALIZER_LUMAFINEST;fino
 TP_DIRPYREQUALIZER_LUMANEUTRAL;Neutralno
 TP_DIRPYREQUALIZER_THRESHOLD;Prag
 TP_DISTORTION_AMOUNT;Količina
-TP_DISTORTION_AUTO;Sam ispravi izobličenja
-TP_DISTORTION_AUTO_TIP;(Eksperimentalno) Automatski ispravlja izobličenja nekih aparata (M4/3, neki kompakti, i dr.)
 TP_DISTORTION_LABEL;Izobličenja
 TP_EPD_EDGESTOPPING;Izoštravanje ivice
 TP_EPD_LABEL;Mapiranje tonova
@@ -1207,7 +1181,6 @@ TP_ICM_INPUTPROFILE;Ulazni profil
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB izlaz
 TP_ICM_OUTPUTPROFILE;Izlazni profil
-TP_ICM_SAVEREFERENCE;Sačuvaj sliku kao referencu za profil
 TP_ICM_SAVEREFERENCE_TOOLTIP;Sačuvaj linearnu TIFF sliku pre primene ulaznog profila. Rezultat može da se koristi za kalibraciju i izradu profila foto-aparata.
 TP_ICM_TONECURVE;Koristi DCP krivu tonova
 TP_ICM_TONECURVE_TOOLTIP;Upotrebljava ugrađenu DCP krivu tonova. Ovo podešavanje je omogućeno samo ako izabrani DCP ima krivu tonova.
@@ -1684,6 +1657,31 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !HISTORY_MSG_441;Retinex - Gain transmission
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_TAB_INSPECT; Inspect
 !MAIN_TAB_WAVELET;Wavelet
 !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: <b>Alt-w</b>
@@ -1718,6 +1716,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1727,7 +1726,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
 !PREFERENCES_EXPAUT;Expert
 !PREFERENCES_FILMSIMULATION;Film Simulation
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREYSC;Scene Yb luminance (%)
 !PREFERENCES_GREYSC18;Yb=18 CIE L#50
@@ -1745,9 +1744,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
 !PREFERENCES_MED;Medium (Tile/2)
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
 !PREFERENCES_NOISE;Noise Reduction
@@ -1758,7 +1758,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1884,6 +1887,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_GAMMA;Gamma
 !TP_EXPOSURE_TCMODE_LUMINANCE;Luminance
 !TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual
@@ -1906,6 +1910,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
 !TP_ICM_INPUTCAMERAICC_TOOLTIP;Use RawTherapee's camera-specific DCP or ICC input color profiles. These profiles are more precise than simpler matrix ones. They are not available for all cameras. These profiles are stored in the /iccprofiles/input and /dcpprofiles folders and are automatically retrieved based on a file name matching to the exact model name of the camera.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 98b726e42..8e7957cf4 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -201,47 +201,23 @@ HISTORY_MSG_92;Gamma smerovej pyramídy
 HISTORY_NEWSNAPSHOT;Nový Snímok
 HISTORY_SNAPSHOT;Snímok
 HISTORY_SNAPSHOTS;Snímky
-IPTCPANEL_AUTHOR;Autor
-IPTCPANEL_AUTHORSPOSITION;Autorov titul
-IPTCPANEL_AUTHORSPOSITIONHINT;Titul tvorcu alebo tvorcov objektu (Titul pri mene autora).
-IPTCPANEL_CAPTION;Titul
-IPTCPANEL_CAPTIONHINT;Textový opis údajov (Titul - Abstrakt).
-IPTCPANEL_CAPTIONWRITER;Pisateľ titulu
-IPTCPANEL_CAPTIONWRITERHINT;Meno osoby, ktorá titul/abstrakt obrazu napísala, upravila alebo opravila (Pisateľ - Editor).
 IPTCPANEL_CATEGORY;Kategória
-IPTCPANEL_CATEGORYHINT;Identifikuje subjekt obrázka podľa názoru poskytovateľa (Kategória).
 IPTCPANEL_CITY;Mesto
-IPTCPANEL_CITYHINT;Mesto pôvodu (Mesto).
 IPTCPANEL_COPYHINT;Kopírovať IPTC nastavenia do schránky
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Akýkoľvek potrebný oznam o copyrighte (Oznam o copyrighte).
 IPTCPANEL_COUNTRY;Krajina
-IPTCPANEL_COUNTRYHINT;Názov krajiny/miesta pôvodu (Krajina - miesto pôvodu).
 IPTCPANEL_CREDIT;Kredit
 IPTCPANEL_CREDITHINT;Identifikuje poskytovateľa obrázka, nemusí byť nevyhnutne vlastníkom/tvorcom (Kredit).
 IPTCPANEL_DATECREATED;Dátum vytvorenia
-IPTCPANEL_DATECREATEDHINT;Dátum, kedy bol vytvorený intelektuálny obsah obrázka; Formát: RRRRMMDD (Deň vytvorenia).
 IPTCPANEL_EMBEDDED;Vložené
 IPTCPANEL_EMBEDDEDHINT;Resetovať na IPTV údaje vložené do obrázka
 IPTCPANEL_HEADLINE;Nadpis
-IPTCPANEL_HEADLINEHINT;Publikovateľný vstup poskytujúci zhrnutie obsahu obrázka (Nadpis).
 IPTCPANEL_INSTRUCTIONS;Pokyny
-IPTCPANEL_INSTRUCTIONSHINT;Iné pokyny ohľadne použitia obrázka (Špeciálne pokyny).
 IPTCPANEL_KEYWORDS;Kľúčové slová
-IPTCPANEL_KEYWORDSHINT;Používa sa na indikáciu kľúčových slov.
 IPTCPANEL_PASTEHINT;Prilepiť IPTC nastavenia zo schránky
-IPTCPANEL_PROVINCE;Provincia/štát
-IPTCPANEL_PROVINCEHINT;Provincia/štát pôvodu obrázka (Provincia-štát).
 IPTCPANEL_RESET;Resetovať
 IPTCPANEL_RESETHINT;Resetovať na predvolené profilom
 IPTCPANEL_SOURCE;Zdroj
-IPTCPANEL_SOURCEHINT;Pôvodný vlastník intektuálneho obsahu obrázka (Zdroj).
-IPTCPANEL_SUPPCATEGORIES;Dodatočné kategórie
-IPTCPANEL_SUPPCATEGORIESHINT;Ďalej upresňuje subjekt obrázka (Dodatočné kategórie).
 IPTCPANEL_TITLE;Názov
-IPTCPANEL_TITLEHINT;Krátka referencia pre obrázok (Meno objektu).
-IPTCPANEL_TRANSREFERENCE;Referencia prenosu
-IPTCPANEL_TRANSREFERENCEHINT;Kód reprezentujúci miesto pôvodného prenosu (Pôvodná referencia prenosu).
 MAIN_BUTTON_FULLSCREEN;Celá obrazovka
 MAIN_BUTTON_PREFERENCES;Predvoľby
 MAIN_BUTTON_PUTTOQUEUE;Vložiť do radu
@@ -463,7 +439,6 @@ TP_ICM_INPUTPROFILE;Vstupný profil
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Bez správy farieb: sRGB výstup
 TP_ICM_OUTPUTPROFILE;Výstupný profil
-TP_ICM_SAVEREFERENCE;Uložiť referenčný obrázok pre tvorbu profilu
 TP_ICM_WORKINGPROFILE;Pracovný profil
 TP_IMPULSEDENOISE_LABEL;Impulzná redukcia šumu
 TP_IMPULSEDENOISE_THRESH;Prah
@@ -1019,6 +994,31 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
 !MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronize the File Browser or Filmstrip with the Editor to reveal the thumbnail of the currently opened image, and clear any active filters.\nShortcut: <b>x</b>\n\nAs above, but without clearing active filters:\nShortcut: <b>y</b>\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1139,6 +1139,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1173,7 +1174,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1209,9 +1210,10 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_NAVIGATIONFRAME;Navigation
@@ -1225,7 +1227,10 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1541,8 +1546,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !TP_DIRPYREQUALIZER_SKIN;Skin targetting/protection
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1626,6 +1630,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1811,7 +1816,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index 6f5d0ed27..d92c71c88 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Uusi pikakuva
 HISTORY_SNAPSHOT;Pikakuva
 HISTORY_SNAPSHOTS;Pikakuvat
-IPTCPANEL_AUTHOR;Kuvaaja
-IPTCPANEL_AUTHORSPOSITION;Kuvaajan titteli
-IPTCPANEL_AUTHORSPOSITIONHINT;(Author position) Kuvaajan titteli.
-IPTCPANEL_CAPTION;Aihe
-IPTCPANEL_CAPTIONHINT;(Caption) Kuvaus kohteesta.
-IPTCPANEL_CAPTIONWRITER;Kuvauksen kirjoittaja
-IPTCPANEL_CAPTIONWRITERHINT;(Caption Writer) Kuvauksen kirjoittajan nimi.
 IPTCPANEL_CATEGORY;Aiheryhmä
-IPTCPANEL_CATEGORYHINT;(Category) Aiheryhmän 3-kirjaiminen koodi.
 IPTCPANEL_CITY;Kaupunki
-IPTCPANEL_CITYHINT;(City) Kaupunki jossa kuva on otettu.
 IPTCPANEL_COPYHINT;Kopioi IPTC tiedot leikepöydälle
-IPTCPANEL_COPYRIGHT;Tekijänoikeudet
-IPTCPANEL_COPYRIGHTHINT;(Copyright) Tekijänoikeustiedot.
 IPTCPANEL_COUNTRY;Maa
-IPTCPANEL_COUNTRYHINT;(Country) Maa jossa kuva on otettu.
 IPTCPANEL_CREDIT;Välittäjä
 IPTCPANEL_CREDITHINT;(Credit) Välittäjän tiedot.
 IPTCPANEL_DATECREATED;Päivämäärä
-IPTCPANEL_DATECREATEDHINT;(Date Created) Päivämäärä jolloin kuva on otettu.
 IPTCPANEL_EMBEDDED;Kuvan oma
 IPTCPANEL_EMBEDDEDHINT;Palauta kuvan IPTC tiedot
 IPTCPANEL_HEADLINE;Julkaistava otsikko
-IPTCPANEL_HEADLINEHINT;(Headline) Julkaistava otsikko.
 IPTCPANEL_INSTRUCTIONS;Ohjeet
-IPTCPANEL_INSTRUCTIONSHINT;(Instructions) Ohjeet ja rajoitukset.
 IPTCPANEL_KEYWORDS;Avainsanat
-IPTCPANEL_KEYWORDSHINT;(Keywords) Kohdetta kuvaavia avainsanoja.
 IPTCPANEL_PASTEHINT;Liitä IPTC tiedot leikepöydältä
-IPTCPANEL_PROVINCE;Maakunta
-IPTCPANEL_PROVINCEHINT;(Province) Maakunta jossa kuva on otettu.
 IPTCPANEL_RESET;Palauta
 IPTCPANEL_RESETHINT;Palauta profiilin oletukseen
 IPTCPANEL_SOURCE;Lähde
-IPTCPANEL_SOURCEHINT;(Source) Kuvan lähde.
-IPTCPANEL_SUPPCATEGORIES;Tarkempi aiheryhmä
-IPTCPANEL_SUPPCATEGORIESHINT;(Supplemental Categories) Tarkempi aiheryhmä.
 IPTCPANEL_TITLE;Otsikko
-IPTCPANEL_TITLEHINT;(Title) Otsikko.
-IPTCPANEL_TRANSREFERENCE;Alkuperäviite
-IPTCPANEL_TRANSREFERENCEHINT;(Original Transmission Reference) Alkuperäviite.
 MAIN_BUTTON_PREFERENCES;Asetukset
 MAIN_BUTTON_SAVE;Tallenna kuva
 MAIN_BUTTON_SENDTOEDITOR;Avaa ulkoisessa ohjelmassa
@@ -397,7 +373,6 @@ TP_ICM_INPUTPROFILE;Lähdeväriprofiili
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;Ei ICM-profiilia: sRGB
 TP_ICM_OUTPUTPROFILE;Tulosväriprofiili
-TP_ICM_SAVEREFERENCE;Tallenna mallikuva\nprofilointia varten
 TP_ICM_WORKINGPROFILE;Työväriprofiili
 TP_RAW_DMETHOD;Menetelmä
 TP_RAW_FALSECOLOR;Värivääristymien eston määrä
@@ -957,6 +932,31 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1089,6 +1089,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1124,7 +1125,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1160,9 +1161,10 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1178,8 +1180,11 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1513,8 +1518,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1598,6 +1602,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1803,7 +1808,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 5b7f64af3..d98dabc24 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1,6 +1,7 @@
 #01 2008-01-22 Emil Ericsson
 #02 2010-2013 Updated by Johan Thor
 #03 2015-08-09 Johan Thor
+#04 2016-12-30 Johan Thor
 
 ABOUT_TAB_BUILD;Version
 ABOUT_TAB_CREDITS;Erkännande
@@ -35,6 +36,7 @@ CURVEEDITOR_TYPE;Typ:
 DIRBROWSER_FOLDERS;Mappar
 EDITWINDOW_TITLE;Bildredigering
 EDIT_OBJECT_TOOLTIP;Visar en widget vid förhandsvisningsfönstret som låter dig ändra detta verktyg.
+EDIT_PIPETTE_TOOLTIP;För att lägga till en punkt på kurvan, håll nere Ctrl-tangenten medan du vänsterklickar på önskad punkt i förhandsgranskningen av bilden.\nFör att justera punkten håller du nere Ctrl-tangenten medan du vänsterklickar i motsvarande område i förhandsgranskningen och sen släpper du Ctrl-tangenten (håll kvar om du önskar noggrannare kontroll) och rör musen upp eller ner medan du håller nere vänster musknapp.
 EXIFFILTER_APERTURE;Bländare
 EXIFFILTER_CAMERA;Kamera
 EXIFFILTER_EXPOSURECOMPENSATION;Exponeringskompensation (EV)
@@ -166,6 +168,7 @@ FILEBROWSER_SHOWEDITEDHINT;Visa redigerade bilder.\nKortkommando: <b>7</b>
 FILEBROWSER_SHOWEDITEDNOTHINT;Visa ickeredigerade bilder.\nKortkommando: <b>6</b>
 FILEBROWSER_SHOWEXIFINFO;Visa EXIF-information.\nKortkommando: <b>i</b>\n\nKortkommando i enkelbildsläget: <b>Alt-i</b>
 FILEBROWSER_SHOWNOTTRASHHINT;Visa endast ej borttagna bilder.
+FILEBROWSER_SHOWORIGINALHINT;Visa endast ursprungliga bilder.\n\nNär flera bilder finns med samma filnamn men med olika filändelser så anses den bild vara urpsrungsbilden som har sin ändelse närmst toppen i listan över filändelser i Inställningar > Filbläddrare > Hanterade filändelser
 FILEBROWSER_SHOWRANK1HINT;Visa bilder med betyg 1.\nKortkommando: <b>1</b>
 FILEBROWSER_SHOWRANK2HINT;Visa bilder med betyg 2.\nKortkommando: <b>2</b>
 FILEBROWSER_SHOWRANK3HINT;Visa bilder med betyg 3.\nKortkommando: <b>3</b>
@@ -194,6 +197,7 @@ FILECHOOSER_FILTER_SAME;Samma format som nuvarande foto
 FILECHOOSER_FILTER_TIFF;TIFF-filer
 GENERAL_ABOUT;Om
 GENERAL_AFTER;Efter
+GENERAL_APPLY;Tillämpa
 GENERAL_ASIMAGE;Som bild
 GENERAL_AUTO;Automatisk
 GENERAL_BEFORE;Före
@@ -209,6 +213,7 @@ GENERAL_NA;Ej tillgänglig
 GENERAL_NO;Nej
 GENERAL_NONE;Inga
 GENERAL_OK;Ok
+GENERAL_OPEN;Öppna
 GENERAL_PORTRAIT;Porträtt
 GENERAL_SAVE;Spara
 GENERAL_UNCHANGED;(Oförändrad)
@@ -391,6 +396,7 @@ HISTORY_MSG_162;Tonmappning
 HISTORY_MSG_163;RGB-kurvor - Röd
 HISTORY_MSG_164;RGB-kurvor - Grön
 HISTORY_MSG_165;RGB-kurvor - Blå
+HISTORY_MSG_166;Exponering - Återställ
 HISTORY_MSG_167;Metod för demozaicing
 HISTORY_MSG_168;'CC'-kurvan
 HISTORY_MSG_169;'CH'-kurvan
@@ -409,7 +415,7 @@ HISTORY_MSG_181;CAM02 - Kroma (C)
 HISTORY_MSG_182;CAM02 - Automatisk CAT02
 HISTORY_MSG_183;CAM02 - Kontrast (J)
 HISTORY_MSG_184;CAM02 - Bild med mörk omgivning
-HISTORY_MSG_185;CAM02 - Kontroll av gamut
+HISTORY_MSG_185;CAM02 - Kontroll av tonomfång
 HISTORY_MSG_186;CAM02 - Algoritm
 HISTORY_MSG_187;CAM02 - Bevarande av röda färger och hudtoner
 HISTORY_MSG_188;CAM02 - Intensitet (Q)
@@ -479,8 +485,12 @@ HISTORY_MSG_252;CbDL Hudtoner
 HISTORY_MSG_253;CbDL Reducera artefakter
 HISTORY_MSG_254;CbDL - Nyans på hudtoner
 HISTORY_MSG_255;CbDL - Algoritm
+HISTORY_MSG_256;NR - Median
 HISTORY_MSG_258;CT - Färgkurva
+HISTORY_MSG_259;CT - Opacitetskurva
+HISTORY_MSG_260;CT - a*[b*] opacitet
 HISTORY_MSG_261;CT - Metod
+HISTORY_MSG_262;CT - b* opacitet
 HISTORY_MSG_263;CT - Skuggor - Röd
 HISTORY_MSG_264;CT - Skuggor - Grön
 HISTORY_MSG_265;CT - Skuggor - Blå
@@ -517,6 +527,7 @@ HISTORY_MSG_297;NR - Kvalitet
 HISTORY_MSG_298;Filter för döda pixlar
 HISTORY_MSG_299;NR - Krominanskurva
 HISTORY_MSG_300;-
+HISTORY_MSG_301;NR - Luminanskontroll
 HISTORY_MSG_302;NR - Chroma-metod
 HISTORY_MSG_303;NR - Chroma-metod
 HISTORY_MSG_304;W - Kontrastnivåer
@@ -527,14 +538,14 @@ HISTORY_MSG_308;W - Process-riktning
 HISTORY_MSG_309;W - ES - Detalj
 HISTORY_MSG_311;W - Wavelet-nivåer
 HISTORY_MSG_312;W - Återstod - Skugg-tröskel
-HISTORY_MSG_314;W - Gamut - Reducera artefakter
+HISTORY_MSG_314;W - Tonomfång - Reducera artefakter
 HISTORY_MSG_315;W - Återstod - Kontrast
-HISTORY_MSG_317;W - Gamut - Hudnyans
+HISTORY_MSG_317;W - Tonomfång - Hudnyans
 HISTORY_MSG_318;W - Kontrast - Högdagernivåer
 HISTORY_MSG_319;W - Kontrast - Högdageromfång
 HISTORY_MSG_320;W - Kontrast - Skuggomgång
 HISTORY_MSG_321;W - Kontrast - Skuggnivåer
-HISTORY_MSG_322;W - Gamut - Undvik färgskiftning
+HISTORY_MSG_322;W - Tonomfång - Undvik färgskiftning
 HISTORY_MSG_323;W - ES - Lokal kontrast
 HISTORY_MSG_324;W - Chroma - Pastell
 HISTORY_MSG_325;W - Chroma - Mättnad
@@ -542,6 +553,7 @@ HISTORY_MSG_326;W - Chroma - Metod
 HISTORY_MSG_327;W - Kontrast - Applicera på
 HISTORY_MSG_328;W - Chroma - Koppla styrka
 HISTORY_MSG_331;W - Kontrastnivåer - Extra
+HISTORY_MSG_332;W - Metod för tiling
 HISTORY_MSG_333;W - Återstod - Skuggor
 HISTORY_MSG_334;W - Återstod - Chroma
 HISTORY_MSG_335;W - Återstod - Högdagrar
@@ -550,6 +562,7 @@ HISTORY_MSG_337;W - Återstod - Nyans himmel
 HISTORY_MSG_338;W - ES - Radie
 HISTORY_MSG_339;W - ES - Styrka
 HISTORY_MSG_340;W - Styrka
+HISTORY_MSG_341;W - Kantprestanda
 HISTORY_MSG_342;W - ES - Första nivån
 HISTORY_MSG_343;W - Chroma-nivåer
 HISTORY_MSG_345;W - ES - Lokal kontrast
@@ -564,13 +577,19 @@ HISTORY_MSG_354;W - ES - Förbättrad
 HISTORY_MSG_355;W - ES - Låg tröskel
 HISTORY_MSG_356;W - ES - Hög tröskel
 HISTORY_MSG_357;W - Brusred. - Koppla med ES
-HISTORY_MSG_358;W - Gamut - CH
+HISTORY_MSG_358;W - Tonomfång - CH
 HISTORY_MSG_359;Het/Död - Tröskel
 HISTORY_MSG_360;TM Gamma
+HISTORY_MSG_361;W - Slutlig - Kromabalansering
 HISTORY_MSG_362;W - Återstod - Komprimeringsmetod
 HISTORY_MSG_363;W - Återstod - Komprimeringsstyrka
+HISTORY_MSG_364;W - Slutlig - Kontrastbalansering
+HISTORY_MSG_365;W - Slutlig - Skillnadsbalansering
 HISTORY_MSG_366;W - Återstod - Komprimering gamma
 HISTORY_MSG_367;W - ES - Lokal kontrastkurva
+HISTORY_MSG_368;W - Slutlig - Kontrastbalans
+HISTORY_MSG_369;W - Slutlig - Balanseringsmetod
+HISTORY_MSG_370;W - Slutlig - Lokal kontrastkurva
 HISTORY_MSG_371;Skärpning efter storleksändring
 HISTORY_MSG_372;PRS USM - Radie
 HISTORY_MSG_373;PRS USM - Mängd
@@ -598,51 +617,60 @@ HISTORY_MSG_395;DCP - Bastabell
 HISTORY_MSG_403;W - ES - Kantkänslighet
 HISTORY_MSG_404;W - ES - Basförstärkning
 HISTORY_MSG_405;W - Brusred. - Nivå 4
+HISTORY_MSG_407;Retinex - Metod
+HISTORY_MSG_408;Retinex - Radie
+HISTORY_MSG_409;Retinex - Kontrast
+HISTORY_MSG_410;Retinex - Kompensation
+HISTORY_MSG_411;Retinex - Styrka
+HISTORY_MSG_413;Retinex - Kontrast
+HISTORY_MSG_414;Retinex - Histogram - Lab
+HISTORY_MSG_415;Retinex - Överföring
+HISTORY_MSG_416;Retinex
+HISTORY_MSG_417;Retinex - Överföring Median
+HISTORY_MSG_418;Retinex - Tröskelvärde
+HISTORY_MSG_419;Retinex - Färgrymd
+HISTORY_MSG_420;Retinex - Histogram - HSL
+HISTORY_MSG_421;Retinex - Gamma
+HISTORY_MSG_422;Retinex - Gamma
+HISTORY_MSG_423;Retinex - Gamma lutning
+HISTORY_MSG_424;Retinex - Tröskelvärde HL
+HISTORY_MSG_426;Retinex - Nyansequalizer
+HISTORY_MSG_429;Retinex - Iterationer
+HISTORY_MSG_430;Retinex - Överföringsgradient
+HISTORY_MSG_431;Retinex - Styrkegradient
+HISTORY_MSG_432;Retinex - M - Högdagrar
+HISTORY_MSG_433;Retinex - M - Högdagrar TW
+HISTORY_MSG_434;Retinex - M - Skuggor
+HISTORY_MSG_435;Retinex - M - Skuggor TW
+HISTORY_MSG_436;Retinex - M - Radie
+HISTORY_MSG_437;Retinex - M - Metod
+HISTORY_MSG_438;Retinex - M - Equalizer
+HISTORY_MSG_439;Retinex - Process
+HISTORY_MSG_440;CbDL - Metod
+HISTORY_MSG_441;Retinex - Ökning, överföring
+HISTORY_MSG_442;Retinex - Skala
+HISTORY_MSG_443;Kompensation svartpunkt för output
 HISTORY_NEWSNAPSHOT;Nytt
 HISTORY_NEWSNAPSHOT_TOOLTIP;Kortkommando: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Bokmärke
 HISTORY_SNAPSHOTS;Bokmärken
-IPTCPANEL_AUTHOR;Upphovsman
-IPTCPANEL_AUTHORSPOSITION;Upphovmannens position
-IPTCPANEL_AUTHORSPOSITIONHINT;Titeln på upphovsmannen/männen (byline)
-IPTCPANEL_CAPTION;Rubrik
-IPTCPANEL_CAPTIONHINT;En beskrivning av informationen
-IPTCPANEL_CAPTIONWRITER;Upphovsman
-IPTCPANEL_CAPTIONWRITERHINT;Namnet på den person som är involverad i att skapa, redigera eller korrigera bilden
 IPTCPANEL_CATEGORY;Kategori
-IPTCPANEL_CATEGORYHINT;Identifierar bildens titel enligt tillhandahållaren.
 IPTCPANEL_CITY;Stad
-IPTCPANEL_CITYHINT;Staden där bilden togs
 IPTCPANEL_COPYHINT;Kopiera IPTC-inställningarna till klippbordet
-IPTCPANEL_COPYRIGHT;Upphovsrätt
-IPTCPANEL_COPYRIGHTHINT;Nödvändig upphovsrättslig information
 IPTCPANEL_COUNTRY;Land
-IPTCPANEL_COUNTRYHINT;Namnet på landet/platsen där bilden togs
 IPTCPANEL_CREDIT;Erkännande
 IPTCPANEL_CREDITHINT;Identifierar tillhandahållaren av bilden, ej nödvändigtvis upphovsmannen
 IPTCPANEL_DATECREATED;Skapad datum
-IPTCPANEL_DATECREATEDHINT;Datumet då innehållet av bilden skapades. Format: ÅÅÅÅMMDD.
 IPTCPANEL_EMBEDDED;Inbäddad
 IPTCPANEL_EMBEDDEDHINT;Återställ IPTC-informationen till innehållet i bildfilen.
 IPTCPANEL_HEADLINE;Rubrik
-IPTCPANEL_HEADLINEHINT;En sammanfattning av vad bilden innehåller.
 IPTCPANEL_INSTRUCTIONS;Instruktioner
-IPTCPANEL_INSTRUCTIONSHINT;Andra instruktioner som rör användandet av bilden.
 IPTCPANEL_KEYWORDS;Nyckelord
-IPTCPANEL_KEYWORDSHINT;Indikerar nyckelord
 IPTCPANEL_PASTEHINT;Klistra in IPTC-inställningar från klippbordet
-IPTCPANEL_PROVINCE;Provins
-IPTCPANEL_PROVINCEHINT;Den provins eller stat från vilken bilden härrör.
 IPTCPANEL_RESET;Återställ
 IPTCPANEL_RESETHINT;Återställ till standardprofilen
 IPTCPANEL_SOURCE;Källa
-IPTCPANEL_SOURCEHINT;Den ursprungliga ägaren av innehållet.
-IPTCPANEL_SUPPCATEGORIES;Övriga kategorier
-IPTCPANEL_SUPPCATEGORIESHINT;Ytterligare beskrivning av bilden
 IPTCPANEL_TITLE;Titel
-IPTCPANEL_TITLEHINT;En kortfattad bildreferens
-IPTCPANEL_TRANSREFERENCE;Överföringsreferens
-IPTCPANEL_TRANSREFERENCEHINT;En kod som representerar platsen för överföring
 ISTORY_MSG_372;PRS USM - Radie
 MAIN_BUTTON_FULLSCREEN;Helskärm
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Flytta till nästa bild relativt den bild som är öppen i redigeringsvyn\nKortkommando: <b>Shift-F4</b>\n\nFlytta till nästa bild relativt den valda miniatyrbilden i filvyn\nKortkommando: <b>F4</b>
@@ -652,6 +680,7 @@ MAIN_BUTTON_PREFERENCES;Inställningar
 MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Lägg till nuvarande bild i behandlingskön.\nKortkommando: Ctrl+b
 MAIN_BUTTON_SAVE;Spara
 MAIN_BUTTON_SAVE_TOOLTIP;Spara nuvarande bild.\nKortkommando: <b>Ctrl+s</b>
+MAIN_BUTTON_SENDTOEDITOR;Redigera bilden i ett externt program
 MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Redigera nuvarande bild i externt bildredigeringsprogram.\nKortkommando: <b>Ctrl+e</b>
 MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Visa/dölj alla sidopaneler.\nKortkommando: <b>m</b>
 MAIN_BUTTON_UNFULLSCREEN;Avsluta helskärmsläget
@@ -716,6 +745,7 @@ MAIN_TOOLTIP_SHOWHIDERP1;Visa/dölj den högra panelen <b>Alt-l</b>
 MAIN_TOOLTIP_SHOWHIDETP1;Visa/dölj den översta panelen <b>Shift-L</b>
 MAIN_TOOLTIP_THRESHOLD;Tröskelvärde
 MAIN_TOOLTIP_TOGGLE;Växla <b>före</b>/<b>efter</b> vy.\nKortkommando: <b>Shift-b</b>
+MONITOR_PROFILE_SYSTEM;Systemets standard
 NAVIGATOR_B;B:
 NAVIGATOR_G;G:
 NAVIGATOR_H;H:
@@ -773,6 +803,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Filter för döda pixlar
 PARTIALPASTE_PREPROCESS_GREENEQUIL;Grönbalansering
 PARTIALPASTE_PREPROCESS_HOTPIXFILT;Filter för heta pixlar
 PARTIALPASTE_PREPROCESS_LINEDENOISE;Linjärt brusfilter
+PARTIALPASTE_PRSHARPENING;Skärpning efter storleksändring
 PARTIALPASTE_RAWCACORR_AUTO;Reducera kromatiska abberationer automatiskt
 PARTIALPASTE_RAWCACORR_CABLUE;Blå
 PARTIALPASTE_RAWCACORR_CARED;Röd
@@ -786,6 +817,7 @@ PARTIALPASTE_RAW_DMETHOD;Metod för demosaicing
 PARTIALPASTE_RAW_FALSECOLOR;Falskt färgbortträngningssteg
 PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE förbättringssteg
 PARTIALPASTE_RESIZE;Ändra storlek
+PARTIALPASTE_RETINEX;Retinex
 PARTIALPASTE_RGBCURVES;RGB-kurvor
 PARTIALPASTE_ROTATION;Rotering
 PARTIALPASTE_SHADOWSHIGHLIGHTS;Skugg- och högdageråterställning
@@ -879,6 +911,7 @@ PREFERENCES_FORRAW;För råbilder
 PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Samma miniatyrbildshöjd mellan redigerings- och filvyn
 PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Att ha olika miniatyrbildshöjder kräver ytterligare beräkningskraft varje gång du växlar mellan redigerings- och filvyn.
 PREFERENCES_GIMPPATH;Installationskatalog för GIMP
+PREFERENCES_GREY;Utenhetens Yb luminans (%)
 PREFERENCES_GREY05;Yb=05 CIE L#30
 PREFERENCES_GREY10;Yb=10 CIE L#40
 PREFERENCES_GREY15;Yb=15 CIE L#45
@@ -905,7 +938,10 @@ PREFERENCES_INTENT_SATURATION;Mättnad
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Visa intern råbild om oredigerad
 PREFERENCES_LANGAUTODETECT;Använd operativsystemets språkinställning
 PREFERENCES_LEVAUTDN;Brusreduceringsnivå
+PREFERENCES_LEVDN;Cellstorlek
+PREFERENCES_MAX;Max (Tile)
 PREFERENCES_MAXRECENTFOLDERS;Maximalt antal visade kataloger
+PREFERENCES_MED;Medium (Tile/2)
 PREFERENCES_MENUGROUPEXTPROGS;Visa "Öppna med"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Visa "Filaktiviteter"
 PREFERENCES_MENUGROUPLABEL;Visa "Etikett"
@@ -913,6 +949,7 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Visa "Profilaktiviteter"
 PREFERENCES_MENUGROUPRANK;Visa "Betygsättning"
 PREFERENCES_MENUOPTIONS;Menyval för högerklick
 PREFERENCES_METADATA;Metadata
+PREFERENCES_MIN;Mini (100x115)
 PREFERENCES_MULTITAB;Öppna bilderna i olika flikar
 PREFERENCES_MULTITABDUALMON;Visa bild på andra skärmen, om möjligt, i flerfliksläge
 PREFERENCES_NAVGUIDEBRUSH;Översiktsvyns guidefärg
@@ -931,6 +968,8 @@ PREFERENCES_PARSEDEXT;Behandlade filtyper
 PREFERENCES_PARSEDEXTADD;Lägg till filtyp
 PREFERENCES_PARSEDEXTADDHINT;Skriv in en filändelse och tryck på den här knappen för att lägga till den i listan
 PREFERENCES_PARSEDEXTDELHINT;Ta bort de markerade filändelserna från listan
+PREFERENCES_PARSEDEXTDOWNHINT;Flytta valt tillägg neråt i listan
+PREFERENCES_PARSEDEXTUPHINT;Flytta valt tillägg uppåt i listan
 PREFERENCES_PREVDEMO;Metod för demosaicing av förhandsbilden
 PREFERENCES_PREVDEMO_FAST;Snabb
 PREFERENCES_PREVDEMO_LABEL;Demosaicing-metod som ska användas för förhandsvisning vid <100% förstoring:
@@ -941,6 +980,7 @@ PREFERENCES_PROFILEPRCACHE;Profil i cache
 PREFERENCES_PROFILEPRFILE;Profil i indatafilen
 PREFERENCES_PROFILESAVECACHE;Spara behandlingsparametrar till cachen
 PREFERENCES_PROFILESAVEINPUT;Spara behandlingsparametrar med indatabildfilen
+PREFERENCES_PROFILE_NONE;Ingen
 PREFERENCES_PROPERTY;Egenskaper
 PREFERENCES_PSPATH;Adobe Photoshops installationskatalog
 PREFERENCES_REMEMBERZOOMPAN;Kom ihåg förstoringsprocent och panorering
@@ -948,6 +988,7 @@ PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Kom ihåg förstoringsgraden i % och panorer
 PREFERENCES_RGBDTL_LABEL;Maximalt antal trådar för brusreducering
 PREFERENCES_RGBDTL_TOOLTIP;Brusreduceringen kräver ungefär 128MB RAM för en 10MPix bild och 512MB för en 40 MPix, och ytterligare 128MB per tråd. Ju fler trådar som körs parallellt, desto snabbare går beräkningarna. Ange värdet "0" för att automatiskt använda så många trådar som möjligt.
 PREFERENCES_SELECTFONT;Välj typsnitt
+PREFERENCES_SELECTFONT_COLPICKER;Välj typsnitt för färgpipetten
 PREFERENCES_SELECTLANG;Välj språk
 PREFERENCES_SELECTTHEME;Välj tema
 PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Seriell läsning av tiff-filer
@@ -958,6 +999,7 @@ PREFERENCES_SHOWDATETIME;Visa datum och tid
 PREFERENCES_SHOWEXPOSURECOMPENSATION;Lägg till exponeringskompensation
 PREFERENCES_SHOWFILMSTRIPTOOLBAR;Visa verktygsraden för filmstrip
 PREFERENCES_SHTHRESHOLD;Tröskelvärde för skuggor
+PREFERENCES_SIMPLAUT;Verktygsläge
 PREFERENCES_SINGLETAB;Öppna en bild åt gången
 PREFERENCES_SINGLETABVERTAB;Enkelfliksläge, vertikala flikar
 PREFERENCES_SLIMUI;Slimmat gränssnitt
@@ -975,10 +1017,12 @@ PREFERENCES_TAB_IMPROC;Bildbehandling
 PREFERENCES_TAB_PERFORMANCE;Prestanda
 PREFERENCES_TAB_SOUND;Ljud
 PREFERENCES_TIMAX;Hög
+PREFERENCES_TINB;Antal tiles
 PREFERENCES_TISTD;Standard
 PREFERENCES_TP_LABEL;Verktygspanel:
 PREFERENCES_TP_USEICONORTEXT;Använd ikoner istället för text
 PREFERENCES_TP_VSCROLLBAR;Göm verktygpanelens vertikala skrollist
+PREFERENCES_TUNNELMETADATA;Kopiera Exif/IPTC/XMP till utfilen oförändrat
 PREFERENCES_USEBUNDLEDPROFILES;Visa förinstallerade profiler
 PREFERENCES_USESYSTEMTHEME;Använd systemtema
 PREFERENCES_VIEW;Utenhetens vitbalansvärde (datorskärm, TV, bildkanon, etc.)
@@ -1031,12 +1075,16 @@ SAVEDLG_PUTTOQUEUEHEAD;Flytta längst fram i behandlingskön
 SAVEDLG_PUTTOQUEUETAIL;Flytta längst bak i behandlingskön
 SAVEDLG_SAVEIMMEDIATELY;Spara direkt
 SAVEDLG_SAVESPP;Spara behandlingsparametrarna med bilderna
+SAVEDLG_SUBSAMP;Subsampling
 SAVEDLG_SUBSAMP_1;Högsta komprimering
 SAVEDLG_SUBSAMP_2;Balanserad
 SAVEDLG_SUBSAMP_3;Högsta kvalitet
+SAVEDLG_SUBSAMP_TOOLTIP;Bästa komprimering:\nJ:a:b 4:2:0\nh/v 2/2\nKroma halveras horisontellt och vertikalt.\n\nBalanserad:\nJ:a:b 4:2:2\nh/v 2/1\nKroma halveras horisontellt.\n\nBästa kvalitet:\nJ:a:b 4:4:4\nh/v 1/1\nIngen subsampling av kroma.
 SAVEDLG_TIFFUNCOMPRESSED;Okomprimerad TIFF
 SAVEDLG_WARNFILENAME;Filen kommer att heta
 SHCSELECTOR_TOOLTIP;Klicka på höger musknapp för att återställa\nde tre reglagens positioner
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Om aktiverad så indikeras i grått de pixlar som hamnar utanför utprofilens tonomfång.
+SOFTPROOF_TOOLTIP;Färggodkännande\nOm aktiverad så kan du simulera renderingen som skapas av utprofilen från ICM-verktyget. Användbar för att simulera utskrifter.
 THRESHOLDSELECTOR_B;Nederst
 THRESHOLDSELECTOR_BL;Nederst till vänster
 THRESHOLDSELECTOR_BR;Nederst till höger
@@ -1044,6 +1092,7 @@ THRESHOLDSELECTOR_HINT;Håll nere <b>Shift</b> tangenten för att flytta de olik
 THRESHOLDSELECTOR_T;Överst
 THRESHOLDSELECTOR_TL;Överst till vänster
 THRESHOLDSELECTOR_TR;Överst till höger
+TOOLBAR_TOOLTIP_COLORPICKER;Låsbar färgpipett\n\nNär denna är aktiverad:\nTryck med vänster musknapp i förhandsgranskningen för att lägga till en färgpipett\nFlytta den medan du håller ner vänster musknapp\nTa bort den genom att trycka med höger musknapp\nTa bort alla genom att använda dig av Shift + höger musknapp\nTryck på höger musknapp utanför färgpipetten för att välja handverktyget
 TOOLBAR_TOOLTIP_CROP;Välj beskärningsområde.\nKortkommando: <b>c</b>\nFlytta beskärningsområdet genom att hålla nere Shift och vänstermusknapp och flytta musen.
 TOOLBAR_TOOLTIP_HAND;Handverktyg.\nKortkommando:<b>h</b>
 TOOLBAR_TOOLTIP_STRAIGHTEN;Räta upp.\nKortkommando:<b>s</b>\n\nDra en linje längs antingen en vertikal eller horisontell linje i bilden för att räta upp bilden. Roterationsvinkeln visas bredvid linjen du drar. Rotationscentrum är det geometriska mittpunkten i bilden.
@@ -1111,6 +1160,9 @@ TP_BWMIX_VAL;L
 TP_CACORRECTION_BLUE;Blå
 TP_CACORRECTION_LABEL;Reducera kromatiska abberationer
 TP_CACORRECTION_RED;Röd
+TP_CBDL_AFT;Efter svartvitt
+TP_CBDL_BEF;Före svartvitt
+TP_CBDL_METHOD_TOOLTIP;Välj om verktyget ska flyttas till efter svartvittsverktyget, vilket gör att det arbetar i L*a*b-rymden, eller före svartvitt, vilket gör att det arbetar i RGB.
 TP_CHMIXER_BLUE;Blå kanal
 TP_CHMIXER_GREEN;Grön kanal
 TP_CHMIXER_LABEL;Kanalmixer
@@ -1156,10 +1208,11 @@ TP_COLORAPP_DATACIE;Resultat av CIECAM02-histogram i kurvor
 TP_COLORAPP_DATACIE_TOOLTIP;När detta är aktiverat, visar CIECAM02-histogram ungefärliga värden/intervall för J eller Q, och C, s eller M efter justeringar i CIECAM02.\nDet här valet påverkar inte huvudhistogrammet.\n\nNär detta är avaktiverat, visar histogrammet för CIECAM02-kurvor Lab-värden innan justeringar av CIECAM02
 TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Om den här checkboxen är aktiverad (rekommenderas), beräknar RT ett optimalt värde som sedan dels används av CAT02 och dels för hela CIECAM02.\nFör att ange ett värde manuellt, avaktivera checkboxen först (värden över 65 rekommenderas)
 TP_COLORAPP_DEGREE_TOOLTIP;Mängd CIE kromatisk anpassning 2002
-TP_COLORAPP_GAMUT;Kontroll av gamut (Lab)
-TP_COLORAPP_GAMUT_TOOLTIP;Tillåt kontroll av gamut i Lab-läge
+TP_COLORAPP_GAMUT;Kontroll av tonomfång (Lab)
+TP_COLORAPP_GAMUT_TOOLTIP;Tillåt kontroll av tonomfång i Lab-läge
 TP_COLORAPP_HUE;Nyans(h)
 TP_COLORAPP_HUE_TOOLTIP;Nyans h) - vinkel mellan 0° och 360°
+TP_COLORAPP_LABEL;CIE Color Appearance Model 2002
 TP_COLORAPP_LABEL_CAM02;Bildjusteringar
 TP_COLORAPP_LABEL_SCENE;Förhållanden då bilden togs
 TP_COLORAPP_LABEL_VIEWING;Förhållanden vid betraktande
@@ -1199,6 +1252,7 @@ TP_COLORTONING_CHROMAC;Opacitet
 TP_COLORTONING_COLOR;Färg
 TP_COLORTONING_HIGHLIGHT;Högdagrar
 TP_COLORTONING_HUE;Nyans
+TP_COLORTONING_LAB;L*a*b*
 TP_COLORTONING_LUMA;Luminans
 TP_COLORTONING_LUMAMODE;Bevara luminansen
 TP_COLORTONING_LUMAMODE_TOOLTIP;Om aktiverad så kommer luminansen för varje pixel bevaras när du ändrar färgerna (röd, grön, cyan, blå, etc.).
@@ -1209,13 +1263,18 @@ TP_COLORTONING_NEUTRAL_TIP;Återställ alla värden (skuggor, mellantoner, högd
 TP_COLORTONING_OPACITY;Opacitet
 TP_COLORTONING_RGBCURVES;RGB - Kurvor
 TP_COLORTONING_RGBSLIDERS;RGB - Reglage
+TP_COLORTONING_SA;Skydd av mättnad
 TP_COLORTONING_SATURATEDOPACITY;Styrka
 TP_COLORTONING_SATURATIONTHRESHOLD;Tröskel
 TP_COLORTONING_SHADOWS;Skuggor
 TP_COLORTONING_SPLITCO;Skuggor/mellantoner/högdagrar
 TP_COLORTONING_SPLITCOCO;Färgbalans för skuggor/mellantoner/högdagrar
+TP_COLORTONING_SPLITLR;Mättnad, 2 färger
 TP_COLORTONING_STR;Styrka
 TP_COLORTONING_STRENGTH;Styrka
+TP_COLORTONING_TWO2;Speciell kroma "2 färger"
+TP_COLORTONING_TWOALL;Speciell kroma
+TP_COLORTONING_TWOBY;Speciell a* and b*
 TP_COLORTONING_TWOSTD;Standard-chroma
 TP_CROP_FIXRATIO;Fast proportion
 TP_CROP_GTDIAGONALS;Diagonalregeln
@@ -1240,14 +1299,26 @@ TP_DARKFRAME_LABEL;Svartbild
 TP_DEFRINGE_LABEL;Fyll ut överstrålning
 TP_DEFRINGE_RADIUS;Radie
 TP_DEFRINGE_THRESHOLD;Tröskelvärde
+TP_DIRPYRDENOISE_3X3;3×3
+TP_DIRPYRDENOISE_3X3_SOFT;3×3 mjuk
+TP_DIRPYRDENOISE_5X5;5×5
+TP_DIRPYRDENOISE_5X5_SOFT;5×5 mjuk
+TP_DIRPYRDENOISE_7X7;7×7
+TP_DIRPYRDENOISE_9X9;9×9
 TP_DIRPYRDENOISE_ABM;Endast chroma
+TP_DIRPYRDENOISE_AUT;Automatisk global
+TP_DIRPYRDENOISE_AUTO;Automatisk global
 TP_DIRPYRDENOISE_AUTO_TOOLTIP;Försök att utvärdera chroma-bruset\nVar försiktig, den här beräkningen görs på genomsnittet och är tämligen subjektiv!
 TP_DIRPYRDENOISE_BLUE;Krominans - Blå-Gul
+TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Manuell\nVerkar på hela bilden.\nDu kontrollerar brusreduceringen manuellt.\n\nAutomatisk global\nVerkar på hela bilden.\n9 zoner används för att beräkna en global kroma-brusreducering.\n\nFörhandsgranskning\nVerkar på hela bilden.\nDen synliga delen av förhandsgranskningen används för att beräkna en global kroma-brusreducering.
 TP_DIRPYRDENOISE_CCCURVE;Krominans-kurva
 TP_DIRPYRDENOISE_CHROMA;Kroma
 TP_DIRPYRDENOISE_CHROMAFR;Krominans
+TP_DIRPYRDENOISE_CTYPE;Metod
 TP_DIRPYRDENOISE_CUR;Kurva
 TP_DIRPYRDENOISE_CURVEEDITOR_CC;Kroma
+TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Öka (multiplicera) värdet av alla krominansreglage.\nDen här kurvan låter dig justera styrkan för den kromatiska brusreduceringen som en funktion av kromaticit, till exempel för att öka mängden i området med låg mättnad och för att minska det i de områden med hög mättnad.
+TP_DIRPYRDENOISE_CURVEEDITOR_L_TOOLTIP;Modulerar verkan av brusreduceringen för 'Luminans' 
 TP_DIRPYRDENOISE_ENH;Förbättrat läge
 TP_DIRPYRDENOISE_ENH_TOOLTIP;Ökar kvaliteten på brusreduceringen till priset av 20 % längre beräkningstid
 TP_DIRPYRDENOISE_GAMMA;Gamma
@@ -1258,6 +1329,8 @@ TP_DIRPYRDENOISE_LABM;L*a*b*
 TP_DIRPYRDENOISE_LCURVE;Luminans-kurva
 TP_DIRPYRDENOISE_LDETAIL;Luminansdetalj
 TP_DIRPYRDENOISE_LM;Endast luminans
+TP_DIRPYRDENOISE_LPLABM;Viktad L* (litet) + a*b* (normal)
+TP_DIRPYRDENOISE_LTYPE;Luminanskontroll
 TP_DIRPYRDENOISE_LUMA;Luminans
 TP_DIRPYRDENOISE_LUMAFR;Luminans
 TP_DIRPYRDENOISE_MAN;Manuell
@@ -1265,13 +1338,18 @@ TP_DIRPYRDENOISE_MANU;Manuell
 TP_DIRPYRDENOISE_METHOD;Metod
 TP_DIRPYRDENOISE_METHOD11;Kvalitet
 TP_DIRPYRDENOISE_METHOD_TOOLTIP;För råfiler kan antingen RGB- eller Labmetoder användas.\n\nFör icke-råfiler kommer Labmetoden att användas, oavsett vad som är valt.
+TP_DIRPYRDENOISE_NOISELABEL;Förhandsgranska brus: Medel=%1  Hög=%2
+TP_DIRPYRDENOISE_NOISELABELEMPTY;Förhandsgranska brus: Medel= -   Hög= -
+TP_DIRPYRDENOISE_PRE;Förhandsgranska multi-zon
 TP_DIRPYRDENOISE_PREV;Förhandsgranska
+TP_DIRPYRDENOISE_PREVLABEL;Förhandsgranska storlek=%1, Centrum: Px=%2  Py=%3
 TP_DIRPYRDENOISE_RED;Krominans - Röd-Grön
 TP_DIRPYRDENOISE_RGB;RGB
 TP_DIRPYRDENOISE_RGBM;RGB
 TP_DIRPYRDENOISE_SHAL;Standard
 TP_DIRPYRDENOISE_SHALBI;Hög
 TP_DIRPYRDENOISE_SLI;Reglage
+TP_DIRPYRDENOISE_TILELABEL;Tile-storlek=%1, Center: Tx=%2  Ty=%3
 TP_DIRPYREQUALIZER_ALGO;Algoritm för hudtoner
 TP_DIRPYREQUALIZER_ALGO_TOOLTIP;Fin: närmre hudens färger, minimerar inverkan på andra färger\nStor: undvik än mer artefakter
 TP_DIRPYREQUALIZER_ARTIF;Reducera artefakter
@@ -1287,8 +1365,6 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;Vid -100 påverkas hudtoner.\nVid 0 behandlas al
 TP_DIRPYREQUALIZER_THRESHOLD;Tröskelvärde
 TP_DIRPYREQUALIZER_TOOLTIP;Försöker reducera artefakter uppkomna av övergångarna mellan färgerna (nyans, kroma, luminans) på hyn och övriga i bilden
 TP_DISTORTION_AMOUNT;Mängd
-TP_DISTORTION_AUTO;Automatisk distorsionskorrigering
-TP_DISTORTION_AUTO_TIP;(Experimentell) Korrigera automatiskt objektivdistorsion för vissa kameror (M4/3, vissa kompaktkameror, etc.)
 TP_DISTORTION_LABEL;Distorsion
 TP_EPD_EDGESTOPPING;Stoppa vid kanter
 TP_EPD_GAMMA;Gamma
@@ -1321,7 +1397,10 @@ TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptuell
 TP_EXPOSURE_TCMODE_SATANDVALBLENDING;Mättnads- och värdeblandning
 TP_EXPOSURE_TCMODE_STANDARD;Standard
 TP_EXPOSURE_TCMODE_WEIGHTEDSTD;Viktad standard
+TP_EXPOS_BLACKPOINT_LABEL;Svartpunkter, Raw
+TP_EXPOS_WHITEPOINT_LABEL;Vitpunkter, Raw
 TP_FILMSIMULATION_LABEL;Filmsimulering
+TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee är konfigurerad för att leta efter Hald CLUT-bilder, som används för filmsimuleringsverktyget, i en katalog som tar för lång tid att ladda.\nGå till Inställningar > Bildbehandling > Filmsimulering\nför att se vilken katalog som används. Du bör antingen hänvisa till en katalog som enbart innehåller Hald CLUT-bilder, eller till en helt tom katalog om du inte vill använda filmsimuleringsverktyget alls.\n\nLäs artikeln på RawPedia för mer information.\n\nVill du avbryta genomsökningen nu?
 TP_FILMSIMULATION_STRENGTH;Styrka
 TP_FILMSIMULATION_ZEROCLUTSFOUND;Ange katalog för HaldCLUT i Inställningar
 TP_FLATFIELD_AUTOSELECT;Autoval
@@ -1363,8 +1442,10 @@ TP_HSVEQUALIZER_SAT;Mättnad
 TP_HSVEQUALIZER_VAL;Värde
 TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Bas-exponering
 TP_ICM_APPLYHUESATMAP;Bas-tabell
+TP_ICM_APPLYLOOKTABLE_TOOLTIP;Tillämpa den inbäddade DCP:ns uppslagstabell. Inställningen är bara aktiv om den valda DCP har en sådan.
 TP_ICM_BLENDCMSMATRIX;Mixa högdagrar med matris
 TP_ICM_BLENDCMSMATRIX_TOOLTIP;Möjliggör återskapande av utbrända högdagrar när LUT-baserade ICC-profiler används.
+TP_ICM_BPC;Svartpunktskompensation
 TP_ICM_DCPILLUMINANT;Ljuskälla
 TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolerad ljuskälla
 TP_ICM_DCPILLUMINANT_TOOLTIP;Välj vilken inbäddad DCP-ljuskälla som ska användas. Standard är "interpolerad" som är en blandning mellan de två baserad på vitbalans. Valet är endast aktiverat om en DCP från en dubbel ljuskälla med interpoleringsstöd är vald
@@ -1383,7 +1464,6 @@ TP_ICM_INPUTPROFILE;Inmatningsprofil
 TP_ICM_LABEL;Färghantering
 TP_ICM_NOICM;Ingen färghantering: sRGB-utmatning
 TP_ICM_OUTPUTPROFILE;Utmatningsprofil
-TP_ICM_SAVEREFERENCE;Spara referensbild för profilering
 TP_ICM_SAVEREFERENCE_APPLYWB;Applicera witbalans
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generellt sätt gäller att du ska applicera vitbalansen när du sparar bilder för att skapa ICC-profiler, men inte när du ska skapa DCP-profiler.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Spara den linjära TIFF-bilden innan inmatningsprofilen appliceras. Detta kan användas för kalibreringsändamål eller generering av en kameraprofil.
@@ -1436,6 +1516,7 @@ TP_LENSPROFILE_LABEL;Objektivkorrigeringsprofil
 TP_LENSPROFILE_USECA;Korrigera för kromatiska abberationer
 TP_LENSPROFILE_USEDIST;Korrigera distorsion
 TP_LENSPROFILE_USEVIGN;Korrigera vinjettering
+TP_NEUTRAL;Återställ
 TP_NEUTRAL_TIP;Återställ exponeringsreglagen till neutrala värden.\nGäller för samma reglage som autonivåer, oavsett om du använder autonivåer eller ej
 TP_PCVIGNETTE_FEATHER;Fjäder
 TP_PCVIGNETTE_FEATHER_TOOLTIP;Fjäder: 0=enbart kanter, 50=halvvägs till mitten, 100=i mitten
@@ -1457,10 +1538,12 @@ TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Försöker att undertrycka heta pixlar.
 TP_PREPROCESS_LABEL;Förbehandling
 TP_PREPROCESS_LINEDENOISE;Linjärt brusfilter
 TP_PREPROCESS_NO_FOUND;Inga hittade
+TP_PRSHARPENING_LABEL;Skärpning efter storleksförändring
 TP_PRSHARPENING_TOOLTIP;Skärper bilden efter att den storleksförändrats. Fungerar endast när "Lanczos" är valt som storleksändringsmetod. Det är omöjligt att förhandsgranska denna effekt. Se på RawPedia-sidan hur du ska använda verktyget.
 TP_RAWCACORR_AUTO;Reducera automatiskt kromatiska abberationer
 TP_RAWCACORR_CABLUE;Blå
 TP_RAWCACORR_CARED;Röd
+TP_RAWCACORR_CASTR;Styrka
 TP_RAWEXPOS_BLACKS;Svartpunktsnivåer
 TP_RAWEXPOS_BLACK_0;Grön 1 (ledare)
 TP_RAWEXPOS_BLACK_1;Röd
@@ -1481,10 +1564,13 @@ TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Förfining av demosaicing...
 TP_RAW_DMETHOD_TOOLTIP;Notera: IGV och LMMSE är avsedda för bilder där mycket brus förekommer.
 TP_RAW_FALSECOLOR;Falskt färgbortträngningssteg
 TP_RAW_HD;Tröskel
+TP_RAW_HD_TOOLTIP;Lägre värden kommer göra het/dödpixelupptäckning mer aggressiv, men fler skenträffar leder också till fler artefakter. Om du noterar artefakter när du använder detta verktg, så minska tröskelvärdet till dess att de försvinner.
 TP_RAW_LABEL;Demosaicing
 TP_RAW_LMMSEITERATIONS;LMMSE förbättringssteg
 TP_RAW_LMMSE_TOOLTIP;Adderar gamma (steg 1) - adderar median (steg 2,3 och 4), slutligen adderas ett förfiningssteg (steg 5 och 6) för att reducera artefakter och för att förbättra signal/brusförhållandet.
 TP_RAW_SENSOR_BAYER_LABEL;Sensor med Bayer-matris
+TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass ger bäst resultat (rekommenderas för bilder tagna med ett lågt ISO-tal).\n1-pass är nästintill ej urskiljbart från 3-pass för bilder tagna på högre ISO-värden, och är dessutom snabbare.
+TP_RAW_SENSOR_XTRANS_LABEL;Sensor med X-Transteknik
 TP_RESIZE_APPLIESTO;Tillämpas på:
 TP_RESIZE_CROPPEDAREA;Beskuren yta
 TP_RESIZE_FITBOX;Begränsad yta
@@ -1499,6 +1585,63 @@ TP_RESIZE_SCALE;Skala
 TP_RESIZE_SPECIFY;Specificera:
 TP_RESIZE_W;B:
 TP_RESIZE_WIDTH;Bredd
+TP_RETINEX_CONTEDIT_HSL;Histogramequalizer HSL
+TP_RETINEX_CONTEDIT_LAB;Histogramequalizer L*a*b*
+TP_RETINEX_CONTEDIT_LH;Nyans-equalizer
+TP_RETINEX_CURVEEDITOR_CD;L=f(L)
+TP_RETINEX_CURVEEDITOR_LH;Styrka=f(H)
+TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Styrka enligt nyans Styrkan=f(H)\nDen här kurvan agerar även på kroma när "Högdager"-metoden används i retinex
+TP_RETINEX_CURVEEDITOR_MAP;L=f(L)
+TP_RETINEX_EQUAL;Equalizer
+TP_RETINEX_FREEGAMMA;Fri gamma
+TP_RETINEX_GAIN;Ökning
+TP_RETINEX_GAINOFFS;Ökning och kompensation (ljushet)
+TP_RETINEX_GAINTRANSMISSION;Transmissionsökning
+TP_RETINEX_GAMMA;Gamma
+TP_RETINEX_GAMMA_FREE;Fri
+TP_RETINEX_GAMMA_HIGH;Hög
+TP_RETINEX_GAMMA_LOW;Låg
+TP_RETINEX_GAMMA_MID;Mellan
+TP_RETINEX_GAMMA_NONE;Ingen
+TP_RETINEX_GRAD;Överföringsgradient
+TP_RETINEX_GRADS;Styrkegradient
+TP_RETINEX_GRADS_TOOLTIP;Om reglaget är på 0 så kommer alla iterationer att vara lika.\nOm > 0 så kommer styrkan att reduceras i takt med att iterationerna ökar och omvänt.
+TP_RETINEX_GRAD_TOOLTIP;Om reglaget är på 0 så kommer alla iterationer att vara lika.\nOm > 0 så kommer variansen och tröskelvärdet att reduceras i takt med att iterationerna ökar och omvänt.
+TP_RETINEX_HIGH;Hög
+TP_RETINEX_HIGHLIG;Högdagrar
+TP_RETINEX_HIGHLIGHT;Tröskelvärde för högdagrar
+TP_RETINEX_HSLSPACE_LIN;HSL-linjär
+TP_RETINEX_HSLSPACE_LOG;HSL-logaritmisk
+TP_RETINEX_ITER;Iterationer (Tone-mapping)
+TP_RETINEX_ITERF;Tone-mapping
+TP_RETINEX_ITER_TOOLTIP;Simulera en tone-mappingoperator.\nHöga värden ökar processtiden.
+TP_RETINEX_LABEL;Retinex
+TP_RETINEX_LABSPACE;L*a*b*
+TP_RETINEX_LOW;Låg
+TP_RETINEX_MAP_NONE;Ingen
+TP_RETINEX_METHOD;Metod
+TP_RETINEX_NEIGHBOR;Radie
+TP_RETINEX_NEUTRAL;Återställ
+TP_RETINEX_NEUTRAL_TIP;Återställer alla reglage och kurvor till sina ursprungliga värden.
+TP_RETINEX_OFFSET;Kompensation (ljushet)
+TP_RETINEX_SCALES;Gaussisk gradient
+TP_RETINEX_SCALES_TOOLTIP;Om reglaget är på 0 så kommer alla iterationer att vara lika.\nOm > 0 så kommer skalan och radien reduceras när iterationerna ökar och omvänt.
+TP_RETINEX_SETTINGS;Inställningar
+TP_RETINEX_SKAL;Sakal
+TP_RETINEX_SLOPE;Lutning, fri gamma
+TP_RETINEX_STRENGTH;Styrka
+TP_RETINEX_THRESHOLD;Tröskelvärde
+TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Medel=%3 Sigma=%4
+TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2
+TP_RETINEX_TRANF;Överföring
+TP_RETINEX_UNIFORM;Uniform
+TP_RETINEX_VARIANCE;Kontrast
+TP_RETINEX_VARIANCE_TOOLTIP;Låga variationer ökar lokal kontrast och mättnad men kan leda till artefakter.
+TP_RETINEX_VIEW;Process
+TP_RETINEX_VIEW_NONE;Standard
+TP_RETINEX_VIEW_TRAN;Överföring - Auto
+TP_RETINEX_VIEW_TRAN2;Överföring - Fixerad
+TP_RETINEX_VIEW_UNSHARP;Oskarp mask
 TP_RGBCURVES_BLUE;B
 TP_RGBCURVES_CHANNEL;Kanal
 TP_RGBCURVES_GREEN;G
@@ -1591,12 +1734,32 @@ TP_WAVELET_BASLI;Reglage
 TP_WAVELET_BATYPE;Kontrast-balans-metod
 TP_WAVELET_CCURVE;Lokal kontrast
 TP_WAVELET_CH1;Hela kromaomfånget
+TP_WAVELET_CH2;Mättad/pastell
 TP_WAVELET_CH3;Koppla kontrastnivåer
 TP_WAVELET_CHCU;Kurva
+TP_WAVELET_CHR;Styrkan i kopplingen mellan kroma och kontrast
+TP_WAVELET_CHRO;Mättad/pastell - tröskelvärde
 TP_WAVELET_CHSL;Reglage
 TP_WAVELET_CHTYPE;Krominans-metod
 TP_WAVELET_COLORT;Opacitet rött-grönt
 TP_WAVELET_COMPCONT;Kontrast
+TP_WAVELET_COMPGAMMA;Komprimering av gamma
+TP_WAVELET_COMPGAMMA_TOOLTIP;Justering av gammat i den återstående bilden låter dig jämna ut datat och histogrammet.
+TP_WAVELET_COMPTM;Tone-mapping
+TP_WAVELET_CONTEDIT;'Efter' kontrastkurvan
+TP_WAVELET_CONTR;Tonomfång
+TP_WAVELET_CONTRA;Kontrast
+TP_WAVELET_CONTRAST_MINUS;Kontrast -
+TP_WAVELET_CONTRAST_PLUS;Kontrast +
+TP_WAVELET_CONTRA_TOOLTIP;Ändrar kontrast i den återstående bilden.
+TP_WAVELET_CTYPE;Kontroll av krominans
+TP_WAVELET_CURVEEDITOR_CH;Kontrastnivåer=f(Nyans)
+TP_WAVELET_CURVEEDITOR_CL;L
+TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applicerar en kontrastbaserad luminanskurva vid slitet av waveletbehandlingen.
+TP_WAVELET_CURVEEDITOR_HH;HH
+TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Ändrar den återstående bildens nyans som en funktion av nyansen.
+TP_WAVELET_DALL;Alla riktningar
+TP_WAVELET_DAUB;Kantprestanda
 TP_WAVELET_DAUB2;D2 - låg
 TP_WAVELET_DAUB4;D4 - standard
 TP_WAVELET_DAUB6;D6 - standard plus
@@ -1607,11 +1770,19 @@ TP_WAVELET_DTHR;Diagonal
 TP_WAVELET_DTWO;Horisontell
 TP_WAVELET_EDCU;Kurva
 TP_WAVELET_EDGCONT;Lokal kontrast
+TP_WAVELET_EDGE;Kantskärpa
 TP_WAVELET_EDGEAMPLI;Basförstärkning
+TP_WAVELET_EDGEDETECT;Känslighet för gradient
+TP_WAVELET_EDGEDETECTTHR_TOOLTIP;Det här reglaget siktar in sig på kantdetektering, t ex för att undvika att kantskärpning appliceras på fina detaljer så som brus i himlen.
+TP_WAVELET_EDGEDETECT_TOOLTIP;Att flytta reglaget till höger ökar kantkänsligheten. Detta påverkar den lokala kontrasten, kantinställningarna och bruset.
+TP_WAVELET_EDGESENSI;Kantkänslighet
+TP_WAVELET_EDGTHRESH;Detalj
 TP_WAVELET_EDRAD;Radie
 TP_WAVELET_EDSL;Tröskelreglage
 TP_WAVELET_EDTYPE;Lokal kontrast-metod
 TP_WAVELET_EDVAL;Styrka
+TP_WAVELET_FINAL;Slutlig förbättring
+TP_WAVELET_FINEST;Finast
 TP_WAVELET_HS2;Skuggor/Högdagrar
 TP_WAVELET_HUESKIN;Hudnyans
 TP_WAVELET_HUESKY;Himmelsnyans
@@ -1619,7 +1790,10 @@ TP_WAVELET_LABEL;Wavelet-nivåer
 TP_WAVELET_LARGEST;Grövst
 TP_WAVELET_LEVCH;Kroma
 TP_WAVELET_LEVDIR_ALL;Alla nivåer i en riktning
+TP_WAVELET_LEVDIR_INF;Under eller lika med nivån
 TP_WAVELET_LEVDIR_ONE;En nivå
+TP_WAVELET_LEVDIR_SUP;Över nivån
+TP_WAVELET_LEVELS;Waveletnivåer
 TP_WAVELET_LEVF;Kontrast
 TP_WAVELET_LEVONE;Nivå 2
 TP_WAVELET_LEVTHRE;Nivå 4
@@ -1627,13 +1801,16 @@ TP_WAVELET_LEVTWO;Nivå 3
 TP_WAVELET_LEVZERO;Nivå 1
 TP_WAVELET_LIPST;Förbättrad algoritm
 TP_WAVELET_MEDGREINF;Första nivån
+TP_WAVELET_MEDI;Reducera artefakter i blå himmel
 TP_WAVELET_MEDILEV;Kantdetektering
 TP_WAVELET_NEUTRAL;Neutral
 TP_WAVELET_NOIS;Brusreducering
+TP_WAVELET_NOISE;Brusreducera och förfina
 TP_WAVELET_NPHIGH;Hög
 TP_WAVELET_NPLOW;Låg
 TP_WAVELET_NPNONE;Ingen
 TP_WAVELET_NPTYPE;Angränsande pixlar
+TP_WAVELET_OPACITYWL;Slutlig lokal kontrast
 TP_WAVELET_PROC;Process
 TP_WAVELET_RE1;Förstärkt
 TP_WAVELET_RE2;Oförändrad
@@ -1651,7 +1828,12 @@ TP_WAVELET_THR;Skuggtröskel
 TP_WAVELET_THRESHOLD;Högdagernivåer
 TP_WAVELET_THRESHOLD2;Skuggnivåer
 TP_WAVELET_THRH;Högdagertröskel
+TP_WAVELET_TILESBIG;Stora tiles
 TP_WAVELET_TILESFULL;Hela bilden
+TP_WAVELET_TILESIZE;Metod för tiling
+TP_WAVELET_TILESLIT;SMå tiles
+TP_WAVELET_TMSTRENGTH;Komprimeringsstyrka
+TP_WAVELET_TMTYPE;Komprimeringsmetod
 TP_WBALANCE_AUTO;Auto
 TP_WBALANCE_CAMERA;Kamera
 TP_WBALANCE_CLOUDY;Molnigt
@@ -1713,34 +1895,16 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !CURVEEDITOR_AXIS_LEFT_TAN;LT:
 !CURVEEDITOR_AXIS_RIGHT_TAN;RT:
 !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
-!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
-!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
-!GENERAL_APPLY;Apply
-!GENERAL_OPEN;Open
-!HISTORY_MSG_166;Exposure - Reset
-!HISTORY_MSG_256;NR - Median type
 !HISTORY_MSG_257;Color Toning
-!HISTORY_MSG_259;CT - Opacity curve
-!HISTORY_MSG_260;CT - a*[b*] opacity
-!HISTORY_MSG_262;CT - b* opacity
 !HISTORY_MSG_288;Flat Field - Clip control
 !HISTORY_MSG_289;Flat Field - Clip control - Auto
-!HISTORY_MSG_301;NR - Luma control
 !HISTORY_MSG_310;W - Residual - Sky tar/prot
 !HISTORY_MSG_313;W - Chroma - Sat/past
 !HISTORY_MSG_316;W - Gamut - Skin tar/prot
 !HISTORY_MSG_329;W - Toning - Opacity RG
 !HISTORY_MSG_330;W - Toning - Opacity BY
-!HISTORY_MSG_332;W - Tiling method
-!HISTORY_MSG_341;W - Edge performance
 !HISTORY_MSG_344;W - Meth chroma sl/cur
 !HISTORY_MSG_353;W - ES - Gradient sensitivity
-!HISTORY_MSG_361;W - Final - Chroma balance
-!HISTORY_MSG_364;W - Final - Contrast balance
-!HISTORY_MSG_365;W - Final - Delta balance
-!HISTORY_MSG_368;W - Final - Contrast balance
-!HISTORY_MSG_369;W - Final - Balance method
-!HISTORY_MSG_370;W - Final - Local contrast curve
 !HISTORY_MSG_393;DCP - Look table
 !HISTORY_MSG_396;W - Contrast sub-tool
 !HISTORY_MSG_397;W - Chroma sub-tool
@@ -1750,277 +1914,124 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_401;W - Toning sub-tool
 !HISTORY_MSG_402;W - Denoise sub-tool
 !HISTORY_MSG_406;W - ES - Neighboring pixels
-!HISTORY_MSG_407;Retinex - Method
-!HISTORY_MSG_408;Retinex - Radius
-!HISTORY_MSG_409;Retinex - Contrast
-!HISTORY_MSG_410;Retinex - Offset
-!HISTORY_MSG_411;Retinex - Strength
 !HISTORY_MSG_412;Retinex - Gaussian Gradient
-!HISTORY_MSG_413;Retinex - Contrast
-!HISTORY_MSG_414;Retinex - Histogram - Lab
-!HISTORY_MSG_415;Retinex - Transmission
-!HISTORY_MSG_416;Retinex
-!HISTORY_MSG_417;Retinex - Transmission Median
-!HISTORY_MSG_418;Retinex - Threshold
-!HISTORY_MSG_419;Retinex - Color space
-!HISTORY_MSG_420;Retinex - Histogram - HSL
-!HISTORY_MSG_421;Retinex - Gamma
-!HISTORY_MSG_422;Retinex - Gamma
-!HISTORY_MSG_423;Retinex - Gamma slope
-!HISTORY_MSG_424;Retinex - HL threshold
 !HISTORY_MSG_425;Retinex - Log base
-!HISTORY_MSG_426;Retinex - Hue equalizer
 !HISTORY_MSG_427;Output rendering intent
 !HISTORY_MSG_428;Monitor rendering intent
-!HISTORY_MSG_429;Retinex - Iterations
-!HISTORY_MSG_430;Retinex - Transmission Gradient
-!HISTORY_MSG_431;Retinex - Strength Gradient
-!HISTORY_MSG_432;Retinex - M - Highlights
-!HISTORY_MSG_433;Retinex - M - Highlights TW
-!HISTORY_MSG_434;Retinex - M - Shadows
-!HISTORY_MSG_435;Retinex - M - Shadows TW
-!HISTORY_MSG_436;Retinex - M - Radius
-!HISTORY_MSG_437;Retinex - M - Method
-!HISTORY_MSG_438;Retinex - M - Equalizer
-!HISTORY_MSG_439;Retinex - Process
-!HISTORY_MSG_440;CbDL - Method
-!HISTORY_MSG_441;Retinex - Gain transmission
-!HISTORY_MSG_442;Retinex - Scale
-!HISTORY_MSG_443;Output Black Point Compensation
-!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
-!MONITOR_PROFILE_SYSTEM;System default
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !PARTIALPASTE_COLORTONING;Color toning
 !PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
-!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
-!PARTIALPASTE_RETINEX;Retinex
-!PREFERENCES_GREY;Output device's Yb luminance (%)
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP;Set the maximum number of images stored in cache when hovering over them in the File Browser; systems with little RAM (2GB) should keep this value set to 1 or 2.
-!PREFERENCES_LEVDN;Cell size
 !PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
-!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
-!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
-!PREFERENCES_PROFILE_NONE;None
-!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!SAVEDLG_SUBSAMP;Subsampling
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
-!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
-!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
-!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen enabled:\nClick in the preview with left mouse button to add a color picker\nDrag it around while pressing the left mouse button\nDelete the color picker with a right mouse button click\nDelete all color pickers with Shift + Right mouse button click\nRight click away from any color picker to go back to the Hand tool
-!TP_CBDL_AFT;After Black-and-White
-!TP_CBDL_BEF;Before Black-and-White
 !TP_CBDL_METHOD;Process located
-!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space.
-!TP_COLORAPP_LABEL;CIE Color Appearance Model 2002
 !TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Chroma opacity as a function of luminance oC=f(L)
-!TP_COLORTONING_LAB;L*a*b* blending
 !TP_COLORTONING_LABEL;Color Toning
 !TP_COLORTONING_METHOD_TOOLTIP;"L*a*b* blending", "RGB sliders" and "RGB curves" use interpolated color blending.\n"Color balance (Shadows/Midtones/Highlights)" and "Saturation 2 colors" use direct colors.\n\nThe Black-and-White tool can be enabled when using any color toning method, which allows for color toning.
-!TP_COLORTONING_SA;Saturation Protection
-!TP_COLORTONING_SPLITLR;Saturation 2 colors
-!TP_COLORTONING_TWO2;Special chroma '2 colors'
-!TP_COLORTONING_TWOALL;Special chroma
-!TP_COLORTONING_TWOBY;Special a* and b*
 !TP_COLORTONING_TWOCOLOR_TOOLTIP;Standard chroma:\nLinear response, a* = b*.\n\nSpecial chroma:\nLinear response, a* = b*, but unbound - try under the diagonal.\n\nSpecial a* and b*:\nLinear response unbound with separate curves for a* and b*. Intended for special effects.\n\nSpecial chroma 2 colors:\nMore predictable.
-!TP_DIRPYRDENOISE_3X3;3×3
-!TP_DIRPYRDENOISE_3X3_SOFT;3×3 soft
-!TP_DIRPYRDENOISE_5X5;5×5
-!TP_DIRPYRDENOISE_5X5_SOFT;5×5 soft
-!TP_DIRPYRDENOISE_7X7;7×7
-!TP_DIRPYRDENOISE_9X9;9×9
-!TP_DIRPYRDENOISE_AUT;Automatic global
-!TP_DIRPYRDENOISE_AUTO;Automatic global
-!TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings.
-!TP_DIRPYRDENOISE_CTYPE;Method
 !TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nAutomatic multi-zones\nNo preview - works only during saving, but using the "Preview" method by matching the tile size and center to the preview size and center you can get an idea of the expected results.\nThe image is divided into tiles (about 10 to 70 depending on image size) and each tile receives its own chrominance noise reduction settings.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings.
-!TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Increase (multiply) the value of all chrominance sliders.\nThis curve lets you adjust the strength of chromatic noise reduction as a function of chromaticity, for instance to increase the action in areas of low saturation and to decrease it in those of high saturation.
-!TP_DIRPYRDENOISE_CURVEEDITOR_L_TOOLTIP;Modulates action of 'Luminance' denoise
-!TP_DIRPYRDENOISE_LPLABM;Weighted L* (little) + a*b* (normal)
-!TP_DIRPYRDENOISE_LTYPE;Luminance control
 !TP_DIRPYRDENOISE_MED;Median Filter
 !TP_DIRPYRDENOISE_MEDMETHOD;Median method
 !TP_DIRPYRDENOISE_MEDTYPE;Median type
 !TP_DIRPYRDENOISE_METHOD11_TOOLTIP;Quality can be adapted to the noise pattern. A setting of "high" increases the noise reduction effect at a cost of extended processing time.
 !TP_DIRPYRDENOISE_METM_TOOLTIP;When using the "Luminance only" and "L*a*b*" methods, median filtering will be performed just after the wavelet step in the noise reduction pipeline.\nWhen using the "RGB" mode, it will be performed at the very end of the noise reduction pipeline.
 !TP_DIRPYRDENOISE_MET_TOOLTIP;Apply a median filter of the desired window size. The larger the window's size, the longer it takes.\n\n3×3 soft: treats 5 pixels in a 3×3 pixel window.\n3×3: treats 9 pixels in a 3×3 pixel window.\n5×5 soft: treats 13 pixels in a 5×5 pixel window.\n5×5: treats 25 pixels in a 5×5 pixel window.\n7×7: treats 49 pixels in a 7×7 pixel window.\n9×9: treats 81 pixels in a 9×9 pixel window.\n\nSometimes it is possible to achieve higher quality running several iterations with a smaller window size than one iteration with a larger one.
-!TP_DIRPYRDENOISE_NOISELABEL;Preview noise: Mean=%1  High=%2
-!TP_DIRPYRDENOISE_NOISELABELEMPTY;Preview noise: Mean= -   High= -
 !TP_DIRPYRDENOISE_NRESID_TOOLTIP;Displays the remaining noise levels of the part of the image visible in the <b>preview</b> after wavelet.\n\n>300 Very noisy\n100-300 Noisy\n50-100 A little noisy\n<50 Very low noise\n\nBeware, the values will differ between RGB and L*a*b* mode. The RGB values are less accurate because the RGB mode does not completely separate luminance and chrominance.
 !TP_DIRPYRDENOISE_PASSES;Median iterations
 !TP_DIRPYRDENOISE_PASSES_TOOLTIP;Applying three median filter iterations with a 3×3 window size often leads to better results than using one median filter iteration with a 7×7 window size.
 !TP_DIRPYRDENOISE_PON;Auto multi-zones
-!TP_DIRPYRDENOISE_PRE;Preview multi-zones
-!TP_DIRPYRDENOISE_PREVLABEL;Preview size=%1, Center: Px=%2  Py=%3
-!TP_DIRPYRDENOISE_TILELABEL;Tile size=%1, Center: Tx=%2  Ty=%3
 !TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;This pyramid is for the upper part, so far as the algorithm at its maximum efficiency.\nTo the lower part, the transition zones.\nIf you need to move the area significantly to the left or right - or if there are artifacts: the <b>white balance is incorrect</b>\nYou can slightly reduce the zone to prevent the rest of the image is affected.
-!TP_EXPOS_BLACKPOINT_LABEL;Raw Black Points
-!TP_EXPOS_WHITEPOINT_LABEL;Raw White Points
-!TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_FLATFIELD_CLIPCONTROL;Clip control
 !TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Clip control avoids clipped highlights caused by applying the flat field. If there are already clipped highlights before applying the flat field, clip control can lead to color cast.
 !TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Employ the embedded DCP baseline exposure offset. The setting is only enabled if the selected DCP has any.
 !TP_ICM_APPLYHUESATMAP_TOOLTIP;Employ the embedded DCP base table (HueSatMap). The setting is only enabled if the selected DCP has one.
 !TP_ICM_APPLYLOOKTABLE;Look table
-!TP_ICM_APPLYLOOKTABLE_TOOLTIP;Employ the embedded DCP look table. The setting is only enabled if the selected DCP has one.
-!TP_ICM_BPC;Black Point Compensation
 !TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
 !TP_ICM_PROFILEINTENT;Rendering Intent
-!TP_NEUTRAL;Reset
-!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
-!TP_RAWCACORR_CASTR;Strength
-!TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear.
-!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
-!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
-!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
-!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
-!TP_RETINEX_CONTEDIT_LH;Hue equalizer
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_RETINEX_CONTEDIT_MAP;Mask equalizer
-!TP_RETINEX_CURVEEDITOR_CD;L=f(L)
 !TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
-!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
-!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
-!TP_RETINEX_CURVEEDITOR_MAP;L=f(L)
 !TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts!
-!TP_RETINEX_EQUAL;Equalizer
-!TP_RETINEX_FREEGAMMA;Free gamma
-!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAINOFFS;Gain and Offset (brightness)
-!TP_RETINEX_GAINTRANSMISSION;Gain transmission
 !TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce transmission map to achieve luminance.\nAbscissa: transmission -min from 0, mean, and values (max).\nOrdinate: gain.
 !TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Gamma
-!TP_RETINEX_GAMMA_FREE;Free
-!TP_RETINEX_GAMMA_HIGH;High
-!TP_RETINEX_GAMMA_LOW;Low
-!TP_RETINEX_GAMMA_MID;Middle
-!TP_RETINEX_GAMMA_NONE;None
 !TP_RETINEX_GAMMA_TOOLTIP;Restore tones by applying gamma before and after Retinex. Different from Retinex curves or others curves (Lab, Exposure, etc.).
-!TP_RETINEX_GRAD;Transmission gradient
-!TP_RETINEX_GRADS;Strength gradient
-!TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely.
-!TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Variance and Threshold are reduced when iterations increase, and conversely.
-!TP_RETINEX_HIGH;High
-!TP_RETINEX_HIGHLIG;Highlight
-!TP_RETINEX_HIGHLIGHT;Highlight threshold
 !TP_RETINEX_HIGHLIGHT_TOOLTIP;Increase action of High algorithm.\nMay require you to re-adjust "Neighboring pixels" and to increase the "White-point correction" in the Raw tab -> Raw White Points tool.
-!TP_RETINEX_HSLSPACE_LIN;HSL-Linear
-!TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmic
-!TP_RETINEX_ITER;Iterations (Tone-mapping)
-!TP_RETINEX_ITERF;Tone mapping
-!TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time.
-!TP_RETINEX_LABEL;Retinex
 !TP_RETINEX_LABEL_MASK;Mask
-!TP_RETINEX_LABSPACE;L*a*b*
-!TP_RETINEX_LOW;Low
 !TP_RETINEX_MAP;Mask method
 !TP_RETINEX_MAP_GAUS;Gaussian mask
 !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial)
 !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total)
 !TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above (Radius, Method) to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow.
-!TP_RETINEX_MAP_NONE;None
 !TP_RETINEX_MEDIAN;Transmission median filter
-!TP_RETINEX_METHOD;Method
 !TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light.\nUniform = Equalize action.\nHigh = Reinforce high light.\nHighlights = Remove magenta in highlights.
 !TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
 !TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
-!TP_RETINEX_NEIGHBOR;Radius
-!TP_RETINEX_NEUTRAL;Reset
-!TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values.
-!TP_RETINEX_OFFSET;Offset (brightness)
-!TP_RETINEX_SCALES;Gaussian gradient
-!TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and radius are reduced when iterations increase, and conversely.
-!TP_RETINEX_SETTINGS;Settings
-!TP_RETINEX_SKAL;Scale
-!TP_RETINEX_SLOPE;Free gamma slope
-!TP_RETINEX_STRENGTH;Strength
-!TP_RETINEX_THRESHOLD;Threshold
 !TP_RETINEX_THRESHOLD_TOOLTIP;Limits in/out.\nIn = image source,\nOut = image gauss.
-!TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4
-!TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2
 !TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma.\nTm=Min TM=Max of transmission map.
-!TP_RETINEX_TRANF;Transmission
 !TP_RETINEX_TRANSMISSION;Transmission map
 !TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction.
-!TP_RETINEX_UNIFORM;Uniform
-!TP_RETINEX_VARIANCE;Contrast
-!TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts.
-!TP_RETINEX_VIEW;Process
 !TP_RETINEX_VIEW_MASK;Mask
 !TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normal display.\nMask -  Displays the mask.\nUnsharp mask - Displays the image with a high radius unsharp mask.\nTransmission - Auto/Fixed - Displays the file transmission-map, before any action on contrast and brightness.\n\nAttention: the mask does not correspond to reality, but is amplified to make it more visible.
-!TP_RETINEX_VIEW_NONE;Standard
-!TP_RETINEX_VIEW_TRAN;Transmission - Auto
-!TP_RETINEX_VIEW_TRAN2;Transmission - Fixed
-!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
 !TP_WAVELET_CBENAB;Toning and Color Balance
 !TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted
-!TP_WAVELET_CH2;Saturated/pastel
-!TP_WAVELET_CHR;Chroma-contrast link strength
-!TP_WAVELET_CHRO;Saturated/pastel threshold
 !TP_WAVELET_CHRO_TOOLTIP;Sets the wavelet level which will be the threshold between saturated and pastel colors.\n1-x: saturated\nx-9: pastel\n\nIf the value exceeds the amount of wavelet levels you are using then it will be ignored.
 !TP_WAVELET_CHR_TOOLTIP;Adjusts chroma as a function of "contrast levels" and "chroma-contrast link strength"
-!TP_WAVELET_COMPGAMMA;Compression gamma
-!TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
-!TP_WAVELET_COMPTM;Tone mapping
-!TP_WAVELET_CONTEDIT;'After' contrast curve
-!TP_WAVELET_CONTR;Gamut
-!TP_WAVELET_CONTRA;Contrast
-!TP_WAVELET_CONTRAST_MINUS;Contrast -
-!TP_WAVELET_CONTRAST_PLUS;Contrast +
-!TP_WAVELET_CONTRA_TOOLTIP;Changes contrast of the residual image.
-!TP_WAVELET_CTYPE;Chrominance control
 !TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifies local contrast as a function of the original local contrast (abscissa).\nLow abscissa values represent small local contrast (real values about 10..20).\n50% abscissa represents average local contrast (real value about 100..300).\n66% abscissa represents standard deviation of local contrast (real value about 300..800).\n100% abscissa represents maximum local contrast (real value about 3000..8000).
-!TP_WAVELET_CURVEEDITOR_CH;Contrast levels=f(Hue)
 !TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifies each level's contrast as a function of hue.\nTake care not to overwrite changes made with the Gamut sub-tool's hue controls.\nThe curve will only have an effect when wavelet contrast level sliders are non-zero.
-!TP_WAVELET_CURVEEDITOR_CL;L
-!TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applies a final contrast luminance curve at the end of the wavelet treatment.
-!TP_WAVELET_CURVEEDITOR_HH;HH
-!TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifies the residual image's hue as a function of hue.
-!TP_WAVELET_DALL;All directions
-!TP_WAVELET_DAUB;Edge performance
 !TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses.
 !TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
-!TP_WAVELET_EDGE;Edge Sharpness
-!TP_WAVELET_EDGEDETECT;Gradient sensitivity
 !TP_WAVELET_EDGEDETECTTHR;Threshold low (noise)
 !TP_WAVELET_EDGEDETECTTHR2;Threshold high (detection)
-!TP_WAVELET_EDGEDETECTTHR_TOOLTIP;This adjuster lets you target edge detection for example to avoid applying edge sharpness to fine details, such as noise in the sky.
-!TP_WAVELET_EDGEDETECT_TOOLTIP;Moving the slider to the right increases edge sensitivity. This affects local contrast, edge settings and noise.
-!TP_WAVELET_EDGESENSI;Edge sensitivity
 !TP_WAVELET_EDGREINF_TOOLTIP;Reinforce or reduce the action of the first level, do the opposite to the second level, and leave the rest unchanged.
-!TP_WAVELET_EDGTHRESH;Detail
 !TP_WAVELET_EDGTHRESH_TOOLTIP;Change the repartition between the first levels and the others. The higher the threshold the more the action is centred on the first levels. Be careful with negative values, they increase the action of high levels and can introduce artifacts.
 !TP_WAVELET_EDRAD_TOOLTIP;This radius adjustment is very different from those in other sharpening tools. Its value is compared to each level through a complex function. In this sense, a value of zero still has an effect.
-!TP_WAVELET_FINAL;Final Touchup
-!TP_WAVELET_FINEST;Finest
 !TP_WAVELET_HIGHLIGHT;Highlight luminance range
 !TP_WAVELET_HS1;Whole luminance range
 !TP_WAVELET_HUESKIN_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the <b>white balance is incorrect</b>.
 !TP_WAVELET_HUESKY_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the <b>white balance is incorrect</b>.
 !TP_WAVELET_ITER;Delta balance levels
 !TP_WAVELET_ITER_TOOLTIP;Left: increase low levels and reduce high levels,\nRight: reduce low levels and increase high levels.
-!TP_WAVELET_LEVDIR_INF;Below or equal the level
-!TP_WAVELET_LEVDIR_SUP;Above the level
-!TP_WAVELET_LEVELS;Wavelet levels
 !TP_WAVELET_LEVELS_TOOLTIP;Choose the number of detail levels the image is to be decomposed into. More levels require more RAM and require a longer processing time.
 !TP_WAVELET_LEVLABEL;Preview maximum possible levels = %1
 !TP_WAVELET_LINKEDG;Link with Edge Sharpness' Strength
 !TP_WAVELET_LOWLIGHT;Shadow luminance range
-!TP_WAVELET_MEDI;Reduce artifacts in blue sky
 !TP_WAVELET_MEDILEV_TOOLTIP;When you enable Edge Detection, it is recommanded:\n- to disabled low contrast levels to avoid artifacts,\n- to use high values of gradient sensitivity.\n\nYou can modulate the strength with 'refine' from Denoise and Refine.
-!TP_WAVELET_NOISE;Denoise and Refine
 !TP_WAVELET_NPTYPE_TOOLTIP;This algorithm uses the proximity of a pixel and eight of its neighbors. If less difference, edges are reinforced.
 !TP_WAVELET_OPACITY;Opacity Blue-Yellow
 !TP_WAVELET_OPACITYW;Contrast balance d/v-h curve
-!TP_WAVELET_OPACITYWL;Final local contrast
 !TP_WAVELET_OPACITYWL_TOOLTIP;Modify the final local contrast at the end of the wavelet treatment.\n\nThe left side represents the smallest local contrast, progressing to the largest local contrast on the right.
 !TP_WAVELET_PASTEL;Pastel chroma
 !TP_WAVELET_SKIN;Skin targetting/protection
@@ -2029,11 +2040,6 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_WAVELET_SKY_TOOLTIP;At -100 sky-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 sky-tones are protected while all other tones are affected.
 !TP_WAVELET_THRESHOLD2_TOOLTIP;Only levels between 9 and 9 minus the value will be affected by the shadow luminance range. Other levels will be fully treated. The highest level possible is limited by the highlight level value (9 minus highlight level value).
 !TP_WAVELET_THRESHOLD_TOOLTIP;Only levels beyond the chosen value will be affected by the highlight luminance range. Other levels will be fully treated. The chosen value here limits the highest possible value of the shadow levels.
-!TP_WAVELET_TILESBIG;Big tiles
-!TP_WAVELET_TILESIZE;Tiling method
-!TP_WAVELET_TILESLIT;Little tiles
 !TP_WAVELET_TILES_TOOLTIP;Processing the full image leads to better quality and is the recommended option, while using tiles is a fall-back solution for users with little RAM. Refer to RawPedia for memory requirements.
-!TP_WAVELET_TMSTRENGTH;Compression strength
 !TP_WAVELET_TMSTRENGTH_TOOLTIP;Control the strength of tone mapping or contrast compression of the residual image. When the value is different from 0, the Strength and Gamma sliders of the Tone Mapping tool in the Exposure tab will become grayed out.
-!TP_WAVELET_TMTYPE;Compression method
 !TP_WAVELET_TON;Toning
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index efb0a6d9f..2e64516f1 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -170,47 +170,23 @@ HISTORY_MSG_81;Resize enabled
 HISTORY_NEWSNAPSHOT;Yeni şipşak
 HISTORY_SNAPSHOT;Şipşak
 HISTORY_SNAPSHOTS;Şipşaklar
-IPTCPANEL_AUTHOR;Author
-IPTCPANEL_AUTHORSPOSITION;Author's position
-IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-IPTCPANEL_CAPTION;Caption
-IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Caption Writer
-IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor).
 IPTCPANEL_CATEGORY;Category
-IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
 IPTCPANEL_CITY;City
-IPTCPANEL_CITYHINT;City of image origin (City).
 IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
 IPTCPANEL_COUNTRY;Country
-IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
 IPTCPANEL_CREDIT;Credit
 IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
 IPTCPANEL_DATECREATED;Date Created
-IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: JJJJMMTT (Date Created).
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file
 IPTCPANEL_HEADLINE;Headline
-IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
 IPTCPANEL_KEYWORDS;Keywords
-IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
 IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Reset to profile default
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. Categories
-IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
 IPTCPANEL_TITLE;Title
-IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. Reference
-IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
 MAIN_BUTTON_PREFERENCES;Seçenekler
 MAIN_BUTTON_SAVE;Görüntüyü kaydet
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
@@ -397,7 +373,6 @@ TP_ICM_INPUTPROFILE;Girdi Profili
 TP_ICM_LABEL;ICM
 TP_ICM_NOICM;No ICM: sRGB çıktı
 TP_ICM_OUTPUTPROFILE;Çıktı profili
-TP_ICM_SAVEREFERENCE;Save reference image for profiling
 TP_ICM_WORKINGPROFILE;Çalışma profili
 TP_RAW_DMETHOD;Yöntem
 TP_RAW_FALSECOLOR;Hatalı-renk bastırma değerleri
@@ -956,6 +931,31 @@ TP_WBALANCE_TEMPERATURE;Isı
 !HISTORY_MSG_442;Retinex - Scale
 !HISTORY_MSG_443;Output Black Point Compensation
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
+!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
+!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
+!IPTCPANEL_COPYRIGHT;Copyright notice
+!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
+!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+!IPTCPANEL_CREATOR;Creator
+!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+!IPTCPANEL_CREATORJOBTITLE;Creator's job title
+!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+!IPTCPANEL_DESCRIPTION;Description
+!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+!IPTCPANEL_DESCRIPTIONWRITER;Description writer
+!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
+!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
+!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
+!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
+!IPTCPANEL_PROVINCE;Province or state
+!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
+!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+!IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
+!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+!IPTCPANEL_TRANSREFERENCE;Job ID
+!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 !MAIN_BUTTON_FULLSCREEN;Fullscreen
 !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -1088,6 +1088,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 !PREFERENCES_CLUTSDIR;HaldCLUT directory
+!PREFERENCES_CMMBPC;Black point compensation
 !PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 !PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 !PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -1123,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_FLUOF2;Fluorescent F2
 !PREFERENCES_FLUOF7;Fluorescent F7
 !PREFERENCES_FLUOF11;Fluorescent F11
-!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_GREY05;Yb=05 CIE L#30
@@ -1159,9 +1160,10 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MIN;Mini (100x115)
-!PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-!PREFERENCES_MONINTENT;Default monitor intent
-!PREFERENCES_MONPROFILE;Default monitor profile
+!PREFERENCES_MONINTENT;Default rendering intent
+!PREFERENCES_MONITOR;Monitor
+!PREFERENCES_MONPROFILE;Default color profile
+!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 !PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1177,8 +1179,11 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_PREVDEMO_FAST;Fast
 !PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 !PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+!PREFERENCES_PRINTER;Printer (Soft-Proofing)
 !PREFERENCES_PROFILE_NONE;None
 !PREFERENCES_PROPERTY;Property
+!PREFERENCES_PRTINTENT;Rendering intent
+!PREFERENCES_PRTPROFILE;Color profile
 !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 !PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
@@ -1512,8 +1517,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
 !TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
-!TP_DISTORTION_AUTO;Auto Distortion Correction
-!TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 !TP_EPD_EDGESTOPPING;Edge stopping
 !TP_EPD_GAMMA;Gamma
 !TP_EPD_LABEL;Tone Mapping
@@ -1597,6 +1601,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !TP_ICM_INPUTNONE;No profile
 !TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
 !TP_ICM_PROFILEINTENT;Rendering Intent
+!TP_ICM_SAVEREFERENCE;Save Reference Image
 !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1802,7 +1807,6 @@ TP_WBALANCE_TEMPERATURE;Isı
 !TP_SHARPENEDGE_LABEL;Edges
 !TP_SHARPENEDGE_PASSES;Iterations
 !TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 !TP_SHARPENMICRO_AMOUNT;Quantity
 !TP_SHARPENMICRO_LABEL;Microcontrast
 !TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 064c4dbdb..dcd6fd3da 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -706,47 +706,48 @@ HISTORY_NEWSNAPSHOT;Add
 HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snapshot
 HISTORY_SNAPSHOTS;Snapshots
-IPTCPANEL_AUTHOR;Author
-IPTCPANEL_AUTHORSPOSITION;Author's position
-IPTCPANEL_AUTHORSPOSITIONHINT;Title of the creator or creators of the object (By-line Title).
-IPTCPANEL_CAPTION;Caption
-IPTCPANEL_CAPTIONHINT;A textual description of the data (Caption - Abstract).
-IPTCPANEL_CAPTIONWRITER;Caption writer
-IPTCPANEL_CAPTIONWRITERHINT;The name of the person involved in the writing, editing or correcting the image or caption/abstract (Writer - Editor).
 IPTCPANEL_CATEGORY;Category
-IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider (Category).
+IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 IPTCPANEL_CITY;City
-IPTCPANEL_CITYHINT;City of image origin (City).
+IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 IPTCPANEL_COPYHINT;Copy IPTC settings to clipboard.
-IPTCPANEL_COPYRIGHT;Copyright
-IPTCPANEL_COPYRIGHTHINT;Any necessary copyright notice (Copyright Notice).
+IPTCPANEL_COPYRIGHT;Copyright notice
+IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe.
 IPTCPANEL_COUNTRY;Country
-IPTCPANEL_COUNTRYHINT;The name of the country/primary location where the image was created (Country - Primary Location Name).
-IPTCPANEL_CREDIT;Credit
-IPTCPANEL_CREDITHINT;Identifies the provider of the image, not necessarily the owner/creator (Credit).
+IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image.
+IPTCPANEL_CREATOR;Creator
+IPTCPANEL_CREATORHINT;Enter the name of the person that created this image.
+IPTCPANEL_CREATORJOBTITLE;Creator's job title
+IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field.
+IPTCPANEL_CREDIT;Credit line
+IPTCPANEL_CREDITHINT;Enter who should be credited when this image is published.
 IPTCPANEL_DATECREATED;Date created
-IPTCPANEL_DATECREATEDHINT;The date the intellectual content of the image was created; Format: YYYYMMDD (Date Created).
+IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken.
+IPTCPANEL_DESCRIPTION;Description
+IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image.
+IPTCPANEL_DESCRIPTIONWRITER;Description writer
+IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image.
 IPTCPANEL_EMBEDDED;Embedded
 IPTCPANEL_EMBEDDEDHINT;Reset to IPTC data embedded in the image file.
 IPTCPANEL_HEADLINE;Headline
-IPTCPANEL_HEADLINEHINT;A publishable entry providing a synopsis of the contents of the image (Headline).
+IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image.
 IPTCPANEL_INSTRUCTIONS;Instructions
-IPTCPANEL_INSTRUCTIONSHINT;Other editorial instructions concerning the use of the image (Special Instructions).
+IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field.
 IPTCPANEL_KEYWORDS;Keywords
-IPTCPANEL_KEYWORDSHINT;Used to indicate specific information retrieval words (Keywords).
+IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image.
 IPTCPANEL_PASTEHINT;Paste IPTC settings from clipboard.
-IPTCPANEL_PROVINCE;Province
-IPTCPANEL_PROVINCEHINT;The Province/State where the image originates (Province-State).
+IPTCPANEL_PROVINCE;Province or state
+IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image.
 IPTCPANEL_RESET;Reset
 IPTCPANEL_RESETHINT;Reset to profile default.
 IPTCPANEL_SOURCE;Source
-IPTCPANEL_SOURCEHINT;The original owner of the intellectual content of the image (Source).
-IPTCPANEL_SUPPCATEGORIES;Suppl. categories
-IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image (Supplemental Categories).
+IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from.
+IPTCPANEL_SUPPCATEGORIES;Supplemental categories
+IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image.
 IPTCPANEL_TITLE;Title
-IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
-IPTCPANEL_TRANSREFERENCE;Trans. reference
-IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of the original transmission (Original Transmission Reference).
+IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name.
+IPTCPANEL_TRANSREFERENCE;Job ID
+IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
 MAIN_BUTTON_FULLSCREEN;Fullscreen
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: <b>Shift-F4</b>\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: <b>Shift-F3</b>\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: <b>F3</b>
@@ -935,6 +936,7 @@ PREFERENCES_CLIPPINGIND;Clipping Indication
 PREFERENCES_CLUTSCACHE;HaldCLUT Cache
 PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
 PREFERENCES_CLUTSDIR;HaldCLUT directory
+PREFERENCES_CMMBPC;Black point compensation
 PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
 PREFERENCES_CURVEBBOXPOS_ABOVE;Above
 PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -985,7 +987,7 @@ PREFERENCES_FLUOF7;Fluorescent F7
 PREFERENCES_FLUOF11;Fluorescent F11
 PREFERENCES_FORIMAGE;For non-raw photos
 PREFERENCES_FORRAW;For raw photos
-PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser
+PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
 PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
 PREFERENCES_GIMPPATH;GIMP installation directory
 PREFERENCES_GREY;Output device's Yb luminance (%)
@@ -1029,9 +1031,10 @@ PREFERENCES_MENUGROUPRANK;Group "Rank"
 PREFERENCES_MENUOPTIONS;Context Menu Options
 PREFERENCES_METADATA;Metadata
 PREFERENCES_MIN;Mini (100x115)
-PREFERENCES_MONBPC;Black Point Compensation for the L*a*b*->Monitor transform
-PREFERENCES_MONINTENT;Default monitor intent
-PREFERENCES_MONPROFILE;Default monitor profile
+PREFERENCES_MONINTENT;Default rendering intent
+PREFERENCES_MONITOR;Monitor
+PREFERENCES_MONPROFILE;Default color profile
+PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
 PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
 PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
 PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1056,6 +1059,7 @@ PREFERENCES_PREVDEMO;Preview Demosaic Method
 PREFERENCES_PREVDEMO_FAST;Fast
 PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
 PREFERENCES_PREVDEMO_SIDECAR;As in PP3
+PREFERENCES_PRINTER;Printer (Soft-Proofing)
 PREFERENCES_PROFILEHANDLING;Processing Profile Handling
 PREFERENCES_PROFILELOADPR;Processing profile loading priority
 PREFERENCES_PROFILEPRCACHE;Profile in cache
@@ -1064,6 +1068,8 @@ PREFERENCES_PROFILESAVECACHE;Save processing profile to the cache
 PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file
 PREFERENCES_PROFILE_NONE;None
 PREFERENCES_PROPERTY;Property
+PREFERENCES_PRTINTENT;Rendering intent
+PREFERENCES_PRTPROFILE;Color profile
 PREFERENCES_PSPATH;Adobe Photoshop installation directory
 PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
 PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3".
@@ -1465,8 +1471,7 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tone
 TP_DIRPYREQUALIZER_THRESHOLD;Threshold
 TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image.
 TP_DISTORTION_AMOUNT;Amount
-TP_DISTORTION_AUTO;Auto Distortion Correction
-TP_DISTORTION_AUTO_TIP;Correct lens distortion automatically for some cameras (Micro 4/3, some compact digital cameras, etc.).
+TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera.
 TP_DISTORTION_LABEL;Distortion Correction
 TP_EPD_EDGESTOPPING;Edge stopping
 TP_EPD_GAMMA;Gamma
@@ -1573,7 +1578,7 @@ TP_ICM_LABEL;Color Management
 TP_ICM_NOICM;No ICM: sRGB Output
 TP_ICM_OUTPUTPROFILE;Output Profile
 TP_ICM_PROFILEINTENT;Rendering Intent
-TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
+TP_ICM_SAVEREFERENCE;Save Reference Image
 TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile.
@@ -1850,7 +1855,6 @@ TP_SHARPENING_RLD_AMOUNT;Amount
 TP_SHARPENING_RLD_DAMPING;Damping
 TP_SHARPENING_RLD_ITERATIONS;Iterations
 TP_SHARPENING_THRESHOLD;Threshold
-TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
 TP_SHARPENING_USM;Unsharp Mask
 TP_SHARPENMICRO_AMOUNT;Quantity
 TP_SHARPENMICRO_LABEL;Microcontrast
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index 49db10faa..8ff5c29a3 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -14,7 +14,7 @@ set (RTENGINESOURCEFILES colortemp.cc curves.cc flatcurves.cc diagonalcurves.cc
     stdimagesource.cc myfile.cc iccjpeg.cc improccoordinator.cc pipettebuffer.cc coord.cc
     processingjob.cc rtthumbnail.cc utils.cc labimage.cc slicer.cc cieimage.cc
     iplab2rgb.cc ipsharpen.cc iptransform.cc ipresize.cc ipvibrance.cc
-    imagedimensions.cc jpeg_memsrc.cc jdatasrc.cc iimage.cc
+    imagedimensions.cc jpeg_ijg/jpeg_memsrc.cc jdatasrc.cc iimage.cc
     EdgePreservingDecomposition.cc cplx_wavelet_dec.cc FTblockDN.cc
     PF_correct_RT.cc previewimage.cc ipwavelet.cc
     dirpyr_equalizer.cc
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index ed28618ab..5d0898ee9 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -364,14 +364,14 @@ Camera constants:
                 { "iso": 100, "levels": 16350 }, // stdev 2.25
                 { "iso": [ 125, 160, 200, 250 ], "levels": 16340 }, // stdev 2.5
                 { "iso": [ 320, 400, 500 ], "levels": 16330 }, // stdev 2.95
-                { "iso": [ 640, 800, 1000 ], "levels": 16320 },// stdev x, 4.0 , x
-                { "iso": [ 1250, 1600, 2000 ], "levels": 16300 },// stdev x, 6.0 , x
+                { "iso": [ 640, 800, 1000 ], "levels": 16320 }, // stdev x, 4.0 , x
+                { "iso": [ 1250, 1600, 2000 ], "levels": 16300 }, // stdev x, 6.0 , x
                 { "iso": [ 2500, 3200, 4000 ], "levels": 16250 }, // STDEV x, 9.8 , x
                 { "iso": [ 5000, 6400, 8000 ], "levels": 16150 }, // stdev x, 17, x
-                { "iso": [ 10000, 12800, 16000 ], "levels": 16100 },// stdev x, 34 , x
-                { "iso": [ 20000, 25600, 32000 ], "levels": 16000 },// stdev x, 68 , x
-                { "iso": [ 40000, 51200, 64000 ], "levels": 15700 },// stdev x, 125, x
-                { "iso": [ 80000, 102400 ], "levels": 15100 },// stdev x, 245
+                { "iso": [ 10000, 12800, 16000 ], "levels": 16100 }, // stdev x, 34 , x
+                { "iso": [ 20000, 25600, 32000 ], "levels": 16000 }, // stdev x, 68 , x
+                { "iso": [ 40000, 51200, 64000 ], "levels": 15700 }, // stdev x, 125, x
+                { "iso": [ 80000, 102400 ], "levels": 15100 }, // stdev x, 245
                 { "iso": [ 204800 ], "levels": 14000 },
                 { "iso": [ 409600 ], "levels": 13000 }
             ],
@@ -437,9 +437,9 @@ Camera constants:
             "white_max": 16383,
             "aperture_scaling": [
                 /* need more data to properly fill all scale factors */
-                { "aperture": 1.4, "scale_factor": 1.130 }, // 
-                { "aperture": 1.6, "scale_factor": 1.100 }, // 
-                { "aperture": 1.8, "scale_factor": 1.070 }, // 
+                { "aperture": 1.4, "scale_factor": 1.160 }, // guessed
+                { "aperture": 1.6, "scale_factor": 1.120 }, // guessed
+                { "aperture": 1.8, "scale_factor": 1.080 }, // guessed
                 { "aperture": 2.0, "scale_factor": 1.050 }, // 14171/13422=1.055
                 { "aperture": 2.2, "scale_factor": 1.035 }, // 13954/13422=1.039
                 { "aperture": 2.5, "scale_factor": 1.025 }, // 11400/11000=1.028
@@ -703,24 +703,27 @@ Camera constants:
         "masked_areas": [ 40, 96, 4000, 260 ],
         "ranges": {
             "white": [
-                { "iso": [ 100, 125, 200, 250 ], "levels": 16200 }, // nominal 16383, LENR blue 16243
+                { "iso": [ 100 ], "levels": 16100 }, // nominal 16383, LENR blue 16243
+                { "iso": [ 125, 200, 250, 400 ], "levels": 16200 }, // nominal 16383, LENR blue 16243
                 { "iso": [ 160 ], "levels": 13000 }, // nominal 13097,
-                { "iso": [ 320, 640, 1250, 2500, 5000, 10000 ], "levels": 13200 }, // G1,G2 13415
-                { "iso": [ 400, 500, 800, 1000, 1600, 2000, 3200, 4000 ], "levels": 16150 }, // nominal 16383, LENR ISO3200 16150
-                { "iso": [ 6400, 8000, 12800, 16000, 25600 ], "levels": 16000 } // R,G1,G2 16383, B 16243, LENR B 16000
+                { "iso": [ 320, 640, 1250 ], "levels": 13250 }, // G1,G2 13415
+                { "iso": [ 500, 800, 1000 ], "levels": 16150 }, // nominal 16383, LENR ISO3200 16150
+                { "iso": [ 1600, 2000, 3200 ], "levels": 16100 }, // nominal 16383, LENR ISO3200 16150
+                { "iso": [ 2500, 5000 ], "levels": 13150 }, // G1,G2 13415
+                { "iso": [ 4000, 6400 ], "levels": 16050 }, // nominal 16383, LENR ISO6400 16050
+                { "iso": [ 8000, 10000 ], "levels": 16000 }, // R,G1,G2 16383, B 16243, LENR B 16000
+                { "iso": [ 12800, 16000, 25600 ], "levels": 15900 } // R,G1,G2 16383, B 16243, LENR BLUE 15750
             ],
             "white_max": 16383,
             "aperture_scaling": [
                 // need for more data to properly fill all scale factors
                 { "aperture": 1.4, "scale_factor": 1.200 }, // guessed
-                { "aperture": 1.6, "scale_factor": 1.080 }, // guessed
-                { "aperture": 1.8, "scale_factor": 1.055 }, // guessed
-                { "aperture": 2.0, "scale_factor": 1.030 }, // guessed
-                { "aperture": 2.2, "scale_factor": 1.025 }, // guessed
-                { "aperture": 2.5, "scale_factor": 1.020 }, // guessed
-                { "aperture": 2.8, "scale_factor": 1.000 }, //
-                { "aperture": 3.2, "scale_factor": 1.000 }, //
-                { "aperture": 3.5, "scale_factor": 1.000 } //
+                { "aperture": 1.6, "scale_factor": 1.130 }, // guessed
+                { "aperture": 1.8, "scale_factor": 1.090 }, // 14338/13097 = 1.094
+                { "aperture": 2.0, "scale_factor": 1.060 }, // 13934/13097 = 1.063
+                { "aperture": 2.2, "scale_factor": 1.025 }, // 13438/13097 = 1.026
+                { "aperture": 2.5, "scale_factor": 1.005 }, // 13190/13097 = 1.007
+                { "aperture": 2.8, "scale_factor": 1.000 }  // 13097/13097
             ]
         }
     },
@@ -954,6 +957,38 @@ Camera constants:
         }
     },
 
+    { // Quality C, White Levels not properly indicated, aperture scaling..missing factors are guessed
+        "make_model": "Canon EOS M5",
+        "dcraw_matrix": [ 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 ], // DNG_V9.8 D65
+        "raw_crop": [ 264, 36, 6024, 4020 ], // full size 6288x4056,
+        //"raw_crop": [ 272, 44, 6008, 4008 ], //  matched to official crop 276,48,6275,4047 - official jpeg 6000X4000
+        "masked_areas": [ 40, 96, 4000, 260 ],
+        "ranges": {
+            "white": [
+                { "iso": [ 100, 125, 200, 250 ], "levels": 15600 }, // nominal 15660-15800
+                { "iso": [ 160 ], "levels": 13000 }, // guessed
+                { "iso": [ 320 ], "levels": 13200 }, // nominal green13528-14466-14380-14368 - blue13262-14186,
+                { "iso": [ 640, 1250 ], "levels": 13150 }, // iso 640 G1,G2 13260-13450 - blue13230-13430 -iso 1250 13430
+                { "iso": [ 2500, 5000, 10000 ], "levels": 13100 }, //
+                { "iso": [ 400, 500, 800, 1000, 1600, 2000, 3200, 4000, 6400 ], "levels": 16100 }, // 16383
+                { "iso": [ 8000, 12800, 16000, 25600 ], "levels": 16000 } // R,G1,G2 16383, B 16243
+            ],
+            "white_max": 16383,
+            "aperture_scaling": [
+                // need for more data to properly fill all scale factors
+                { "aperture": 1.4, "scale_factor": 1.200 }, // 31/25
+                { "aperture": 1.6, "scale_factor": 1.080 }, // guessed
+                { "aperture": 1.8, "scale_factor": 1.050 }, // guessed
+                { "aperture": 2.0, "scale_factor": 1.030 }, // 15292/ 14916/ 320-14466/ 320-13528/
+                { "aperture": 2.2, "scale_factor": 1.020 }, // guessed
+                { "aperture": 2.5, "scale_factor": 1.010 }, // guessed
+                { "aperture": 2.8, "scale_factor": 1.000 }, //
+                { "aperture": 3.2, "scale_factor": 1.000 }, //
+                { "aperture": 3.5, "scale_factor": 1.000 } //
+            ]
+        }
+    },
+
 // Canon Powershot
 
     { // Quality C, CHDK DNGs, raw frame corrections, experimental infrared support commented out
@@ -977,10 +1012,10 @@ Camera constants:
     { // Quality A, changes for raw crop which is optimistic in dcraw
         "make_model": "Canon PowerShot G12",
         "dcraw_matrix": [ 13244,-5501,-1248,-1508,9858,1935,-270,1083,4366 ],
-        //"raw_crop": [ 62, 18, 3666, 2748 ],// max usable
-        "raw_crop": [ 68, 20, 3656, 2744 ],// equal to official Canon frame, 72,24,3719,2759 = 3648x2736
-        "masked_areas": [ 24, 40, 2770, 44 ],// as declared in maker data
-        "ranges": { "white": 4080 } //
+        //"raw_crop": [ 62, 18, 3666, 2748 ], // max usable
+        "raw_crop": [ 68, 20, 3656, 2744 ], // equal to official Canon frame, 72,24,3719,2759 = 3648x2736
+        "masked_areas": [ 24, 40, 2770, 44 ], // as declared in maker data
+        "ranges": { "white": 4080 }
     },
 
     { // Quality B, needs a way to auto apply 3/2 or 4/3 crops (read Exif tags ..) to work better with auto distortion,
@@ -1061,6 +1096,12 @@ Camera constants:
         "ranges": { "white": 4050 }
     },
 
+    { // Quality B
+        "make_model": "FUJIFILM X-A3",
+        "dcraw_matrix": [ 12407,-5222,-1086,-2971,11116,2120,-294,1029,5284 ], // DNGv9.8 D65
+        "ranges": { "white": 4050 }
+    },
+
     { // Quality B
         "make_model": [ "FUJIFILM X-T1", "FUJIFILM X-T10", "FUJIFILM X-E2" ],
         "dcraw_matrix": [ 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 ], // DNG D65
@@ -1228,8 +1269,8 @@ Camera constants:
     },
 
     { // Quality B
-        "make_model": "Nikon D5500",
-        "dcraw_matrix": [ 8821,-2938,-785,-4178,12142,2287,-824,1651,6860 ], // adobe dng_v9.0 d65
+        "make_model": [ "Nikon D5500", "Nikon D5600" ],
+        "dcraw_matrix": [ 8821,-2938,-785,-4178,12142,2287,-824,1651,6860 ], // adobe dng_v9.8 d65
         "ranges": { "white": 16300 } // WL value is for 14-bit files, RT auto adapts it for 12-bit files. WL typical 16383 set to 16300 for safety
     },
 
@@ -1239,8 +1280,8 @@ Camera constants:
         "ranges": { "white": 16300 } // WL value is for 14-bit files, RT auto adapts it for 12-bit files. WL typical 16383 set to 16300 for safety,
     },
 
-   { // Quality B, samples by joachip at RT forums, are measures at long exposures with LongExposureNoiseReduction
-     // aperture scaling known to exist, but little to gain as the levels are so close to white_max
+    { // Quality B, samples by joachip at RT forums, are measures at long exposures with LongExposureNoiseReduction
+      // aperture scaling known to exist, but little to gain as the levels are so close to white_max
         "make_model": "Nikon D600",
         "dcraw_matrix": [ 8178,-2245,-609,-4857,12394,2776,-1207,2086,7298 ], // dcp d65
         //"raw_crop": [ 0, 0, 6034, 4028 ], // dcraw
@@ -1332,9 +1373,10 @@ Camera constants:
         }
     },
 
-    { // Quality C, 20Mp and 80Mp raw frames, Color matrix copied from EM5MKII which looks to be close.
+    { // Quality B, 20Mp and 80Mp raw frames,
         "make_model": "OLYMPUS E-M1MarkII",
-        "dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // E-M5II dng_v9.5 D65
+        //"dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // E-M5II dng_v9.5 D65
+        "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ], // beta, dng_v9.8 D65
         "raw_crop": [ 8, 8, -16, -8 ], // full raw 5240X3912, jpeg top12,left12,5184x3888, full hires 10400X7792, jpeg crop 8,8,10368x7776
         "ranges": {
             "white": [
@@ -1367,8 +1409,8 @@ Camera constants:
     },
 
     { // Quality B, with long exposure noise reduction White Level gets WL-BL = around 256_12-bit levels less
-        "make_model": "OLYMPUS E-PL7",
-        "dcraw_matrix": [ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 ], // DNG_V8.7 D65
+        "make_model": [ "OLYMPUS E-PL7", "OLYMPUS E-PL8" ],
+        "dcraw_matrix": [ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 ], // DNG_v9.8 D65
         "ranges": { "white": 4080 } // nominal 4093
     },
 
@@ -1421,6 +1463,19 @@ Camera constants:
         }
     },
 
+    { // Quality B,
+        "make_model": [ "Panasonic DMC-FZ2500", "Panasonic DMC-FZ2000", "Panasonic DMC-FZH1" ],
+        "dcraw_matrix": [ 7386,-2443,-743,-3437,11864,1757,-608,1660,4766  ], // dcp_v9.8 d65
+        "ranges": {
+            "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
+            "white": [
+                { "iso": 80, "levels": 3600 }, // Exif:3277 distribution peak at 3700 up to +/- 100
+                { "iso": [ 100, 125, 200, 400, 800, 1600 ], "levels": 4050 }, // Exif 4095 distribution 4050-4095
+                { "iso": [ 3200, 6400, 12600, 25600 ], "levels": 4080 } // Exif 4095 distribution 4080-4095
+            ]
+        }
+    },
+
     { // Quality A, samples by helices at RT forums and Chris Power at github
         "make_model": [ "Panasonic DMC-ZS100", "Panasonic DMC-ZS110", "Panasonic DMC-TZ100", "Panasonic DMC-TZ101", "Panasonic DMC-TZ110", "Panasonic DMC-TX1" ],
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // dcp_v8.6 d65
@@ -1615,7 +1670,7 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-G7", "Panasonic DMC-G70" ],
-        "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],// DNG_v9.1 D65
+        "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.1 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
             "white": [
@@ -1628,7 +1683,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-GX80", "Panasonic DMC-GX85", "Panasonic DMC-GX7MK2" ],
-        "dcraw_matrix": [ 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 ],// DNG_v9.6 D65
+        "dcraw_matrix": [ 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 ], // DNG_v9.6 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
             "white": [
@@ -1641,7 +1696,7 @@ Camera constants:
 
     { // Quality B, Same as Panasonic G7
         "make_model": [ "Panasonic DMC-G8", "Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85" ],
-        "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],// DNG_v9.7 D65
+        "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.7 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
             "white": [
@@ -1665,22 +1720,29 @@ Camera constants:
         }
     },
 
-    { // Quality B, uncertainty about ISO 100 WL
+    { // Quality B, samples by Ingo, missing some long exposure at high ISO samples with LENR ON
         "make_model": [ "Panasonic DMC-LX100", "Leica D-LUX (Typ 109)" ],
         "dcraw_matrix": [ 8844,-3538,-768,-3709,11762,2200,-698,1792,5220 ], // DNG_V8.7 d65
         //"dcraw_matrix": [ 6538,-1614,-549,-5475,13096,2646,-1780,2799,5612 ], // calculated from DxO D50
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset.
             "white": [
-                { "iso": 100, "levels": 2300 }, // gaussian 2400-2700 Exif_linearitylimit 2111
-                { "iso": [ 160, 200, 250, 320, 400, 500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095
+                { "iso": 100, "levels": 2400 }, // gaussian R,B 2450-2700 G1,G2 2550-2800 Exif_linearitylimit 2111
+                { "iso": 125, "levels": 3000 }, // gaussian R,B 3050-3350 G1,G2 3170-3480 Exif_linearitylimit 2626
+                { "iso": 160, "levels": 3800 }, // gaussian R,B 3850-median 4020 G1,G2 3870-median 4050 Exif_linearitylimit 3277
+                { "iso": [ 200, 250, 320, 400 ], "levels": 4080 }, // nominal 4095
+                { "iso": [ 500, 640, 800, 1000, 1250, 1600 ], "levels": 4060 }, // nominal 4095
+                { "iso": [ 2000, 2500 ], "levels": 4040 }, // nominal 4095
+                { "iso": [ 3200, 4000, 5000 ], "levels": 3950 }, // nominal 4095
+                { "iso": [ 6400, 8000, 10000 ], "levels": 4020 }, // nominal 4095
+                { "iso": [ 12800, 16000, 20000, 25600 ], "levels": 4000 } // nominal 4095
             ]
         }
     },
 
-    { // Quality C, Color matrix guessed, Intemediate ISOs missing
-        "make_model": [ "Panasonic DMC-LX10", "Panasonic DMC-LX15" ],
-        "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], //copy from TZ100 dcp_v8.6 d65
+    { // Quality B, Intermediate ISOs missing
+        "make_model": [ "Panasonic DMC-LX9", "Panasonic DMC-LX10", "Panasonic DMC-LX15" ],
+        "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // DNg_v9.8 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset.
@@ -1700,8 +1762,10 @@ Camera constants:
 
     { // Quality B, Intemediate ISO samples missing, Pentax_DNG WLtags are after BL sutraction and not valid
         "make_model": [ "RICOH PENTAX K-70", "PENTAX K-70" ],
-        "dcraw_matrix": [ 8050,-2061,-1264,-4359,12953,1515,-1096,1965,6075 ], // PENTAX DNG D65
-        "raw_crop": [ 58, 28, 6022, 4024 ], // full frame 6080x4064, cropped to official DNG raw_crop 28,58,6080,4052, official jpeg crop 6000x4000
+        //"dcraw_matrix": [ 8050,-2061,-1264,-4359,12953,1515,-1096,1965,6075 ], // PENTAX DNG D65
+        "dcraw_matrix": [ 8766,-3149,-747,-3976,11943,2292,-517,1259,5552 ], // Adobe DNGv9.8 D65
+        "raw_crop": [ 58, 28, 6022, 4020 ], // full frame 6080x4064, usefull raw frame 56,28,6080,4049, official DNG raw_crop 58,28,6080,4052, official jpeg crop 58+8,28+4 6000x4000
+        // "raw_crop": [ 62, 28, 6000, 4000 ], // matched to official jpeg crop 58+8,28+4 6000x4000
         "ranges": {
             "white": [
                 { "iso": 100, "levels": 16300 }, // 16319-16377
@@ -1720,7 +1784,7 @@ Camera constants:
         "make_model": [ "RICOH PENTAX K-1", "PENTAX K-1" ],
         "dcraw_matrix": [ 8596,-2981,-639,-4202,12046,2431,-685,1424,6122 ], // adobe DNG v9.7 D65
         //"dcraw_matrix": [ 8566,-2746,-1201,-3612,12204,1550,-893,1680,6264 ], // PENTAX DNG
-        "raw_crop": [ 6, 18, 7376, 4932 ], // full frame 7392x4950, cropped to official DNG raw_crop 6,18,7382,4950, official jpeg crop 8,10,7360x4912
+        //"raw_crop": [ 6, 18, 7376, 4932 ], // full frame 7392x4950, cropped to official DNG raw_crop 6,18,7382,4950, official jpeg crop 8,10,7360x4912
         "ranges": {
             "white": [
                 { "iso": [ 100, 200, 400, 800 ], "levels": 16300 }, // 16380
@@ -1752,7 +1816,7 @@ Camera constants:
     { // Quality B, intermediate ISOs info missing
         "make_model": [ "RICOH PENTAX 645Z", "PENTAX 645Z" ],
         "dcraw_matrix": [ 9519,-3591,-664,-4074,11725,2671,-624,1501,6653 ], // adobe dcp d65
-        "raw_crop": [ 48, 0, 8276, 6208 ],// full sensor 8384x6208 - official jpeg 8256x6192
+        "raw_crop": [ 48, 0, 8276, 6208 ], // full sensor 8384x6208 - official jpeg 8256x6192
         "ranges": {
             "white": [
                 { "iso": 100, "levels": 16310 }, // 16317 or 16350
@@ -1809,22 +1873,23 @@ Camera constants:
     { // Quality C, corrections for frame size, black and white levels not declared properly
         "make_model": "Sigma SD9",
         "dcraw_matrix": [ 14996,-3468,-1425,5576,3642,972,1761,3773,3720 ], // experimental calculated from sun0.icc data
-        "ranges": { "black": 0, "white": 16383 },// black is already subtracted by dcraw, white copied from x3dump data
+        "ranges": { "black": 0, "white": 16383 }, // black is already subtracted by dcraw, white copied from x3dump data
         "raw_crop": [ 20, 8, -18, -12 ]
     },
 
     { // Quality C, corrections for frame size, black level not declared properly
         "make_model": "Sigma SD10",
         "dcraw_matrix": [ 12555,-1865,-1125,5093,4120,867,1929,3810,3507 ], // experimental calculated from .icc data
-        "ranges": { "black": 0, "white": 16383 },// black is already subtracted by dcraw, white copied from x3dump data
+        "ranges": { "black": 0, "white": 16383 }, // black is already subtracted by dcraw, white copied from x3dump data
         //"raw_crop": [ 0, 0, -0, -0 ]
        "raw_crop": [ 20, 8, -18, -12 ]
     },
+
     { // Quality C, corrections for frame size, black and white levels not declared properly
         "make_model": "Sigma SD14",
         "dcraw_matrix": [ 16411,-4764,-2383,8110,2603,-645,3135,3878,1984 ], // experimental inverted icc wp12 - build with BL=15
         //"dcraw_matrix": [ 13804,-4156,-1896,6917,1909,-431,2768,2989,1741 ], // experimental inverted icc wp10 - build with BL=15
-        "ranges": { "black": 0, "white": 16383 },// peripheral black stripes give BL around 37
+        "ranges": { "black": 0, "white": 16383 }, // peripheral black stripes give BL around 37
         "raw_crop": [ 0, 0, -0, -0 ]
         //"raw_crop": [ 18, 12, 2652, 1768 ]
     },
@@ -1832,7 +1897,7 @@ Camera constants:
     { // Quality C, correction for frame width
         "make_model": "Sigma SD1",
         "dcraw_matrix": [ 5270,42,-814,3737,5506,124,1112,9714,4510 ], // experimental from icm 1.04477,-0.74838,1.01617, -0.54028,2.52690,-3.83257, 0.54869,-0.69556,3.73746
-        "ranges": { "black": 16, "white": 4070 },// BL is 16 or 31, should be measured at the horizontal black stripe at the top
+        "ranges": { "black": 16, "white": 4070 }, // BL is 16 or 31, should be measured at the horizontal black stripe at the top
         "raw_crop": [ 12, 52, -110, -8 ]
     },
 
@@ -1883,6 +1948,13 @@ Camera constants:
         "ranges": { "black": 512, "white": 16300 }
     },
 
+    { // Quality B, correction for frame width, crop modes covered
+        "make_model": "Sony ILCA-99M2",
+        "dcraw_matrix": [ 6660,-1918,-471,-4613,12398,2485,-649,1433,6447 ], // DNG_v9.8 D65
+        "raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
+        "ranges": { "black": 512, "white": 16300 }
+    },
+
     { // Quality A, correction for frame width
         "make_model": [ "Sony ILCE-3000", "Sony ILCE-3500", "Sony ILCE-5000", "Sony ILCE-QX1" ],
         "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], // adobe dcp d65
@@ -1905,8 +1977,8 @@ Camera constants:
     },
 
     { // Quality A
-        "make_model": "Sony ILCE-6300",
-        "dcraw_matrix": [ 5973,-1695,-419,-3826,11797,2293,-639,1398,5789 ], // DNG_v9.5 D65
+        "make_model": [ "Sony ILCE-6300","Sony ILCE-6500" ],
+        "dcraw_matrix": [ 5973,-1695,-419,-3826,11797,2293,-639,1398,5789 ], // DNG_v9.8 D65
         "raw_crop": [ 0, 0, 6024, 4024 ],
         "ranges": { "black": 512, "white": 16300 }
     },
@@ -1939,8 +2011,8 @@ Camera constants:
     },
 
     { // Quality A
-        "make_model": [ "Sony DSC-RX100M3", "Sony DSC-RX100M4", "Sony DSC-RX100M5" ],
-        "dcraw_matrix": [ 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 ], // DNG_v9.1.1 D65
+        "make_model": [ "Sony DSC-RX100M2", "Sony DSC-RX100M3", "Sony DSC-RX100M4", "Sony DSC-RX100M5" ],
+        "dcraw_matrix": [ 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 ], // DNG_v9.8 D65
         "ranges": { "black": 800, "white": 16300 }
     },
 
@@ -1950,7 +2022,7 @@ Camera constants:
         "ranges": { "black": 800, "white": 16300 }
     },
 
-    { // Quality C, No proper color data, beta samples, frame set to official jpeg, WL corrections need adobe_coeff setting in dcraw.cc to become active
+    { // Quality C, No proper color data, beta samples, frame set to official jpeg,
         "make_model": "XIAOYI M1",
         "dcraw_matrix": [ 7158,-1911,-606,-3603,10669,2530,-659,1236,5530 ], // XIAO YI DNG D65
         "raw_crop": [ 4, 3, 5192, 3896 ], // full raw 5200x3902, official jpeg 5184X3888
diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index d4a9811d0..8e973913e 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -8743,6 +8743,10 @@ void CLASS identify()
   if (width == 7424 && !strcmp(model,"645D"))
     { height  = 5502;   width  = 7328; filters = 0x61616161; top_margin = 29;
       left_margin = 48; }
+  if (width == 7392 && !strncmp(model,"K-1",3))
+    { left_margin = 6; width  = 7376; if(!dng_version) {top_margin = 18; height -= top_margin; }}
+  if (width == 4832 && !strncmp(model,"K-1",3)) // K-1 APS-C format
+     if(!dng_version) {top_margin = 18; height -= top_margin; }
   if (height == 3014 && width == 4096)	/* Ricoh GX200 */
 			width  = 4014;
   if (dng_version) {
@@ -9727,10 +9731,28 @@ static void copyFloatDataToInt(float * src, ushort * dst, size_t size, float max
 }
 
 void CLASS deflate_dng_load_raw() {
+    float_raw_image = new float[raw_width * raw_height];
+
+#ifdef _OPENMP
+#pragma omp parallel for
+#endif
+    for (size_t i = 0; i < raw_width * raw_height; ++i)
+      float_raw_image[i] = 0.0f;
+
+  if(tiff_samples != 1) {
+    fprintf(stderr, "deflate_dng_load_raw %s: demosaiced float dng files are not supported\n",ifname);
+    return;
+  }
+
   struct tiff_ifd * ifd = &tiff_ifd[0];
   while (ifd < &tiff_ifd[tiff_nifds] && ifd->offset != data_offset) ++ifd;
   if (ifd == &tiff_ifd[tiff_nifds]) {
-    fprintf(stderr, "DNG Deflate: Raw image not found???\n");
+    fprintf(stderr, "deflate_dng_load_raw %s: Raw image not found???\n",ifname);
+    return;
+  }
+
+  if (ifd->sample_format != 3) {  // no floating point data
+    fprintf(stderr, "deflate_dng_load_raw %s: Only float format is supported for deflate compressed dng files\n",ifname);
     return;
   }
 
@@ -9742,16 +9764,6 @@ void CLASS deflate_dng_load_raw() {
 	default: predFactor = 0; break;
   }
 
-  if (ifd->sample_format == 3) {  // Floating point data
-    float_raw_image = new float[raw_width * raw_height];
-
-#ifdef _OPENMP
-#pragma omp parallel for
-#endif
-    for (size_t i = 0; i < raw_width * raw_height; ++i)
-      float_raw_image[i] = 0.0f;
-  }
-
   // NOTE: This reader is based on the official DNG SDK from Adobe.
   // It assumes tiles without subtiles, but the standard does not say that
   // subtiles or strips couldn't be used.
diff --git a/rtengine/dcraw.patch.README b/rtengine/dcraw.patch.README
index 22b2323d7..7d2c6dc4f 100644
--- a/rtengine/dcraw.patch.README
+++ b/rtengine/dcraw.patch.README
@@ -1,8 +1,7 @@
 Patch for vanilla dcraw.  Please run this against any new dcraw version copied here.
  Instructions for patching:
-1) Download newest dcraw.c file, and copy to this folder.
-2) Run 'patch -p0 < dcraw.patch' to patch the file.  If there are any rejections, please fix them manually.
-3) Move the patched dcraw.c to dcraw.cc
-4) Re-copy the vanilla downloaded dcraw.c back to this folder, and update the patch: 'diff -u dcraw.c dcraw.cc > dcraw.patch'
-
 
+1) Create the patch: 'diff -u dcraw.c dcraw.cc > dcraw.patch'
+2) Download newest dcraw.c file, and copy to this folder.
+3) Run 'patch -p0 < dcraw.patch' to patch the file.  If there are any rejections, please fix them manually.
+4) Move the patched dcraw.c to dcraw.cc
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 5e3ef6991..a90c78069 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -678,7 +678,7 @@ void Crop::update (int todo)
     createBuffer(cropw, croph);
 
     // transform
-    if (needstransform || ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
+    if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
         if (!transCrop) {
             transCrop = new Imagefloat (cropw, croph);
         }
@@ -701,7 +701,7 @@ void Crop::update (int todo)
         transCrop = nullptr;
     }
 
-    if ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
+    if ((todo & (M_TRANSFORM | M_RGBCURVE))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
 
         const int W = baseCrop->getWidth();
         const int H = baseCrop->getHeight();
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index 3cb9b4a71..3965b2335 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -165,16 +165,20 @@ std::vector<Glib::ustring> getWorkingProfiles ()
     return res;
 }
 
-std::vector<Glib::ustring> ICCStore::getProfiles (const bool onlyRgb) const
+std::vector<Glib::ustring> ICCStore::getProfiles (const ProfileType type) const
 {
 
     MyMutex::MyLock lock(mutex_);
 
     std::vector<Glib::ustring> res;
 
-    for (ProfileMap::const_iterator profile = fileProfiles.begin (); profile != fileProfiles.end (); ++profile) {
-        if (!onlyRgb || (onlyRgb && cmsGetColorSpace (profile->second) == cmsSigRgbData))
-        res.push_back (profile->first);
+    for (const auto profile : fileProfiles) {
+        if (  (type==ICCStore::ProfileType::MONITOR && cmsGetDeviceClass(profile.second) == cmsSigDisplayClass && cmsGetColorSpace (profile.second) == cmsSigRgbData)
+           || (type==ICCStore::ProfileType::PRINTER && cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
+           || (type==ICCStore::ProfileType::OUTPUT  && cmsGetDeviceClass(profile.second) == cmsSigDisplayClass && cmsGetColorSpace (profile.second) == cmsSigRgbData) )
+        {
+            res.push_back (profile.first);
+        }
     }
 
     return res;
diff --git a/rtengine/iccstore.h b/rtengine/iccstore.h
index bb9693f1a..58ddfdbc9 100644
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@@ -84,6 +84,12 @@ class ICCStore
 
 public:
 
+    enum class ProfileType {
+        MONITOR,
+        PRINTER,
+        OUTPUT  // (actually correspond to the same profiles than with MONITOR)
+    };
+
     static ICCStore* getInstance ();
 
     void init (const Glib::ustring& usrICCDir, const Glib::ustring& stdICCDir);
@@ -112,7 +118,7 @@ public:
     cmsHPROFILE      getXYZProfile  () const;
     cmsHPROFILE      getsRGBProfile () const;
 
-    std::vector<Glib::ustring> getProfiles (const bool onlyRgb = false) const;
+    std::vector<Glib::ustring> getProfiles (const ProfileType type = ProfileType::MONITOR) const;
     std::vector<Glib::ustring> getProfilesFromDir (const Glib::ustring& dirName) const;
 
     uint8_t     getInputIntents  (cmsHPROFILE profile) const;
diff --git a/rtengine/iimage.h b/rtengine/iimage.h
index 7e88e407f..b06a188bc 100644
--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@@ -1291,7 +1291,7 @@ public:
         b.height_ = height;
 #endif
 
-        abData.resize(width * height * 3);
+        abData.resize(width * height * 3u);
 
         if (!abData.isEmpty()) {
             data = abData.data;
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index 8cb2b887a..9eaf3afc5 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -67,7 +67,7 @@ void Image8::setScanline (int row, unsigned char* buffer, int bps, float *minVal
 
     switch (sampleFormat) {
     case (IIOSF_UNSIGNED_CHAR):
-        memcpy (data + row * width * 3, buffer, width * 3);
+        memcpy (data + row * width * 3u, buffer, width * 3);
         break;
 
     case (IIOSF_UNSIGNED_SHORT): {
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 639841ac5..a9641c35f 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -373,12 +373,12 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
     // Remove transformation if unneeded
     bool needstransform = ipf.needsTransform();
 
-    if (!needstransform && !((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
+    if (!needstransform && !((todo & (M_TRANSFORM | M_RGBCURVE))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
         delete oprevi;
         oprevi = orig_prev;
     }
 
-    if ((needstransform || ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
+    if ((needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
         if(!oprevi || oprevi == orig_prev)
             oprevi = new Imagefloat (pW, pH);
         if (needstransform)
@@ -388,7 +388,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             orig_prev->copyData(oprevi);
     }
 
-    if ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
+    if ((todo & (M_TRANSFORM | M_RGBCURVE))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
         const int W = oprevi->getWidth();
         const int H = oprevi->getHeight();
         LabImage labcbdl(W, H);
@@ -782,7 +782,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
         lastOutputProfile = params.icm.output;
         lastOutputIntent = params.icm.outputIntent;
         lastOutputBPC = params.icm.outputBPC;
-        ipf.updateColorProfiles(params.icm, monitorProfile, monitorIntent, softProof, gamutCheck);
+        ipf.updateColorProfiles(monitorProfile, monitorIntent, softProof, gamutCheck);
     }
 
     // process crop, if needed
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 8cb1e77c4..95966944a 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -68,7 +68,7 @@ void ImProcFunctions::setScale (double iscale)
     scale = iscale;
 }
 
-void ImProcFunctions::updateColorProfiles (const ColorManagementParams& icm, const Glib::ustring& monitorProfile, RenderingIntent monitorIntent, bool softProof, bool gamutCheck)
+void ImProcFunctions::updateColorProfiles (const Glib::ustring& monitorProfile, RenderingIntent monitorIntent, bool softProof, bool gamutCheck)
 {
     // set up monitor transform
     if (monitorTransform) {
@@ -77,9 +77,14 @@ void ImProcFunctions::updateColorProfiles (const ColorManagementParams& icm, con
 
     monitorTransform = nullptr;
 
+    cmsHPROFILE monitor = nullptr;
+    if (!monitorProfile.empty()) {
 #if !defined(__APPLE__) // No support for monitor profiles on OS X, all data is sRGB
-
-    cmsHPROFILE monitor = iccStore->getProfile (monitorProfile);
+        monitor = iccStore->getProfile (monitorProfile);
+#else
+        monitor = iccStore->getProfile ("RT_sRGB");
+#endif
+    }
 
     if (monitor) {
         MyMutex::MyLock lcmsLock (*lcmsMutex);
@@ -91,25 +96,14 @@ void ImProcFunctions::updateColorProfiles (const ColorManagementParams& icm, con
 
         if (softProof) {
             cmsHPROFILE oprof = nullptr;
-            if(icm.gamma != "default" || icm.freegamma) { // if select gamma output between BT709, sRGB, linear, low, high, 2.2 , 1.8
-                GammaValues ga;
-                iccStore->getGammaArray(icm, ga);
-                oprof = iccStore->createGammaProfile (icm, ga);
-            }
-            else if (!icm.output.empty() && icm.output != ColorManagementParams::NoICMString) {
-                if(icm.gamma != "default" || icm.freegamma) { // if select gamma output between BT709, sRGB, linear, low, high, 2.2 , 1.8
-                    GammaValues ga;
-                    iccStore->getGammaArray(icm, ga);
-                    oprof = iccStore->createCustomGammaOutputProfile (icm, ga);
-                } else {
-                    oprof = iccStore->getProfile(icm.output);
-                }
+            if (!settings->printerProfile.empty()) {
+                oprof = iccStore->getProfile(settings->printerProfile);
             }
 
             if (oprof) {
                 // NOCACHE is for thread safety, NOOPTIMIZE for precision
                 flags = cmsFLAGS_SOFTPROOFING | cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE;
-                if (icm.outputBPC) {
+                if (settings->printerBPC) {
                     flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
                 }
                 if (gamutCheck) {
@@ -119,7 +113,7 @@ void ImProcFunctions::updateColorProfiles (const ColorManagementParams& icm, con
                                         iprof, TYPE_Lab_FLT,
                                         monitor, TYPE_RGB_8,
                                         oprof,
-                                        monitorIntent, icm.outputIntent,
+                                        monitorIntent, settings->printerIntent,
                                         flags
                                     );
                 if (monitorTransform) {
@@ -138,8 +132,6 @@ void ImProcFunctions::updateColorProfiles (const ColorManagementParams& icm, con
 
         cmsCloseProfile(iprof);
     }
-
-#endif
 }
 
 void ImProcFunctions::firstAnalysis (const Imagefloat* const original, const ProcParams &params, LUTu & histogram)
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index 6a182e67b..e70083b0b 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -205,7 +205,7 @@ public:
     bool needsPCVignetting ();
 
     void firstAnalysis    (const Imagefloat* const working, const ProcParams &params, LUTu & vhist16);
-    void updateColorProfiles (const ColorManagementParams& icm, const Glib::ustring& monitorProfile, RenderingIntent monitorIntent, bool softProof, bool gamutCheck);
+    void updateColorProfiles (const Glib::ustring& monitorProfile, RenderingIntent monitorIntent, bool softProof, bool gamutCheck);
     void rgbProc          (Imagefloat* working, LabImage* lab, PipetteBuffer *pipetteBuffer, LUTf & hltonecurve, LUTf & shtonecurve, LUTf & tonecurve,
                            SHMap* shmap, int sat, LUTf & rCurve, LUTf & gCurve, LUTf & bCurve, float satLimit , float satLimitOpacity, const ColorGradientCurve & ctColorCurve, const OpacityCurve & ctOpacityCurve, bool opautili, LUTf & clcurve, LUTf & cl2curve, const ToneCurve & customToneCurve1, const ToneCurve & customToneCurve2,
                            const ToneCurve & customToneCurvebw1, const ToneCurve & customToneCurvebw2, double &rrm, double &ggm, double &bbm, float &autor, float &autog, float &autob, DCPProfile *dcpProf, const DCPProfile::ApplyState &asIn, LUTu &histToneCurve );
diff --git a/rtengine/iptcpairs.h b/rtengine/iptcpairs.h
index 363a4f6ab..e0b34180f 100644
--- a/rtengine/iptcpairs.h
+++ b/rtengine/iptcpairs.h
@@ -32,8 +32,8 @@ const IptcPair strTags[] = {
     {IPTC_TAG_HEADLINE, 256, "Headline"},
     {IPTC_TAG_SPECIAL_INSTRUCTIONS, 256, "Instructions"},
     {IPTC_TAG_CATEGORY, 3, "Category"},
-    {IPTC_TAG_BYLINE, 32, "Author"},
-    {IPTC_TAG_BYLINE_TITLE, 32, "AuthorsPosition"},
+    {IPTC_TAG_BYLINE, 32, "Creator"},
+    {IPTC_TAG_BYLINE_TITLE, 32, "CreatorJobTitle"},
     {IPTC_TAG_CREDIT, 32, "Credit"},
     {IPTC_TAG_SOURCE, 32, "Source"},
     {IPTC_TAG_COPYRIGHT_NOTICE, 128, "Copyright"},
diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index 7356231cb..1c0a09929 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -24,8 +24,67 @@
 #include "mytime.h"
 #include "rt_math.h"
 #include "sleef.c"
+
 using namespace std;
 
+namespace
+{
+
+float pow3(float x)
+{
+    return x * x * x;
+}
+
+float pow4(float x)
+{
+    return (x * x) * (x * x);
+}
+
+float pown(float x, int n)
+{
+
+    switch (n) {
+        case 0:
+            return 1;
+
+        case 2:
+            return x * x;
+
+        case 4:
+            return pow4(x);
+
+        case 6:
+            return (x * x) * pow4(x);
+
+        case 8:
+            return pow4(x) * pow4(x);
+
+        default:
+            return pow_F(x, n);
+    }
+}
+
+float normn(float a, float b, int n)
+{
+    switch (n) {
+        case 2:
+            return sqrtf(a * a + b * b);
+
+        case 4:
+            return sqrtf(sqrtf(pow4(a) + pow4(b)));
+
+        case 6:
+            return sqrtf(xcbrtf(pow3(a) * pow3(a) + pow3(b) * pow3(b)));
+
+        case 8:
+            return sqrtf(sqrtf(sqrtf(pow4(a) * pow4(a) + pow4(b) * pow4(b))));
+
+        default:
+            return pow_F(pown(a, n) + pown(b, n), 1.f / n);
+    }
+}
+}
+
 namespace rtengine
 {
 #undef CLIPTOC
@@ -382,13 +441,15 @@ static float calcGradientFactor(const struct grad_params& gp, int x, int y)
             float val = ((float)(gy - gp.top_edge_0) * gp.ys_inv);
 
             if (gp.bright_top) {
-                val = 1.0 - val;
+                val = 1.f - val;
             }
 
-            if (gp.scale < 1.0) {
-                val = pow(xsinf(val * M_PI / 2), 3);
+            val *= M_PIf_2;
+
+            if (gp.scale < 1.f) {
+                val = pow3(xsinf(val));
             } else {
-                val = 1.0 - pow(xcosf(val * M_PI / 2), 3);
+                val = 1.f - pow3(xcosf(val));
             }
 
             return gp.scale + val * (1.0 - gp.scale);
@@ -396,7 +457,7 @@ static float calcGradientFactor(const struct grad_params& gp, int x, int y)
     } else {
         int gy = gp.transpose ? x : y;
         int gx = gp.transpose ? gp.h - y - 1 : x;
-        float top_edge = gp.yc - gp.ys / 2.0 - gp.ta * (gx - gp.xc);
+        float top_edge = gp.top_edge_0 - gp.ta * (gx - gp.xc);
 
         if (gy < top_edge) {
             return gp.topmul;
@@ -405,14 +466,14 @@ static float calcGradientFactor(const struct grad_params& gp, int x, int y)
         } else {
             float val = ((float)(gy - top_edge) * gp.ys_inv);
 
-            if (gp.bright_top) {
-                val = 1.0 - val;
-            }
+            val = gp.bright_top ? 1.f - val : val;
 
-            if (gp.scale < 1.0) {
-                val = pow(xsinf(val * M_PI / 2), 3);
+            val *= M_PIf_2;
+
+            if (gp.scale < 1.f) {
+                val = pow3(xsinf(val));
             } else {
-                val = 1.0 - pow(xcosf(val * M_PI / 2), 3);
+                val = 1.f - pow3(xcosf(val));
             }
 
             return gp.scale + val * (1.0 - gp.scale);
@@ -459,7 +520,7 @@ static void calcPCVignetteParams(int fW, int fH, int oW, int oH, const PCVignett
     pcv.sepmix = 0;
     pcv.oe_a = sqrt(2.0) * long_side * 0.5;
     pcv.oe_b = pcv.oe_a * short_side / long_side;
-    pcv.ie_mul = 1.0 / sqrt(2.0);
+    pcv.ie_mul = (1.0 / sqrt(2.0)) * (1.0 - pcv.feather);
     pcv.is_super_ellipse_mode = false;
     pcv.is_portrait = (pcv.w < pcv.h);
 
@@ -471,10 +532,10 @@ static void calcPCVignetteParams(int fW, int fH, int oW, int oH, const PCVignett
         pcv.sepmix = (sepf - pcv.sep) * 0.5; // 0.0 to 1.0
         pcv.oe1_a = powf(2.0, 1.0 / pcv.sep) * long_side * 0.5;
         pcv.oe1_b = pcv.oe1_a * short_side / long_side;
-        pcv.ie1_mul = 1.0 / powf(2.0, 1.0 / pcv.sep);
+        pcv.ie1_mul = (1.0 / powf(2.0, 1.0 / pcv.sep)) * (1.0 - pcv.feather);
         pcv.oe2_a = powf(2.0, 1.0 / (pcv.sep + 2)) * long_side * 0.5;
         pcv.oe2_b = pcv.oe2_a * short_side / long_side;
-        pcv.ie2_mul = 1.0 / powf(2.0, 1.0 / (pcv.sep + 2));
+        pcv.ie2_mul = (1.0 / powf(2.0, 1.0 / (pcv.sep + 2))) * (1.0 - pcv.feather);
     }
 
     if (roundness > 0.5) {
@@ -496,7 +557,7 @@ static void calcPCVignetteParams(int fW, int fH, int oW, int oH, const PCVignett
 static float calcPCVignetteFactor(const struct pcv_params& pcv, int x, int y)
 {
 
-    float fo = 1.0;
+    float fo = 1.f;
 
     if (x < pcv.x1 || x > pcv.x2 || y < pcv.y1 || y > pcv.y2) {
         /*
@@ -517,23 +578,19 @@ static float calcPCVignetteFactor(const struct pcv_params& pcv, int x, int y)
 
         fo = sqrtf(dist_x * dist_x + dist_y * dist_y) * pcv.fadeout_mul;
 
-        if (fo >= 1.0) {
-            return 1.0;
+        if (fo >= 1.f) {
+            return 1.f;
         }
     }
 
-    float val, a, b;
+    float a = fabs((x - pcv.x1) - pcv.w * 0.5f);
+    float b = fabs((y - pcv.y1) - pcv.h * 0.5f);
 
-    if (pcv.is_portrait) {
-        a = fabs((y - pcv.y1) - pcv.h * 0.5);
-        b = fabs((x - pcv.x1) - pcv.w * 0.5);
-    } else {
-        a = fabs((x - pcv.x1) - pcv.w * 0.5);
-        b = fabs((y - pcv.y1) - pcv.h * 0.5);
+    if(pcv.is_portrait) {
+        std::swap(a, b);
     }
 
-    float angle = xatan2f(b, a);
-    float dist = sqrtf(a * a + b * b);
+    float dist = normn(a, b, 2);
     float dist_oe, dist_ie;
     float2 sincosval;
 
@@ -546,37 +603,39 @@ static float calcPCVignetteFactor(const struct pcv_params& pcv, int x, int y)
     }
 
     if (pcv.is_super_ellipse_mode) {
-        float dist_oe1 = pcv.oe1_a * pcv.oe1_b / pow_F(pow(pcv.oe1_b * sincosval.y, pcv.sep) + pow(pcv.oe1_a * sincosval.x, pcv.sep), 1.0 / pcv.sep);
-        float dist_oe2 = pcv.oe2_a * pcv.oe2_b / pow_F(pow(pcv.oe2_b * sincosval.y, pcv.sep + 2) + pow(pcv.oe2_a * sincosval.x, pcv.sep + 2), 1.0 / (pcv.sep + 2));
-        float dist_ie1 = pcv.ie1_mul * dist_oe1 * (1.0 - pcv.feather);
-        float dist_ie2 = pcv.ie2_mul * dist_oe2 * (1.0 - pcv.feather);
-        dist_oe = dist_oe1 * (1.0 - pcv.sepmix) + dist_oe2 * pcv.sepmix;
-        dist_ie = dist_ie1 * (1.0 - pcv.sepmix) + dist_ie2 * pcv.sepmix;
+        float dist_oe1 = pcv.oe1_a * pcv.oe1_b / normn(pcv.oe1_b * sincosval.y, pcv.oe1_a * sincosval.x, pcv.sep);
+        float dist_oe2 = pcv.oe2_a * pcv.oe2_b / normn(pcv.oe2_b * sincosval.y, pcv.oe2_a * sincosval.x, pcv.sep + 2);
+        float dist_ie1 = pcv.ie1_mul * dist_oe1;
+        float dist_ie2 = pcv.ie2_mul * dist_oe2;
+        dist_oe = dist_oe1 * (1.f - pcv.sepmix) + dist_oe2 * pcv.sepmix;
+        dist_ie = dist_ie1 * (1.f - pcv.sepmix) + dist_ie2 * pcv.sepmix;
     } else {
         dist_oe = pcv.oe_a * pcv.oe_b / sqrtf(SQR(pcv.oe_b * sincosval.y) + SQR(pcv.oe_a * sincosval.x));
-        dist_ie = pcv.ie_mul * dist_oe * (1.0 - pcv.feather);
+        dist_ie = pcv.ie_mul * dist_oe;
     }
 
     if (dist <= dist_ie) {
-        return 1.0;
+        return 1.f;
     }
 
+    float val;
+
     if (dist >= dist_oe) {
         val = pcv.scale;
     } else {
-        val = (dist - dist_ie) / (dist_oe - dist_ie);
+        val = M_PIf_2 * (dist - dist_ie) / (dist_oe - dist_ie);
 
-        if (pcv.scale < 1.0) {
-            val = pow(xcosf(val * M_PI / 2), 4);
+        if (pcv.scale < 1.f) {
+            val = pow4(xcosf(val));
         } else {
-            val = 1 - pow(xsinf(val * M_PI / 2), 4);
+            val = 1 - pow4(xsinf(val));
         }
 
-        val = pcv.scale + val * (1.0 - pcv.scale);
+        val = pcv.scale + val * (1.f - pcv.scale);
     }
 
-    if (fo < 1.0) {
-        val = 1.0 * fo + val * (1.0 - fo);
+    if (fo < 1.f) {
+        val = fo + val * (1.f - fo);
     }
 
     return val;
@@ -584,6 +643,7 @@ static float calcPCVignetteFactor(const struct pcv_params& pcv, int x, int y)
 
 void ImProcFunctions::transformLuminanceOnly (Imagefloat* original, Imagefloat* transformed, int cx, int cy, int oW, int oH, int fW, int fH)
 {
+
     const bool applyVignetting = needsVignetting();
     const bool applyGradient = needsGradient();
     const bool applyPCVignetting = needsPCVignetting();
diff --git a/rtengine/jpeg_ijg/README b/rtengine/jpeg_ijg/README
new file mode 100644
index 000000000..4c8e82e9b
--- /dev/null
+++ b/rtengine/jpeg_ijg/README
@@ -0,0 +1,375 @@
+The Independent JPEG Group's JPEG software
+==========================================
+
+README for release 9b of 17-Jan-2016
+====================================
+
+This distribution contains the ninth public release of the Independent JPEG
+Group's free JPEG software.  You are welcome to redistribute this software and
+to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
+
+This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
+Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
+Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
+and other members of the Independent JPEG Group.
+
+IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
+(previously known as JPEG, together with ITU-T SG16).
+
+
+DOCUMENTATION ROADMAP
+=====================
+
+This file contains the following sections:
+
+OVERVIEW            General description of JPEG and the IJG software.
+LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
+REFERENCES          Where to learn more about JPEG.
+ARCHIVE LOCATIONS   Where to find newer versions of this software.
+ACKNOWLEDGMENTS     Special thanks.
+FILE FORMAT WARS    Software *not* to get.
+TO DO               Plans for future IJG releases.
+
+Other documentation files in the distribution are:
+
+User documentation:
+  install.txt       How to configure and install the IJG software.
+  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
+                    rdjpgcom, and wrjpgcom.
+  *.1               Unix-style man pages for programs (same info as usage.txt).
+  wizard.txt        Advanced usage instructions for JPEG wizards only.
+  change.log        Version-to-version change highlights.
+Programmer and internal documentation:
+  libjpeg.txt       How to use the JPEG library in your own programs.
+  example.c         Sample code for calling the JPEG library.
+  structure.txt     Overview of the JPEG library's internal structure.
+  filelist.txt      Road map of IJG files.
+  coderules.txt     Coding style rules --- please read if you contribute code.
+
+Please read at least the files install.txt and usage.txt.  Some information
+can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
+ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
+
+If you want to understand how the JPEG code works, we suggest reading one or
+more of the REFERENCES, then looking at the documentation files (in roughly
+the order listed) before diving into the code.
+
+
+OVERVIEW
+========
+
+This package contains C software to implement JPEG image encoding, decoding,
+and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
+method for full-color and grayscale images.
+
+This software implements JPEG baseline, extended-sequential, and progressive
+compression processes.  Provision is made for supporting all variants of these
+processes, although some uncommon parameter settings aren't implemented yet.
+We have made no provision for supporting the hierarchical or lossless
+processes defined in the standard.
+
+We provide a set of library routines for reading and writing JPEG image files,
+plus two sample applications "cjpeg" and "djpeg", which use the library to
+perform conversion between JPEG and some other popular image file formats.
+The library is intended to be reused in other applications.
+
+In order to support file conversion and viewing software, we have included
+considerable functionality beyond the bare JPEG coding/decoding capability;
+for example, the color quantization modules are not strictly part of JPEG
+decoding, but they are essential for output to colormapped file formats or
+colormapped displays.  These extra functions can be compiled out of the
+library if not required for a particular application.
+
+We have also included "jpegtran", a utility for lossless transcoding between
+different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
+applications for inserting and extracting textual comments in JFIF files.
+
+The emphasis in designing this software has been on achieving portability and
+flexibility, while also making it fast enough to be useful.  In particular,
+the software is not intended to be read as a tutorial on JPEG.  (See the
+REFERENCES section for introductory material.)  Rather, it is intended to
+be reliable, portable, industrial-strength code.  We do not claim to have
+achieved that goal in every aspect of the software, but we strive for it.
+
+We welcome the use of this software as a component of commercial products.
+No royalty is required, but we do ask for an acknowledgement in product
+documentation, as described under LEGAL ISSUES.
+
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-2016, Thomas G. Lane, Guido Vollbeding.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
+but is also freely distributable.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent (now expired), GIF reading
+support has been removed altogether, and the GIF writer has been simplified
+to produce "uncompressed GIFs".  This technique does not use the LZW
+algorithm; the resulting GIF files are larger than usual, but are readable
+by all standard GIF decoders.
+
+
+REFERENCES
+==========
+
+We recommend reading one or more of these references before trying to
+understand the innards of the JPEG software.
+
+The best short technical introduction to the JPEG compression algorithm is
+	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+(Adjacent articles in that issue discuss MPEG motion picture compression,
+applications of JPEG, and related topics.)  If you don't have the CACM issue
+handy, a PDF file containing a revised version of Wallace's article is
+available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
+a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+omits the sample images that appeared in CACM, but it includes corrections
+and some added material.  Note: the Wallace article is copyright ACM and IEEE,
+and it may not be used for commercial purposes.
+
+A somewhat less technical, more leisurely introduction to JPEG can be found in
+"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
+good explanations and example C code for a multitude of compression methods
+including JPEG.  It is an excellent source if you are comfortable reading C
+code but don't know much about data compression in general.  The book's JPEG
+sample code is far from industrial-strength, but when you are ready to look
+at a full implementation, you've got one here...
+
+The best currently available description of JPEG is the textbook "JPEG Still
+Image Data Compression Standard" by William B. Pennebaker and Joan L.
+Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
+Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
+standards (DIS 10918-1 and draft DIS 10918-2).
+Although this is by far the most detailed and comprehensive exposition of
+JPEG publicly available, we point out that it is still missing an explanation
+of the most essential properties and algorithms of the underlying DCT
+technology.
+If you think that you know about DCT-based JPEG after reading this book,
+then you are in delusion.  The real fundamentals and corresponding potential
+of DCT-based JPEG are not publicly known so far, and that is the reason for
+all the mistaken developments taking place in the image coding domain.
+
+The original JPEG standard is divided into two parts, Part 1 being the actual
+specification, while Part 2 covers compliance testing methods.  Part 1 is
+titled "Digital Compression and Coding of Continuous-tone Still Images,
+Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
+10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
+Continuous-tone Still Images, Part 2: Compliance testing" and has document
+numbers ISO/IEC IS 10918-2, ITU-T T.83.
+IJG JPEG 8 introduced an implementation of the JPEG SmartScale extension
+which is specified in two documents:  A contributed document at ITU and ISO
+with title "ITU-T JPEG-Plus Proposal for Extending ITU-T T.81 for Advanced
+Image Coding", April 2006, Geneva, Switzerland.  The latest version of this
+document is Revision 3.  And a contributed document ISO/IEC JTC1/SC29/WG1 N
+5799 with title "Evolution of JPEG", June/July 2011, Berlin, Germany.
+IJG JPEG 9 introduces a reversible color transform for improved lossless
+compression which is described in a contributed document ISO/IEC JTC1/SC29/
+WG1 N 6080 with title "JPEG 9 Lossless Coding", June/July 2012, Paris,
+France.
+
+The JPEG standard does not specify all details of an interchangeable file
+format.  For the omitted details we follow the "JFIF" conventions, version 2.
+JFIF version 1 has been adopted as Recommendation ITU-T T.871 (05/2011) :
+Information technology - Digital compression and coding of continuous-tone
+still images: JPEG File Interchange Format (JFIF).  It is available as a
+free download in PDF file format from http://www.itu.int/rec/T-REC-T.871.
+A PDF file of the older JFIF document is available at
+http://www.w3.org/Graphics/JPEG/jfif3.pdf.
+
+The TIFF 6.0 file format specification can be obtained by FTP from
+ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
+found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
+IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
+Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
+(Compression tag 7).  Copies of this Note can be obtained from
+http://www.ijg.org/files/.  It is expected that the next revision
+of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+uses our library to implement TIFF/JPEG per the Note.
+
+
+ARCHIVE LOCATIONS
+=================
+
+The "official" archive site for this software is www.ijg.org.
+The most recent released version can always be found there in
+directory "files".  This particular version will be archived as
+http://www.ijg.org/files/jpegsrc.v9b.tar.gz, and in Windows-compatible
+"zip" archive format as http://www.ijg.org/files/jpegsr9b.zip.
+
+The JPEG FAQ (Frequently Asked Questions) article is a source of some
+general information about JPEG.
+It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
+and other news.answers archive sites, including the official news.answers
+archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
+If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
+with body
+	send usenet/news.answers/jpeg-faq/part1
+	send usenet/news.answers/jpeg-faq/part2
+
+
+ACKNOWLEDGMENTS
+===============
+
+Thank to Juergen Bruder for providing me with a copy of the common DCT
+algorithm article, only to find out that I had come to the same result
+in a more direct and comprehensible way with a more generative approach.
+
+Thank to Istvan Sebestyen and Joan L. Mitchell for inviting me to the
+ITU JPEG (Study Group 16) meeting in Geneva, Switzerland.
+
+Thank to Thomas Wiegand and Gary Sullivan for inviting me to the
+Joint Video Team (MPEG & ITU) meeting in Geneva, Switzerland.
+
+Thank to Thomas Richter and Daniel Lee for inviting me to the
+ISO/IEC JTC1/SC29/WG1 (previously known as JPEG, together with ITU-T SG16)
+meeting in Berlin, Germany.
+
+Thank to John Korejwa and Massimo Ballerini for inviting me to
+fruitful consultations in Boston, MA and Milan, Italy.
+
+Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther
+Maier-Gerber, Walter Stoeber, Fred Schmitz, and Norbert Braunagel
+for corresponding business development.
+
+Thank to Nico Zschach and Dirk Stelling of the technical support team
+at the Digital Images company in Halle for providing me with extra
+equipment for configuration tests.
+
+Thank to Richard F. Lyon (then of Foveon Inc.) for fruitful
+communication about JPEG configuration in Sigma Photo Pro software.
+
+Thank to Andrew Finkenstadt for hosting the ijg.org site.
+
+Last but not least special thank to Thomas G. Lane for the original
+design and development of this singular software package.
+
+
+FILE FORMAT WARS
+================
+
+The ISO/IEC JTC1/SC29/WG1 standards committee (previously known as JPEG,
+together with ITU-T SG16) currently promotes different formats containing
+the name "JPEG" which is misleading because these formats are incompatible
+with original DCT-based JPEG and are based on faulty technologies.
+IJG therefore does not and will not support such momentary mistakes
+(see REFERENCES).
+There exist also distributions under the name "OpenJPEG" promoting such
+kind of formats which is misleading because they don't support original
+JPEG images.
+We have no sympathy for the promotion of inferior formats.  Indeed, one of
+the original reasons for developing this free software was to help force
+convergence on common, interoperable format standards for JPEG files.
+Don't use an incompatible file format!
+(In any case, our decoder will remain capable of reading existing JPEG
+image files indefinitely.)
+
+The ISO committee pretends to be "responsible for the popular JPEG" in their
+public reports which is not true because they don't respond to actual
+requirements for the maintenance of the original JPEG specification.
+Furthermore, the ISO committee pretends to "ensure interoperability" with
+their standards which is not true because their "standards" support only
+application-specific and proprietary use cases and contain mathematically
+incorrect code.
+
+There are currently different distributions in circulation containing the
+name "libjpeg" which is misleading because they don't have the features and
+are incompatible with formats supported by actual IJG libjpeg distributions.
+One of those fakes is released by members of the ISO committee and just uses
+the name of libjpeg for misdirection of people, similar to the abuse of the
+name JPEG as described above, while having nothing in common with actual IJG
+libjpeg distributions and containing mathematically incorrect code.
+The other one claims to be a "derivative" or "fork" of the original libjpeg,
+but violates the license conditions as described under LEGAL ISSUES above
+and violates basic C programming properties.
+We have no sympathy for the release of misleading, incorrect and illegal
+distributions derived from obsolete code bases.
+Don't use an obsolete code base!
+
+According to the UCC (Uniform Commercial Code) law, IJG has the lawful and
+legal right to foreclose on certain standardization bodies and other
+institutions or corporations that knowingly perform substantial and
+systematic deceptive acts and practices, fraud, theft, and damaging of the
+value of the people of this planet without their knowing, willing and
+intentional consent.
+The titles, ownership, and rights of these institutions and all their assets
+are now duly secured and held in trust for the free people of this planet.
+People of the planet, on every country, may have a financial interest in
+the assets of these former principals, agents, and beneficiaries of the
+foreclosed institutions and corporations.
+IJG asserts what is: that each man, woman, and child has unalienable value
+and rights granted and deposited in them by the Creator and not any one of
+the people is subordinate to any artificial principality, corporate fiction
+or the special interest of another without their appropriate knowing,
+willing and intentional consent made by contract or accommodation agreement.
+IJG expresses that which already was.
+The people have already determined and demanded that public administration
+entities, national governments, and their supporting judicial systems must
+be fully transparent, accountable, and liable.
+IJG has secured the value for all concerned free people of the planet.
+
+A partial list of foreclosed institutions and corporations ("Hall of Shame")
+is currently prepared and will be published later.
+
+
+TO DO
+=====
+
+Version 9 is the second release of a new generation JPEG standard
+to overcome the limitations of the original JPEG specification,
+and is the first true source reference JPEG codec.
+More features are being prepared for coming releases...
+
+Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.
diff --git a/rtengine/jpeg_memsrc.cc b/rtengine/jpeg_ijg/jpeg_memsrc.cc
similarity index 99%
rename from rtengine/jpeg_memsrc.cc
rename to rtengine/jpeg_ijg/jpeg_memsrc.cc
index 5459af8b6..3e245b87e 100644
--- a/rtengine/jpeg_memsrc.cc
+++ b/rtengine/jpeg_ijg/jpeg_memsrc.cc
@@ -22,7 +22,7 @@
 #include <cstdio>
 #include <jpeglib.h>
 #include <jerror.h>
-#include "jpeg.h"
+#include "../jpeg.h"
 
 
 /* Expanded data source object for memory input */
diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc
index a9ff42de5..02354588b 100644
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -539,7 +539,7 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
             free (raw_image);
             raw_image = nullptr;
         } else {
-            if (cc && cc->has_rawCrop()) { // foveon images
+            if (is_foveon && cc && cc->has_rawCrop()) { // foveon images
                 int lm, tm, w, h;
                 cc->get_rawCrop(lm, tm, w, h);
                 left_margin = lm;
@@ -729,6 +729,10 @@ float** RawImage::compress_image(int frameNum)
                 this->data[row][col] = image[row * width + col][0];
             }
     } else {
+        if(get_maker() == "Sigma" && dng_version) { // Hack to prevent sigma dng files from crashing
+            height -= top_margin;
+            width -= left_margin;
+        }
         #pragma omp parallel for
 
         for (int row = 0; row < height; row++)
diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h
index 4644f7dca..3f4307054 100644
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -275,37 +275,37 @@ public:
     {
         return profile_data;
     }
-    IMFILE *get_file()
+    IMFILE *get_file() const
     {
         return ifp;
     }
     bool is_supportedThumb() const ;
     bool is_jpegThumb() const ;
     bool is_ppmThumb() const ;
-    int get_thumbOffset()
+    int get_thumbOffset() const
     {
         return int(thumb_offset);
     }
-    int get_thumbWidth()
+    int get_thumbWidth() const
     {
         return int(thumb_width);
     }
-    int get_thumbHeight()
+    int get_thumbHeight() const
     {
         return int(thumb_height);
     }
-    int get_thumbBPS()
+    int get_thumbBPS() const
     {
         return thumb_load_raw ? 16 : 8;
     }
     bool get_thumbSwap() const;
-    unsigned get_thumbLength()
+    unsigned get_thumbLength() const
     {
         return thumb_length;
     }
-    bool zeroIsBad()
+    bool zeroIsBad() const
     {
-        return zero_is_bad == 1 ? true : false;
+        return zero_is_bad == 1;
     }
 
 public:
@@ -357,6 +357,10 @@ public:
         return (xtrans[(row) % 6][(col) % 6]);
     }
 
+    unsigned DNGVERSION ( ) const
+    {
+        return dng_version;
+    }
 };
 
 }
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index a5ec68433..14f9f91c1 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -41,6 +41,25 @@
 #include "StopWatch.h"
 
 
+namespace
+{
+
+    bool checkRawImageThumb(const rtengine::RawImage& raw_image)
+    {
+        if (!raw_image.is_supportedThumb()) {
+            return false;
+        }
+
+        const std::size_t length =
+            fdata(raw_image.get_thumbOffset(), raw_image.get_file())[1] != 0xD8 && raw_image.is_ppmThumb()
+                ? raw_image.get_thumbWidth() * raw_image.get_thumbHeight() * (raw_image.get_thumbBPS() / 8) * 3
+                : raw_image.get_thumbLength();
+
+        return raw_image.get_thumbOffset() + length <= raw_image.get_file()->size;
+    }
+
+}
+
 extern Options options;
 
 namespace rtengine
@@ -176,8 +195,8 @@ Thumbnail* Thumbnail::loadQuickFromRaw (const Glib::ustring& fname, RawMetaDataL
 
     int err = 1;
 
-    // see if it is something we support
-    if ( ri->is_supportedThumb() && ri->get_thumbOffset() < ri->get_file()->size ) {
+    // See if it is something we support
+    if (checkRawImageThumb(*ri)) {
         const char* data((const char*)fdata(ri->get_thumbOffset(), ri->get_file()));
 
         if ( (unsigned char)data[1] == 0xd8 ) {
@@ -452,6 +471,10 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
             int left_margin = ri->get_leftmargin();
             firstgreen += left_margin;
             int top_margin = ri->get_topmargin();
+            if(ri->get_maker() == "Sigma" && ri->DNGVERSION()) { // Hack to prevent sigma dng files from crashing
+                tmpw = (width - 2 - left_margin) / hskip;
+                tmph = (height - 2 - top_margin) / vskip;
+            }
 
             for (int row = 1 + top_margin, y = 0; row < iheight + top_margin  - 1 && y < tmph; row += vskip, y++) {
                 rofs = row * iwidth;
@@ -496,6 +519,17 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
         tmph = high;
     }
 
+    const bool rotate_90 =
+        rotate
+        && (
+            ri->get_rotateDegree() == 90
+            || ri->get_rotateDegree() == 270
+        );
+
+    if (rotate_90) {
+        std::swap(tmpw, tmph);
+    }
+
     if (fixwh == 1) { // fix height, scale width
         w = tmpw * h / tmph;
     } else {
@@ -506,8 +540,11 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
         delete tpp->thumbImg;
     }
 
-    tpp->thumbImg = nullptr;
-    tpp->thumbImg = resizeTo<Image16>(w, h, TI_Bilinear, tmpImg);
+    if (rotate_90) {
+        tpp->thumbImg = resizeTo<Image16>(h, w, TI_Bilinear, tmpImg);
+    } else {
+        tpp->thumbImg = resizeTo<Image16>(w, h, TI_Bilinear, tmpImg);
+    }
     delete tmpImg;
 
 
@@ -914,7 +951,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
 
     ImProcFunctions ipf (&params, false);
     ipf.setScale (sqrt(double(fw * fw + fh * fh)) / sqrt(double(thumbImg->width * thumbImg->width + thumbImg->height * thumbImg->height))*scale);
-    ipf.updateColorProfiles (params.icm, options.rtSettings.monitorProfile, options.rtSettings.monitorIntent, false, false);
+    ipf.updateColorProfiles (options.rtSettings.monitorProfile, options.rtSettings.monitorIntent, false, false);
 
     LUTu hist16 (65536);
 
diff --git a/rtengine/settings.h b/rtengine/settings.h
index b572e7310..ada63400a 100644
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -38,6 +38,9 @@ public:
     int             leveldnliss;            // level of auto multi zone
     int             leveldnautsimpl;            // STD or EXPERT
 
+    Glib::ustring   printerProfile;         ///< ICC profile name used for soft-proofing a printer output
+    RenderingIntent printerIntent;          ///< Colorimetric intent used with the above profile
+    bool            printerBPC;             ///< Black Point Compensation for the Labimage->Printer->Monitor transform
     Glib::ustring   monitorProfile;         ///< ICC profile name used for the monitor
     RenderingIntent monitorIntent;          ///< Colorimetric intent used with the above profile
     bool            monitorBPC;             ///< Black Point Compensation for the Labimage->Monitor transform (directly, i.e. not soft-proofing and no WCS in between)
diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc
index 01b825882..9bbeee8ce 100644
--- a/rtexif/nikonattribs.cc
+++ b/rtexif/nikonattribs.cc
@@ -322,526 +322,9 @@ NAAFInfoInterpreter naAFInfoInterpreter;
 
 class NALensDataInterpreter : public Interpreter
 {
-    std::map<std::string, std::string> lenses;
+    static const std::map<std::string, std::string> lenses;
+
 public:
-    NALensDataInterpreter ()
-    {
-        /*  The key is a composite string made of 8 HEX bytes
-         *  LensIDNumber LensFStops MinFocalLength MaxFocalLength MaxApertureAtMinFocal MaxApertureAtMaxFocal MCUVersion and LensType */
-        lenses["00 00 00 00 00 00 00 01"] = "Manual Lens No CPU";
-        lenses["00 00 00 00 00 00 E1 12"] = "TC-17E II";
-        lenses["00 00 00 00 00 00 F1 0C"] = "TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x";
-        lenses["00 00 00 00 00 00 F2 18"] = "TC-20E [II] or Sigma APO Tele Converter 2x EX DG or Kenko Teleplus PRO 300 DG 2.0x";
-        lenses["00 00 48 48 53 53 00 01"] = "Loreo 40mm f/11-22 3D Lens in a Cap 9005";
-        lenses["00 36 1C 2D 34 3C 00 06"] = "Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical (IF) (A13)";
-        lenses["00 3C 1F 37 30 30 00 06"] = "Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)";
-        lenses["00 3C 2B 44 30 30 00 06"] = "Tokina AT-X 17-35 f/4 PRO FX (AF 17-35mm f/4)";
-        lenses["00 3C 5C 80 30 30 00 0E"] = "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)";
-        lenses["00 3E 80 A0 38 3F 00 02"] = "Tamron SP AF 200-500mm f/5-6.3 Di LD (IF) (A08)";
-        lenses["00 3F 2D 80 2B 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) (A14)";
-        lenses["00 3F 2D 80 2C 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14)";
-        lenses["00 3F 80 A0 38 3F 00 02"] = "Tamron SP AF 200-500mm f/5-6.3 Di (A08)";
-        lenses["00 40 11 11 2C 2C 00 00"] = "Samyang 8mm f/3.5 Fish-Eye";
-        lenses["00 40 18 2B 2C 34 00 06"] = "Tokina AT-X 107 AF DX Fisheye (AF 10-17mm f/3.5-4.5)";
-        lenses["00 40 2A 72 2C 3C 00 06"] = "Tokina AT-X 16.5-135 DX (AF 16.5-135mm f/3.5-5.6)";
-        lenses["00 40 2B 2B 2C 2C 00 02"] = "Tokina AT-X 17 AF PRO (AF 17mm f/3.5)";
-        lenses["00 40 2D 2D 2C 2C 00 00"] = "Carl Zeiss Distagon T* 3.5/18 ZF.2";
-        lenses["00 40 2D 80 2C 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)";
-        lenses["00 40 2D 88 2C 40 00 06"] = "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)";
-        lenses["00 40 2D 88 2C 40 62 06"] = "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18)";
-        lenses["00 40 31 31 2C 2C 00 00"] = "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical";
-        lenses["00 40 37 80 2C 3C 00 02"] = "Tokina AT-X 242 AF (AF 24-200mm f/3.5-5.6)";
-        lenses["00 40 64 64 2C 2C 00 00"] = "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus";
-        lenses["00 44 60 98 34 3C 00 02"] = "Tokina AT-X 840 D (AF 80-400mm f/4.5-5.6)";
-        lenses["00 47 10 10 24 24 00 00"] = "Fisheye Nikkor 8mm f/2.8 AiS";
-        lenses["00 47 25 25 24 24 00 02"] = "Tamron SP AF 14mm f/2.8 Aspherical (IF) (69E)";
-        lenses["00 47 3C 3C 24 24 00 00"] = "Nikkor 28mm f/2.8 AiS";
-        lenses["00 47 44 44 24 24 00 06"] = "Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)";
-        lenses["00 47 53 80 30 3C 00 06"] = "Tamron AF 55-200mm f/4-5.6 Di II LD (A15)";
-        lenses["00 48 1C 29 24 24 00 06"] = "Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)";
-        lenses["00 48 29 3C 24 24 00 06"] = "Tokina AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)";
-        lenses["00 48 29 50 24 24 00 06"] = "Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)";
-        lenses["00 48 32 32 24 24 00 00"] = "Carl Zeiss Distagon T* 2.8/21 ZF.2";
-        lenses["00 48 37 5C 24 24 00 06"] = "Tokina AT-X 24-70 f/2.8 PRO FX (AF 24-70mm f/2.8)";
-        lenses["00 48 3C 3C 24 24 00 00"] = "Voigtlander Color Skopar 28mm f/2.8 SL II";
-        lenses["00 48 3C 60 24 24 00 02"] = "Tokina AT-X 280 AF PRO (AF 28-80mm f/2.8)";
-        lenses["00 48 3C 6A 24 24 00 02"] = "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF (176D)";
-        lenses["00 48 50 50 18 18 00 00"] = "Nikkor H 50mm f/2";
-        lenses["00 48 50 72 24 24 00 06"] = "Tokina AT-X 535 PRO DX (AF 50-135mm f/2.8)";
-        lenses["00 48 5C 80 30 30 00 0E"] = "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)";
-        lenses["00 48 5C 8E 30 3C 00 06"] = "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17NII)";
-        lenses["00 48 68 68 24 24 00 00"] = "Series E 100mm f/2.8";
-        lenses["00 48 80 80 30 30 00 00"] = "Nikkor 200mm f/4 AiS";
-        lenses["00 49 30 48 22 2B 00 02"] = "Tamron SP AF 20-40mm f/2.7-3.5 (166D)";
-        lenses["00 4C 6A 6A 20 20 00 00"] = "Nikkor 105mm f/2.5 AiS";
-        lenses["00 4C 7C 7C 2C 2C 00 02"] = "Tamron SP AF 180mm f/3.5 Di Model (B01)";
-        lenses["00 53 2B 50 24 24 00 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16)";
-        lenses["00 54 2B 50 24 24 00 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)";
-        lenses["00 54 3C 3C 18 18 00 00"] = "Carl Zeiss Distagon T* 2/28 ZF.2";
-        lenses["00 54 44 44 0C 0C 00 00"] = "Carl Zeiss Distagon T* 1.4/35 ZF.2";
-        lenses["00 54 44 44 18 18 00 00"] = "Carl Zeiss Distagon T* 2/35 ZF.2";
-        lenses["00 54 48 48 18 18 00 00"] = "Voigtlander Ultron 40mm f/2 SLII Aspherical";
-        lenses["00 54 50 50 0C 0C 00 00"] = "Carl Zeiss Planar T* 1.4/50 ZF.2";
-        lenses["00 54 50 50 18 18 00 00"] = "Carl Zeiss Makro-Planar T* 2/50 ZF.2";
-        lenses["00 54 53 53 0C 0C 00 00"] = "Zeiss Otus 1.4/55";
-        lenses["00 54 55 55 0C 0C 00 00"] = "Voigtlander Nokton 58mm f/1.4 SLII";
-        lenses["00 54 56 56 30 30 00 00"] = "Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo";
-        lenses["00 54 62 62 0C 0C 00 00"] = "Carl Zeiss Planar T* 1.4/85 ZF.2";
-        lenses["00 54 68 68 18 18 00 00"] = "Carl Zeiss Makro-Planar T* 2/100 ZF.2";
-        lenses["00 54 68 68 24 24 00 02"] = "Tokina AT-X M100 AF PRO D (AF 100mm f/2.8 Macro)";
-        lenses["00 54 72 72 18 18 00 00"] = "Carl Zeiss Apo Sonnar T* 2/135 ZF.2";
-        lenses["00 54 8E 8E 24 24 00 02"] = "Tokina AT-X 300 AF PRO (AF 300mm f/2.8)";
-        lenses["00 57 50 50 14 14 00 00"] = "Nikkor 50mm f/1.8 AI";
-        lenses["00 58 64 64 20 20 00 00"] = "Soligor C/D Macro MC 90mm f/2.5";
-        lenses["01 00 00 00 00 00 02 00"] = "TC-16A";
-        lenses["01 00 00 00 00 00 08 00"] = "TC-16A";
-        lenses["01 54 62 62 0C 0C 00 00"] = "Zeiss Otus 1.4/85";
-        lenses["01 58 50 50 14 14 02 00"] = "AF Nikkor 50mm f/1.8";
-        lenses["01 58 50 50 14 14 05 00"] = "AF Nikkor 50mm f/1.8";
-        lenses["02 2F 98 98 3D 3D 02 00"] = "Sigma APO 400mm f/5.6";
-        lenses["02 34 A0 A0 44 44 02 00"] = "Sigma APO 500mm f/7.2";
-        lenses["02 37 5E 8E 35 3D 02 00"] = "Sigma 75-300mm f/4.5-5.6 APO";
-        lenses["02 37 A0 A0 34 34 02 00"] = "Sigma APO 500mm f/4.5";
-        lenses["02 3A 37 50 31 3D 02 00"] = "Sigma 24-50mm f/4-5.6 UC";
-        lenses["02 3A 5E 8E 32 3D 02 00"] = "Sigma 75-300mm f/4.0-5.6";
-        lenses["02 3B 44 61 30 3D 02 00"] = "Sigma 35-80mm f/4-5.6";
-        lenses["02 3C B0 B0 3C 3C 02 00"] = "Sigma APO 800mm f/5.6";
-        lenses["02 3F 24 24 2C 2C 02 00"] = "Sigma 14mm f/3.5";
-        lenses["02 3F 3C 5C 2D 35 02 00"] = "Sigma 28-70mm f/3.5-4.5 UC";
-        lenses["02 40 44 5C 2C 34 02 00"] = "Exakta AF 35-70mm 1:3.5-4.5 MC";
-        lenses["02 40 44 73 2B 36 02 00"] = "Sigma 35-135mm f/3.5-4.5 a";
-        lenses["02 40 5C 82 2C 35 02 00"] = "Sigma APO 70-210mm f/3.5-4.5";
-        lenses["02 42 44 5C 2A 34 02 00"] = "AF Zoom-Nikkor 35-70mm f/3.3-4.5";
-        lenses["02 42 44 5C 2A 34 08 00"] = "AF Zoom-Nikkor 35-70mm f/3.3-4.5";
-        lenses["02 46 37 37 25 25 02 00"] = "Sigma 24mm f/2.8 Super Wide II Macro";
-        lenses["02 46 3C 5C 25 25 02 00"] = "Sigma 28-70mm f/2.8";
-        lenses["02 46 5C 82 25 25 02 00"] = "Sigma 70-210mm f/2.8 APO";
-        lenses["02 48 50 50 24 24 02 00"] = "Sigma Macro 50mm f/2.8";
-        lenses["02 48 65 65 24 24 02 00"] = "Sigma Macro 90mm f/2.8";
-        lenses["03 43 5C 81 35 35 02 00"] = "Soligor AF C/D Zoom UMCS 70-210mm 1:4.5";
-        lenses["03 48 5C 81 30 30 02 00"] = "AF Zoom-Nikkor 70-210mm f/4";
-        lenses["04 48 3C 3C 24 24 03 00"] = "AF Nikkor 28mm f/2.8";
-        lenses["05 54 50 50 0C 0C 04 00"] = "AF Nikkor 50mm f/1.4";
-        lenses["06 3F 68 68 2C 2C 06 00"] = "Cosina AF 100mm f/3.5 Macro";
-        lenses["06 54 53 53 24 24 06 00"] = "AF Micro-Nikkor 55mm f/2.8";
-        lenses["07 36 3D 5F 2C 3C 03 00"] = "Cosina AF Zoom 28-80mm f/3.5-5.6 MC Macro";
-        lenses["07 3E 30 43 2D 35 03 00"] = "Soligor AF Zoom 19-35mm 1:3.5-4.5 MC";
-        lenses["07 40 2F 44 2C 34 03 02"] = "Tamron AF 19-35mm f/3.5-4.5 (A10)";
-        lenses["07 40 30 45 2D 35 03 02"] = "Tamron AF 19-35mm f/3.5-4.5 (A10)";
-        lenses["07 40 3C 5C 2C 35 03 00"] = "Tokina AF 270 II (AF 28-70mm f/3.5-4.5)";
-        lenses["07 40 3C 62 2C 34 03 00"] = "AF Zoom-Nikkor 28-85mm f/3.5-4.5";
-        lenses["07 46 2B 44 24 30 03 02"] = "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical (IF) (A05)";
-        lenses["07 46 3D 6A 25 2F 03 00"] = "Cosina AF Zoom 28-105mm f/2.8-3.8 MC";
-        lenses["07 47 3C 5C 25 35 03 00"] = "Tokina AF 287 SD (AF 28-70mm f/2.8-4.5)";
-        lenses["07 48 3C 5C 24 24 03 00"] = "Tokina AT-X 287 AF (AF 28-70mm f/2.8)";
-        lenses["08 40 44 6A 2C 34 04 00"] = "AF Zoom-Nikkor 35-105mm f/3.5-4.5";
-        lenses["09 48 37 37 24 24 04 00"] = "AF Nikkor 24mm f/2.8";
-        lenses["0A 48 8E 8E 24 24 03 00"] = "AF Nikkor 300mm f/2.8 IF-ED";
-        lenses["0A 48 8E 8E 24 24 05 00"] = "AF Nikkor 300mm f/2.8 IF-ED N";
-        lenses["0B 3E 3D 7F 2F 3D 0E 00"] = "Tamron AF 28-200mm f/3.8-5.6 (71D)";
-        lenses["0B 3E 3D 7F 2F 3D 0E 02"] = "Tamron AF 28-200mm f/3.8-5.6D (171D)";
-        lenses["0B 48 7C 7C 24 24 05 00"] = "AF Nikkor 180mm f/2.8 IF-ED";
-        lenses["0D 40 44 72 2C 34 07 00"] = "AF Zoom-Nikkor 35-135mm f/3.5-4.5";
-        lenses["0E 48 5C 81 30 30 05 00"] = "AF Zoom-Nikkor 70-210mm f/4";
-        lenses["0E 4A 31 48 23 2D 0E 02"] = "Tamron SP AF 20-40mm f/2.7-3.5 (166D)";
-        lenses["0F 58 50 50 14 14 05 00"] = "AF Nikkor 50mm f/1.8 N";
-        lenses["10 3D 3C 60 2C 3C D2 02"] = "Tamron AF 28-80mm f/3.5-5.6 Aspherical (177D)";
-        lenses["10 48 8E 8E 30 30 08 00"] = "AF Nikkor 300mm f/4 IF-ED";
-        lenses["11 48 44 5C 24 24 08 00"] = "AF Zoom-Nikkor 35-70mm f/2.8";
-        lenses["12 36 5C 81 35 3D 09 00"] = "Cosina AF Zoom 70-210mm f/4.5-5.6 MC Macro";
-        lenses["12 36 69 97 35 42 09 00"] = "Soligor AF Zoom 100-400mm 1:4.5-6.7 MC";
-        lenses["12 38 69 97 35 42 09 02"] = "Promaster Spectrum 7 100-400mm f/4.5-6.7";
-        lenses["12 39 5C 8E 34 3D 08 02"] = "Cosina AF Zoom 70-300mm f/4.5-5.6 MC Macro";
-        lenses["12 3B 68 8D 3D 43 09 02"] = "Cosina AF Zoom 100-300mm f/5.6-6.7 MC Macro";
-        lenses["12 3B 98 98 3D 3D 09 00"] = "Tokina AT-X 400 AF SD (AF 400mm f/5.6)";
-        lenses["12 3D 3C 80 2E 3C DF 02"] = "Tamron AF 28-200mm f/3.8-5.6 AF Aspherical LD (IF) (271D)";
-        lenses["12 44 5E 8E 34 3C 09 00"] = "Tokina AF 730 (AF 75-300mm f/4.5-5.6)";
-        lenses["12 48 5C 81 30 3C 09 00"] = "AF Nikkor 70-210mm f/4-5.6";
-        lenses["12 4A 5C 81 31 3D 09 00"] = "Soligor AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS";
-        lenses["13 42 37 50 2A 34 0B 00"] = "AF Zoom-Nikkor 24-50mm f/3.3-4.5";
-        lenses["14 48 60 80 24 24 0B 00"] = "AF Zoom-Nikkor 80-200mm f/2.8 ED";
-        lenses["14 48 68 8E 30 30 0B 00"] = "Tokina AT-X 340 AF (AF 100-300mm f/4)";
-        lenses["14 54 60 80 24 24 0B 00"] = "Tokina AT-X 828 AF (AF 80-200mm f/2.8)";
-        lenses["15 4C 62 62 14 14 0C 00"] = "AF Nikkor 85mm f/1.8";
-        lenses["17 3C A0 A0 30 30 0F 00"] = "Nikkor 500mm f/4 P ED IF";
-        lenses["17 3C A0 A0 30 30 11 00"] = "Nikkor 500mm f/4 P ED IF";
-        lenses["18 40 44 72 2C 34 0E 00"] = "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N";
-        lenses["1A 54 44 44 18 18 11 00"] = "AF Nikkor 35mm f/2";
-        lenses["1B 44 5E 8E 34 3C 10 00"] = "AF Zoom-Nikkor 75-300mm f/4.5-5.6";
-        lenses["1C 48 30 30 24 24 12 00"] = "AF Nikkor 20mm f/2.8";
-        lenses["1D 42 44 5C 2A 34 12 00"] = "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N";
-        lenses["1E 54 56 56 24 24 13 00"] = "AF Micro-Nikkor 60mm f/2.8";
-        lenses["1E 5D 64 64 20 20 13 00"] = "Tamron SP AF 90mm f/2.5 (52E)";
-        lenses["1F 54 6A 6A 24 24 14 00"] = "AF Micro-Nikkor 105mm f/2.8";
-        lenses["20 3C 80 98 3D 3D 1E 02"] = "Tamron AF 200-400mm f/5.6 LD IF (75D)";
-        lenses["20 48 60 80 24 24 15 00"] = "AF Zoom-Nikkor 80-200mm f/2.8 ED";
-        lenses["20 5A 64 64 20 20 14 00"] = "Tamron SP AF 90mm f/2.5 Macro (152E)";
-        lenses["21 40 3C 5C 2C 34 16 00"] = "AF Zoom-Nikkor 28-70mm f/3.5-4.5";
-        lenses["21 56 8E 8E 24 24 14 00"] = "Tamron SP AF 300mm f/2.8 LD-IF (60E)";
-        lenses["22 48 72 72 18 18 16 00"] = "AF DC-Nikkor 135mm f/2";
-        lenses["22 53 64 64 24 24 E0 02"] = "Tamron SP AF 90mm f/2.8 Macro 1:1 (72E)";
-        lenses["23 30 BE CA 3C 48 17 00"] = "Zoom-Nikkor 1200-1700mm f/5.6-8 P ED IF";
-        lenses["24 44 60 98 34 3C 1A 02"] = "Tokina AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)";
-        lenses["24 48 60 80 24 24 1A 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
-        lenses["24 54 60 80 24 24 1A 02"] = "Tokina AT-X 828 AF PRO (AF 80-200mm f/2.8)";
-        lenses["25 44 44 8E 34 42 1B 02"] = "Tokina AF 353 (AF 35-300mm f/4.5-6.7)";
-        lenses["25 48 3C 5C 24 24 1B 02"] = "Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)";
-        lenses["25 48 3C 5C 24 24 1B 02"] = "Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)";
-        lenses["25 48 44 5C 24 24 1B 02"] = "AF Zoom-Nikkor 35-70mm f/2.8D";
-        lenses["25 48 44 5C 24 24 3A 02"] = "AF Zoom-Nikkor 35-70mm f/2.8D";
-        lenses["25 48 44 5C 24 24 52 02"] = "AF Zoom-Nikkor 35-70mm f/2.8D";
-        lenses["26 3C 54 80 30 3C 1C 06"] = "Sigma 55-200mm f/4-5.6 DC";
-        lenses["26 3C 5C 82 30 3C 1C 02"] = "Sigma 70-210mm f/4-5.6 UC-II";
-        lenses["26 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm f/4-5.6 DG Macro";
-        lenses["26 3C 98 98 3C 3C 1C 02"] = "Sigma APO Tele Macro 400mm f/5.6";
-        lenses["26 3D 3C 80 2F 3D 1C 02"] = "Sigma 28-300mm f/3.8-5.6 Aspherical";
-        lenses["26 3E 3C 6A 2E 3C 1C 02"] = "Sigma 28-105mm f/3.8-5.6 UC-III Aspherical IF";
-        lenses["26 40 27 3F 2C 34 1C 02"] = "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical DF";
-        lenses["26 40 2D 44 2B 34 1C 02"] = "Sigma 18-35mm f/3.5-4.5 Aspherical";
-        lenses["26 40 2D 50 2C 3C 1C 06"] = "Sigma 18-50mm f/3.5-5.6 DC";
-        lenses["26 40 2D 70 2B 3C 1C 06"] = "Sigma 18-125mm f/3.5-5.6 DC";
-        lenses["26 40 2D 80 2C 40 1C 06"] = "Sigma 18-200mm f/3.5-6.3 DC";
-        lenses["26 40 37 5C 2C 3C 1C 02"] = "Sigma 24-70mm f/3.5-5.6 Aspherical HF";
-        lenses["26 40 3C 5C 2C 34 1C 02"] = "AF Zoom-Nikkor 28-70mm f/3.5-4.5D";
-        lenses["26 40 3C 60 2C 3C 1C 02"] = "Sigma 28-80mm f/3.5-5.6 Mini Zoom Macro II Aspherical";
-        lenses["26 40 3C 65 2C 3C 1C 02"] = "Sigma 28-90mm f/3.5-5.6 Macro";
-        lenses["26 40 3C 80 2B 3C 1C 02"] = "Sigma 28-200mm f/3.5-5.6 Compact Aspherical Hyperzoom Macro";
-        lenses["26 40 3C 80 2C 3C 1C 02"] = "Sigma 28-200mm f/3.5-5.6 Compact Aspherical Hyperzoom Macro";
-        lenses["26 40 3C 8E 2C 40 1C 02"] = "Sigma 28-300mm f/3.5-6.3 Macro";
-        lenses["26 40 7B A0 34 40 1C 02"] = "Sigma APO 170-500mm f/5-6.3 Aspherical RF";
-        lenses["26 41 3C 8E 2C 40 1C 02"] = "Sigma 28-300mm f/3.5-6.3 DG Macro";
-        lenses["26 44 73 98 34 3C 1C 02"] = "Sigma 135-400mm f/4.5-5.6 APO Aspherical";
-        lenses["26 48 11 11 30 30 1C 02"] = "Sigma 8mm f/4 EX Circular Fisheye";
-        lenses["26 48 27 27 24 24 1C 02"] = "Sigma 15mm f/2.8 EX Diagonal Fisheye";
-        lenses["26 48 2D 50 24 24 1C 06"] = "Sigma 18-50mm f/2.8 EX DC";
-        lenses["26 48 31 49 24 24 1C 02"] = "Sigma 20-40mm f/2.8";
-        lenses["26 48 37 56 24 24 1C 02"] = "Sigma 24-60mm f/2.8 EX DG";
-        lenses["26 48 3C 5C 24 24 1C 06"] = "Sigma 28-70mm f/2.8 EX DG";
-        lenses["26 48 3C 5C 24 30 1C 02"] = "Sigma 28-70mm f/2.8-4 DG";
-        lenses["26 48 3C 6A 24 30 1C 02"] = "Sigma 28-105mm f/2.8-4 Aspherical";
-        lenses["26 48 8E 8E 30 30 1C 02"] = "Sigma APO Tele Macro 300mm f/4";
-        lenses["26 54 2B 44 24 30 1C 02"] = "Sigma 17-35mm f/2.8-4 EX Aspherical";
-        lenses["26 54 37 5C 24 24 1C 02"] = "Sigma 24-70mm f/2.8 EX DG Macro";
-        lenses["26 54 37 73 24 34 1C 02"] = "Sigma 24-135mm f/2.8-4.5";
-        lenses["26 54 3C 5C 24 24 1C 02"] = "Sigma 28-70mm f/2.8 EX";
-        lenses["26 58 31 31 14 14 1C 02"] = "Sigma 20mm f/1.8 EX DG Aspherical RF";
-        lenses["26 58 37 37 14 14 1C 02"] = "Sigma 24mm f/1.8 EX DG Aspherical Macro";
-        lenses["26 58 3C 3C 14 14 1C 02"] = "Sigma 28mm f/1.8 EX DG Aspherical Macro";
-        lenses["27 48 8E 8E 24 24 1D 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED";
-        lenses["27 48 8E 8E 24 24 E1 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E";
-        lenses["27 48 8E 8E 24 24 F1 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E";
-        lenses["27 48 8E 8E 24 24 F2 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E";
-        lenses["27 48 8E 8E 30 30 1D 02"] = "Tokina AT-X 304 AF (AF 300mm f/4.0)";
-        lenses["27 54 8E 8E 24 24 1D 02"] = "Tamron SP AF 300mm f/2.8 LD-IF (360E)";
-        lenses["28 3C A6 A6 30 30 1D 02"] = "AF-I Nikkor 600mm f/4D IF-ED";
-        lenses["28 3C A6 A6 30 30 E1 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-17E";
-        lenses["28 3C A6 A6 30 30 F1 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-14E";
-        lenses["28 3C A6 A6 30 30 F2 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-20E";
-        lenses["2A 54 3C 3C 0C 0C 26 02"] = "AF Nikkor 28mm f/1.4D";
-        lenses["2B 3C 44 60 30 3C 1F 02"] = "AF Zoom-Nikkor 35-80mm f/4-5.6D";
-        lenses["2C 48 6A 6A 18 18 27 02"] = "AF DC-Nikkor 105mm f/2D";
-        lenses["2D 48 80 80 30 30 21 02"] = "AF Micro-Nikkor 200mm f/4D IF-ED";
-        lenses["2E 48 5C 82 30 3C 22 02"] = "AF Nikkor 70-210mm f/4-5.6D";
-        lenses["2E 48 5C 82 30 3C 28 02"] = "AF Nikkor 70-210mm f/4-5.6D";
-        lenses["2F 40 30 44 2C 34 29 02"] = "Tokina AF 235 II (AF 20-35mm f/3.5-4.5)";
-        lenses["2F 40 30 44 2C 34 29 02"] = "Tokina AF 193 (AF 19-35mm f/3.5-4.5)";
-        lenses["2F 48 30 44 24 24 29 02"] = "AF Zoom-Nikkor 20-35mm f/2.8D IF";
-        lenses["2F 48 30 44 24 24 29 02"] = "Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)";
-        lenses["30 48 98 98 24 24 24 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED";
-        lenses["30 48 98 98 24 24 E1 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E";
-        lenses["30 48 98 98 24 24 F1 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E";
-        lenses["30 48 98 98 24 24 F2 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E";
-        lenses["31 54 56 56 24 24 25 02"] = "AF Micro-Nikkor 60mm f/2.8D";
-        lenses["32 53 64 64 24 24 35 02"] = "Tamron SP AF 90mm f/2.8 [Di] Macro 1:1 (172E/272E)";
-        lenses["32 54 50 50 24 24 35 02"] = "Sigma Macro 50mm f/2.8 EX DG";
-        lenses["32 54 6A 6A 24 24 35 02"] = "AF Micro-Nikkor 105mm f/2.8D";
-        lenses["32 54 6A 6A 24 24 35 02"] = "Sigma Macro 105mm f/2.8 EX DG";
-        lenses["33 48 2D 2D 24 24 31 02"] = "AF Nikkor 18mm f/2.8D";
-        lenses["33 54 3C 5E 24 24 62 02"] = "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)";
-        lenses["34 48 29 29 24 24 32 02"] = "AF Fisheye Nikkor 16mm f/2.8D";
-        lenses["35 3C A0 A0 30 30 33 02"] = "AF-I Nikkor 500mm f/4D IF-ED";
-        lenses["35 3C A0 A0 30 30 E1 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-17E";
-        lenses["35 3C A0 A0 30 30 F1 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-14E";
-        lenses["35 3C A0 A0 30 30 F2 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-20E";
-        lenses["36 48 37 37 24 24 34 02"] = "AF Nikkor 24mm f/2.8D";
-        lenses["37 48 30 30 24 24 36 02"] = "AF Nikkor 20mm f/2.8D";
-        lenses["38 4C 62 62 14 14 37 02"] = "AF Nikkor 85mm f/1.8D";
-        lenses["3A 40 3C 5C 2C 34 39 02"] = "AF Zoom-Nikkor 28-70mm f/3.5-4.5D";
-        lenses["3B 48 44 5C 24 24 3A 02"] = "AF Zoom-Nikkor 35-70mm f/2.8D N";
-        lenses["3C 48 60 80 24 24 3B 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
-        lenses["3D 3C 44 60 30 3C 3E 02"] = "AF Zoom-Nikkor 35-80mm f/4-5.6D";
-        lenses["3E 48 3C 3C 24 24 3D 02"] = "AF Nikkor 28mm f/2.8D";
-        lenses["3F 40 44 6A 2C 34 45 02"] = "AF Zoom-Nikkor 35-105mm f/3.5-4.5D";
-        lenses["41 48 7C 7C 24 24 43 02"] = "AF Nikkor 180mm f/2.8D IF-ED";
-        lenses["42 54 44 44 18 18 44 02"] = "AF Nikkor 35mm f/2D";
-        lenses["43 54 50 50 0C 0C 46 02"] = "AF Nikkor 50mm f/1.4D";
-        lenses["44 44 60 80 34 3C 47 02"] = "AF Zoom-Nikkor 80-200mm f/4.5-5.6D";
-        lenses["45 3D 3C 60 2C 3C 48 02"] = "Tamron AF 28-80mm f/3.5-5.6 Aspherical (177D)";
-        lenses["45 40 3C 60 2C 3C 48 02"] = "AF Zoom-Nikkor 28-80mm f/3.5-5.6D";
-        lenses["45 41 37 72 2C 3C 48 02"] = "Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro (190D)";
-        lenses["46 3C 44 60 30 3C 49 02"] = "AF Zoom-Nikkor 35-80mm f/4-5.6D N";
-        lenses["47 42 37 50 2A 34 4A 02"] = "AF Zoom-Nikkor 24-50mm f/3.3-4.5D";
-        lenses["48 38 1F 37 34 3C 4B 06"] = "Sigma 12-24mm f/4.5-5.6 EX DG Aspherical HSM";
-        lenses["48 3C 19 31 30 3C 4B 06"] = "Sigma 10-20mm f/4-5.6 EX DC HSM";
-        lenses["48 3C 50 A0 30 40 4B 02"] = "Sigma 50-500mm f/4-6.3 EX APO RF HSM";
-        lenses["48 3C 8E B0 3C 3C 4B 02"] = "Sigma APO 300-800mm f/5.6 EX DG HSM";
-        lenses["48 3C B0 B0 3C 3C 4B 02"] = "Sigma APO 800mm f/5.6 EX HSM";
-        lenses["48 44 A0 A0 34 34 4B 02"] = "Sigma APO 500mm f/4.5 EX HSM";
-        lenses["48 48 24 24 24 24 4B 02"] = "Sigma 14mm f/2.8 EX Aspherical HSM";
-        lenses["48 48 2B 44 24 30 4B 06"] = "Sigma 17-35mm f/2.8-4 EX DG  Aspherical HSM";
-        lenses["48 48 68 8E 30 30 4B 02"] = "Sigma APO 100-300mm f/4 EX IF HSM";
-        lenses["48 48 76 76 24 24 4B 06"] = "Sigma APO Macro 150mm f/2.8 EX DG HSM";
-        lenses["48 48 8E 8E 24 24 4B 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED";
-        lenses["48 48 8E 8E 24 24 E1 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E";
-        lenses["48 48 8E 8E 24 24 F1 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E";
-        lenses["48 48 8E 8E 24 24 F2 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E";
-        lenses["48 4C 7C 7C 2C 2C 4B 02"] = "Sigma APO Macro 180mm f/3.5 EX DG HSM";
-        lenses["48 4C 7D 7D 2C 2C 4B 02"] = "Sigma APO Macro 180mm f/3.5 EX DG HSM";
-        lenses["48 54 3E 3E 0C 0C 4B 06"] = "Sigma 30mm f/1.4 EX DC HSM";
-        lenses["48 54 5C 80 24 24 4B 02"] = "Sigma 70-200mm f/2.8 EX APO IF HSM";
-        lenses["48 54 6F 8E 24 24 4B 02"] = "Sigma APO 120-300mm f/2.8 EX DG HSM";
-        lenses["48 54 8E 8E 24 24 4B 02"] = "Sigma APO 300mm f/2.8 EX DG HSM";
-        lenses["49 3C A6 A6 30 30 4C 02"] = "AF-S Nikkor 600mm f/4D IF-ED";
-        lenses["49 3C A6 A6 30 30 E1 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-17E";
-        lenses["49 3C A6 A6 30 30 F1 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-14E";
-        lenses["49 3C A6 A6 30 30 F2 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-20E";
-        lenses["4A 40 11 11 2C 0C 4D 02"] = "Samyang 8mm f/3.5 Fish-Eye CS";
-        lenses["4A 48 1E 1E 24 0C 4D 02"] = "Samyang 12mm f/2.8 ED AS NCS Fish-Eye";
-        lenses["4A 48 24 24 24 0C 4D 02"] = "Samyang AE 14mm f/2.8 ED AS IF UMC";
-        lenses["4A 54 29 29 18 0C 4D 02"] = "Samyang 16mm f/2.0 ED AS UMC CS";
-        lenses["4A 54 62 62 0C 0C 4D 02"] = "AF Nikkor 85mm f/1.4D IF";
-        lenses["4A 60 44 44 0C 0C 4D 02"] = "Samyang 35mm f/1.4 AS UMC";
-        lenses["4A 60 62 62 0C 0C 4D 02"] = "Samyang AE 85mm f/1.4 AS IF UMC";
-        lenses["4B 3C A0 A0 30 30 4E 02"] = "AF-S Nikkor 500mm f/4D IF-ED";
-        lenses["4B 3C A0 A0 30 30 E1 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-17E";
-        lenses["4B 3C A0 A0 30 30 F1 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-14E";
-        lenses["4B 3C A0 A0 30 30 F2 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-20E";
-        lenses["4C 40 37 6E 2C 3C 4F 02"] = "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF";
-        lenses["4D 3E 3C 80 2E 3C 62 02"] = "Tamron AF 28-200mm f/3.8-5.6 XR Aspherical (IF) Macro (A03N)";
-        lenses["4D 40 3C 80 2C 3C 62 02"] = "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF";
-        lenses["4D 41 3C 8E 2B 40 62 02"] = "Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical (IF) (A061)";
-        lenses["4D 41 3C 8E 2C 40 62 02"] = "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical (IF) (185D)";
-        lenses["4E 48 72 72 18 18 51 02"] = "AF DC-Nikkor 135mm f/2D";
-        lenses["4F 40 37 5C 2C 3C 53 06"] = "IX-Nikkor 24-70mm f/3.5-5.6";
-        lenses["50 48 56 7C 30 3C 54 06"] = "IX-Nikkor 60-180mm f/4-5.6";
-        lenses["52 54 44 44 18 18 00 00"] = "Zeiss Milvus 35mm f/2";
-        lenses["53 48 60 80 24 24 57 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
-        lenses["53 48 60 80 24 24 60 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
-        lenses["53 54 50 50 0C 0C 00 00"] = "Zeiss Milvus 50mm f/1.4";
-        lenses["54 44 5C 7C 34 3C 58 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED";
-        lenses["54 44 5C 7C 34 3C 61 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED";
-        lenses["54 54 50 50 18 18 00 00"] = "Zeiss Milvus 50mm f/2 Macro";
-        lenses["55 54 62 62 0C 0C 00 00"] = "Zeiss Milvus 85mm f/1.4";
-        lenses["56 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm f/4-5.6 APO Macro Super II";
-        lenses["56 48 5C 8E 30 3C 5A 02"] = "AF Zoom-Nikkor 70-300mm f/4-5.6D ED";
-        lenses["56 54 68 68 18 18 00 00"] = "Zeiss Milvus 100mm f/2 Macro";
-        lenses["59 48 98 98 24 24 5D 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED";
-        lenses["59 48 98 98 24 24 E1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E";
-        lenses["59 48 98 98 24 24 F1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E";
-        lenses["59 48 98 98 24 24 F2 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E";
-        lenses["5A 3C 3E 56 30 3C 5E 06"] = "IX-Nikkor 30-60mm f/4-5.6";
-        lenses["5B 44 56 7C 34 3C 5F 06"] = "IX-Nikkor 60-180mm f/4.5-5.6";
-        lenses["5D 48 3C 5C 24 24 63 02"] = "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED";
-        lenses["5E 48 60 80 24 24 64 02"] = "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED";
-        lenses["5F 40 3C 6A 2C 34 65 02"] = "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF";
-        lenses["60 40 3C 60 2C 3C 66 02"] = "AF Zoom-Nikkor 28-80mm f/3.5-5.6D";
-        lenses["61 44 5E 86 34 3C 67 02"] = "AF Zoom-Nikkor 75-240mm f/4.5-5.6D";
-        lenses["63 48 2B 44 24 24 68 02"] = "AF-S Nikkor 17-35mm f/2.8D IF-ED";
-        lenses["64 00 62 62 24 24 6A 02"] = "PC Micro-Nikkor 85mm f/2.8D";
-        lenses["65 44 60 98 34 3C 6B 0A"] = "AF VR Zoom-Nikkor 80-400mm f/4.5-5.6D ED";
-        lenses["66 40 2D 44 2C 34 6C 02"] = "AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED";
-        lenses["67 48 37 62 24 30 6D 02"] = "AF Zoom-Nikkor 24-85mm f/2.8-4D IF";
-        lenses["67 54 37 5C 24 24 1C 02"] = "Sigma 24-70mm f/2.8 EX DG Macro";
-        lenses["68 42 3C 60 2A 3C 6E 06"] = "AF Zoom-Nikkor 28-80mm f/3.3-5.6G";
-        lenses["69 47 5C 8E 30 3C 00 02"] = "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17N)";
-        lenses["69 48 5C 8E 30 3C 6F 02"] = "Tamron AF 70-300mm f/4-5.6 LD Macro 1:2 (572D/772D)";
-        lenses["69 48 5C 8E 30 3C 6F 06"] = "AF Zoom-Nikkor 70-300mm f/4-5.6G";
-        lenses["6A 48 8E 8E 30 30 70 02"] = "AF-S Nikkor 300mm f/4D IF-ED";
-        lenses["6B 48 24 24 24 24 71 02"] = "AF Nikkor ED 14mm f/2.8D";
-        lenses["6D 48 8E 8E 24 24 73 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED II";
-        lenses["6E 48 98 98 24 24 74 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED II";
-        lenses["6F 3C A0 A0 30 30 75 02"] = "AF-S Nikkor 500mm f/4D IF-ED II";
-        lenses["70 3C A6 A6 30 30 76 02"] = "AF-S Nikkor 600mm f/4D IF-ED II";
-        lenses["72 48 4C 4C 24 24 77 00"] = "Nikkor 45mm f/2.8 P";
-        lenses["74 40 37 62 2C 34 78 06"] = "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED";
-        lenses["75 40 3C 68 2C 3C 79 06"] = "AF Zoom-Nikkor 28-100mm f/3.5-5.6G";
-        lenses["76 58 50 50 14 14 7A 02"] = "AF Nikkor 50mm f/1.8D";
-        lenses["77 44 61 98 34 3C 7B 0E"] = "Sigma 80-400mm f/4.5-5.6 EX OS";
-        lenses["77 48 5C 80 24 24 7B 0E"] = "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED";
-        lenses["78 40 37 6E 2C 3C 7C 0E"] = "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED";
-        lenses["79 40 11 11 2C 2C 1C 06"] = "Sigma 8mm f/3.5 EX Circular Fisheye";
-        lenses["79 40 3C 80 2C 3C 7F 06"] = "AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED";
-        lenses["79 48 3C 5C 24 24 1C 06"] = "Sigma 28-70mm f/2.8 EX DG";
-        lenses["79 48 5C 5C 24 24 1C 06"] = "Sigma Macro 70mm f/2.8 EX DG";
-        lenses["7A 3B 53 80 30 3C 4B 06"] = "Sigma 55-200mm f/4-5.6 DC HSM";
-        lenses["7A 3C 1F 37 30 30 7E 06"] = "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED";
-        lenses["7A 3C 1F 37 30 30 7E 06"] = "Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)";
-        lenses["7A 3C 1F 3C 30 30 7E 06"] = "Tokina AT-X 12-28 PRO DX (AF 12-28mm f/4)";
-        lenses["7A 40 2D 50 2C 3C 4B 06"] = "Sigma 18-50mm f/3.5-5.6 DC HSM";
-        lenses["7A 40 2D 80 2C 40 4B 0E"] = "Sigma 18-200mm f/3.5-6.3 DC OS HSM";
-        lenses["7A 47 2B 5C 24 34 4B 06"] = "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM";
-        lenses["7A 47 50 76 24 24 4B 06"] = "Sigma 50-150mm f/2.8 EX APO DC HSM";
-        lenses["7A 48 1C 29 24 24 7E 06"] = "Tokina AT-X 116 PRO DX II (AF 11-16mm f/2.8)";
-        lenses["7A 48 1C 30 24 24 7E 06"] = "Tokina AT-X 11-20 f/2.8 PRO DX (AF 11-20mm f/2.8)";
-        lenses["7A 48 2B 5C 24 34 4B 06"] = "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM";
-        lenses["7A 48 2D 50 24 24 4B 06"] = "Sigma 18-50mm f/2.8 EX DC Macro";
-        lenses["7A 48 5C 80 24 24 4B 06"] = "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II";
-        lenses["7A 54 6E 8E 24 24 4B 02"] = "Sigma APO 120-300mm f/2.8 EX DG HSM";
-        lenses["7B 48 80 98 30 30 80 0E"] = "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED";
-        lenses["7D 48 2B 53 24 24 82 06"] = "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED";
-        lenses["7F 40 2D 5C 2C 34 84 06"] = "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED";
-        lenses["7F 48 2B 5C 24 34 1C 06"] = "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF";
-        lenses["7F 48 2D 50 24 24 1C 06"] = "Sigma 18-50mm f/2.8 EX DC Macro";
-        lenses["80 48 1A 1A 24 24 85 06"] = "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED";
-        lenses["81 34 76 A6 38 40 4B 0E"] = "Sigma 150-600mm f/5-6.3 DG OS HSM | S";
-        lenses["81 54 80 80 18 18 86 0E"] = "AF-S VR Nikkor 200mm f/2G IF-ED";
-        lenses["82 34 76 A6 38 40 4B 0E"] = "Sigma 150-600mm f/5-6.3 DG OS HSM | C";
-        lenses["82 48 8E 8E 24 24 87 0E"] = "AF-S VR Nikkor 300mm f/2.8G IF-ED";
-        lenses["83 00 B0 B0 5A 5A 88 04"] = "FSA-L2, EDG 65, 800mm f/13 G";
-        lenses["88 54 50 50 0C 0C 4B 06"] = "Sigma 50mm f/1.4 DG HSM | A";
-        lenses["89 3C 53 80 30 3C 8B 06"] = "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED";
-        lenses["8A 3C 37 6A 30 30 4B 0E"] = "Sigma 24-105mm f/4 DG OS HSM";
-        lenses["8A 54 6A 6A 24 24 8C 0E"] = "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED";
-        lenses["8B 40 2D 80 2C 3C 8D 0E"] = "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED";
-        lenses["8B 40 2D 80 2C 3C FD 0E"] = "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED [II]";
-        lenses["8B 4C 2D 44 14 14 4B 06"] = "Sigma 18-35mm f/1.8 DC HSM";
-        lenses["8C 40 2D 53 2C 3C 8E 06"] = "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED";
-        lenses["8D 44 5C 8E 34 3C 8F 0E"] = "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED";
-        lenses["8E 3C 2B 5C 24 30 4B 0E"] = "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C";
-        lenses["8F 40 2D 72 2C 3C 91 06"] = "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED";
-        lenses["8F 48 2B 50 24 24 4B 0E"] = "Sigma 17-50mm f/2.8 EX DC OS HSM";
-        lenses["90 3B 53 80 30 3C 92 0E"] = "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED";
-        lenses["90 40 2D 80 2C 40 4B 0E"] = "Sigma 18-200mm f/3.5-6.3 II DC OS HSM";
-        lenses["91 54 44 44 0C 0C 4B 06"] = "Sigma 35mm f/1.4 DG HSM";
-        lenses["92 2C 2D 88 2C 40 4B 0E"] = "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM";
-        lenses["92 48 24 37 24 24 94 06"] = "AF-S Zoom-Nikkor 14-24mm f/2.8G ED";
-        lenses["93 48 37 5C 24 24 95 06"] = "AF-S Zoom-Nikkor 24-70mm f/2.8G ED";
-        lenses["94 40 2D 53 2C 3C 96 06"] = "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II";
-        lenses["95 00 37 37 2C 2C 97 06"] = "PC-E Nikkor 24mm f/3.5D ED";
-        lenses["95 4C 37 37 2C 2C 97 02"] = "PC-E Nikkor 24mm f/3.5D ED";
-        lenses["96 38 1F 37 34 3C 4B 06"] = "Sigma 12-24mm f/4.5-5.6 II DG HSM";
-        lenses["96 48 98 98 24 24 98 0E"] = "AF-S VR Nikkor 400mm f/2.8G ED";
-        lenses["97 3C A0 A0 30 30 99 0E"] = "AF-S VR Nikkor 500mm f/4G ED";
-        lenses["97 48 6A 6A 24 24 4B 0E"] = "Sigma Macro 105mm f/2.8 EX DG OS HSM";
-        lenses["98 3C A6 A6 30 30 9A 0E"] = "AF-S VR Nikkor 600mm f/4G ED";
-        lenses["98 48 50 76 24 24 4B 0E"] = "Sigma 50-150mm f/2.8 EX APO DC OS HSM";
-        lenses["99 40 29 62 2C 3C 9B 0E"] = "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED";
-        lenses["99 48 76 76 24 24 4B 0E"] = "Sigma APO Macro 150mm f/2.8 EX DG OS HSM";
-        lenses["9A 40 2D 53 2C 3C 9C 0E"] = "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G";
-        lenses["9B 00 4C 4C 24 24 9D 06"] = "PC-E Micro Nikkor 45mm f/2.8D ED";
-        lenses["9B 54 4C 4C 24 24 9D 02"] = "PC-E Micro Nikkor 45mm f/2.8D ED";
-        lenses["9B 54 62 62 0C 0C 4B 06"] = "Sigma 85mm f/1.4 EX DG HSM";
-        lenses["9C 48 5C 80 24 24 4B 0E"] = "Sigma 70-200mm f/2.8 EX DG OS HSM";
-        lenses["9C 54 56 56 24 24 9E 06"] = "AF-S Micro Nikkor 60mm f/2.8G ED";
-        lenses["9D 00 62 62 24 24 9F 06"] = "PC-E Micro Nikkor 85mm f/2.8D";
-        lenses["9D 48 2B 50 24 24 4B 0E"] = "Sigma 17-50mm f/2.8 EX DC OS HSM";
-        lenses["9D 54 62 62 24 24 9F 02"] = "PC-E Micro Nikkor 85mm f/2.8D";
-        lenses["9E 38 11 29 34 3C 4B 06"] = "Sigma 8-16mm f/4.5-5.6 DC HSM";
-        lenses["9E 40 2D 6A 2C 3C A0 0E"] = "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED";
-        lenses["9F 37 50 A0 34 40 4B 0E"] = "Sigma 50-500mm f/4.5-6.3 DG OS HSM";
-        lenses["9F 58 44 44 14 14 A1 06"] = "AF-S DX Nikkor 35mm f/1.8G";
-        lenses["A0 40 2D 74 2C 3C BB 0E"] = "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR";
-        lenses["A0 48 2A 5C 24 30 4B 0E"] = "Sigma 17-70mm f/2.8-4 DC Macro OS HSM";
-        lenses["A0 54 50 50 0C 0C A2 06"] = "AF-S Nikkor 50mm f/1.4G";
-        lenses["A1 40 18 37 2C 34 A3 06"] = "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED";
-        lenses["A1 41 19 31 2C 2C 4B 06"] = "Sigma 10-20mm f/3.5 EX DC HSM";
-        lenses["A1 54 55 55 0C 0C BC 06"] = "AF-S Nikkor 58mm f/1.4G";
-        lenses["A2 40 2D 53 2C 3C BD 0E"] = "AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II";
-        lenses["A2 48 5C 80 24 24 A4 0E"] = "AF-S Nikkor 70-200mm f/2.8G ED VR II";
-        lenses["A3 3C 29 44 30 30 A5 0E"] = "AF-S Nikkor 16-35mm f/4G ED VR";
-        lenses["A3 3C 5C 8E 30 3C 4B 0E"] = "Sigma 70-300mm f/4-5.6 DG OS";
-        lenses["A4 40 2D 8E 2C 40 BF 0E"] = "AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR";
-        lenses["A4 47 2D 50 24 34 4B 0E"] = "Sigma 18-50mm f/2.8-4.5 DC OS HSM";
-        lenses["A4 54 37 37 0C 0C A6 06"] = "AF-S Nikkor 24mm f/1.4G ED";
-        lenses["A5 40 2D 88 2C 40 4B 0E"] = "Sigma 18-250mm f/3.5-6.3 DC OS HSM";
-        lenses["A5 40 3C 8E 2C 3C A7 0E"] = "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR";
-        lenses["A5 4C 44 44 14 14 C0 06"] = "AF-S Nikkor 35mm f/1.8G ED";
-        lenses["A6 48 37 5C 24 24 4B 06"] = "Sigma 24-70mm f/2.8 IF EX DG HSM";
-        lenses["A6 48 8E 8E 24 24 A8 0E"] = "AF-S VR Nikkor 300mm f/2.8G IF-ED II";
-        lenses["A6 48 98 98 24 24 C1 0E"] = "AF-S Nikkor 400mm f/2.8E FL ED VR";
-        lenses["A7 3C 53 80 30 3C C2 0E"] = "AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II";
-        lenses["A7 49 80 A0 24 24 4B 06"] = "Sigma APO 200-500mm f/2.8 EX DG";
-        lenses["A7 4B 62 62 2C 2C A9 0E"] = "AF-S DX Micro Nikkor 85mm f/3.5G ED VR";
-        lenses["A8 48 80 98 30 30 AA 0E"] = "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED II";
-        lenses["A8 48 8E 8E 30 30 C3 0E"] = "AF-S Nikkor 300mm f/4E PF ED VR";
-        lenses["A8 48 8E 8E 30 30 C3 4E"] = "AF-S Nikkor 300mm f/4E PF ED VR";
-        lenses["A9 4C 31 31 14 14 C4 06"] = "AF-S Nikkor 20mm f/1.8G ED";
-        lenses["A9 54 80 80 18 18 AB 0E"] = "AF-S Nikkor 200mm f/2G ED VR II";
-        lenses["AA 3C 37 6E 30 30 AC 0E"] = "AF-S Nikkor 24-120mm f/4G ED VR";
-        lenses["AA 48 37 5C 24 24 C5 4E"] = "AF-S Nikkor 24-70mm f/2.8E ED VR";
-        lenses["AB 3C A0 A0 30 30 C6 4E"] = "AF-S Nikkor 500mm f/4E FL ED VR";
-        lenses["AC 38 53 8E 34 3C AE 0E"] = "AF-S DX VR Nikkor 55-300mm f/4.5-5.6G ED";
-        lenses["AC 3C A6 A6 30 30 C7 4E"] = "AF-S Nikkor 600mm f/4E FL ED VR";
-        lenses["AD 3C 2D 8E 2C 3C AF 0E"] = "AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR";
-        lenses["AD 48 28 60 24 30 C8 0E"] = "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR";
-        lenses["AD 48 28 60 24 30 C8 4E"] = "AF-S DX Nikkor 16-80mm f/2.8-4E ED VR";
-        lenses["AE 3C 80 A0 3C 3C C9 0E"] = "AF-S Nikkor 200-500mm f/5.6E ED VR";
-        lenses["AE 3C 80 A0 3C 3C C9 4E"] = "AF-S Nikkor 200-500mm f/5.6E ED VR";
-        lenses["AE 54 62 62 0C 0C B0 06"] = "AF-S Nikkor 85mm f/1.4G";
-        lenses["AF 4C 37 37 14 14 CC 06"] = "AF-S Nikkor 24mm f/1.8G ED";
-        lenses["AF 54 44 44 0C 0C B1 06"] = "AF-S Nikkor 35mm f/1.4G";
-        lenses["B0 4C 50 50 14 14 B2 06"] = "AF-S Nikkor 50mm f/1.8G";
-        lenses["B1 48 48 48 24 24 B3 06"] = "AF-S DX Micro Nikkor 40mm f/2.8G";
-        lenses["B2 48 5C 80 30 30 B4 0E"] = "AF-S Nikkor 70-200mm f/4G ED VR";
-        lenses["B3 4C 62 62 14 14 B5 06"] = "AF-S Nikkor 85mm f/1.8G";
-        lenses["B4 40 37 62 2C 34 B6 0E"] = "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED";
-        lenses["B5 4C 3C 3C 14 14 B7 06"] = "AF-S Nikkor 28mm f/1.8G";
-        lenses["B6 3C B0 B0 3C 3C B8 0E"] = "AF-S VR Nikkor 800mm f/5.6E FL ED";
-        lenses["B6 48 37 56 24 24 1C 02"] = "Sigma 24-60mm f/2.8 EX DG";
-        lenses["B7 44 60 98 34 3C B9 0E"] = "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR";
-        lenses["B8 40 2D 44 2C 34 BA 06"] = "AF-S Nikkor 18-35mm f/3.5-4.5G ED";
-        lenses["CC 4C 50 68 14 14 4B 06"] = "Sigma 50-100mm f/1.8 DC HSM | A";
-        lenses["CD 3D 2D 70 2E 3C 4B 0E"] = "Sigma 18-125mm f/3.8-5.6 DC OS HSM";
-        lenses["CE 34 76 A0 38 40 4B 0E"] = "Sigma 150-500mm f/5-6.3 DG OS APO HSM";
-        lenses["CF 38 6E 98 34 3C 4B 0E"] = "Sigma APO 120-400mm f/4.5-5.6 DG OS HSM";
-        lenses["DC 48 19 19 24 24 4B 06"] = "Sigma 10mm f/2.8 EX DC HSM Fisheye";
-        lenses["DE 54 50 50 0C 0C 4B 06"] = "Sigma 50mm f/1.4 EX DG HSM";
-        lenses["E0 3C 5C 8E 30 3C 4B 06"] = "Sigma 70-300mm f/4-5.6 APO DG Macro HSM";
-        lenses["E1 58 37 37 14 14 1C 02"] = "Sigma 24mm f/1.8 EX DG Aspherical Macro";
-        lenses["E3 54 50 50 24 24 35 02"] = "Sigma Macro 50mm f/2.8 EX DG";
-        lenses["E5 54 6A 6A 24 24 35 02"] = "Sigma Macro 105mm f/2.8 EX DG";
-        lenses["E6 41 3C 8E 2C 40 1C 02"] = "Sigma 28-300mm f/3.5-6.3 DG Macro";
-        lenses["E8 4C 44 44 14 14 DF 0E"] = "Tamron SP 35mm f/1.8 VC";
-        lenses["E9 48 27 3E 24 24 DF 0E"] = "Tamron SP 15-30mm f/2.8 Di VC USD (A012)";
-        lenses["E9 54 37 5C 24 24 1C 02"] = "Sigma 24-70mm f/2.8 EX DG Macro";
-        lenses["EA 40 29 8E 2C 40 DF 0E"] = "Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD (B016)";
-        lenses["EA 48 27 27 24 24 1C 02"] = "Sigma 15mm f/2.8 EX Diagonal Fisheye";
-        lenses["EB 40 76 A6 38 40 DF 0E"] = "Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)";
-        lenses["ED 40 2D 80 2C 40 4B 0E"] = "Sigma 18-200mm f/3.5-6.3 DC OS HSM";
-        lenses["EE 48 5C 80 24 24 4B 06"] = "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II";
-        lenses["F0 38 1F 37 34 3C 4B 06"] = "Sigma 12-24mm f/4.5-5.6 EX DG Aspherical HSM";
-        lenses["F0 3F 2D 8A 2C 40 DF 0E"] = "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)";
-        lenses["F1 44 A0 A0 34 34 4B 02"] = "Sigma APO 500mm f/4.5 EX DG HSM";
-        lenses["F1 47 5C 8E 30 3C DF 0E"] = "Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)";
-        lenses["F3 48 68 8E 30 30 4B 02"] = "Sigma APO 100-300mm f/4 EX IF HSM";
-        lenses["F3 54 2B 50 24 24 84 0E"] = "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF) (B005)";
-        lenses["F4 54 56 56 18 18 84 06"] = "Tamron SP AF 60mm f/2.0 Di II Macro 1:1 (G005)";
-        lenses["F5 40 2C 8A 2C 40 40 0E"] = "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical (IF) Macro (B003)";
-        lenses["F5 48 76 76 24 24 4B 06"] = "Sigma APO Macro 150mm f/2.8 EX DG HSM";
-        lenses["F6 3F 18 37 2C 34 84 06"] = "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)";
-        lenses["F6 3F 18 37 2C 34 DF 06"] = "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)";
-        lenses["F6 48 2D 50 24 24 4B 06"] = "Sigma 18-50mm f/2.8 EX DC Macro";
-        lenses["F7 53 5C 80 24 24 40 06"] = "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)";
-        lenses["F7 53 5C 80 24 24 84 06"] = "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)";
-        lenses["F8 54 3E 3E 0C 0C 4B 06"] = "Sigma 30mm f/1.4 EX DC HSM";
-        lenses["F8 54 64 64 24 24 DF 06"] = "Tamron SP AF 90mm f/2.8 Di Macro 1:1 (272NII)";
-        lenses["F8 55 64 64 24 24 84 06"] = "Tamron SP AF 90mm f/2.8 Di Macro 1:1 (272NII)";
-        lenses["F9 3C 19 31 30 3C 4B 06"] = "Sigma 10-20mm f/4-5.6 EX DC HSM";
-        lenses["F9 40 3C 8E 2C 40 40 0E"] = "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical (IF) Macro (A20)";
-        lenses["FA 54 3C 5E 24 24 84 06"] = "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)";
-        lenses["FA 54 3C 5E 24 24 DF 06"] = "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)";
-        lenses["FA 54 6E 8E 24 24 4B 02"] = "Sigma APO 120-300mm f/2.8 EX DG HSM";
-        lenses["FB 54 2B 50 24 24 84 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)";
-        lenses["FB 54 8E 8E 24 24 4B 02"] = "Sigma APO 300mm f/2.8 EX DG HSM";
-        lenses["FC 40 2D 80 2C 40 DF 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)";
-        lenses["FD 47 50 76 24 24 4B 06"] = "Sigma 50-150mm f/2.8 EX APO DC HSM II";
-        lenses["FE 47 00 00 24 24 4B 06"] = "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye";
-        lenses["FE 48 37 5C 24 24 DF 0E"] = "Tamron SP 24-70mm f/2.8 Di VC USD (A007)";
-        lenses["FE 53 5C 80 24 24 84 06"] = "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)";
-        lenses["FE 54 5C 80 24 24 DF 0E"] = "Tamron SP 70-200mm f/2.8 Di VC USD (A009)";
-        lenses["FE 54 64 64 24 24 DF 0E"] = "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F004)";
-        lenses["FF 40 2D 80 2C 40 4B 06"] = "Sigma 18-200mm f/3.5-6.3 DC";
-    }
     virtual std::string toString (Tag* t)
     {
 
@@ -1066,7 +549,7 @@ public:
 
         lid << std::setw(2) << std::setfill('0') << lenstype;
 
-        std::map<std::string, std::string>::iterator r = lenses.find (lid.str());
+        std::map<std::string, std::string>::const_iterator r = lenses.find (lid.str());
 
         if (r != lenses.end()) {
             if(r == lenses.begin() && EffectiveMaxApertureString != "") {       // first entry is for unchipped lenses
@@ -1083,6 +566,523 @@ public:
 
 };
 NALensDataInterpreter naLensDataInterpreter;
+const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
+    // The key is a composite string made of 8 HEX bytes
+    // LensIDNumber LensFStops MinFocalLength MaxFocalLength MaxApertureAtMinFocal MaxApertureAtMaxFocal MCUVersion and LensType
+    {"00 00 00 00 00 00 00 01", "Manual Lens No CPU"},
+    {"00 00 00 00 00 00 E1 12", "TC-17E II"},
+    {"00 00 00 00 00 00 F1 0C", "TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x"},
+    {"00 00 00 00 00 00 F2 18", "TC-20E [II] or Sigma APO Tele Converter 2x EX DG or Kenko Teleplus PRO 300 DG 2.0x"},
+    {"00 00 48 48 53 53 00 01", "Loreo 40mm f/11-22 3D Lens in a Cap 9005"},
+    {"00 36 1C 2D 34 3C 00 06", "Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical (IF) (A13)"},
+    {"00 3C 1F 37 30 30 00 06", "Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
+    {"00 3C 2B 44 30 30 00 06", "Tokina AT-X 17-35 f/4 PRO FX (AF 17-35mm f/4)"},
+    {"00 3C 5C 80 30 30 00 0E", "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)"},
+    {"00 3E 80 A0 38 3F 00 02", "Tamron SP AF 200-500mm f/5-6.3 Di LD (IF) (A08)"},
+    {"00 3F 2D 80 2B 40 00 06", "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) (A14)"},
+    {"00 3F 2D 80 2C 40 00 06", "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14)"},
+    {"00 3F 80 A0 38 3F 00 02", "Tamron SP AF 200-500mm f/5-6.3 Di (A08)"},
+    {"00 40 11 11 2C 2C 00 00", "Samyang 8mm f/3.5 Fish-Eye"},
+    {"00 40 18 2B 2C 34 00 06", "Tokina AT-X 107 AF DX Fisheye (AF 10-17mm f/3.5-4.5)"},
+    {"00 40 2A 72 2C 3C 00 06", "Tokina AT-X 16.5-135 DX (AF 16.5-135mm f/3.5-5.6)"},
+    {"00 40 2B 2B 2C 2C 00 02", "Tokina AT-X 17 AF PRO (AF 17mm f/3.5)"},
+    {"00 40 2D 2D 2C 2C 00 00", "Carl Zeiss Distagon T* 3.5/18 ZF.2"},
+    {"00 40 2D 80 2C 40 00 06", "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)"},
+    {"00 40 2D 88 2C 40 00 06", "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)"},
+    {"00 40 2D 88 2C 40 62 06", "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18)"},
+    {"00 40 31 31 2C 2C 00 00", "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical"},
+    {"00 40 37 80 2C 3C 00 02", "Tokina AT-X 242 AF (AF 24-200mm f/3.5-5.6)"},
+    {"00 40 64 64 2C 2C 00 00", "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus"},
+    {"00 44 60 98 34 3C 00 02", "Tokina AT-X 840 D (AF 80-400mm f/4.5-5.6)"},
+    {"00 47 10 10 24 24 00 00", "Fisheye Nikkor 8mm f/2.8 AiS"},
+    {"00 47 25 25 24 24 00 02", "Tamron SP AF 14mm f/2.8 Aspherical (IF) (69E)"},
+    {"00 47 3C 3C 24 24 00 00", "Nikkor 28mm f/2.8 AiS"},
+    {"00 47 44 44 24 24 00 06", "Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"},
+    {"00 47 53 80 30 3C 00 06", "Tamron AF 55-200mm f/4-5.6 Di II LD (A15)"},
+    {"00 48 1C 29 24 24 00 06", "Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)"},
+    {"00 48 29 3C 24 24 00 06", "Tokina AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)"},
+    {"00 48 29 50 24 24 00 06", "Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)"},
+    {"00 48 32 32 24 24 00 00", "Carl Zeiss Distagon T* 2.8/21 ZF.2"},
+    {"00 48 37 5C 24 24 00 06", "Tokina AT-X 24-70 f/2.8 PRO FX (AF 24-70mm f/2.8)"},
+    {"00 48 3C 3C 24 24 00 00", "Voigtlander Color Skopar 28mm f/2.8 SL II"},
+    {"00 48 3C 60 24 24 00 02", "Tokina AT-X 280 AF PRO (AF 28-80mm f/2.8)"},
+    {"00 48 3C 6A 24 24 00 02", "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF (176D)"},
+    {"00 48 50 50 18 18 00 00", "Nikkor H 50mm f/2"},
+    {"00 48 50 72 24 24 00 06", "Tokina AT-X 535 PRO DX (AF 50-135mm f/2.8)"},
+    {"00 48 5C 80 30 30 00 0E", "Tokina AT-X 70-200 f/4 FX VCM-S (AF 70-200mm f/4)"},
+    {"00 48 5C 8E 30 3C 00 06", "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17NII)"},
+    {"00 48 68 68 24 24 00 00", "Series E 100mm f/2.8"},
+    {"00 48 80 80 30 30 00 00", "Nikkor 200mm f/4 AiS"},
+    {"00 49 30 48 22 2B 00 02", "Tamron SP AF 20-40mm f/2.7-3.5 (166D)"},
+    {"00 4C 6A 6A 20 20 00 00", "Nikkor 105mm f/2.5 AiS"},
+    {"00 4C 7C 7C 2C 2C 00 02", "Tamron SP AF 180mm f/3.5 Di Model (B01)"},
+    {"00 53 2B 50 24 24 00 06", "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16)"},
+    {"00 54 2B 50 24 24 00 06", "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)"},
+    {"00 54 3C 3C 18 18 00 00", "Carl Zeiss Distagon T* 2/28 ZF.2"},
+    {"00 54 44 44 0C 0C 00 00", "Carl Zeiss Distagon T* 1.4/35 ZF.2"},
+    {"00 54 44 44 18 18 00 00", "Carl Zeiss Distagon T* 2/35 ZF.2"},
+    {"00 54 48 48 18 18 00 00", "Voigtlander Ultron 40mm f/2 SLII Aspherical"},
+    {"00 54 50 50 0C 0C 00 00", "Carl Zeiss Planar T* 1.4/50 ZF.2"},
+    {"00 54 50 50 18 18 00 00", "Carl Zeiss Makro-Planar T* 2/50 ZF.2"},
+    {"00 54 53 53 0C 0C 00 00", "Zeiss Otus 1.4/55"},
+    {"00 54 55 55 0C 0C 00 00", "Voigtlander Nokton 58mm f/1.4 SLII"},
+    {"00 54 56 56 30 30 00 00", "Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo"},
+    {"00 54 62 62 0C 0C 00 00", "Carl Zeiss Planar T* 1.4/85 ZF.2"},
+    {"00 54 68 68 18 18 00 00", "Carl Zeiss Makro-Planar T* 2/100 ZF.2"},
+    {"00 54 68 68 24 24 00 02", "Tokina AT-X M100 AF PRO D (AF 100mm f/2.8 Macro)"},
+    {"00 54 72 72 18 18 00 00", "Carl Zeiss Apo Sonnar T* 2/135 ZF.2"},
+    {"00 54 8E 8E 24 24 00 02", "Tokina AT-X 300 AF PRO (AF 300mm f/2.8)"},
+    {"00 57 50 50 14 14 00 00", "Nikkor 50mm f/1.8 AI"},
+    {"00 58 64 64 20 20 00 00", "Soligor C/D Macro MC 90mm f/2.5"},
+    {"01 00 00 00 00 00 02 00", "TC-16A"},
+    {"01 00 00 00 00 00 08 00", "TC-16A"},
+    {"01 54 62 62 0C 0C 00 00", "Zeiss Otus 1.4/85"},
+    {"01 58 50 50 14 14 02 00", "AF Nikkor 50mm f/1.8"},
+    {"01 58 50 50 14 14 05 00", "AF Nikkor 50mm f/1.8"},
+    {"02 2F 98 98 3D 3D 02 00", "Sigma APO 400mm f/5.6"},
+    {"02 34 A0 A0 44 44 02 00", "Sigma APO 500mm f/7.2"},
+    {"02 37 5E 8E 35 3D 02 00", "Sigma 75-300mm f/4.5-5.6 APO"},
+    {"02 37 A0 A0 34 34 02 00", "Sigma APO 500mm f/4.5"},
+    {"02 3A 37 50 31 3D 02 00", "Sigma 24-50mm f/4-5.6 UC"},
+    {"02 3A 5E 8E 32 3D 02 00", "Sigma 75-300mm f/4.0-5.6"},
+    {"02 3B 44 61 30 3D 02 00", "Sigma 35-80mm f/4-5.6"},
+    {"02 3C B0 B0 3C 3C 02 00", "Sigma APO 800mm f/5.6"},
+    {"02 3F 24 24 2C 2C 02 00", "Sigma 14mm f/3.5"},
+    {"02 3F 3C 5C 2D 35 02 00", "Sigma 28-70mm f/3.5-4.5 UC"},
+    {"02 40 44 5C 2C 34 02 00", "Exakta AF 35-70mm 1:3.5-4.5 MC"},
+    {"02 40 44 73 2B 36 02 00", "Sigma 35-135mm f/3.5-4.5 a"},
+    {"02 40 5C 82 2C 35 02 00", "Sigma APO 70-210mm f/3.5-4.5"},
+    {"02 42 44 5C 2A 34 02 00", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
+    {"02 42 44 5C 2A 34 08 00", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
+    {"02 46 37 37 25 25 02 00", "Sigma 24mm f/2.8 Super Wide II Macro"},
+    {"02 46 3C 5C 25 25 02 00", "Sigma 28-70mm f/2.8"},
+    {"02 46 5C 82 25 25 02 00", "Sigma 70-210mm f/2.8 APO"},
+    {"02 48 50 50 24 24 02 00", "Sigma Macro 50mm f/2.8"},
+    {"02 48 65 65 24 24 02 00", "Sigma Macro 90mm f/2.8"},
+    {"03 43 5C 81 35 35 02 00", "Soligor AF C/D Zoom UMCS 70-210mm 1:4.5"},
+    {"03 48 5C 81 30 30 02 00", "AF Zoom-Nikkor 70-210mm f/4"},
+    {"04 48 3C 3C 24 24 03 00", "AF Nikkor 28mm f/2.8"},
+    {"05 54 50 50 0C 0C 04 00", "AF Nikkor 50mm f/1.4"},
+    {"06 3F 68 68 2C 2C 06 00", "Cosina AF 100mm f/3.5 Macro"},
+    {"06 54 53 53 24 24 06 00", "AF Micro-Nikkor 55mm f/2.8"},
+    {"07 36 3D 5F 2C 3C 03 00", "Cosina AF Zoom 28-80mm f/3.5-5.6 MC Macro"},
+    {"07 3E 30 43 2D 35 03 00", "Soligor AF Zoom 19-35mm 1:3.5-4.5 MC"},
+    {"07 40 2F 44 2C 34 03 02", "Tamron AF 19-35mm f/3.5-4.5 (A10)"},
+    {"07 40 30 45 2D 35 03 02", "Tamron AF 19-35mm f/3.5-4.5 (A10)"},
+    {"07 40 3C 5C 2C 35 03 00", "Tokina AF 270 II (AF 28-70mm f/3.5-4.5)"},
+    {"07 40 3C 62 2C 34 03 00", "AF Zoom-Nikkor 28-85mm f/3.5-4.5"},
+    {"07 46 2B 44 24 30 03 02", "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical (IF) (A05)"},
+    {"07 46 3D 6A 25 2F 03 00", "Cosina AF Zoom 28-105mm f/2.8-3.8 MC"},
+    {"07 47 3C 5C 25 35 03 00", "Tokina AF 287 SD (AF 28-70mm f/2.8-4.5)"},
+    {"07 48 3C 5C 24 24 03 00", "Tokina AT-X 287 AF (AF 28-70mm f/2.8)"},
+    {"08 40 44 6A 2C 34 04 00", "AF Zoom-Nikkor 35-105mm f/3.5-4.5"},
+    {"09 48 37 37 24 24 04 00", "AF Nikkor 24mm f/2.8"},
+    {"0A 48 8E 8E 24 24 03 00", "AF Nikkor 300mm f/2.8 IF-ED"},
+    {"0A 48 8E 8E 24 24 05 00", "AF Nikkor 300mm f/2.8 IF-ED N"},
+    {"0B 3E 3D 7F 2F 3D 0E 00", "Tamron AF 28-200mm f/3.8-5.6 (71D)"},
+    {"0B 3E 3D 7F 2F 3D 0E 02", "Tamron AF 28-200mm f/3.8-5.6D (171D)"},
+    {"0B 48 7C 7C 24 24 05 00", "AF Nikkor 180mm f/2.8 IF-ED"},
+    {"0D 40 44 72 2C 34 07 00", "AF Zoom-Nikkor 35-135mm f/3.5-4.5"},
+    {"0E 48 5C 81 30 30 05 00", "AF Zoom-Nikkor 70-210mm f/4"},
+    {"0E 4A 31 48 23 2D 0E 02", "Tamron SP AF 20-40mm f/2.7-3.5 (166D)"},
+    {"0F 58 50 50 14 14 05 00", "AF Nikkor 50mm f/1.8 N"},
+    {"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"},
+    {"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"},
+    {"12 39 5C 8E 34 3D 08 02", "Cosina AF Zoom 70-300mm f/4.5-5.6 MC Macro"},
+    {"12 3B 68 8D 3D 43 09 02", "Cosina AF Zoom 100-300mm f/5.6-6.7 MC Macro"},
+    {"12 3B 98 98 3D 3D 09 00", "Tokina AT-X 400 AF SD (AF 400mm f/5.6)"},
+    {"12 3D 3C 80 2E 3C DF 02", "Tamron AF 28-200mm f/3.8-5.6 AF Aspherical LD (IF) (271D)"},
+    {"12 44 5E 8E 34 3C 09 00", "Tokina AF 730 (AF 75-300mm f/4.5-5.6)"},
+    {"12 48 5C 81 30 3C 09 00", "AF Nikkor 70-210mm f/4-5.6"},
+    {"12 4A 5C 81 31 3D 09 00", "Soligor AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS"},
+    {"13 42 37 50 2A 34 0B 00", "AF Zoom-Nikkor 24-50mm f/3.3-4.5"},
+    {"14 48 60 80 24 24 0B 00", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
+    {"14 48 68 8E 30 30 0B 00", "Tokina AT-X 340 AF (AF 100-300mm f/4)"},
+    {"14 54 60 80 24 24 0B 00", "Tokina AT-X 828 AF (AF 80-200mm f/2.8)"},
+    {"15 4C 62 62 14 14 0C 00", "AF Nikkor 85mm f/1.8"},
+    {"17 3C A0 A0 30 30 0F 00", "Nikkor 500mm f/4 P ED IF"},
+    {"17 3C A0 A0 30 30 11 00", "Nikkor 500mm f/4 P ED IF"},
+    {"18 40 44 72 2C 34 0E 00", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
+    {"1A 54 44 44 18 18 11 00", "AF Nikkor 35mm f/2"},
+    {"1B 44 5E 8E 34 3C 10 00", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"},
+    {"1C 48 30 30 24 24 12 00", "AF Nikkor 20mm f/2.8"},
+    {"1D 42 44 5C 2A 34 12 00", "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N"},
+    {"1E 54 56 56 24 24 13 00", "AF Micro-Nikkor 60mm f/2.8"},
+    {"1E 5D 64 64 20 20 13 00", "Tamron SP AF 90mm f/2.5 (52E)"},
+    {"1F 54 6A 6A 24 24 14 00", "AF Micro-Nikkor 105mm f/2.8"},
+    {"20 3C 80 98 3D 3D 1E 02", "Tamron AF 200-400mm f/5.6 LD IF (75D)"},
+    {"20 48 60 80 24 24 15 00", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
+    {"20 5A 64 64 20 20 14 00", "Tamron SP AF 90mm f/2.5 Macro (152E)"},
+    {"21 40 3C 5C 2C 34 16 00", "AF Zoom-Nikkor 28-70mm f/3.5-4.5"},
+    {"21 56 8E 8E 24 24 14 00", "Tamron SP AF 300mm f/2.8 LD-IF (60E)"},
+    {"22 48 72 72 18 18 16 00", "AF DC-Nikkor 135mm f/2"},
+    {"22 53 64 64 24 24 E0 02", "Tamron SP AF 90mm f/2.8 Macro 1:1 (72E)"},
+    {"23 30 BE CA 3C 48 17 00", "Zoom-Nikkor 1200-1700mm f/5.6-8 P ED IF"},
+    {"24 44 60 98 34 3C 1A 02", "Tokina AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)"},
+    {"24 48 60 80 24 24 1A 02", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+    {"24 54 60 80 24 24 1A 02", "Tokina AT-X 828 AF PRO (AF 80-200mm f/2.8)"},
+    {"25 44 44 8E 34 42 1B 02", "Tokina AF 353 (AF 35-300mm f/4.5-6.7)"},
+    {"25 48 3C 5C 24 24 1B 02", "Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"},
+    {"25 48 3C 5C 24 24 1B 02", "Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"},
+    {"25 48 44 5C 24 24 1B 02", "AF Zoom-Nikkor 35-70mm f/2.8D"},
+    {"25 48 44 5C 24 24 3A 02", "AF Zoom-Nikkor 35-70mm f/2.8D"},
+    {"25 48 44 5C 24 24 52 02", "AF Zoom-Nikkor 35-70mm f/2.8D"},
+    {"26 3C 54 80 30 3C 1C 06", "Sigma 55-200mm f/4-5.6 DC"},
+    {"26 3C 5C 82 30 3C 1C 02", "Sigma 70-210mm f/4-5.6 UC-II"},
+    {"26 3C 5C 8E 30 3C 1C 02", "Sigma 70-300mm f/4-5.6 DG Macro"},
+    {"26 3C 98 98 3C 3C 1C 02", "Sigma APO Tele Macro 400mm f/5.6"},
+    {"26 3D 3C 80 2F 3D 1C 02", "Sigma 28-300mm f/3.8-5.6 Aspherical"},
+    {"26 3E 3C 6A 2E 3C 1C 02", "Sigma 28-105mm f/3.8-5.6 UC-III Aspherical IF"},
+    {"26 40 27 3F 2C 34 1C 02", "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical DF"},
+    {"26 40 2D 44 2B 34 1C 02", "Sigma 18-35mm f/3.5-4.5 Aspherical"},
+    {"26 40 2D 50 2C 3C 1C 06", "Sigma 18-50mm f/3.5-5.6 DC"},
+    {"26 40 2D 70 2B 3C 1C 06", "Sigma 18-125mm f/3.5-5.6 DC"},
+    {"26 40 2D 80 2C 40 1C 06", "Sigma 18-200mm f/3.5-6.3 DC"},
+    {"26 40 37 5C 2C 3C 1C 02", "Sigma 24-70mm f/3.5-5.6 Aspherical HF"},
+    {"26 40 3C 5C 2C 34 1C 02", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
+    {"26 40 3C 60 2C 3C 1C 02", "Sigma 28-80mm f/3.5-5.6 Mini Zoom Macro II Aspherical"},
+    {"26 40 3C 65 2C 3C 1C 02", "Sigma 28-90mm f/3.5-5.6 Macro"},
+    {"26 40 3C 80 2B 3C 1C 02", "Sigma 28-200mm f/3.5-5.6 Compact Aspherical Hyperzoom Macro"},
+    {"26 40 3C 80 2C 3C 1C 02", "Sigma 28-200mm f/3.5-5.6 Compact Aspherical Hyperzoom Macro"},
+    {"26 40 3C 8E 2C 40 1C 02", "Sigma 28-300mm f/3.5-6.3 Macro"},
+    {"26 40 7B A0 34 40 1C 02", "Sigma APO 170-500mm f/5-6.3 Aspherical RF"},
+    {"26 41 3C 8E 2C 40 1C 02", "Sigma 28-300mm f/3.5-6.3 DG Macro"},
+    {"26 44 73 98 34 3C 1C 02", "Sigma 135-400mm f/4.5-5.6 APO Aspherical"},
+    {"26 48 11 11 30 30 1C 02", "Sigma 8mm f/4 EX Circular Fisheye"},
+    {"26 48 27 27 24 24 1C 02", "Sigma 15mm f/2.8 EX Diagonal Fisheye"},
+    {"26 48 2D 50 24 24 1C 06", "Sigma 18-50mm f/2.8 EX DC"},
+    {"26 48 31 49 24 24 1C 02", "Sigma 20-40mm f/2.8"},
+    {"26 48 37 56 24 24 1C 02", "Sigma 24-60mm f/2.8 EX DG"},
+    {"26 48 3C 5C 24 24 1C 06", "Sigma 28-70mm f/2.8 EX DG"},
+    {"26 48 3C 5C 24 30 1C 02", "Sigma 28-70mm f/2.8-4 DG"},
+    {"26 48 3C 6A 24 30 1C 02", "Sigma 28-105mm f/2.8-4 Aspherical"},
+    {"26 48 8E 8E 30 30 1C 02", "Sigma APO Tele Macro 300mm f/4"},
+    {"26 54 2B 44 24 30 1C 02", "Sigma 17-35mm f/2.8-4 EX Aspherical"},
+    {"26 54 37 5C 24 24 1C 02", "Sigma 24-70mm f/2.8 EX DG Macro"},
+    {"26 54 37 73 24 34 1C 02", "Sigma 24-135mm f/2.8-4.5"},
+    {"26 54 3C 5C 24 24 1C 02", "Sigma 28-70mm f/2.8 EX"},
+    {"26 58 31 31 14 14 1C 02", "Sigma 20mm f/1.8 EX DG Aspherical RF"},
+    {"26 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
+    {"26 58 3C 3C 14 14 1C 02", "Sigma 28mm f/1.8 EX DG Aspherical Macro"},
+    {"27 48 8E 8E 24 24 1D 02", "AF-I Nikkor 300mm f/2.8D IF-ED"},
+    {"27 48 8E 8E 24 24 E1 02", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E"},
+    {"27 48 8E 8E 24 24 F1 02", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E"},
+    {"27 48 8E 8E 24 24 F2 02", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E"},
+    {"27 48 8E 8E 30 30 1D 02", "Tokina AT-X 304 AF (AF 300mm f/4.0)"},
+    {"27 54 8E 8E 24 24 1D 02", "Tamron SP AF 300mm f/2.8 LD-IF (360E)"},
+    {"28 3C A6 A6 30 30 1D 02", "AF-I Nikkor 600mm f/4D IF-ED"},
+    {"28 3C A6 A6 30 30 E1 02", "AF-I Nikkor 600mm f/4D IF-ED + TC-17E"},
+    {"28 3C A6 A6 30 30 F1 02", "AF-I Nikkor 600mm f/4D IF-ED + TC-14E"},
+    {"28 3C A6 A6 30 30 F2 02", "AF-I Nikkor 600mm f/4D IF-ED + TC-20E"},
+    {"2A 54 3C 3C 0C 0C 26 02", "AF Nikkor 28mm f/1.4D"},
+    {"2B 3C 44 60 30 3C 1F 02", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
+    {"2C 48 6A 6A 18 18 27 02", "AF DC-Nikkor 105mm f/2D"},
+    {"2D 48 80 80 30 30 21 02", "AF Micro-Nikkor 200mm f/4D IF-ED"},
+    {"2E 48 5C 82 30 3C 22 02", "AF Nikkor 70-210mm f/4-5.6D"},
+    {"2E 48 5C 82 30 3C 28 02", "AF Nikkor 70-210mm f/4-5.6D"},
+    {"2F 40 30 44 2C 34 29 02", "Tokina AF 235 II (AF 20-35mm f/3.5-4.5)"},
+    {"2F 40 30 44 2C 34 29 02", "Tokina AF 193 (AF 19-35mm f/3.5-4.5)"},
+    {"2F 48 30 44 24 24 29 02", "AF Zoom-Nikkor 20-35mm f/2.8D IF"},
+    {"2F 48 30 44 24 24 29 02", "Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)"},
+    {"30 48 98 98 24 24 24 02", "AF-I Nikkor 400mm f/2.8D IF-ED"},
+    {"30 48 98 98 24 24 E1 02", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E"},
+    {"30 48 98 98 24 24 F1 02", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"},
+    {"30 48 98 98 24 24 F2 02", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E"},
+    {"31 54 56 56 24 24 25 02", "AF Micro-Nikkor 60mm f/2.8D"},
+    {"32 53 64 64 24 24 35 02", "Tamron SP AF 90mm f/2.8 [Di] Macro 1:1 (172E/272E)"},
+    {"32 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
+    {"32 54 6A 6A 24 24 35 02", "AF Micro-Nikkor 105mm f/2.8D"},
+    {"32 54 6A 6A 24 24 35 02", "Sigma Macro 105mm f/2.8 EX DG"},
+    {"33 48 2D 2D 24 24 31 02", "AF Nikkor 18mm f/2.8D"},
+    {"33 54 3C 5E 24 24 62 02", "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)"},
+    {"34 48 29 29 24 24 32 02", "AF Fisheye Nikkor 16mm f/2.8D"},
+    {"35 3C A0 A0 30 30 33 02", "AF-I Nikkor 500mm f/4D IF-ED"},
+    {"35 3C A0 A0 30 30 E1 02", "AF-I Nikkor 500mm f/4D IF-ED + TC-17E"},
+    {"35 3C A0 A0 30 30 F1 02", "AF-I Nikkor 500mm f/4D IF-ED + TC-14E"},
+    {"35 3C A0 A0 30 30 F2 02", "AF-I Nikkor 500mm f/4D IF-ED + TC-20E"},
+    {"36 48 37 37 24 24 34 02", "AF Nikkor 24mm f/2.8D"},
+    {"37 48 30 30 24 24 36 02", "AF Nikkor 20mm f/2.8D"},
+    {"38 4C 62 62 14 14 37 02", "AF Nikkor 85mm f/1.8D"},
+    {"3A 40 3C 5C 2C 34 39 02", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
+    {"3B 48 44 5C 24 24 3A 02", "AF Zoom-Nikkor 35-70mm f/2.8D N"},
+    {"3C 48 60 80 24 24 3B 02", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+    {"3D 3C 44 60 30 3C 3E 02", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
+    {"3E 48 3C 3C 24 24 3D 02", "AF Nikkor 28mm f/2.8D"},
+    {"3F 40 44 6A 2C 34 45 02", "AF Zoom-Nikkor 35-105mm f/3.5-4.5D"},
+    {"41 48 7C 7C 24 24 43 02", "AF Nikkor 180mm f/2.8D IF-ED"},
+    {"42 54 44 44 18 18 44 02", "AF Nikkor 35mm f/2D"},
+    {"43 54 50 50 0C 0C 46 02", "AF Nikkor 50mm f/1.4D"},
+    {"44 44 60 80 34 3C 47 02", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
+    {"45 3D 3C 60 2C 3C 48 02", "Tamron AF 28-80mm f/3.5-5.6 Aspherical (177D)"},
+    {"45 40 3C 60 2C 3C 48 02", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
+    {"45 41 37 72 2C 3C 48 02", "Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro (190D)"},
+    {"46 3C 44 60 30 3C 49 02", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"},
+    {"47 42 37 50 2A 34 4A 02", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"},
+    {"48 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 EX DG Aspherical HSM"},
+    {"48 3C 19 31 30 3C 4B 06", "Sigma 10-20mm f/4-5.6 EX DC HSM"},
+    {"48 3C 50 A0 30 40 4B 02", "Sigma 50-500mm f/4-6.3 EX APO RF HSM"},
+    {"48 3C 8E B0 3C 3C 4B 02", "Sigma APO 300-800mm f/5.6 EX DG HSM"},
+    {"48 3C B0 B0 3C 3C 4B 02", "Sigma APO 800mm f/5.6 EX HSM"},
+    {"48 44 A0 A0 34 34 4B 02", "Sigma APO 500mm f/4.5 EX HSM"},
+    {"48 48 24 24 24 24 4B 02", "Sigma 14mm f/2.8 EX Aspherical HSM"},
+    {"48 48 2B 44 24 30 4B 06", "Sigma 17-35mm f/2.8-4 EX DG  Aspherical HSM"},
+    {"48 48 68 8E 30 30 4B 02", "Sigma APO 100-300mm f/4 EX IF HSM"},
+    {"48 48 76 76 24 24 4B 06", "Sigma APO Macro 150mm f/2.8 EX DG HSM"},
+    {"48 48 8E 8E 24 24 4B 02", "AF-S Nikkor 300mm f/2.8D IF-ED"},
+    {"48 48 8E 8E 24 24 E1 02", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E"},
+    {"48 48 8E 8E 24 24 F1 02", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E"},
+    {"48 48 8E 8E 24 24 F2 02", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E"},
+    {"48 4C 7C 7C 2C 2C 4B 02", "Sigma APO Macro 180mm f/3.5 EX DG HSM"},
+    {"48 4C 7D 7D 2C 2C 4B 02", "Sigma APO Macro 180mm f/3.5 EX DG HSM"},
+    {"48 54 3E 3E 0C 0C 4B 06", "Sigma 30mm f/1.4 EX DC HSM"},
+    {"48 54 5C 80 24 24 4B 02", "Sigma 70-200mm f/2.8 EX APO IF HSM"},
+    {"48 54 6F 8E 24 24 4B 02", "Sigma APO 120-300mm f/2.8 EX DG HSM"},
+    {"48 54 8E 8E 24 24 4B 02", "Sigma APO 300mm f/2.8 EX DG HSM"},
+    {"49 3C A6 A6 30 30 4C 02", "AF-S Nikkor 600mm f/4D IF-ED"},
+    {"49 3C A6 A6 30 30 E1 02", "AF-S Nikkor 600mm f/4D IF-ED + TC-17E"},
+    {"49 3C A6 A6 30 30 F1 02", "AF-S Nikkor 600mm f/4D IF-ED + TC-14E"},
+    {"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 AE 14mm f/2.8 ED AS IF UMC"},
+    {"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 44 44 0C 0C 4D 02", "Samyang 35mm f/1.4 AS UMC"},
+    {"4A 60 62 62 0C 0C 4D 02", "Samyang AE 85mm f/1.4 AS IF UMC"},
+    {"4B 3C A0 A0 30 30 4E 02", "AF-S Nikkor 500mm f/4D IF-ED"},
+    {"4B 3C A0 A0 30 30 E1 02", "AF-S Nikkor 500mm f/4D IF-ED + TC-17E"},
+    {"4B 3C A0 A0 30 30 F1 02", "AF-S Nikkor 500mm f/4D IF-ED + TC-14E"},
+    {"4B 3C A0 A0 30 30 F2 02", "AF-S Nikkor 500mm f/4D IF-ED + TC-20E"},
+    {"4C 40 37 6E 2C 3C 4F 02", "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF"},
+    {"4D 3E 3C 80 2E 3C 62 02", "Tamron AF 28-200mm f/3.8-5.6 XR Aspherical (IF) Macro (A03N)"},
+    {"4D 40 3C 80 2C 3C 62 02", "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF"},
+    {"4D 41 3C 8E 2B 40 62 02", "Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical (IF) (A061)"},
+    {"4D 41 3C 8E 2C 40 62 02", "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical (IF) (185D)"},
+    {"4E 48 72 72 18 18 51 02", "AF DC-Nikkor 135mm f/2D"},
+    {"4F 40 37 5C 2C 3C 53 06", "IX-Nikkor 24-70mm f/3.5-5.6"},
+    {"50 48 56 7C 30 3C 54 06", "IX-Nikkor 60-180mm f/4-5.6"},
+    {"52 54 44 44 18 18 00 00", "Zeiss Milvus 35mm f/2"},
+    {"53 48 60 80 24 24 57 02", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+    {"53 48 60 80 24 24 60 02", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+    {"53 54 50 50 0C 0C 00 00", "Zeiss Milvus 50mm f/1.4"},
+    {"54 44 5C 7C 34 3C 58 02", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
+    {"54 44 5C 7C 34 3C 61 02", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
+    {"54 54 50 50 18 18 00 00", "Zeiss Milvus 50mm f/2 Macro"},
+    {"55 54 62 62 0C 0C 00 00", "Zeiss Milvus 85mm f/1.4"},
+    {"56 3C 5C 8E 30 3C 1C 02", "Sigma 70-300mm f/4-5.6 APO Macro Super II"},
+    {"56 48 5C 8E 30 3C 5A 02", "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"},
+    {"56 54 68 68 18 18 00 00", "Zeiss Milvus 100mm f/2 Macro"},
+    {"59 48 98 98 24 24 5D 02", "AF-S Nikkor 400mm f/2.8D IF-ED"},
+    {"59 48 98 98 24 24 E1 02", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"},
+    {"59 48 98 98 24 24 F1 02", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"},
+    {"59 48 98 98 24 24 F2 02", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E"},
+    {"5A 3C 3E 56 30 3C 5E 06", "IX-Nikkor 30-60mm f/4-5.6"},
+    {"5B 44 56 7C 34 3C 5F 06", "IX-Nikkor 60-180mm f/4.5-5.6"},
+    {"5D 48 3C 5C 24 24 63 02", "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED"},
+    {"5E 48 60 80 24 24 64 02", "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED"},
+    {"5F 40 3C 6A 2C 34 65 02", "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF"},
+    {"60 40 3C 60 2C 3C 66 02", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
+    {"61 44 5E 86 34 3C 67 02", "AF Zoom-Nikkor 75-240mm f/4.5-5.6D"},
+    {"63 48 2B 44 24 24 68 02", "AF-S Nikkor 17-35mm f/2.8D IF-ED"},
+    {"64 00 62 62 24 24 6A 02", "PC Micro-Nikkor 85mm f/2.8D"},
+    {"65 44 60 98 34 3C 6B 0A", "AF VR Zoom-Nikkor 80-400mm f/4.5-5.6D ED"},
+    {"66 40 2D 44 2C 34 6C 02", "AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED"},
+    {"67 48 37 62 24 30 6D 02", "AF Zoom-Nikkor 24-85mm f/2.8-4D IF"},
+    {"67 54 37 5C 24 24 1C 02", "Sigma 24-70mm f/2.8 EX DG Macro"},
+    {"68 42 3C 60 2A 3C 6E 06", "AF Zoom-Nikkor 28-80mm f/3.3-5.6G"},
+    {"69 47 5C 8E 30 3C 00 02", "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17N)"},
+    {"69 48 5C 8E 30 3C 6F 02", "Tamron AF 70-300mm f/4-5.6 LD Macro 1:2 (572D/772D)"},
+    {"69 48 5C 8E 30 3C 6F 06", "AF Zoom-Nikkor 70-300mm f/4-5.6G"},
+    {"6A 48 8E 8E 30 30 70 02", "AF-S Nikkor 300mm f/4D IF-ED"},
+    {"6B 48 24 24 24 24 71 02", "AF Nikkor ED 14mm f/2.8D"},
+    {"6D 48 8E 8E 24 24 73 02", "AF-S Nikkor 300mm f/2.8D IF-ED II"},
+    {"6E 48 98 98 24 24 74 02", "AF-S Nikkor 400mm f/2.8D IF-ED II"},
+    {"6F 3C A0 A0 30 30 75 02", "AF-S Nikkor 500mm f/4D IF-ED II"},
+    {"70 3C A6 A6 30 30 76 02", "AF-S Nikkor 600mm f/4D IF-ED II"},
+    {"72 48 4C 4C 24 24 77 00", "Nikkor 45mm f/2.8 P"},
+    {"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 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"},
+    {"79 40 11 11 2C 2C 1C 06", "Sigma 8mm f/3.5 EX Circular Fisheye"},
+    {"79 40 3C 80 2C 3C 7F 06", "AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED"},
+    {"79 48 3C 5C 24 24 1C 06", "Sigma 28-70mm f/2.8 EX DG"},
+    {"79 48 5C 5C 24 24 1C 06", "Sigma Macro 70mm f/2.8 EX DG"},
+    {"7A 3B 53 80 30 3C 4B 06", "Sigma 55-200mm f/4-5.6 DC HSM"},
+    {"7A 3C 1F 37 30 30 7E 06", "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED"},
+    {"7A 3C 1F 37 30 30 7E 06", "Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
+    {"7A 3C 1F 3C 30 30 7E 06", "Tokina AT-X 12-28 PRO DX (AF 12-28mm f/4)"},
+    {"7A 40 2D 50 2C 3C 4B 06", "Sigma 18-50mm f/3.5-5.6 DC HSM"},
+    {"7A 40 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC OS HSM"},
+    {"7A 47 2B 5C 24 34 4B 06", "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM"},
+    {"7A 47 50 76 24 24 4B 06", "Sigma 50-150mm f/2.8 EX APO DC HSM"},
+    {"7A 48 1C 29 24 24 7E 06", "Tokina AT-X 116 PRO DX II (AF 11-16mm f/2.8)"},
+    {"7A 48 1C 30 24 24 7E 06", "Tokina AT-X 11-20 f/2.8 PRO DX (AF 11-20mm f/2.8)"},
+    {"7A 48 2B 5C 24 34 4B 06", "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF HSM"},
+    {"7A 48 2D 50 24 24 4B 06", "Sigma 18-50mm f/2.8 EX DC Macro"},
+    {"7A 48 5C 80 24 24 4B 06", "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II"},
+    {"7A 54 6E 8E 24 24 4B 02", "Sigma APO 120-300mm f/2.8 EX DG HSM"},
+    {"7B 48 80 98 30 30 80 0E", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"},
+    {"7D 48 2B 53 24 24 82 06", "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED"},
+    {"7F 40 2D 5C 2C 34 84 06", "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED"},
+    {"7F 48 2B 5C 24 34 1C 06", "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF"},
+    {"7F 48 2D 50 24 24 1C 06", "Sigma 18-50mm f/2.8 EX DC Macro"},
+    {"80 48 1A 1A 24 24 85 06", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"},
+    {"81 34 76 A6 38 40 4B 0E", "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
+    {"81 54 80 80 18 18 86 0E", "AF-S VR Nikkor 200mm f/2G IF-ED"},
+    {"82 34 76 A6 38 40 4B 0E", "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
+    {"82 48 8E 8E 24 24 87 0E", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
+    {"83 00 B0 B0 5A 5A 88 04", "FSA-L2, EDG 65, 800mm f/13 G"},
+    {"88 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 DG HSM | A"},
+    {"89 3C 53 80 30 3C 8B 06", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
+    {"8A 3C 37 6A 30 30 4B 0E", "Sigma 24-105mm f/4 DG OS HSM"},
+    {"8A 54 6A 6A 24 24 8C 0E", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
+    {"8B 40 2D 80 2C 3C 8D 0E", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
+    {"8B 40 2D 80 2C 3C FD 0E", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED [II]"},
+    {"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"},
+    {"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"},
+    {"90 3B 53 80 30 3C 92 0E", "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"},
+    {"90 40 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"},
+    {"91 54 44 44 0C 0C 4B 06", "Sigma 35mm f/1.4 DG HSM"},
+    {"92 2C 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"},
+    {"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"},
+    {"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"},
+    {"96 48 98 98 24 24 98 0E", "AF-S VR Nikkor 400mm f/2.8G ED"},
+    {"97 3C A0 A0 30 30 99 0E", "AF-S VR Nikkor 500mm f/4G ED"},
+    {"97 48 6A 6A 24 24 4B 0E", "Sigma Macro 105mm f/2.8 EX DG OS HSM"},
+    {"98 3C A6 A6 30 30 9A 0E", "AF-S VR Nikkor 600mm f/4G ED"},
+    {"98 48 50 76 24 24 4B 0E", "Sigma 50-150mm f/2.8 EX APO DC OS HSM"},
+    {"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"},
+    {"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"},
+    {"9C 48 5C 80 24 24 4B 0E", "Sigma 70-200mm f/2.8 EX DG OS HSM"},
+    {"9C 54 56 56 24 24 9E 06", "AF-S Micro Nikkor 60mm f/2.8G ED"},
+    {"9D 00 62 62 24 24 9F 06", "PC-E Micro Nikkor 85mm f/2.8D"},
+    {"9D 48 2B 50 24 24 4B 0E", "Sigma 17-50mm f/2.8 EX DC OS HSM"},
+    {"9D 54 62 62 24 24 9F 02", "PC-E Micro Nikkor 85mm f/2.8D"},
+    {"9E 38 11 29 34 3C 4B 06", "Sigma 8-16mm f/4.5-5.6 DC HSM"},
+    {"9E 40 2D 6A 2C 3C A0 0E", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
+    {"9F 37 50 A0 34 40 4B 0E", "Sigma 50-500mm f/4.5-6.3 DG OS HSM"},
+    {"9F 58 44 44 14 14 A1 06", "AF-S DX Nikkor 35mm f/1.8G"},
+    {"A0 40 2D 74 2C 3C BB 0E", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
+    {"A0 48 2A 5C 24 30 4B 0E", "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"},
+    {"A0 54 50 50 0C 0C A2 06", "AF-S Nikkor 50mm f/1.4G"},
+    {"A1 40 18 37 2C 34 A3 06", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
+    {"A1 41 19 31 2C 2C 4B 06", "Sigma 10-20mm f/3.5 EX DC HSM"},
+    {"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 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 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"},
+    {"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 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 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 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"},
+    {"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 4E", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
+    {"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"},
+    {"AC 3C A6 A6 30 30 C7 4E", "AF-S Nikkor 600mm f/4E FL ED VR"},
+    {"AD 3C 2D 8E 2C 3C AF 0E", "AF-S DX Nikkor 18-300mm f/3.5-5.6G 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"},
+    {"AE 3C 80 A0 3C 3C C9 4E", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
+    {"AE 54 62 62 0C 0C B0 06", "AF-S Nikkor 85mm f/1.4G"},
+    {"AF 4C 37 37 14 14 CC 06", "AF-S Nikkor 24mm f/1.8G ED"},
+    {"AF 54 44 44 0C 0C B1 06", "AF-S Nikkor 35mm f/1.4G"},
+    {"B0 4C 50 50 14 14 B2 06", "AF-S Nikkor 50mm f/1.8G"},
+    {"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"},
+    {"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 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"},
+    {"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"},
+    {"CF 38 6E 98 34 3C 4B 0E", "Sigma APO 120-400mm f/4.5-5.6 DG OS HSM"},
+    {"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"},
+    {"E1 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
+    {"E3 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
+    {"E5 54 6A 6A 24 24 35 02", "Sigma Macro 105mm f/2.8 EX DG"},
+    {"E6 41 3C 8E 2C 40 1C 02", "Sigma 28-300mm f/3.5-6.3 DG Macro"},
+    {"E8 4C 44 44 14 14 DF 0E", "Tamron SP 35mm f/1.8 VC"},
+    {"E9 48 27 3E 24 24 DF 0E", "Tamron SP 15-30mm f/2.8 Di VC USD (A012)"},
+    {"E9 54 37 5C 24 24 1C 02", "Sigma 24-70mm f/2.8 EX DG Macro"},
+    {"EA 40 29 8E 2C 40 DF 0E", "Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD (B016)"},
+    {"EA 48 27 27 24 24 1C 02", "Sigma 15mm f/2.8 EX Diagonal Fisheye"},
+    {"EB 40 76 A6 38 40 DF 0E", "Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)"},
+    {"ED 40 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC OS HSM"},
+    {"EE 48 5C 80 24 24 4B 06", "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II"},
+    {"F0 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 EX DG Aspherical HSM"},
+    {"F0 3F 2D 8A 2C 40 DF 0E", "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)"},
+    {"F1 44 A0 A0 34 34 4B 02", "Sigma APO 500mm f/4.5 EX DG HSM"},
+    {"F1 47 5C 8E 30 3C DF 0E", "Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)"},
+    {"F3 48 68 8E 30 30 4B 02", "Sigma APO 100-300mm f/4 EX IF HSM"},
+    {"F3 54 2B 50 24 24 84 0E", "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF) (B005)"},
+    {"F4 54 56 56 18 18 84 06", "Tamron SP AF 60mm f/2.0 Di II Macro 1:1 (G005)"},
+    {"F5 40 2C 8A 2C 40 40 0E", "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical (IF) Macro (B003)"},
+    {"F5 48 76 76 24 24 4B 06", "Sigma APO Macro 150mm f/2.8 EX DG HSM"},
+    {"F6 3F 18 37 2C 34 84 06", "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)"},
+    {"F6 3F 18 37 2C 34 DF 06", "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)"},
+    {"F6 48 2D 50 24 24 4B 06", "Sigma 18-50mm f/2.8 EX DC Macro"},
+    {"F7 53 5C 80 24 24 40 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"},
+    {"F7 53 5C 80 24 24 84 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"},
+    {"F8 54 3E 3E 0C 0C 4B 06", "Sigma 30mm f/1.4 EX DC HSM"},
+    {"F8 54 64 64 24 24 DF 06", "Tamron SP AF 90mm f/2.8 Di Macro 1:1 (272NII)"},
+    {"F8 55 64 64 24 24 84 06", "Tamron SP AF 90mm f/2.8 Di Macro 1:1 (272NII)"},
+    {"F9 3C 19 31 30 3C 4B 06", "Sigma 10-20mm f/4-5.6 EX DC HSM"},
+    {"F9 40 3C 8E 2C 40 40 0E", "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical (IF) Macro (A20)"},
+    {"FA 54 3C 5E 24 24 84 06", "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)"},
+    {"FA 54 3C 5E 24 24 DF 06", "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)"},
+    {"FA 54 6E 8E 24 24 4B 02", "Sigma APO 120-300mm f/2.8 EX DG HSM"},
+    {"FB 54 2B 50 24 24 84 06", "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)"},
+    {"FB 54 8E 8E 24 24 4B 02", "Sigma APO 300mm f/2.8 EX DG HSM"},
+    {"FC 40 2D 80 2C 40 DF 06", "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)"},
+    {"FD 47 50 76 24 24 4B 06", "Sigma 50-150mm f/2.8 EX APO DC HSM II"},
+    {"FE 47 00 00 24 24 4B 06", "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"},
+    {"FE 48 37 5C 24 24 DF 0E", "Tamron SP 24-70mm f/2.8 Di VC USD (A007)"},
+    {"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"}
+};
 
 const TagAttrib nikonISOInfoAttribs[] = {
     {0, AC_WRITE, 0, nullptr, 0x0000, AUTO, "ISO", &naISOInfoISOInterpreter},
diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc
index adb19c969..a559969bf 100644
--- a/rtexif/sonyminoltaattribs.cc
+++ b/rtexif/sonyminoltaattribs.cc
@@ -541,513 +541,515 @@ public:
 };
 SAAntiBlurInterpreter saAntiBlurInterpreter;
 
-class SALensIDInterpreter : public IntLensInterpreter< int >
+class SALensIDInterpreter : public IntLensInterpreter<int>
 {
 public:
     SALensIDInterpreter ()
     {
-        choices.insert(p_t(0, "Minolta AF 28-85mm f/3.5-4.5 New"));
-        choices.insert(p_t(1, "Minolta AF 80-200mm f/2.8 HS-APO G"));
-        choices.insert(p_t(2, "Minolta AF 28-70mm f/2.8 G"));
-        choices.insert(p_t(3, "Minolta AF 28-80mm f/4-5.6"));
-        choices.insert(p_t(4, "Minolta AF 85mm f/1.4G"));
-        choices.insert(p_t(5, "Minolta AF 35-70mm f/3.5-4.5 [II]"));
-        choices.insert(p_t(6, "Minolta AF 24-85mm f/3.5-4.5 [New]"));
-        choices.insert(p_t(7, "Minolta AF 100-300mm f/4.5-5.6 APO [New] or 100-400mm or Sigma Lens"));
-        choices.insert(p_t(7, "Minolta AF 100-400mm f/4.5-6.7 APO"));
-        choices.insert(p_t(7, "Sigma AF 100-300mm f/4 EX DG IF"));
-        choices.insert(p_t(8, "Minolta AF 70-210mm f/4.5-5.6 [II]"));
-        choices.insert(p_t(9, "Minolta AF 50mm f/3.5 Macro"));
-        choices.insert(p_t(10, "Minolta AF 28-105mm f/3.5-4.5 [New]"));
-        choices.insert(p_t(11, "Minolta AF 300mm f/4 HS-APO G"));
-        choices.insert(p_t(12, "Minolta AF 100mm f/2.8 Soft Focus"));
-        choices.insert(p_t(13, "Minolta AF 75-300mm f/4.5-5.6 (New or II)"));
-        choices.insert(p_t(14, "Minolta AF 100-400mm f/4.5-6.7 APO"));
-        choices.insert(p_t(15, "Minolta AF 400mm f/4.5 HS-APO G"));
-        choices.insert(p_t(16, "Minolta AF 17-35mm f/3.5 G"));
-        choices.insert(p_t(17, "Minolta AF 20-35mm f/3.5-4.5"));
-        choices.insert(p_t(18, "Minolta AF 28-80mm f/3.5-5.6 II"));
-        choices.insert(p_t(19, "Minolta AF 35mm f/1.4 G"));
-        choices.insert(p_t(20, "Minolta/Sony 135mm f/2.8 [T4.5] STF"));
-        choices.insert(p_t(22, "Minolta AF 35-80mm f/4-5.6 II"));
-        choices.insert(p_t(23, "Minolta AF 200mm f/4 Macro APO G"));
-        choices.insert(p_t(24, "Minolta/Sony AF 24-105mm f/3.5-4.5 (D) or Sigma or Tamron Lens"));
-        choices.insert(p_t(24, "Sigma 18-50mm f/2.8"));
-        choices.insert(p_t(24, "Sigma 17-70mm f/2.8-4.5 (D)"));
-        choices.insert(p_t(24, "Sigma 20-40mm f/2.8 EX DG Aspherical IF"));
-        choices.insert(p_t(24, "Sigma 18-200mm f/3.5-6.3 DC"));
-        choices.insert(p_t(24, "Sigma DC 18-125mm f/4-5,6 D"));
-        choices.insert(p_t(24, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"));
-        choices.insert(p_t(25, "Minolta AF 100-300mm f/4.5-5.6 APO (D) or Sigma Lens"));
-        choices.insert(p_t(25, "Sigma 100-300mm f/4 EX (APO (D) or D IF)"));
-        choices.insert(p_t(25, "Sigma 70mm f/2.8 EX DG Macro"));
-        choices.insert(p_t(25, "Sigma 20mm f/1.8 EX DG Aspherical RF"));
-        choices.insert(p_t(25, "Sigma 30mm f/1.4 EX DC"));
-        choices.insert(p_t(25, "Sigma 24mm f/1.8 EX DG ASP Macro"));
-        choices.insert(p_t(27, "Minolta AF 85mm f/1.4 G (D)"));
-        choices.insert(p_t(28, "Minolta/Sony AF 100mm f/2.8 Macro (D) or Tamron Lens"));
-        choices.insert(p_t(28, "Tamron SP AF 90mm f/2.8 Di Macro"));
-        choices.insert(p_t(28, "Tamron SP AF 180mm f/3.5 Di LD [IF] Macro"));
-        choices.insert(p_t(29, "Minolta/Sony AF 75-300mm f/4.5-5.6 (D)"));
-        choices.insert(p_t(30, "Minolta AF 28-80mm f/3.5-5.6 (D) or Sigma Lens"));
-        choices.insert(p_t(30, "Sigma AF 10-20mm f/4-5.6 EX DC"));
-        choices.insert(p_t(30, "Sigma AF 12-24mm f/4.5-5.6 EX DG"));
-        choices.insert(p_t(30, "Sigma 28-70mm EX DG f/2.8"));
-        choices.insert(p_t(30, "Sigma 55-200mm f/4-5.6 DC"));
-        choices.insert(p_t(31, "Minolta/Sony AF 50mm f/2.8 Macro (D) or f/3.5"));
-        choices.insert(p_t(31, "Minolta/Sony AF 50mm f/3.5 Macro"));
-        choices.insert(p_t(32, "Minolta/Sony AF 300mm f/2.8 G or 1.5x Teleconverter"));
-        choices.insert(p_t(33, "Minolta/Sony AF 70-200mm f/2.8 G"));
-        choices.insert(p_t(35, "Minolta AF 85mm f/1.4 G (D) Limited"));
-        choices.insert(p_t(36, "Minolta AF 28-100mm f/3.5-5.6 (D)"));
-        choices.insert(p_t(38, "Minolta AF 17-35mm f/2.8-4 (D)"));
-        choices.insert(p_t(39, "Minolta AF 28-75mm f/2.8 (D)"));
-        choices.insert(p_t(40, "Minolta/Sony AF DT 18-70mm f/3.5-5.6 (D)"));
-        choices.insert(p_t(41, "Minolta/Sony AF DT 11-18mm f/4.5-5.6 (D) or Tamron Lens"));
-        choices.insert(p_t(41, "Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical IF"));
-        choices.insert(p_t(42, "Minolta/Sony AF DT 18-200mm f/3.5-6.3 (D)"));
-        choices.insert(p_t(43, "Sony 35mm f/1.4 G (SAL35F14G)"));
-        choices.insert(p_t(44, "Sony 50mm f/1.4 (SAL50F14)"));
-        choices.insert(p_t(45, "Carl Zeiss Planar T* 85mm f/1.4 ZA (SAL85F14Z)"));
-        choices.insert(p_t(46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm f/3.5-4.5 ZA (SAL1680Z)"));
-        choices.insert(p_t(47, "Carl Zeiss Sonnar T* 135mm f/1.8 ZA (SAL135F18Z)"));
-        choices.insert(p_t(48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM (SAL2470Z) or ZA SSM II"));
-        choices.insert(p_t(48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM II (SAL2470Z2)"));
-        choices.insert(p_t(49, "Sony DT 55-200mm f/4-5.6 (SAL55200)"));
-        choices.insert(p_t(50, "Sony DT 18-250mm f/3.5-6.3 (SAL18250)"));
-        choices.insert(p_t(51, "Sony DT 16-105mm f/3.5-5.6 (SAL16105)"));
-        choices.insert(p_t(52, "Sony 70-300mm f/4.5-5.6 G SSM (SAL70300G) or G SSM II or Tamron Lens"));
-        choices.insert(p_t(52, "Sony 70-300mm f/4.5-5.6 G SSM II (SAL70300G2)"));
-        choices.insert(p_t(52, "Tamron SP 70-300mm f/4-5.6 Di USD"));
-        choices.insert(p_t(53, "Sony 70-400mm f/4-5.6 G SSM (SAL70400G)"));
-        choices.insert(p_t(54, "Carl Zeiss Vario-Sonnar T* 16-35mm f/2.8 ZA SSM (SAL1635Z) or ZA SSM II"));
-        choices.insert(p_t(54, "Carl Zeiss Vario-Sonnar T* 16-35mm f/2.8 ZA SSM II (SAL1635Z2)"));
-        choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855) or SAM II"));
-        choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM II (SAL18552)"));
-        choices.insert(p_t(56, "Sony DT 55-200mm f/4-5.6 SAM (SAL55200-2)"));
-        choices.insert(p_t(57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens or Commlite CM-EF-NEX adapter"));
-        choices.insert(p_t(57, "Tamron SP AF 60mm f/2 Di II LD [IF] Macro 1:1"));
-        choices.insert(p_t(57, "Tamron 18-270mm f/3.5-6.3 Di II PZD"));
-        choices.insert(p_t(58, "Sony DT 30mm f/2.8 Macro SAM (SAL30M28)"));
-        choices.insert(p_t(59, "Sony 28-75mm f/2.8 SAM (SAL2875)"));
-        choices.insert(p_t(60, "Carl Zeiss Distagon T* 24mm f/2 ZA SSM (SAL24F20Z)"));
-        choices.insert(p_t(61, "Sony 85mm f/2.8 SAM (SAL85F28)"));
-        choices.insert(p_t(62, "Sony DT 35mm f/1.8 SAM (SAL35F18)"));
-        choices.insert(p_t(63, "Sony DT 16-50mm f/2.8 SSM (SAL1650)"));
-        choices.insert(p_t(64, "Sony 500mm f/4 G SSM (SAL500F40G)"));
-        choices.insert(p_t(65, "Sony DT 18-135mm f/3.5-5.6 SAM (SAL18135)"));
-        choices.insert(p_t(66, "Sony 300mm f/2.8 G SSM II (SAL300F28G2)"));
-        choices.insert(p_t(67, "Sony 70-200mm f/2.8 G SSM II (SAL70200G2)"));
-        choices.insert(p_t(68, "Sony DT 55-300mm f/4.5-5.6 SAM (SAL55300)"));
-        choices.insert(p_t(69, "Sony 70-400mm f/4-5.6 G SSM II (SAL70400G2)"));
-        choices.insert(p_t(70, "Carl Zeiss Planar T* 50mm f/1.4 ZA SSM (SAL50F14Z)"));
-        choices.insert(p_t(128, "Tamron or Sigma Lens (128)"));
-        choices.insert(p_t(128, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"));
-        choices.insert(p_t(128, "Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical [IF] Macro"));
-        choices.insert(p_t(128, "Tamron 80-300mm f/3.5-6.3"));
-        choices.insert(p_t(128, "Tamron AF 28-200mm f/3.8-5.6 XR Di Aspherical [IF] Macro"));
-        choices.insert(p_t(128, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"));
-        choices.insert(p_t(128, "Sigma AF 50-150mm f/2.8 EX DC APO HSM II"));
-        choices.insert(p_t(128, "Sigma 10-20mm f/3.5 EX DC HSM"));
-        choices.insert(p_t(128, "Sigma 70-200mm f/2.8 II EX DG APO MACRO HSM"));
-        choices.insert(p_t(128, "Sigma 10mm f/2.8 EX DC HSM Fisheye"));
-        choices.insert(p_t(128, "Sigma 50mm f/1.4 EX DG HSM"));
-        choices.insert(p_t(128, "Sigma 85mm f/1.4 EX DG HSM"));
-        choices.insert(p_t(128, "Sigma 24-70mm f/2.8 IF EX DG HSM"));
-        choices.insert(p_t(128, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"));
-        choices.insert(p_t(128, "Sigma 17-50mm f/2.8 EX DC HSM"));
-        choices.insert(p_t(128, "Sigma 17-70mm f/2.8-4 DC Macro HSM"));
-        choices.insert(p_t(128, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"));
-        choices.insert(p_t(128, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"));
-        choices.insert(p_t(128, "Tamron AF 28-105mm f/4-5.6 [IF]"));
-        choices.insert(p_t(128, "Sigma 35mm f/1.4 DG HSM"));
-        choices.insert(p_t(128, "Sigma 18-35mm f/1.8 DC HSM"));
-        choices.insert(p_t(128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"));
-        choices.insert(p_t(129, "Tamron Lens (129)"));
-        choices.insert(p_t(129, "Tamron 200-400mm f/5.6 LD"));
-        choices.insert(p_t(129, "Tamron 70-300mm f/4-5.6 LD"));
-        choices.insert(p_t(131, "Tamron 20-40mm f/2.7-3.5 SP Aspherical IF"));
-        choices.insert(p_t(135, "Vivitar 28-210mm f/3.5-5.6"));
-        choices.insert(p_t(136, "Tokina EMZ M100 AF 100mm f/3.5"));
-        choices.insert(p_t(137, "Cosina 70-210mm f/2.8-4 AF"));
-        choices.insert(p_t(138, "Soligor 19-35mm f/3.5-4.5"));
-        choices.insert(p_t(139, "Tokina AF 28-300mm f/4-6.3"));
-        choices.insert(p_t(142, "Voigtlander 70-300mm f/4.5-5.6"));
-        choices.insert(p_t(146, "Voigtlander Macro APO-Lanthar 125mm f/2.5 SL"));
-        choices.insert(p_t(194, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical [IF]"));
-        choices.insert(p_t(203, "Tamron SP 70-200mm f/2.8 Di USD"));
-        choices.insert(p_t(204, "Tamron SP 24-70mm f/2.8 Di USD"));
-        choices.insert(p_t(213, "Tamron 16-300mm f/3.5-6.3 Di II PZD"));
-        choices.insert(p_t(214, "Tamron SP 150-600mm f/5-6.3 Di USD"));
-        choices.insert(p_t(224, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD"));
-        choices.insert(p_t(255, "Tamron Lens (255)"));
-        choices.insert(p_t(255, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical"));
-        choices.insert(p_t(255, "Tamron AF 18-250mm f/3.5-6.3 XR Di II LD"));
-        choices.insert(p_t(255, "Tamron AF 55-200mm f/4-5.6 Di II LD Macro"));
-        choices.insert(p_t(255, "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2"));
-        choices.insert(p_t(255, "Tamron SP AF 200-500mm f/5.0-6.3 Di LD IF"));
-        choices.insert(p_t(255, "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical IF"));
-        choices.insert(p_t(255, "Tamron SP AF 70-200mm f/2.8 Di LD IF Macro"));
-        choices.insert(p_t(255, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical IF"));
-        choices.insert(p_t(255, "Tamron AF 90-300mm f/4.5-5.6 Telemacro"));
-        choices.insert(p_t(1868, "Sigma MC-11 Adapter"));
-        choices.insert(p_t(2550, "Minolta AF 50mm f/1.7"));
-        choices.insert(p_t(2551, "Minolta AF 35-70mm f/4 or Other Lens"));
-        choices.insert(p_t(2551, "Sigma UC AF 28-70mm f/3.5-4.5"));
-        choices.insert(p_t(2551, "Sigma AF 28-70mm f/2.8"));
-        choices.insert(p_t(2551, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"));
-        choices.insert(p_t(2551, "Quantaray M-AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(2551, "Tokina 28-70mm f/2.8-4.5 AF"));
-        choices.insert(p_t(2552, "Minolta AF 28-85mm f/3.5-4.5 or Other Lens"));
-        choices.insert(p_t(2552, "Tokina 19-35mm f/3.5-4.5"));
-        choices.insert(p_t(2552, "Tokina 28-70mm f/2.8 AT-X"));
-        choices.insert(p_t(2552, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"));
-        choices.insert(p_t(2552, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"));
-        choices.insert(p_t(2552, "Tokina AT-X PRO [II] AF 28-70mm f/2.6-2.8 270"));
-        choices.insert(p_t(2552, "Tamron AF 19-35mm f/3.5-4.5"));
-        choices.insert(p_t(2552, "Angenieux AF 28-70mm f/2.6"));
-        choices.insert(p_t(2552, "Tokina AT-X 17 AF 17mm f/3.5"));
-        choices.insert(p_t(2552, "Tokina 20-35mm f/3.5-4.5 II AF"));
-        choices.insert(p_t(2553, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"));
-        choices.insert(p_t(2553, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"));
-        choices.insert(p_t(2553, "Sigma 28-105mm f/2.8-4 Aspherical"));
-        choices.insert(p_t(2553, "Sigma 28-105mm f/4-5.6 UC"));
-        choices.insert(p_t(2554, "Minolta AF 35-105mm f/3.5-4.5"));
-        choices.insert(p_t(2555, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"));
-        choices.insert(p_t(2555, "Sigma 70-210mm f/4-5.6 APO"));
-        choices.insert(p_t(2555, "Sigma M-AF 70-200mm f/2.8 EX APO"));
-        choices.insert(p_t(2555, "Sigma 75-200mm f/2.8-3.5"));
-        choices.insert(p_t(2556, "Minolta AF 135mm f/2.8"));
-        choices.insert(p_t(2557, "Minolta/Sony AF 28mm f/2.8"));
-        choices.insert(p_t(2558, "Minolta AF 24-50mm f/4"));
-        choices.insert(p_t(2560, "Minolta AF 100-200mm f/4.5"));
-        choices.insert(p_t(2561, "Minolta AF 75-300mm f/4.5-5.6 or Sigma Lens"));
-        choices.insert(p_t(2561, "Sigma 70-300mm f/4-5.6 DL Macro"));
-        choices.insert(p_t(2561, "Sigma 300mm f/4 APO Macro"));
-        choices.insert(p_t(2561, "Sigma AF 500mm f/4.5 APO"));
-        choices.insert(p_t(2561, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
-        choices.insert(p_t(2561, "Tokina AT-X AF 300mm f/4"));
-        choices.insert(p_t(2561, "Tokina AT-X AF 400mm f/5.6 SD"));
-        choices.insert(p_t(2561, "Tokina AF 730 II 75-300mm f/4.5-5.6"));
-        choices.insert(p_t(2561, "Sigma 800mm f/5.6 APO"));
-        choices.insert(p_t(2561, "Sigma AF 400mm f/5.6 APO Macro"));
-        choices.insert(p_t(2562, "Minolta AF 50mm f/1.4 [New]"));
-        choices.insert(p_t(2563, "Minolta AF 300mm f/2.8 APO or Sigma Lens"));
-        choices.insert(p_t(2563, "Sigma AF 50-500mm f/4-6.3 EX DG APO"));
-        choices.insert(p_t(2563, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
-        choices.insert(p_t(2563, "Sigma AF 500mm f/4.5 EX DG APO"));
-        choices.insert(p_t(2563, "Sigma 400mm f/5.6 APO"));
-        choices.insert(p_t(2564, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"));
-        choices.insert(p_t(2564, "Sigma 50mm f/2.8 EX Macro"));
-        choices.insert(p_t(2565, "Minolta AF 600mm f/4 APO"));
-        choices.insert(p_t(2566, "Minolta AF 24mm f/2.8 or Sigma Lens"));
-        choices.insert(p_t(2566, "Sigma 17-35mm f/2.8-4 EX Aspherical"));
-        choices.insert(p_t(2572, "Minolta/Sony AF 500mm f/8 Reflex"));
-        choices.insert(p_t(2578, "Minolta/Sony AF 16mm f/2.8 Fisheye or Sigma Lens"));
-        choices.insert(p_t(2578, "Sigma 8mm f/4 EX [DG] Fisheye"));
-        choices.insert(p_t(2578, "Sigma 14mm f/3.5"));
-        choices.insert(p_t(2578, "Sigma 15mm f/2.8 Fisheye"));
-        choices.insert(p_t(2579, "Minolta/Sony AF 20mm f/2.8 or Tokina Lens"));
-        choices.insert(p_t(2579, "Tokina AT-X Pro DX 11-16mm f/2.8"));
-        choices.insert(p_t(2581, "Minolta AF 100mm f/2.8 Macro [New] or Sigma or Tamron Lens"));
-        choices.insert(p_t(2581, "Sigma AF 90mm f/2.8 Macro"));
-        choices.insert(p_t(2581, "Sigma AF 105mm f/2.8 EX [DG] Macro"));
-        choices.insert(p_t(2581, "Sigma 180mm f/5.6 Macro"));
-        choices.insert(p_t(2581, "Sigma 180mm f/3.5 EX DG Macro"));
-        choices.insert(p_t(2581, "Tamron 90mm f/2.8 Macro"));
-        choices.insert(p_t(2585, "Minolta AF 35-105mm f/3.5-4.5 New or Tamron Lens"));
-        choices.insert(p_t(2585, "Beroflex 35-135mm f/3.5-4.5"));
-        choices.insert(p_t(2585, "Tamron 24-135mm f/3.5-5.6"));
-        choices.insert(p_t(2588, "Minolta AF 70-210mm f/3.5-4.5"));
-        choices.insert(p_t(2589, "Minolta AF 80-200mm f/2.8 APO or Tokina Lens"));
-        choices.insert(p_t(2589, "Tokina 80-200mm f/2.8"));
-        choices.insert(p_t(2590, "Minolta AF 200mm f/2.8 G APO + Minolta AF 1.4x APO or Other Lens + 1.4x"));
-        choices.insert(p_t(2590, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"));
-        choices.insert(p_t(2591, "Minolta AF 35mm f/1.4"));
-        choices.insert(p_t(2592, "Minolta AF 85mm f/1.4 G (D)"));
-        choices.insert(p_t(2593, "Minolta AF 200mm f/2.8 APO"));
-        choices.insert(p_t(2594, "Minolta AF 3x-1x f/1.7-2.8 Macro"));
-        choices.insert(p_t(2596, "Minolta AF 28mm f/2"));
-        choices.insert(p_t(2597, "Minolta AF 35mm f/2 [New]"));
-        choices.insert(p_t(2598, "Minolta AF 100mm f/2"));
-        choices.insert(p_t(2601, "Minolta AF 200mm f/2.8 G APO + Minolta AF 2x APO or Other Lens + 2x"));
-        choices.insert(p_t(2601, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 2x APO"));
-        choices.insert(p_t(2604, "Minolta AF 80-200mm f/4.5-5.6"));
-        choices.insert(p_t(2605, "Minolta AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(2606, "Minolta AF 100-300mm f/4.5-5.6"));
-        choices.insert(p_t(2607, "Minolta AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(2608, "Minolta AF 300mm f/2.8 HS-APO G"));
-        choices.insert(p_t(2609, "Minolta AF 600mm f/4 HS-APO G"));
-        choices.insert(p_t(2612, "Minolta AF 200mm f/2.8 HS-APO G"));
-        choices.insert(p_t(2613, "Minolta AF 50mm f/1.7 New"));
-        choices.insert(p_t(2615, "Minolta AF 28-105mm f/3.5-4.5 xi"));
-        choices.insert(p_t(2616, "Minolta AF 35-200mm f/4.5-5.6 xi"));
-        choices.insert(p_t(2618, "Minolta AF 28-80mm f/4-5.6 xi"));
-        choices.insert(p_t(2619, "Minolta AF 80-200mm f/4.5-5.6 xi"));
-        choices.insert(p_t(2620, "Minolta AF 28-70mm f/2.8 G"));
-        choices.insert(p_t(2621, "Minolta AF 100-300mm f/4.5-5.6 xi"));
-        choices.insert(p_t(2624, "Minolta AF 35-80mm f/4-5.6 Power Zoom"));
-        choices.insert(p_t(2628, "Minolta AF 80-200mm f/2.8 HS-APO G"));
-        choices.insert(p_t(2629, "Minolta AF 85mm f/1.4 New"));
-        choices.insert(p_t(2631, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"));
-        choices.insert(p_t(2632, "Minolta AF 24-50mm f/4 New"));
-        choices.insert(p_t(2638, "Minolta AF 50mm f/2.8 Macro New"));
-        choices.insert(p_t(2639, "Minolta AF 100mm f/2.8 Macro"));
-        choices.insert(p_t(2641, "Minolta/Sony AF 20mm f/2.8 New"));
-        choices.insert(p_t(2642, "Minolta AF 24mm f/2.8 New"));
-        choices.insert(p_t(2644, "Minolta AF 100-400mm f/4.5-6.7 APO"));
-        choices.insert(p_t(2662, "Minolta AF 50mm f/1.4 New"));
-        choices.insert(p_t(2667, "Minolta AF 35mm f/2 New"));
-        choices.insert(p_t(2668, "Minolta AF 28mm f/2 New"));
-        choices.insert(p_t(2672, "Minolta AF 24-105mm f/3.5-4.5 (D)"));
-        choices.insert(p_t(3046, "Metabones Canon EF Speed Booster"));
-        choices.insert(p_t(4567, "Tokina 70-210mm f/4-5.6"));
-        choices.insert(p_t(4571, "Vivitar 70-210mm f/4.5-5.6"));
-        choices.insert(p_t(4574, "2x Teleconverter or Tamron or Tokina Lens"));
-        choices.insert(p_t(4574, "Tamron SP AF 90mm f/2.5"));
-        choices.insert(p_t(4574, "Tokina RF 500mm f/8.0 x2"));
-        choices.insert(p_t(4574, "Tokina 300mm f/2.8 x2"));
-        choices.insert(p_t(4575, "1.4x Teleconverter"));
-        choices.insert(p_t(4585, "Tamron SP AF 300mm f/2.8 LD IF"));
-        choices.insert(p_t(4586, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"));
-        choices.insert(p_t(4587, "Tamron AF 70-210mm f/2.8 SP LD"));
-        choices.insert(p_t(4812, "Metabones Canon EF Speed Booster Ultra"));
-        choices.insert(p_t(6118, "Canon EF Adapter"));
-        choices.insert(p_t(6553, "E-Mount, T-Mount, Other Lens or no lens"));
-        choices.insert(p_t(6553, "Sony E 16mm f/2.8"));
-        choices.insert(p_t(6553, "Sony E 18-55mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(6553, "Sony E 55-210mm f/4.5-6.3 OSS"));
-        choices.insert(p_t(6553, "Sony E 18-200mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(6553, "Sony E 30mm f/3.5 Macro"));
-        choices.insert(p_t(6553, "Sony E 24mm f/1.8 ZA"));
-        choices.insert(p_t(6553, "Sony E 50mm f/1.8 OSS"));
-        choices.insert(p_t(6553, "Sony E 16-70mm f/4 ZA OSS"));
-        choices.insert(p_t(6553, "Sony E 10-18mm f/4 OSS"));
-        choices.insert(p_t(6553, "Sony E PZ 16-50mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(6553, "Sony FE 35mm f/2.8 ZA"));
-        choices.insert(p_t(6553, "Sony FE 24-70mm f/4 ZA OSS"));
-        choices.insert(p_t(6553, "Sony E 18-200mm f/3.5-6.3 OSS LE"));
-        choices.insert(p_t(6553, "Sony E 20mm f/2.8"));
-        choices.insert(p_t(6553, "Sony E 35mm f/1.8 OSS"));
-        choices.insert(p_t(6553, "Sony E PZ 18-105mm f/4 G OSS"));
-        choices.insert(p_t(6553, "Sony FE 90mm f/2.8 Macro G OSS"));
-        choices.insert(p_t(6553, "Sony E 18-50mm f/4-5.6"));
-        choices.insert(p_t(6553, "Sony E PZ 18-200mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(6553, "Sony FE 55mm f/1.8 ZA"));
-        choices.insert(p_t(6553, "Sony FE 70-200mm f/4 G OSS"));
-        choices.insert(p_t(6553, "Sony FE 16-35mm f/4 ZA OSS"));
-        choices.insert(p_t(6553, "Sony FE 28-70mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(6553, "Sony FE 35mm f/1.4 ZA"));
-        choices.insert(p_t(6553, "Sony FE 24-240mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(6553, "Sony FE 28mm f/2"));
-        choices.insert(p_t(6553, "Sony FE PZ 28-135mm f/4 G OSS"));
-        choices.insert(p_t(6553, "Sony FE 24-70mm f/2.8 GM"));
-        choices.insert(p_t(6553, "Sony FE 85mm f/1.4 GM"));
-        choices.insert(p_t(6553, "Sony FE 50mm f/1.8"));
-        choices.insert(p_t(6553, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
-        choices.insert(p_t(6553, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
-        choices.insert(p_t(6553, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
-        choices.insert(p_t(6553, "Sony FE 70-200mm f/2.8 GM OSS"));
-        choices.insert(p_t(6553, "Sigma 19mm f/2.8 [EX] DN"));
-        choices.insert(p_t(6553, "Sigma 30mm f/2.8 [EX] DN"));
-        choices.insert(p_t(6553, "Sigma 60mm f/2.8 DN"));
-        choices.insert(p_t(6553, "Sigma 30mm f/1.4 DC DN | C"));
-        choices.insert(p_t(6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
-        choices.insert(p_t(6553, "Zeiss Batis 25mm f/2"));
-        choices.insert(p_t(6553, "Zeiss Batis 85mm f/1.8"));
-        choices.insert(p_t(6553, "Zeiss Batis 18mm f/2.8"));
-        choices.insert(p_t(6553, "Zeiss Loxia 21mm f/2.8"));
-        choices.insert(p_t(6553, "Zeiss Loxia 35mm f/2"));
-        choices.insert(p_t(6553, "Zeiss Loxia 50mm f/2"));
-        choices.insert(p_t(6553, "Zeiss Touit 12mm f/2.8"));
-        choices.insert(p_t(6553, "Zeiss Touit 32mm f/1.8"));
-        choices.insert(p_t(6553, "Zeiss Touit 50mm f/2.8 Macro"));
-        choices.insert(p_t(6553, "Arax MC 35mm f/2.8 Tilt+Shift"));
-        choices.insert(p_t(6553, "Arax MC 80mm f/2.8 Tilt+Shift"));
-        choices.insert(p_t(6553, "Zenitar MF 16mm f/2.8 Fisheye M42"));
-        choices.insert(p_t(6553, "Samyang 500mm Mirror f/8.0"));
-        choices.insert(p_t(6553, "Pentacon Auto 135mm f/2.8"));
-        choices.insert(p_t(6553, "Pentacon Auto 29mm f/2.8"));
-        choices.insert(p_t(6553, "Helios 44-2 58mm f/2.0"));
-        choices.insert(p_t(18688, "Sigma MC-11 Adapter"));
-        choices.insert(p_t(25501, "Minolta AF 50mm f/1.7"));
-        choices.insert(p_t(25511, "Minolta AF 35-70mm f/4 or Other Lens"));
-        choices.insert(p_t(25511, "Sigma UC AF 28-70mm f/3.5-4.5"));
-        choices.insert(p_t(25511, "Sigma AF 28-70mm f/2.8"));
-        choices.insert(p_t(25511, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"));
-        choices.insert(p_t(25511, "Quantaray M-AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(25511, "Tokina 28-70mm f/2.8-4.5 AF"));
-        choices.insert(p_t(25521, "Minolta AF 28-85mm f/3.5-4.5 or Other Lens"));
-        choices.insert(p_t(25521, "Tokina 19-35mm f/3.5-4.5"));
-        choices.insert(p_t(25521, "Tokina 28-70mm f/2.8 AT-X"));
-        choices.insert(p_t(25521, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"));
-        choices.insert(p_t(25521, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"));
-        choices.insert(p_t(25521, "Tokina AT-X PRO [II] AF 28-70mm f/2.6-2.8 270"));
-        choices.insert(p_t(25521, "Tamron AF 19-35mm f/3.5-4.5"));
-        choices.insert(p_t(25521, "Angenieux AF 28-70mm f/2.6"));
-        choices.insert(p_t(25521, "Tokina AT-X 17 AF 17mm f/3.5"));
-        choices.insert(p_t(25521, "Tokina 20-35mm f/3.5-4.5 II AF"));
-        choices.insert(p_t(25531, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"));
-        choices.insert(p_t(25531, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"));
-        choices.insert(p_t(25531, "Sigma 28-105mm f/2.8-4 Aspherical"));
-        choices.insert(p_t(25531, "Sigma 28-105mm f/4-5.6 UC"));
-        choices.insert(p_t(25541, "Minolta AF 35-105mm f/3.5-4.5"));
-        choices.insert(p_t(25551, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"));
-        choices.insert(p_t(25551, "Sigma 70-210mm f/4-5.6 APO"));
-        choices.insert(p_t(25551, "Sigma M-AF 70-200mm f/2.8 EX APO"));
-        choices.insert(p_t(25551, "Sigma 75-200mm f/2.8-3.5"));
-        choices.insert(p_t(25561, "Minolta AF 135mm f/2.8"));
-        choices.insert(p_t(25571, "Minolta/Sony AF 28mm f/2.8"));
-        choices.insert(p_t(25581, "Minolta AF 24-50mm f/4"));
-        choices.insert(p_t(25601, "Minolta AF 100-200mm f/4.5"));
-        choices.insert(p_t(25611, "Minolta AF 75-300mm f/4.5-5.6 or Sigma Lens"));
-        choices.insert(p_t(25611, "Sigma 70-300mm f/4-5.6 DL Macro"));
-        choices.insert(p_t(25611, "Sigma 300mm f/4 APO Macro"));
-        choices.insert(p_t(25611, "Sigma AF 500mm f/4.5 APO"));
-        choices.insert(p_t(25611, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
-        choices.insert(p_t(25611, "Tokina AT-X AF 300mm f/4"));
-        choices.insert(p_t(25611, "Tokina AT-X AF 400mm f/5.6 SD"));
-        choices.insert(p_t(25611, "Tokina AF 730 II 75-300mm f/4.5-5.6"));
-        choices.insert(p_t(25611, "Sigma 800mm f/5.6 APO"));
-        choices.insert(p_t(25611, "Sigma AF 400mm f/5.6 APO Macro"));
-        choices.insert(p_t(25621, "Minolta AF 50mm f/1.4 [New]"));
-        choices.insert(p_t(25631, "Minolta AF 300mm f/2.8 APO or Sigma Lens"));
-        choices.insert(p_t(25631, "Sigma AF 50-500mm f/4-6.3 EX DG APO"));
-        choices.insert(p_t(25631, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
-        choices.insert(p_t(25631, "Sigma AF 500mm f/4.5 EX DG APO"));
-        choices.insert(p_t(25631, "Sigma 400mm f/5.6 APO"));
-        choices.insert(p_t(25641, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"));
-        choices.insert(p_t(25641, "Sigma 50mm f/2.8 EX Macro"));
-        choices.insert(p_t(25651, "Minolta AF 600mm f/4 APO"));
-        choices.insert(p_t(25661, "Minolta AF 24mm f/2.8 or Sigma Lens"));
-        choices.insert(p_t(25661, "Sigma 17-35mm f/2.8-4 EX Aspherical"));
-        choices.insert(p_t(25721, "Minolta/Sony AF 500mm f/8 Reflex"));
-        choices.insert(p_t(25781, "Minolta/Sony AF 16mm f/2.8 Fisheye or Sigma Lens"));
-        choices.insert(p_t(25781, "Sigma 8mm f/4 EX [DG] Fisheye"));
-        choices.insert(p_t(25781, "Sigma 14mm f/3.5"));
-        choices.insert(p_t(25781, "Sigma 15mm f/2.8 Fisheye"));
-        choices.insert(p_t(25791, "Minolta/Sony AF 20mm f/2.8 or Tokina Lens"));
-        choices.insert(p_t(25791, "Tokina AT-X Pro DX 11-16mm f/2.8"));
-        choices.insert(p_t(25811, "Minolta AF 100mm f/2.8 Macro [New] or Sigma or Tamron Lens"));
-        choices.insert(p_t(25811, "Sigma AF 90mm f/2.8 Macro"));
-        choices.insert(p_t(25811, "Sigma AF 105mm f/2.8 EX [DG] Macro"));
-        choices.insert(p_t(25811, "Sigma 180mm f/5.6 Macro"));
-        choices.insert(p_t(25811, "Sigma 180mm f/3.5 EX DG Macro"));
-        choices.insert(p_t(25811, "Tamron 90mm f/2.8 Macro"));
-        choices.insert(p_t(25851, "Beroflex 35-135mm f/3.5-4.5"));
-        choices.insert(p_t(25858, "Minolta AF 35-105mm f/3.5-4.5 New or Tamron Lens"));
-        choices.insert(p_t(25858, "Tamron 24-135mm f/3.5-5.6"));
-        choices.insert(p_t(25881, "Minolta AF 70-210mm f/3.5-4.5"));
-        choices.insert(p_t(25891, "Minolta AF 80-200mm f/2.8 APO or Tokina Lens"));
-        choices.insert(p_t(25891, "Tokina 80-200mm f/2.8"));
-        choices.insert(p_t(25901, "Minolta AF 200mm f/2.8 G APO + Minolta AF 1.4x APO or Other Lens + 1.4x"));
-        choices.insert(p_t(25901, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"));
-        choices.insert(p_t(25911, "Minolta AF 35mm f/1.4"));
-        choices.insert(p_t(25921, "Minolta AF 85mm f/1.4 G (D)"));
-        choices.insert(p_t(25931, "Minolta AF 200mm f/2.8 APO"));
-        choices.insert(p_t(25941, "Minolta AF 3x-1x f/1.7-2.8 Macro"));
-        choices.insert(p_t(25961, "Minolta AF 28mm f/2"));
-        choices.insert(p_t(25971, "Minolta AF 35mm f/2 [New]"));
-        choices.insert(p_t(25981, "Minolta AF 100mm f/2"));
-        choices.insert(p_t(26011, "Minolta AF 200mm f/2.8 G APO + Minolta AF 2x APO or Other Lens + 2x"));
-        choices.insert(p_t(26011, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 2x APO"));
-        choices.insert(p_t(26041, "Minolta AF 80-200mm f/4.5-5.6"));
-        choices.insert(p_t(26051, "Minolta AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(26061, "Minolta AF 100-300mm f/4.5-5.6"));
-        choices.insert(p_t(26071, "Minolta AF 35-80mm f/4-5.6"));
-        choices.insert(p_t(26081, "Minolta AF 300mm f/2.8 HS-APO G"));
-        choices.insert(p_t(26091, "Minolta AF 600mm f/4 HS-APO G"));
-        choices.insert(p_t(26121, "Minolta AF 200mm f/2.8 HS-APO G"));
-        choices.insert(p_t(26131, "Minolta AF 50mm f/1.7 New"));
-        choices.insert(p_t(26151, "Minolta AF 28-105mm f/3.5-4.5 xi"));
-        choices.insert(p_t(26161, "Minolta AF 35-200mm f/4.5-5.6 xi"));
-        choices.insert(p_t(26181, "Minolta AF 28-80mm f/4-5.6 xi"));
-        choices.insert(p_t(26191, "Minolta AF 80-200mm f/4.5-5.6 xi"));
-        choices.insert(p_t(26201, "Minolta AF 28-70mm f/2.8 G"));
-        choices.insert(p_t(26211, "Minolta AF 100-300mm f/4.5-5.6 xi"));
-        choices.insert(p_t(26241, "Minolta AF 35-80mm f/4-5.6 Power Zoom"));
-        choices.insert(p_t(26281, "Minolta AF 80-200mm f/2.8 HS-APO G"));
-        choices.insert(p_t(26291, "Minolta AF 85mm f/1.4 New"));
-        choices.insert(p_t(26311, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"));
-        choices.insert(p_t(26321, "Minolta AF 24-50mm f/4 New"));
-        choices.insert(p_t(26381, "Minolta AF 50mm f/2.8 Macro New"));
-        choices.insert(p_t(26391, "Minolta AF 100mm f/2.8 Macro"));
-        choices.insert(p_t(26411, "Minolta/Sony AF 20mm f/2.8 New"));
-        choices.insert(p_t(26421, "Minolta AF 24mm f/2.8 New"));
-        choices.insert(p_t(26441, "Minolta AF 100-400mm f/4.5-6.7 APO"));
-        choices.insert(p_t(26621, "Minolta AF 50mm f/1.4 New"));
-        choices.insert(p_t(26671, "Minolta AF 35mm f/2 New"));
-        choices.insert(p_t(26681, "Minolta AF 28mm f/2 New"));
-        choices.insert(p_t(26721, "Minolta AF 24-105mm f/3.5-4.5 (D)"));
-        choices.insert(p_t(30464, "Metabones Canon EF Speed Booster"));
-        choices.insert(p_t(45671, "Tokina 70-210mm f/4-5.6"));
-        choices.insert(p_t(45711, "Vivitar 70-210mm f/4.5-5.6"));
-        choices.insert(p_t(45741, "2x Teleconverter or Tamron or Tokina Lens"));
-        choices.insert(p_t(45741, "Tamron SP AF 90mm f/2.5"));
-        choices.insert(p_t(45741, "Tokina RF 500mm f/8.0 x2"));
-        choices.insert(p_t(45741, "Tokina 300mm f/2.8 x2"));
-        choices.insert(p_t(45751, "1.4x Teleconverter"));
-        choices.insert(p_t(45851, "Tamron SP AF 300mm f/2.8 LD IF"));
-        choices.insert(p_t(45861, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"));
-        choices.insert(p_t(45871, "Tamron AF 70-210mm f/2.8 SP LD"));
-        choices.insert(p_t(48128, "Metabones Canon EF Speed Booster Ultra"));
-        choices.insert(p_t(61184, "Canon EF Adapter"));
-        choices.insert(p_t(65535, "E-Mount, T-Mount, Other Lens or no lens"));
-        choices.insert(p_t(65535, "Sony E 16mm f/2.8"));
-        choices.insert(p_t(65535, "Sony E 18-55mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(65535, "Sony E 55-210mm f/4.5-6.3 OSS"));
-        choices.insert(p_t(65535, "Sony E 18-200mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(65535, "Sony E 30mm f/3.5 Macro"));
-        choices.insert(p_t(65535, "Sony E 24mm f/1.8 ZA"));
-        choices.insert(p_t(65535, "Sony E 50mm f/1.8 OSS"));
-        choices.insert(p_t(65535, "Sony E 16-70mm f/4 ZA OSS"));
-        choices.insert(p_t(65535, "Sony E 10-18mm f/4 OSS"));
-        choices.insert(p_t(65535, "Sony E PZ 16-50mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(65535, "Sony FE 35mm f/2.8 ZA"));
-        choices.insert(p_t(65535, "Sony FE 24-70mm f/4 ZA OSS"));
-        choices.insert(p_t(65535, "Sony E 18-200mm f/3.5-6.3 OSS LE"));
-        choices.insert(p_t(65535, "Sony E 20mm f/2.8"));
-        choices.insert(p_t(65535, "Sony E 35mm f/1.8 OSS"));
-        choices.insert(p_t(65535, "Sony E PZ 18-105mm f/4 G OSS"));
-        choices.insert(p_t(65535, "Sony FE 90mm f/2.8 Macro G OSS"));
-        choices.insert(p_t(65535, "Sony E 18-50mm f/4-5.6"));
-        choices.insert(p_t(65535, "Sony E PZ 18-200mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(65535, "Sony FE 55mm f/1.8 ZA"));
-        choices.insert(p_t(65535, "Sony FE 70-200mm f/4 G OSS"));
-        choices.insert(p_t(65535, "Sony FE 16-35mm f/4 ZA OSS"));
-        choices.insert(p_t(65535, "Sony FE 28-70mm f/3.5-5.6 OSS"));
-        choices.insert(p_t(65535, "Sony FE 35mm f/1.4 ZA"));
-        choices.insert(p_t(65535, "Sony FE 24-240mm f/3.5-6.3 OSS"));
-        choices.insert(p_t(65535, "Sony FE 28mm f/2"));
-        choices.insert(p_t(65535, "Sony FE PZ 28-135mm f/4 G OSS"));
-        choices.insert(p_t(65535, "Sony FE 24-70mm f/2.8 GM"));
-        choices.insert(p_t(65535, "Sony FE 85mm f/1.4 GM"));
-        choices.insert(p_t(65535, "Sony FE 50mm f/1.8"));
-        choices.insert(p_t(65535, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
-        choices.insert(p_t(65535, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
-        choices.insert(p_t(65535, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
-        choices.insert(p_t(65535, "Sony FE 70-200mm f/2.8 GM OSS"));
-        choices.insert(p_t(65535, "Sigma 19mm f/2.8 [EX] DN"));
-        choices.insert(p_t(65535, "Sigma 30mm f/2.8 [EX] DN"));
-        choices.insert(p_t(65535, "Sigma 60mm f/2.8 DN"));
-        choices.insert(p_t(65535, "Sigma 30mm f/1.4 DC DN | C"));
-        choices.insert(p_t(65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
-        choices.insert(p_t(65535, "Zeiss Batis 25mm f/2"));
-        choices.insert(p_t(65535, "Zeiss Batis 85mm f/1.8"));
-        choices.insert(p_t(65535, "Zeiss Batis 18mm f/2.8"));
-        choices.insert(p_t(65535, "Zeiss Loxia 21mm f/2.8"));
-        choices.insert(p_t(65535, "Zeiss Loxia 35mm f/2"));
-        choices.insert(p_t(65535, "Zeiss Loxia 50mm f/2"));
-        choices.insert(p_t(65535, "Zeiss Touit 12mm f/2.8"));
-        choices.insert(p_t(65535, "Zeiss Touit 32mm f/1.8"));
-        choices.insert(p_t(65535, "Zeiss Touit 50mm f/2.8 Macro"));
-        choices.insert(p_t(65535, "Arax MC 35mm f/2.8 Tilt+Shift"));
-        choices.insert(p_t(65535, "Arax MC 80mm f/2.8 Tilt+Shift"));
-        choices.insert(p_t(65535, "Zenitar MF 16mm f/2.8 Fisheye M42"));
-        choices.insert(p_t(65535, "Samyang 500mm Mirror f/8.0"));
-        choices.insert(p_t(65535, "Pentacon Auto 135mm f/2.8"));
-        choices.insert(p_t(65535, "Pentacon Auto 29mm f/2.8"));
-        choices.insert(p_t(65535, "Helios 44-2 58mm f/2.0"));
+        choices = {
+            {0, "Minolta AF 28-85mm f/3.5-4.5 New"},
+            {1, "Minolta AF 80-200mm f/2.8 HS-APO G"},
+            {2, "Minolta AF 28-70mm f/2.8 G"},
+            {3, "Minolta AF 28-80mm f/4-5.6"},
+            {4, "Minolta AF 85mm f/1.4G"},
+            {5, "Minolta AF 35-70mm f/3.5-4.5 [II]"},
+            {6, "Minolta AF 24-85mm f/3.5-4.5 [New]"},
+            {7, "Minolta AF 100-300mm f/4.5-5.6 APO [New] or 100-400mm or Sigma Lens"},
+            {7, "Minolta AF 100-400mm f/4.5-6.7 APO"},
+            {7, "Sigma AF 100-300mm f/4 EX DG IF"},
+            {8, "Minolta AF 70-210mm f/4.5-5.6 [II]"},
+            {9, "Minolta AF 50mm f/3.5 Macro"},
+            {10, "Minolta AF 28-105mm f/3.5-4.5 [New]"},
+            {11, "Minolta AF 300mm f/4 HS-APO G"},
+            {12, "Minolta AF 100mm f/2.8 Soft Focus"},
+            {13, "Minolta AF 75-300mm f/4.5-5.6 (New or II)"},
+            {14, "Minolta AF 100-400mm f/4.5-6.7 APO"},
+            {15, "Minolta AF 400mm f/4.5 HS-APO G"},
+            {16, "Minolta AF 17-35mm f/3.5 G"},
+            {17, "Minolta AF 20-35mm f/3.5-4.5"},
+            {18, "Minolta AF 28-80mm f/3.5-5.6 II"},
+            {19, "Minolta AF 35mm f/1.4 G"},
+            {20, "Minolta/Sony 135mm f/2.8 [T4.5] STF"},
+            {22, "Minolta AF 35-80mm f/4-5.6 II"},
+            {23, "Minolta AF 200mm f/4 Macro APO G"},
+            {24, "Minolta/Sony AF 24-105mm f/3.5-4.5 (D) or Sigma or Tamron Lens"},
+            {24, "Sigma 18-50mm f/2.8"},
+            {24, "Sigma 17-70mm f/2.8-4.5 (D)"},
+            {24, "Sigma 20-40mm f/2.8 EX DG Aspherical IF"},
+            {24, "Sigma 18-200mm f/3.5-6.3 DC"},
+            {24, "Sigma DC 18-125mm f/4-5,6 D"},
+            {24, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
+            {25, "Minolta AF 100-300mm f/4.5-5.6 APO (D) or Sigma Lens"},
+            {25, "Sigma 100-300mm f/4 EX (APO (D) or D IF)"},
+            {25, "Sigma 70mm f/2.8 EX DG Macro"},
+            {25, "Sigma 20mm f/1.8 EX DG Aspherical RF"},
+            {25, "Sigma 30mm f/1.4 EX DC"},
+            {25, "Sigma 24mm f/1.8 EX DG ASP Macro"},
+            {27, "Minolta AF 85mm f/1.4 G (D)"},
+            {28, "Minolta/Sony AF 100mm f/2.8 Macro (D) or Tamron Lens"},
+            {28, "Tamron SP AF 90mm f/2.8 Di Macro"},
+            {28, "Tamron SP AF 180mm f/3.5 Di LD [IF] Macro"},
+            {29, "Minolta/Sony AF 75-300mm f/4.5-5.6 (D)"},
+            {30, "Minolta AF 28-80mm f/3.5-5.6 (D) or Sigma Lens"},
+            {30, "Sigma AF 10-20mm f/4-5.6 EX DC"},
+            {30, "Sigma AF 12-24mm f/4.5-5.6 EX DG"},
+            {30, "Sigma 28-70mm EX DG f/2.8"},
+            {30, "Sigma 55-200mm f/4-5.6 DC"},
+            {31, "Minolta/Sony AF 50mm f/2.8 Macro (D) or f/3.5"},
+            {31, "Minolta/Sony AF 50mm f/3.5 Macro"},
+            {32, "Minolta/Sony AF 300mm f/2.8 G or 1.5x Teleconverter"},
+            {33, "Minolta/Sony AF 70-200mm f/2.8 G"},
+            {35, "Minolta AF 85mm f/1.4 G (D) Limited"},
+            {36, "Minolta AF 28-100mm f/3.5-5.6 (D)"},
+            {38, "Minolta AF 17-35mm f/2.8-4 (D)"},
+            {39, "Minolta AF 28-75mm f/2.8 (D)"},
+            {40, "Minolta/Sony AF DT 18-70mm f/3.5-5.6 (D)"},
+            {41, "Minolta/Sony AF DT 11-18mm f/4.5-5.6 (D) or Tamron Lens"},
+            {41, "Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical IF"},
+            {42, "Minolta/Sony AF DT 18-200mm f/3.5-6.3 (D)"},
+            {43, "Sony 35mm f/1.4 G (SAL35F14G)"},
+            {44, "Sony 50mm f/1.4 (SAL50F14)"},
+            {45, "Carl Zeiss Planar T* 85mm f/1.4 ZA (SAL85F14Z)"},
+            {46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm f/3.5-4.5 ZA (SAL1680Z)"},
+            {47, "Carl Zeiss Sonnar T* 135mm f/1.8 ZA (SAL135F18Z)"},
+            {48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM (SAL2470Z) or ZA SSM II"},
+            {48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM II (SAL2470Z2)"},
+            {49, "Sony DT 55-200mm f/4-5.6 (SAL55200)"},
+            {50, "Sony DT 18-250mm f/3.5-6.3 (SAL18250)"},
+            {51, "Sony DT 16-105mm f/3.5-5.6 (SAL16105)"},
+            {52, "Sony 70-300mm f/4.5-5.6 G SSM (SAL70300G) or G SSM II or Tamron Lens"},
+            {52, "Sony 70-300mm f/4.5-5.6 G SSM II (SAL70300G2)"},
+            {52, "Tamron SP 70-300mm f/4-5.6 Di USD"},
+            {53, "Sony 70-400mm f/4-5.6 G SSM (SAL70400G)"},
+            {54, "Carl Zeiss Vario-Sonnar T* 16-35mm f/2.8 ZA SSM (SAL1635Z) or ZA SSM II"},
+            {54, "Carl Zeiss Vario-Sonnar T* 16-35mm f/2.8 ZA SSM II (SAL1635Z2)"},
+            {55, "Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855) or SAM II"},
+            {55, "Sony DT 18-55mm f/3.5-5.6 SAM II (SAL18552)"},
+            {56, "Sony DT 55-200mm f/4-5.6 SAM (SAL55200-2)"},
+            {57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens or Commlite CM-EF-NEX adapter"},
+            {57, "Tamron SP AF 60mm f/2 Di II LD [IF] Macro 1:1"},
+            {57, "Tamron 18-270mm f/3.5-6.3 Di II PZD"},
+            {58, "Sony DT 30mm f/2.8 Macro SAM (SAL30M28)"},
+            {59, "Sony 28-75mm f/2.8 SAM (SAL2875)"},
+            {60, "Carl Zeiss Distagon T* 24mm f/2 ZA SSM (SAL24F20Z)"},
+            {61, "Sony 85mm f/2.8 SAM (SAL85F28)"},
+            {62, "Sony DT 35mm f/1.8 SAM (SAL35F18)"},
+            {63, "Sony DT 16-50mm f/2.8 SSM (SAL1650)"},
+            {64, "Sony 500mm f/4 G SSM (SAL500F40G)"},
+            {65, "Sony DT 18-135mm f/3.5-5.6 SAM (SAL18135)"},
+            {66, "Sony 300mm f/2.8 G SSM II (SAL300F28G2)"},
+            {67, "Sony 70-200mm f/2.8 G SSM II (SAL70200G2)"},
+            {68, "Sony DT 55-300mm f/4.5-5.6 SAM (SAL55300)"},
+            {69, "Sony 70-400mm f/4-5.6 G SSM II (SAL70400G2)"},
+            {70, "Carl Zeiss Planar T* 50mm f/1.4 ZA SSM (SAL50F14Z)"},
+            {128, "Tamron or Sigma Lens (128)"},
+            {128, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"},
+            {128, "Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical [IF] Macro"},
+            {128, "Tamron 80-300mm f/3.5-6.3"},
+            {128, "Tamron AF 28-200mm f/3.8-5.6 XR Di Aspherical [IF] Macro"},
+            {128, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
+            {128, "Sigma AF 50-150mm f/2.8 EX DC APO HSM II"},
+            {128, "Sigma 10-20mm f/3.5 EX DC HSM"},
+            {128, "Sigma 70-200mm f/2.8 II EX DG APO MACRO HSM"},
+            {128, "Sigma 10mm f/2.8 EX DC HSM Fisheye"},
+            {128, "Sigma 50mm f/1.4 EX DG HSM"},
+            {128, "Sigma 85mm f/1.4 EX DG HSM"},
+            {128, "Sigma 24-70mm f/2.8 IF EX DG HSM"},
+            {128, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"},
+            {128, "Sigma 17-50mm f/2.8 EX DC HSM"},
+            {128, "Sigma 17-70mm f/2.8-4 DC Macro HSM"},
+            {128, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"},
+            {128, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"},
+            {128, "Tamron AF 28-105mm f/4-5.6 [IF]"},
+            {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"},
+            {129, "Tamron Lens (129)"},
+            {129, "Tamron 200-400mm f/5.6 LD"},
+            {129, "Tamron 70-300mm f/4-5.6 LD"},
+            {131, "Tamron 20-40mm f/2.7-3.5 SP Aspherical IF"},
+            {135, "Vivitar 28-210mm f/3.5-5.6"},
+            {136, "Tokina EMZ M100 AF 100mm f/3.5"},
+            {137, "Cosina 70-210mm f/2.8-4 AF"},
+            {138, "Soligor 19-35mm f/3.5-4.5"},
+            {139, "Tokina AF 28-300mm f/4-6.3"},
+            {142, "Voigtlander 70-300mm f/4.5-5.6"},
+            {146, "Voigtlander Macro APO-Lanthar 125mm f/2.5 SL"},
+            {194, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical [IF]"},
+            {203, "Tamron SP 70-200mm f/2.8 Di USD"},
+            {204, "Tamron SP 24-70mm f/2.8 Di USD"},
+            {213, "Tamron 16-300mm f/3.5-6.3 Di II PZD"},
+            {214, "Tamron SP 150-600mm f/5-6.3 Di USD"},
+            {224, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD"},
+            {255, "Tamron Lens (255)"},
+            {255, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical"},
+            {255, "Tamron AF 18-250mm f/3.5-6.3 XR Di II LD"},
+            {255, "Tamron AF 55-200mm f/4-5.6 Di II LD Macro"},
+            {255, "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2"},
+            {255, "Tamron SP AF 200-500mm f/5.0-6.3 Di LD IF"},
+            {255, "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical IF"},
+            {255, "Tamron SP AF 70-200mm f/2.8 Di LD IF Macro"},
+            {255, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical IF"},
+            {255, "Tamron AF 90-300mm f/4.5-5.6 Telemacro"},
+            {1868, "Sigma MC-11 Adapter"},
+            {2550, "Minolta AF 50mm f/1.7"},
+            {2551, "Minolta AF 35-70mm f/4 or Other Lens"},
+            {2551, "Sigma UC AF 28-70mm f/3.5-4.5"},
+            {2551, "Sigma AF 28-70mm f/2.8"},
+            {2551, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"},
+            {2551, "Quantaray M-AF 35-80mm f/4-5.6"},
+            {2551, "Tokina 28-70mm f/2.8-4.5 AF"},
+            {2552, "Minolta AF 28-85mm f/3.5-4.5 or Other Lens"},
+            {2552, "Tokina 19-35mm f/3.5-4.5"},
+            {2552, "Tokina 28-70mm f/2.8 AT-X"},
+            {2552, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"},
+            {2552, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"},
+            {2552, "Tokina AT-X PRO [II] AF 28-70mm f/2.6-2.8 270"},
+            {2552, "Tamron AF 19-35mm f/3.5-4.5"},
+            {2552, "Angenieux AF 28-70mm f/2.6"},
+            {2552, "Tokina AT-X 17 AF 17mm f/3.5"},
+            {2552, "Tokina 20-35mm f/3.5-4.5 II AF"},
+            {2553, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"},
+            {2553, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"},
+            {2553, "Sigma 28-105mm f/2.8-4 Aspherical"},
+            {2553, "Sigma 28-105mm f/4-5.6 UC"},
+            {2554, "Minolta AF 35-105mm f/3.5-4.5"},
+            {2555, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"},
+            {2555, "Sigma 70-210mm f/4-5.6 APO"},
+            {2555, "Sigma M-AF 70-200mm f/2.8 EX APO"},
+            {2555, "Sigma 75-200mm f/2.8-3.5"},
+            {2556, "Minolta AF 135mm f/2.8"},
+            {2557, "Minolta/Sony AF 28mm f/2.8"},
+            {2558, "Minolta AF 24-50mm f/4"},
+            {2560, "Minolta AF 100-200mm f/4.5"},
+            {2561, "Minolta AF 75-300mm f/4.5-5.6 or Sigma Lens"},
+            {2561, "Sigma 70-300mm f/4-5.6 DL Macro"},
+            {2561, "Sigma 300mm f/4 APO Macro"},
+            {2561, "Sigma AF 500mm f/4.5 APO"},
+            {2561, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"},
+            {2561, "Tokina AT-X AF 300mm f/4"},
+            {2561, "Tokina AT-X AF 400mm f/5.6 SD"},
+            {2561, "Tokina AF 730 II 75-300mm f/4.5-5.6"},
+            {2561, "Sigma 800mm f/5.6 APO"},
+            {2561, "Sigma AF 400mm f/5.6 APO Macro"},
+            {2562, "Minolta AF 50mm f/1.4 [New]"},
+            {2563, "Minolta AF 300mm f/2.8 APO or Sigma Lens"},
+            {2563, "Sigma AF 50-500mm f/4-6.3 EX DG APO"},
+            {2563, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"},
+            {2563, "Sigma AF 500mm f/4.5 EX DG APO"},
+            {2563, "Sigma 400mm f/5.6 APO"},
+            {2564, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"},
+            {2564, "Sigma 50mm f/2.8 EX Macro"},
+            {2565, "Minolta AF 600mm f/4 APO"},
+            {2566, "Minolta AF 24mm f/2.8 or Sigma Lens"},
+            {2566, "Sigma 17-35mm f/2.8-4 EX Aspherical"},
+            {2572, "Minolta/Sony AF 500mm f/8 Reflex"},
+            {2578, "Minolta/Sony AF 16mm f/2.8 Fisheye or Sigma Lens"},
+            {2578, "Sigma 8mm f/4 EX [DG] Fisheye"},
+            {2578, "Sigma 14mm f/3.5"},
+            {2578, "Sigma 15mm f/2.8 Fisheye"},
+            {2579, "Minolta/Sony AF 20mm f/2.8 or Tokina Lens"},
+            {2579, "Tokina AT-X Pro DX 11-16mm f/2.8"},
+            {2581, "Minolta AF 100mm f/2.8 Macro [New] or Sigma or Tamron Lens"},
+            {2581, "Sigma AF 90mm f/2.8 Macro"},
+            {2581, "Sigma AF 105mm f/2.8 EX [DG] Macro"},
+            {2581, "Sigma 180mm f/5.6 Macro"},
+            {2581, "Sigma 180mm f/3.5 EX DG Macro"},
+            {2581, "Tamron 90mm f/2.8 Macro"},
+            {2585, "Minolta AF 35-105mm f/3.5-4.5 New or Tamron Lens"},
+            {2585, "Beroflex 35-135mm f/3.5-4.5"},
+            {2585, "Tamron 24-135mm f/3.5-5.6"},
+            {2588, "Minolta AF 70-210mm f/3.5-4.5"},
+            {2589, "Minolta AF 80-200mm f/2.8 APO or Tokina Lens"},
+            {2589, "Tokina 80-200mm f/2.8"},
+            {2590, "Minolta AF 200mm f/2.8 G APO + Minolta AF 1.4x APO or Other Lens + 1.4x"},
+            {2590, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"},
+            {2591, "Minolta AF 35mm f/1.4"},
+            {2592, "Minolta AF 85mm f/1.4 G (D)"},
+            {2593, "Minolta AF 200mm f/2.8 APO"},
+            {2594, "Minolta AF 3x-1x f/1.7-2.8 Macro"},
+            {2596, "Minolta AF 28mm f/2"},
+            {2597, "Minolta AF 35mm f/2 [New]"},
+            {2598, "Minolta AF 100mm f/2"},
+            {2601, "Minolta AF 200mm f/2.8 G APO + Minolta AF 2x APO or Other Lens + 2x"},
+            {2601, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 2x APO"},
+            {2604, "Minolta AF 80-200mm f/4.5-5.6"},
+            {2605, "Minolta AF 35-80mm f/4-5.6"},
+            {2606, "Minolta AF 100-300mm f/4.5-5.6"},
+            {2607, "Minolta AF 35-80mm f/4-5.6"},
+            {2608, "Minolta AF 300mm f/2.8 HS-APO G"},
+            {2609, "Minolta AF 600mm f/4 HS-APO G"},
+            {2612, "Minolta AF 200mm f/2.8 HS-APO G"},
+            {2613, "Minolta AF 50mm f/1.7 New"},
+            {2615, "Minolta AF 28-105mm f/3.5-4.5 xi"},
+            {2616, "Minolta AF 35-200mm f/4.5-5.6 xi"},
+            {2618, "Minolta AF 28-80mm f/4-5.6 xi"},
+            {2619, "Minolta AF 80-200mm f/4.5-5.6 xi"},
+            {2620, "Minolta AF 28-70mm f/2.8 G"},
+            {2621, "Minolta AF 100-300mm f/4.5-5.6 xi"},
+            {2624, "Minolta AF 35-80mm f/4-5.6 Power Zoom"},
+            {2628, "Minolta AF 80-200mm f/2.8 HS-APO G"},
+            {2629, "Minolta AF 85mm f/1.4 New"},
+            {2631, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"},
+            {2632, "Minolta AF 24-50mm f/4 New"},
+            {2638, "Minolta AF 50mm f/2.8 Macro New"},
+            {2639, "Minolta AF 100mm f/2.8 Macro"},
+            {2641, "Minolta/Sony AF 20mm f/2.8 New"},
+            {2642, "Minolta AF 24mm f/2.8 New"},
+            {2644, "Minolta AF 100-400mm f/4.5-6.7 APO"},
+            {2662, "Minolta AF 50mm f/1.4 New"},
+            {2667, "Minolta AF 35mm f/2 New"},
+            {2668, "Minolta AF 28mm f/2 New"},
+            {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"},
+            {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"},
+            {4574, "Tokina RF 500mm f/8.0 x2"},
+            {4574, "Tokina 300mm f/2.8 x2"},
+            {4575, "1.4x Teleconverter"},
+            {4585, "Tamron SP AF 300mm f/2.8 LD IF"},
+            {4586, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"},
+            {4587, "Tamron AF 70-210mm f/2.8 SP LD"},
+            {4812, "Metabones Canon EF Speed Booster Ultra"},
+            {6118, "Canon EF Adapter"},
+            {6553, "E-Mount, T-Mount, Other Lens or no lens"},
+            {6553, "Sony E 16mm f/2.8"},
+            {6553, "Sony E 18-55mm f/3.5-5.6 OSS"},
+            {6553, "Sony E 55-210mm f/4.5-6.3 OSS"},
+            {6553, "Sony E 18-200mm f/3.5-6.3 OSS"},
+            {6553, "Sony E 30mm f/3.5 Macro"},
+            {6553, "Sony E 24mm f/1.8 ZA"},
+            {6553, "Sony E 50mm f/1.8 OSS"},
+            {6553, "Sony E 16-70mm f/4 ZA OSS"},
+            {6553, "Sony E 10-18mm f/4 OSS"},
+            {6553, "Sony E PZ 16-50mm f/3.5-5.6 OSS"},
+            {6553, "Sony FE 35mm f/2.8 ZA"},
+            {6553, "Sony FE 24-70mm f/4 ZA OSS"},
+            {6553, "Sony E 18-200mm f/3.5-6.3 OSS LE"},
+            {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 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"},
+            {6553, "Sony FE 55mm f/1.8 ZA"},
+            {6553, "Sony FE 70-200mm f/4 G OSS"},
+            {6553, "Sony FE 16-35mm f/4 ZA OSS"},
+            {6553, "Sony FE 28-70mm f/3.5-5.6 OSS"},
+            {6553, "Sony FE 35mm f/1.4 ZA"},
+            {6553, "Sony FE 24-240mm f/3.5-6.3 OSS"},
+            {6553, "Sony FE 28mm f/2"},
+            {6553, "Sony FE PZ 28-135mm f/4 G OSS"},
+            {6553, "Sony FE 24-70mm f/2.8 GM"},
+            {6553, "Sony FE 85mm f/1.4 GM"},
+            {6553, "Sony FE 50mm f/1.8"},
+            {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 70-200mm f/2.8 GM OSS"},
+            {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, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
+            {6553, "Zeiss Batis 25mm f/2"},
+            {6553, "Zeiss Batis 85mm f/1.8"},
+            {6553, "Zeiss Batis 18mm f/2.8"},
+            {6553, "Zeiss Loxia 21mm f/2.8"},
+            {6553, "Zeiss Loxia 35mm f/2"},
+            {6553, "Zeiss Loxia 50mm f/2"},
+            {6553, "Zeiss Touit 12mm f/2.8"},
+            {6553, "Zeiss Touit 32mm f/1.8"},
+            {6553, "Zeiss Touit 50mm f/2.8 Macro"},
+            {6553, "Arax MC 35mm f/2.8 Tilt+Shift"},
+            {6553, "Arax MC 80mm f/2.8 Tilt+Shift"},
+            {6553, "Zenitar MF 16mm f/2.8 Fisheye M42"},
+            {6553, "Samyang 500mm Mirror f/8.0"},
+            {6553, "Pentacon Auto 135mm f/2.8"},
+            {6553, "Pentacon Auto 29mm f/2.8"},
+            {6553, "Helios 44-2 58mm f/2.0"},
+            {18688, "Sigma MC-11 Adapter"},
+            {25501, "Minolta AF 50mm f/1.7"},
+            {25511, "Minolta AF 35-70mm f/4 or Other Lens"},
+            {25511, "Sigma UC AF 28-70mm f/3.5-4.5"},
+            {25511, "Sigma AF 28-70mm f/2.8"},
+            {25511, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"},
+            {25511, "Quantaray M-AF 35-80mm f/4-5.6"},
+            {25511, "Tokina 28-70mm f/2.8-4.5 AF"},
+            {25521, "Minolta AF 28-85mm f/3.5-4.5 or Other Lens"},
+            {25521, "Tokina 19-35mm f/3.5-4.5"},
+            {25521, "Tokina 28-70mm f/2.8 AT-X"},
+            {25521, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"},
+            {25521, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"},
+            {25521, "Tokina AT-X PRO [II] AF 28-70mm f/2.6-2.8 270"},
+            {25521, "Tamron AF 19-35mm f/3.5-4.5"},
+            {25521, "Angenieux AF 28-70mm f/2.6"},
+            {25521, "Tokina AT-X 17 AF 17mm f/3.5"},
+            {25521, "Tokina 20-35mm f/3.5-4.5 II AF"},
+            {25531, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"},
+            {25531, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"},
+            {25531, "Sigma 28-105mm f/2.8-4 Aspherical"},
+            {25531, "Sigma 28-105mm f/4-5.6 UC"},
+            {25541, "Minolta AF 35-105mm f/3.5-4.5"},
+            {25551, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"},
+            {25551, "Sigma 70-210mm f/4-5.6 APO"},
+            {25551, "Sigma M-AF 70-200mm f/2.8 EX APO"},
+            {25551, "Sigma 75-200mm f/2.8-3.5"},
+            {25561, "Minolta AF 135mm f/2.8"},
+            {25571, "Minolta/Sony AF 28mm f/2.8"},
+            {25581, "Minolta AF 24-50mm f/4"},
+            {25601, "Minolta AF 100-200mm f/4.5"},
+            {25611, "Minolta AF 75-300mm f/4.5-5.6 or Sigma Lens"},
+            {25611, "Sigma 70-300mm f/4-5.6 DL Macro"},
+            {25611, "Sigma 300mm f/4 APO Macro"},
+            {25611, "Sigma AF 500mm f/4.5 APO"},
+            {25611, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"},
+            {25611, "Tokina AT-X AF 300mm f/4"},
+            {25611, "Tokina AT-X AF 400mm f/5.6 SD"},
+            {25611, "Tokina AF 730 II 75-300mm f/4.5-5.6"},
+            {25611, "Sigma 800mm f/5.6 APO"},
+            {25611, "Sigma AF 400mm f/5.6 APO Macro"},
+            {25621, "Minolta AF 50mm f/1.4 [New]"},
+            {25631, "Minolta AF 300mm f/2.8 APO or Sigma Lens"},
+            {25631, "Sigma AF 50-500mm f/4-6.3 EX DG APO"},
+            {25631, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"},
+            {25631, "Sigma AF 500mm f/4.5 EX DG APO"},
+            {25631, "Sigma 400mm f/5.6 APO"},
+            {25641, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"},
+            {25641, "Sigma 50mm f/2.8 EX Macro"},
+            {25651, "Minolta AF 600mm f/4 APO"},
+            {25661, "Minolta AF 24mm f/2.8 or Sigma Lens"},
+            {25661, "Sigma 17-35mm f/2.8-4 EX Aspherical"},
+            {25721, "Minolta/Sony AF 500mm f/8 Reflex"},
+            {25781, "Minolta/Sony AF 16mm f/2.8 Fisheye or Sigma Lens"},
+            {25781, "Sigma 8mm f/4 EX [DG] Fisheye"},
+            {25781, "Sigma 14mm f/3.5"},
+            {25781, "Sigma 15mm f/2.8 Fisheye"},
+            {25791, "Minolta/Sony AF 20mm f/2.8 or Tokina Lens"},
+            {25791, "Tokina AT-X Pro DX 11-16mm f/2.8"},
+            {25811, "Minolta AF 100mm f/2.8 Macro [New] or Sigma or Tamron Lens"},
+            {25811, "Sigma AF 90mm f/2.8 Macro"},
+            {25811, "Sigma AF 105mm f/2.8 EX [DG] Macro"},
+            {25811, "Sigma 180mm f/5.6 Macro"},
+            {25811, "Sigma 180mm f/3.5 EX DG Macro"},
+            {25811, "Tamron 90mm f/2.8 Macro"},
+            {25851, "Beroflex 35-135mm f/3.5-4.5"},
+            {25858, "Minolta AF 35-105mm f/3.5-4.5 New or Tamron Lens"},
+            {25858, "Tamron 24-135mm f/3.5-5.6"},
+            {25881, "Minolta AF 70-210mm f/3.5-4.5"},
+            {25891, "Minolta AF 80-200mm f/2.8 APO or Tokina Lens"},
+            {25891, "Tokina 80-200mm f/2.8"},
+            {25901, "Minolta AF 200mm f/2.8 G APO + Minolta AF 1.4x APO or Other Lens + 1.4x"},
+            {25901, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"},
+            {25911, "Minolta AF 35mm f/1.4"},
+            {25921, "Minolta AF 85mm f/1.4 G (D)"},
+            {25931, "Minolta AF 200mm f/2.8 APO"},
+            {25941, "Minolta AF 3x-1x f/1.7-2.8 Macro"},
+            {25961, "Minolta AF 28mm f/2"},
+            {25971, "Minolta AF 35mm f/2 [New]"},
+            {25981, "Minolta AF 100mm f/2"},
+            {26011, "Minolta AF 200mm f/2.8 G APO + Minolta AF 2x APO or Other Lens + 2x"},
+            {26011, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 2x APO"},
+            {26041, "Minolta AF 80-200mm f/4.5-5.6"},
+            {26051, "Minolta AF 35-80mm f/4-5.6"},
+            {26061, "Minolta AF 100-300mm f/4.5-5.6"},
+            {26071, "Minolta AF 35-80mm f/4-5.6"},
+            {26081, "Minolta AF 300mm f/2.8 HS-APO G"},
+            {26091, "Minolta AF 600mm f/4 HS-APO G"},
+            {26121, "Minolta AF 200mm f/2.8 HS-APO G"},
+            {26131, "Minolta AF 50mm f/1.7 New"},
+            {26151, "Minolta AF 28-105mm f/3.5-4.5 xi"},
+            {26161, "Minolta AF 35-200mm f/4.5-5.6 xi"},
+            {26181, "Minolta AF 28-80mm f/4-5.6 xi"},
+            {26191, "Minolta AF 80-200mm f/4.5-5.6 xi"},
+            {26201, "Minolta AF 28-70mm f/2.8 G"},
+            {26211, "Minolta AF 100-300mm f/4.5-5.6 xi"},
+            {26241, "Minolta AF 35-80mm f/4-5.6 Power Zoom"},
+            {26281, "Minolta AF 80-200mm f/2.8 HS-APO G"},
+            {26291, "Minolta AF 85mm f/1.4 New"},
+            {26311, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"},
+            {26321, "Minolta AF 24-50mm f/4 New"},
+            {26381, "Minolta AF 50mm f/2.8 Macro New"},
+            {26391, "Minolta AF 100mm f/2.8 Macro"},
+            {26411, "Minolta/Sony AF 20mm f/2.8 New"},
+            {26421, "Minolta AF 24mm f/2.8 New"},
+            {26441, "Minolta AF 100-400mm f/4.5-6.7 APO"},
+            {26621, "Minolta AF 50mm f/1.4 New"},
+            {26671, "Minolta AF 35mm f/2 New"},
+            {26681, "Minolta AF 28mm f/2 New"},
+            {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"},
+            {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"},
+            {45741, "Tokina RF 500mm f/8.0 x2"},
+            {45741, "Tokina 300mm f/2.8 x2"},
+            {45751, "1.4x Teleconverter"},
+            {45851, "Tamron SP AF 300mm f/2.8 LD IF"},
+            {45861, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"},
+            {45871, "Tamron AF 70-210mm f/2.8 SP LD"},
+            {48128, "Metabones Canon EF Speed Booster Ultra"},
+            {61184, "Canon EF Adapter"},
+            {65535, "E-Mount, T-Mount, Other Lens or no lens"},
+            {65535, "Sony E 16mm f/2.8"},
+            {65535, "Sony E 18-55mm f/3.5-5.6 OSS"},
+            {65535, "Sony E 55-210mm f/4.5-6.3 OSS"},
+            {65535, "Sony E 18-200mm f/3.5-6.3 OSS"},
+            {65535, "Sony E 30mm f/3.5 Macro"},
+            {65535, "Sony E 24mm f/1.8 ZA"},
+            {65535, "Sony E 50mm f/1.8 OSS"},
+            {65535, "Sony E 16-70mm f/4 ZA OSS"},
+            {65535, "Sony E 10-18mm f/4 OSS"},
+            {65535, "Sony E PZ 16-50mm f/3.5-5.6 OSS"},
+            {65535, "Sony FE 35mm f/2.8 ZA"},
+            {65535, "Sony FE 24-70mm f/4 ZA OSS"},
+            {65535, "Sony E 18-200mm f/3.5-6.3 OSS LE"},
+            {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 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"},
+            {65535, "Sony FE 55mm f/1.8 ZA"},
+            {65535, "Sony FE 70-200mm f/4 G OSS"},
+            {65535, "Sony FE 16-35mm f/4 ZA OSS"},
+            {65535, "Sony FE 28-70mm f/3.5-5.6 OSS"},
+            {65535, "Sony FE 35mm f/1.4 ZA"},
+            {65535, "Sony FE 24-240mm f/3.5-6.3 OSS"},
+            {65535, "Sony FE 28mm f/2"},
+            {65535, "Sony FE PZ 28-135mm f/4 G OSS"},
+            {65535, "Sony FE 24-70mm f/2.8 GM"},
+            {65535, "Sony FE 85mm f/1.4 GM"},
+            {65535, "Sony FE 50mm f/1.8"},
+            {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 70-200mm f/2.8 GM OSS"},
+            {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, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
+            {65535, "Zeiss Batis 25mm f/2"},
+            {65535, "Zeiss Batis 85mm f/1.8"},
+            {65535, "Zeiss Batis 18mm f/2.8"},
+            {65535, "Zeiss Loxia 21mm f/2.8"},
+            {65535, "Zeiss Loxia 35mm f/2"},
+            {65535, "Zeiss Loxia 50mm f/2"},
+            {65535, "Zeiss Touit 12mm f/2.8"},
+            {65535, "Zeiss Touit 32mm f/1.8"},
+            {65535, "Zeiss Touit 50mm f/2.8 Macro"},
+            {65535, "Arax MC 35mm f/2.8 Tilt+Shift"},
+            {65535, "Arax MC 80mm f/2.8 Tilt+Shift"},
+            {65535, "Zenitar MF 16mm f/2.8 Fisheye M42"},
+            {65535, "Samyang 500mm Mirror f/8.0"},
+            {65535, "Pentacon Auto 135mm f/2.8"},
+            {65535, "Pentacon Auto 29mm f/2.8"},
+            {65535, "Helios 44-2 58mm f/2.0"}
+        };
     }
 
     virtual std::string toString (Tag* t)
diff --git a/rtexif/stdattribs.cc b/rtexif/stdattribs.cc
index 2bd7a60f7..ed8f97819 100644
--- a/rtexif/stdattribs.cc
+++ b/rtexif/stdattribs.cc
@@ -445,11 +445,16 @@ public:
     UserCommentInterpreter () {}
     virtual std::string toString (Tag* t)
     {
-        char *buffer = new char[t->getCount()];
+        int count = t->getCount();
+        if(count <= 8) {
+            return std::string();
+        }
+        count = std::min(count, 65535); // limit to 65535 chars to avoid crashes in case of corrupted metadata
+        char *buffer = new char[count - 7];
 
-        if (!strncmp((char*)t->getValue(), "ASCII\0\0\0", 8)) {
-            strncpy (buffer, (char*)t->getValue() + 8, t->getCount() - 8);
-            buffer[t->getCount() - 8] = '\0';
+        if (!memcmp((char*)t->getValue(), "ASCII\0\0\0", 8)) {
+            strncpy (buffer, (char*)t->getValue() + 8, count - 8);
+            buffer[count - 8] = '\0';
         } else {
             buffer[0] = 0;
         }
diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index e2122f79e..a4d28c104 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -40,7 +40,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     colorCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_COLOR"));
     colorCurveEditorG->setCurveListener (this);
 
-    colorShape = static_cast<FlatCurveEditor*>(colorCurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    colorShape = static_cast<FlatCurveEditor*>(colorCurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     colorShape->setCurveColorProvider(this, 1);
     std::vector<GradientMilestone> milestones;
 
@@ -89,7 +89,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     opacityCurveEditorG->setCurveListener (this);
 
     rtengine::ColorToningParams::getDefaultOpacityCurve(defaultCurve);
-    opacityShape = static_cast<FlatCurveEditor*>(opacityCurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    opacityShape = static_cast<FlatCurveEditor*>(opacityCurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     opacityShape->setIdentityValue(0.);
     opacityShape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
     opacityShape->setBottomBarBgGradient(milestones);
@@ -108,7 +108,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     clCurveEditorG->setCurveListener (this);
 
     rtengine::ColorToningParams::getDefaultCLCurve(defaultCurve);
-    clshape = static_cast<DiagonalCurveEditor*>(clCurveEditorG->addCurve(CT_Diagonal, M("TP_COLORTONING_AB"), irg));
+    clshape = static_cast<DiagonalCurveEditor*>(clCurveEditorG->addCurve(CT_Diagonal, M("TP_COLORTONING_AB"), irg, false));
     clshape->setResetCurve(DiagonalCurveType(defaultCurve.at(0)), defaultCurve);
     clshape->setTooltip(M("TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP"));
 
@@ -128,7 +128,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     cl2CurveEditorG->setCurveListener (this);
 
     rtengine::ColorToningParams::getDefaultCL2Curve(defaultCurve);
-    cl2shape = static_cast<DiagonalCurveEditor*>(cl2CurveEditorG->addCurve(CT_Diagonal, M("TP_COLORTONING_BY"), iby));
+    cl2shape = static_cast<DiagonalCurveEditor*>(cl2CurveEditorG->addCurve(CT_Diagonal, M("TP_COLORTONING_BY"), iby, false));
     cl2shape->setResetCurve(DiagonalCurveType(defaultCurve.at(0)), defaultCurve);
     cl2shape->setTooltip(M("TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP"));
 
diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc
index 2dbdf0e8b..2513bb137 100644
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -2086,12 +2086,12 @@ void CropWindow::updateHoveredPicker (rtengine::Coord *imgPos)
     hoveredPicker->setValidity (validity);
 
     {
-    MyMutex::MyLock lock(cropHandler.cimg);
+        MyMutex::MyLock lock(cropHandler.cimg);
 
-    if (validity == LockableColorPicker::Validity::INSIDE) {
-        cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize());
-        hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview);
-    }
+        if (validity == LockableColorPicker::Validity::INSIDE) {
+            cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize());
+            hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview);
+        }
     }
 }
 void CropWindow::changeZoom  (int zoom, bool notify, int centerx, int centery)
diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc
index 5428677c3..117051b2a 100644
--- a/rtgui/curveeditor.cc
+++ b/rtgui/curveeditor.cc
@@ -200,6 +200,7 @@ CurveEditor::CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEd
     leftBarCP = nullptr;
     curveCP = nullptr;
     relatedWidget = nullptr;
+    expandRelatedWidget = true;
 
     group = ceGroup;
     subGroup = ceSubGroup;
diff --git a/rtgui/curveeditor.h b/rtgui/curveeditor.h
index a3ba68436..3f279ff05 100644
--- a/rtgui/curveeditor.h
+++ b/rtgui/curveeditor.h
@@ -66,6 +66,7 @@ protected:
     CurveEditorGroup* group;
     CurveEditorSubGroup* subGroup;
     Gtk::Widget* relatedWidget;
+    bool expandRelatedWidget;
 
     std::vector<double> tempCurve;
     sigc::connection typeconn;
diff --git a/rtgui/curveeditorgroup.cc b/rtgui/curveeditorgroup.cc
index ecb4c8542..aad30ac37 100644
--- a/rtgui/curveeditorgroup.cc
+++ b/rtgui/curveeditorgroup.cc
@@ -73,7 +73,7 @@ void CurveEditorGroup::hideCurrentCurve()
  *     periodic:      for FlatCurve only, ask the curve to be periodic (default: True)
  *
  */
-CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget, bool periodic)
+CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget, bool expandRelatedWidget, bool periodic)
 {
     switch (cType) {
     case (CT_Diagonal): {
@@ -84,6 +84,7 @@ CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabe
         // We add it to the curve editor list
         DiagonalCurveEditor* newCE = diagonalSubGroup->addCurve(curveLabel);
         newCE->relatedWidget = relatedWidget;
+        newCE->expandRelatedWidget = expandRelatedWidget;
         curveEditors.push_back(newCE);
         return (newCE);
     }
@@ -96,6 +97,7 @@ CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabe
         // We add it to the curve editor list
         FlatCurveEditor* newCE = flatSubGroup->addCurve(curveLabel, periodic);
         newCE->relatedWidget = relatedWidget;
+        newCE->expandRelatedWidget = expandRelatedWidget;
         curveEditors.push_back(newCE);
         return (newCE);
     }
@@ -131,20 +133,21 @@ void CurveEditorGroup::newLine()
         }
 
         int j = numberOfPackedCurve;
-        bool hasRelatedWidget = false;
+
+        bool rwe = false;
 
         for (int i = (int)(curveEditors.size()) - 1; i >= j; i--) {
-            if (curveEditors[i]->relatedWidget != nullptr) {
-                hasRelatedWidget = true;
+            if (curveEditors[i]->relatedWidget != nullptr && curveEditors[i]->expandRelatedWidget) {
+                rwe = true;
             }
         }
 
         for (int i = (int)(curveEditors.size()) - 1; i >= j; i--) {
             if (curveEditors[i]->relatedWidget != nullptr) {
-                headerBox->pack_end (*curveEditors[i]->relatedWidget, Gtk::PACK_EXPAND_WIDGET, 2);
+                headerBox->pack_end (*curveEditors[i]->relatedWidget, curveEditors[i]->expandRelatedWidget ? Gtk::PACK_EXPAND_WIDGET : Gtk::PACK_SHRINK, 2);
             }
 
-            headerBox->pack_end (*curveEditors[i]->curveType->buttonGroup, hasRelatedWidget ? Gtk::PACK_SHRINK : Gtk::PACK_EXPAND_WIDGET, 2);
+            headerBox->pack_end (*curveEditors[i]->curveType->buttonGroup, rwe ? Gtk::PACK_SHRINK : Gtk::PACK_EXPAND_WIDGET, 2);
             numberOfPackedCurve++;
         }
 
diff --git a/rtgui/curveeditorgroup.h b/rtgui/curveeditorgroup.h
index caf08b4a4..097bfd3e3 100644
--- a/rtgui/curveeditorgroup.h
+++ b/rtgui/curveeditorgroup.h
@@ -85,7 +85,7 @@ public:
         return displayedCurve;
     }
     //void on_realize ();
-    CurveEditor* addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget = nullptr, bool periodic = true);
+    CurveEditor* addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget = nullptr, bool expandRelatedWidget = true, bool periodic = true);
 
 protected:
     //void curveTypeToggled ();
diff --git a/rtgui/defringe.cc b/rtgui/defringe.cc
index 5da21185c..8d7287ac1 100644
--- a/rtgui/defringe.cc
+++ b/rtgui/defringe.cc
@@ -35,8 +35,6 @@ Defringe::Defringe () : FoldableToolPanel(this, "defringe", M("TP_DEFRINGE_LABEL
         bottomMilestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) );
     }
 
-    setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
-
     curveEditorPF = new CurveEditorGroup (options.lastPFCurvesDir);
     curveEditorPF->setCurveListener (this);
     chshape = static_cast<FlatCurveEditor*>(curveEditorPF->addCurve(CT_Flat, M("TP_PFCURVE_CURVEEDITOR_CH")));
diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc
index f4ad271b3..3cee199f8 100644
--- a/rtgui/dirpyrdenoise.cc
+++ b/rtgui/dirpyrdenoise.cc
@@ -64,7 +64,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
     //curveEditorG = new CurveEditorGroup (options.lastLabCurvesDir);
     NoiscurveEditorG->setCurveListener (this);
     rtengine::DirPyrDenoiseParams::getDefaultNoisCurve(defaultCurve);
-    lshape = static_cast<FlatCurveEditor*>(NoiscurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    lshape = static_cast<FlatCurveEditor*>(NoiscurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     lshape->setIdentityValue(0.);
     lshape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
 
@@ -154,7 +154,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
     CCcurveEditorG = new CurveEditorGroup (options.lastDenoiseCurvesDir, M("TP_DIRPYRDENOISE_CCCURVE"));
     CCcurveEditorG->setCurveListener (this);
     rtengine::DirPyrDenoiseParams::getDefaultCCCurve(defaultCurve);
-    ccshape = static_cast<FlatCurveEditor*>(CCcurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    ccshape = static_cast<FlatCurveEditor*>(CCcurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     ccshape->setIdentityValue(0.);
     ccshape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
 
diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc
index 53b4805ff..262f0f448 100644
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -69,8 +69,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
     cbVBox->pack_start(*cdbox);
     pack_start(*cbVBox);
 
-    setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
-
     Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
     pack_start(*buttonBox1);
 
diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc
index 91ad00ae9..1760d4b69 100644
--- a/rtgui/distortion.cc
+++ b/rtgui/distortion.cc
@@ -27,8 +27,8 @@ Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTIO
 {
 
     rlistener = nullptr;
-    autoDistor = Gtk::manage (new Gtk::Button (M("TP_DISTORTION_AUTO")));
-    autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto.png")));
+    autoDistor = Gtk::manage (new Gtk::Button (M("GENERAL_AUTO")));
+    autoDistor->set_alignment(0.5f, 0.5f);
     autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP"));
     idConn = autoDistor->signal_pressed().connect( sigc::mem_fun(*this, &Distortion::idPressed) );
     autoDistor->show();
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 8dba7e38e..67850c545 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -38,15 +38,19 @@ using namespace rtengine::procparams;
 class EditorPanel::ColorManagementToolbar
 {
 private:
+#if !defined(__APPLE__) // monitor profile not supported on apple
     MyComboBoxText profileBox;
+#endif
     PopUpButton intentBox;
     Gtk::ToggleButton softProof;
     Gtk::ToggleButton spGamutCheck;
-    sigc::connection profileConn, intentConn;
+    sigc::connection profileConn, intentConn, softproofConn;
+    bool canSProof;
 
     rtengine::StagedImageProcessor* const& processor;
 
 private:
+#if !defined(__APPLE__) // monitor profile not supported on apple
     void prepareProfileBox ()
     {
         profileBox.set_size_request (100, -1);
@@ -58,13 +62,13 @@ private:
 #else
         profileBox.set_active (0);
 #endif
-
-        const std::vector<Glib::ustring> profiles = rtengine::iccStore->getProfiles (true);
-        for (std::vector<Glib::ustring>::const_iterator iterator = profiles.begin (); iterator != profiles.end (); ++iterator) {
-            profileBox.append_text (*iterator);
+        const std::vector<Glib::ustring> profiles = rtengine::iccStore->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
+        for (const auto profile: profiles) {
+            profileBox.append_text (profile);
         }
         profileBox.set_tooltip_text (profileBox.get_active_text ());
     }
+#endif
 
     void prepareIntentBox ()
     {
@@ -86,6 +90,7 @@ private:
         softProof.set_tooltip_markup(M("SOFTPROOF_TOOLTIP"));
 
         softProof.set_active(false);
+        softProof.set_sensitive(canSProof);
         softProof.show ();
 
         Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("spGamutCheck.png"));
@@ -121,12 +126,15 @@ private:
 
     void updateParameters (bool noEvent = false)
     {
+#if !defined(__APPLE__) // monitor profile not supported on apple
         ConnectionBlocker profileBlocker (profileConn);
+#endif
         ConnectionBlocker intentBlocker (intentConn);
 
         Glib::ustring profile;
 
-#ifdef WIN32
+#if !defined(__APPLE__) // monitor profile not supported on apple
+    #ifdef WIN32
         if (profileBox.get_active_row_number () == 1) {
             profile = rtengine::iccStore->getDefaultMonitorProfileName ();
             if (profile.empty ()) {
@@ -138,10 +146,14 @@ private:
         } else if (profileBox.get_active_row_number () > 1) {
             profile = profileBox.get_active_text ();
         }
-#else
+    #else
         profile = profileBox.get_active_row_number () > 0 ? profileBox.get_active_text () : Glib::ustring ();
+    #endif
+#else
+        profile = "RT_sRGB";
 #endif
 
+#if !defined(__APPLE__) // monitor profile not supported on apple
         if (profileBox.get_active_row_number () == 0) {
 
             profile.clear();
@@ -164,8 +176,8 @@ private:
                 intentBox.setItemSensitivity(0, supportsPerceptual);
                 intentBox.setItemSensitivity(1, supportsRelativeColorimetric);
                 intentBox.setItemSensitivity(2, supportsAbsoluteColorimetric);
-                softProof.set_sensitive(true);
-                spGamutCheck.set_sensitive(true);
+                softProof.set_sensitive(canSProof);
+                spGamutCheck.set_sensitive(canSProof);
             } else {
                 intentBox.setItemSensitivity(0, true);
                 intentBox.setItemSensitivity(1, true);
@@ -178,7 +190,7 @@ private:
 
             profileBox.set_tooltip_text (profileBox.get_active_text ());
         }
-
+#endif
         rtengine::RenderingIntent intent;
         switch (intentBox.getSelected ()) {
         default:
@@ -209,33 +221,53 @@ private:
 
     void updateSoftProofParameters (bool noEvent = false)
     {
-        spGamutCheck.set_sensitive(softProof.get_active());
-
-        if (profileBox.get_active_row_number () > 0) {
-            if (!noEvent) {
-                processor->beginUpdateParams ();
-            }
-            processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_sensitive() && spGamutCheck.get_active());
-            if (!noEvent) {
-                processor->endUpdateParams (rtengine::EvMonitorTransform);
-            }
+        if (!canSProof) {
+            ConnectionBlocker profileBlocker (softproofConn);
+            softProof.set_active(false);
+            softProof.set_sensitive(false);
+#if !defined(__APPLE__) // monitor profile not supported on apple
+        } else {
+            softProof.set_sensitive(profileBox.get_active_row_number () > 0);
+#endif
         }
+        spGamutCheck.set_sensitive(softProof.get_sensitive() && softProof.get_active());
+
+#if !defined(__APPLE__) // monitor profile not supported on apple
+        if (profileBox.get_active_row_number () > 0) {
+#endif
+            if (processor) {
+                if (!noEvent) {
+                    processor->beginUpdateParams ();
+                }
+                processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_sensitive() && spGamutCheck.get_active());
+                if (!noEvent) {
+                    processor->endUpdateParams (rtengine::EvMonitorTransform);
+                }
+            }
+#if !defined(__APPLE__) // monitor profile not supported on apple
+        }
+#endif
     }
 
 public:
     explicit ColorManagementToolbar (rtengine::StagedImageProcessor* const& ipc) :
         intentBox (Glib::ustring (), true),
+        canSProof(!options.rtSettings.printerProfile.empty() && options.rtSettings.printerProfile != "None"),  // assuming the printer profile exist!
         processor (ipc)
     {
+#if !defined(__APPLE__) // monitor profile not supported on apple
         prepareProfileBox ();
+#endif
         prepareIntentBox ();
         prepareSoftProofingBox ();
 
         reset ();
 
-        softProof.signal_toggled().connect(sigc::mem_fun (this, &ColorManagementToolbar::softProofToggled));
-        spGamutCheck.signal_toggled().connect(sigc::mem_fun (this, &ColorManagementToolbar::spGamutCheckToggled));;
+        softproofConn = softProof.signal_toggled().connect(sigc::mem_fun (this, &ColorManagementToolbar::softProofToggled));
+        spGamutCheck.signal_toggled().connect(sigc::mem_fun (this, &ColorManagementToolbar::spGamutCheckToggled));
+#if !defined(__APPLE__) // monitor profile not supported on apple
         profileConn = profileBox.signal_changed ().connect (sigc::mem_fun (this, &ColorManagementToolbar::profileBoxChanged));
+#endif
         intentConn = intentBox.signal_changed ().connect (sigc::mem_fun (this, &ColorManagementToolbar::intentBoxChanged));
     }
 
@@ -244,7 +276,15 @@ public:
         box->pack_end (spGamutCheck, Gtk::PACK_SHRINK, 0);
         box->pack_end (softProof, Gtk::PACK_SHRINK, 0);
         box->pack_end (*intentBox.buttonGroup, Gtk::PACK_SHRINK, 0);
+#if !defined(__APPLE__) // monitor profile not supported on apple
         box->pack_end (profileBox, Gtk::PACK_SHRINK, 0);
+#endif
+    }
+
+    void canSoftProof(bool canSP)
+    {
+        canSProof = canSP;
+        updateSoftProofParameters();
     }
 
     void updateProcessor()
@@ -256,17 +296,19 @@ public:
 
     void reset ()
     {
-        ConnectionBlocker profileBlocker (profileConn);
         ConnectionBlocker intentBlocker (intentConn);
+#if !defined(__APPLE__) // monitor profile not supported on apple
+        ConnectionBlocker profileBlocker (profileConn);
 
-#ifdef WIN32
+    #ifdef WIN32
         if (options.rtSettings.autoMonitorProfile) {
             setActiveTextOrIndex (profileBox, options.rtSettings.monitorProfile, 1);
         } else {
             setActiveTextOrIndex (profileBox, options.rtSettings.monitorProfile, 0);
         }
-#else
+    #else
         setActiveTextOrIndex (profileBox, options.rtSettings.monitorProfile, 0);
+    #endif
 #endif
 
         switch (options.rtSettings.monitorIntent)
@@ -1639,8 +1681,7 @@ void EditorPanel::saveAsPressed ()
         fnameOut = saveAsDialog->getFileName ();
 
         options.lastSaveAsPath = saveAsDialog->getDirectory ();
-        options.saveAsDialogWidth = saveAsDialog->get_width ();
-        options.saveAsDialogHeight = saveAsDialog->get_height ();
+        saveAsDialog->get_size(options.saveAsDialogWidth, options.saveAsDialogHeight);
         options.autoSuffix = saveAsDialog->getAutoSuffix ();
         options.saveMethodNum = saveAsDialog->getSaveMethodNum ();
         lastSaveAsFileName = Glib::path_get_basename (removeExtension (fnameOut));
@@ -1709,6 +1750,8 @@ void EditorPanel::saveAsPressed ()
     } while (!fnameOK);
 
     saveAsDialog->hide();
+
+    delete saveAsDialog;
 }
 
 void EditorPanel::queueImgPressed ()
@@ -2016,6 +2059,11 @@ void EditorPanel::tbShowHideSidePanels_managestate()
     ShowHideSidePanelsconn.block (false);
 }
 
+void EditorPanel::updateProfiles(const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC)
+{
+    colorMgmtToolBar->canSoftProof(!printerProfile.empty() && printerProfile != "None");
+}
+
 void EditorPanel::updateTPVScrollbar (bool hide)
 {
     tpc->updateTPVScrollbar (hide);
diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h
index ac2be9566..def9e9145 100644
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -208,6 +208,7 @@ public:
     {
         return isProcessing;
     }
+    void updateProfiles(const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
     void updateTPVScrollbar (bool hide);
     void updateTabsUsesIcons (bool useIcons);
     void updateHistogramPosition (int oldPosition, int newPosition);
diff --git a/rtgui/extprog.cc b/rtgui/extprog.cc
index d0cf44151..30e33b6b9 100644
--- a/rtgui/extprog.cc
+++ b/rtgui/extprog.cc
@@ -244,8 +244,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
 #if defined WIN32
 
     auto executable = Glib::build_filename (options.gimpDir, "bin", "gimp-win-remote");
-    auto cmdLine = Glib::ustring::compose ("\"%1\" gimp-2.4.exe \"%2\"", executable, fileName);
-    auto success = spawnCommandAsync (cmdLine);
+    auto success = ShellExecute( NULL, "open", executable.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL );
 
 #elif defined __APPLE__
 
@@ -262,19 +261,25 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
 
 #endif
 
+#ifdef WIN32
+    if ((uintptr_t)success > 32) {
+        return true;
+    }
+#else
     if (success) {
         return true;
     }
 
+#endif
+
 #ifdef WIN32
 
     for (auto ver = 12; ver >= 0; --ver) {
 
         executable = Glib::build_filename (options.gimpDir, "bin", Glib::ustring::compose (Glib::ustring("gimp-2.%1.exe"), ver));
-        cmdLine = Glib::ustring::compose ("\"%1\" \"%2\"", executable, fileName);
-        success = spawnCommandAsync (cmdLine);
+        auto success = ShellExecute( NULL, "open", executable.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL );
 
-        if (success) {
+        if ((uintptr_t)success > 32) {
             return true;
         }
     }
@@ -318,17 +323,22 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName)
 {
 #if defined WIN32
 
-    const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\" \"") + fileName + Glib::ustring("\"");
+    const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\"");
+    auto success = ShellExecute( NULL, "open", cmdLine.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL );
+    if ((uintptr_t)success > 32) {
+        return true;
+    }
 
 #elif defined __APPLE__
 
     const auto cmdLine = options.customEditorProg + Glib::ustring(" \"") + fileName + Glib::ustring("\"");
+    return spawnCommandAsync (cmdLine);
 
 #else
 
     const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\" \"") + fileName + Glib::ustring("\"");
+    return spawnCommandAsync (cmdLine);
 
 #endif
 
-    return spawnCommandAsync (cmdLine);
 }
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 97407fb1e..dd66b1cc9 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -773,7 +773,7 @@ void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn)
 
     previewsLoaded++;
 
-    g_idle_add (refreshProgressBarUI, this);
+    _refreshProgressBar();
 }
 
 int prevfinished (void* data)
diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h
index b8e058eb4..597173086 100644
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -472,9 +472,13 @@ public:
 
 inline void setActiveTextOrIndex (Gtk::ComboBoxText& comboBox, const Glib::ustring& text, int index)
 {
-    comboBox.set_active_text (text);
+    bool valueSet = false;
+    if (!text.empty()) {
+        comboBox.set_active_text (text);
+        valueSet = true;
+    }
 
-    if (comboBox.get_active_row_number () < 0)
+    if (!valueSet || comboBox.get_active_row_number () < 0)
         comboBox.set_active (index);
 }
 
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 68663ed7e..ec798fe62 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -97,7 +97,6 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     dcpIll->show ();
     dcpTemperatures[0] = 0;
     dcpTemperatures[1] = 0;
-    ignoreDcpSignal = true;
     dcpIllHBox->pack_start(*dcpIllLabel, Gtk::PACK_SHRINK, 4);
     dcpIllHBox->pack_start(*dcpIll);
 
@@ -131,7 +130,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     //iVBox->pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 2);
 
     saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE")));
-    saveRef->set_image (*Gtk::manage (new RTImage ("gtk-save-large.png")));
+    saveRef->set_alignment (0.5f, 0.5f);
     saveRef->set_tooltip_markup (M("TP_ICM_SAVEREFERENCE_TOOLTIP"));
     iVBox->pack_start (*saveRef, Gtk::PACK_SHRINK, 2);
 
@@ -181,7 +180,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     onames->append_text (M("TP_ICM_NOICM"));
     onames->set_active (0);
 
-    std::vector<Glib::ustring> opnames = iccStore->getProfiles ();
+    std::vector<Glib::ustring> opnames = iccStore->getProfiles (rtengine::ICCStore::ProfileType::OUTPUT);
 
     for (size_t i = 0; i < opnames.size(); i++) {
         onames->append_text (opnames[i]);
@@ -295,11 +294,11 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
 
     oldip = "";
 
-    wnames->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::wpChanged) );
-    onames->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::opChanged) );
-    ointent->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::oiChanged) );
-    wgamma->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::gpChanged) );
-    dcpIll->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::dcpIlluminantChanged) );
+    wnamesconn = wnames->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::wpChanged) );
+    onamesconn = onames->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::opChanged) );
+    ointentconn = ointent->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::oiChanged) );
+    wgammaconn = wgamma->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::gpChanged) );
+    dcpillconn = dcpIll->signal_changed().connect( sigc::mem_fun(*this, &ICMPanel::dcpIlluminantChanged) );
 
     obpcconn = obpc->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::oBPCChanged) );
     gamcsconn = freegamma->signal_toggled().connect ( sigc::mem_fun(*this, &ICMPanel::GamChanged));
@@ -347,6 +346,7 @@ void ICMPanel::updateRenderingIntent (const Glib::ustring &profile) {
 
 void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
 {
+    ConnectionBlocker dcpillconn_(dcpillconn);
 
     if (isBatchMode) {
         dcpFrame->set_sensitive(true);
@@ -359,7 +359,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
 
         if (dcpTemperatures[0] != 0 || dcpTemperatures[1] != 0) {
             int curr_active = dcpIll->get_active_row_number();
-            ignoreDcpSignal = true;
             dcpIll->clear_items ();
             dcpIll->append_text (M("TP_ICM_DCPILLUMINANT_INTERPOLATED"));
             dcpIll->append_text (M("TP_ICM_DCPILLUMINANT") + " 1");
@@ -368,7 +367,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
             dcpTemperatures[0] = 0;
             dcpTemperatures[1] = 0;
             dcpIll->set_active (curr_active);
-            ignoreDcpSignal = false;
         }
 
         if (dcpIll->get_active_row_number() == -1 && dcpIlluminant == -1) {
@@ -425,7 +423,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
                 sprintf(tempstr1, "%.0fK", illuminants.temperature_1);
                 sprintf(tempstr2, "%.0fK", illuminants.temperature_2);
                 int curr_active = dcpIll->get_active_row_number();
-                ignoreDcpSignal = true;
                 dcpIll->clear_items ();
                 dcpIll->append_text (M("TP_ICM_DCPILLUMINANT_INTERPOLATED"));
                 dcpIll->append_text (tempstr1);
@@ -433,7 +430,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
                 dcpTemperatures[0] = illuminants.temperature_1;
                 dcpTemperatures[1] = illuminants.temperature_2;
                 dcpIll->set_active (curr_active);
-                ignoreDcpSignal = false;
             }
 
             if (dcpIlluminant > 2) {
@@ -441,22 +437,16 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
             }
 
             if (dcpIll->get_active_row_number() == -1 && dcpIlluminant == -1) {
-                ignoreDcpSignal = true;
                 dcpIll->set_active(0);
-                ignoreDcpSignal = false;
             } else if (dcpIlluminant >= 0 && dcpIlluminant != dcpIll->get_active_row_number()) {
-                ignoreDcpSignal = true;
                 dcpIll->set_active(dcpIlluminant);
-                ignoreDcpSignal = false;
             }
 
             dcpIll->set_sensitive (true);
             dcpIllLabel->set_sensitive (true);
         } else {
             if (dcpIll->get_active_row_number() != -1) {
-                ignoreDcpSignal = true;
                 dcpIll->set_active(-1);
-                ignoreDcpSignal = false;
             }
         }
     }
@@ -464,7 +454,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
     if (!dcpIllLabel->get_sensitive() && dcpIll->get_active_row_number() != 0) {
         if (dcpTemperatures[0] != 0 || dcpTemperatures[1] != 0) {
             int curr_active = dcpIll->get_active_row_number();
-            ignoreDcpSignal = true;
             dcpIll->clear_items ();
             dcpIll->append_text (M("TP_ICM_DCPILLUMINANT_INTERPOLATED"));
             dcpIll->append_text (M("TP_ICM_DCPILLUMINANT") + " 1");
@@ -477,7 +466,6 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
             dcpTemperatures[0] = 0;
             dcpTemperatures[1] = 0;
             dcpIll->set_active (curr_active);
-            ignoreDcpSignal = false;
         }
     }
 }
@@ -487,14 +475,19 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
 
     disableListener ();
 
-    obpcconn.block (true);
-    ipc.block (true);
-    gamcsconn.block (true);
-    tcurveconn.block(true);
-    ltableconn.block(true);
-    beoconn.block(true);
-    hsmconn.block(true);
-    blendcmsconn.block(true);
+    ConnectionBlocker obpcconn_(obpcconn);
+    ConnectionBlocker ipc_(ipc);
+    ConnectionBlocker gamcsconn_(gamcsconn);
+    ConnectionBlocker tcurveconn_(tcurveconn);
+    ConnectionBlocker ltableconn_(ltableconn);
+    ConnectionBlocker beoconn_(beoconn);
+    ConnectionBlocker hsmconn_(hsmconn);
+    ConnectionBlocker blendcmsconn_(blendcmsconn);
+    ConnectionBlocker wnamesconn_(wnamesconn);
+    ConnectionBlocker onamesconn_(onamesconn);
+    ConnectionBlocker ointentconn_(ointentconn);
+    ConnectionBlocker wgammaconn_(wgammaconn);
+    ConnectionBlocker dcpillconn_(dcpillconn);
 
     if(pp->icm.input.substr(0, 5) != "file:" && !ipDialog->get_filename().empty()) {
         ipDialog->set_filename(pp->icm.input);
@@ -626,15 +619,6 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
 
     }
 
-    blendcmsconn.block(false);
-    tcurveconn.block(false);
-    ltableconn.block(false);
-    beoconn.block(false);
-    hsmconn.block(false);
-    gamcsconn.block (false);
-    ipc.block (false);
-    obpcconn.block (false);
-
     enableListener ();
 }
 
@@ -661,11 +645,7 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited)
 
     pp->icm.working = wnames->get_active_text ();
     pp->icm.gamma = wgamma->get_active_text ();
-    pp->icm.dcpIlluminant = dcpIll->get_active_row_number();
-
-    if (pp->icm.dcpIlluminant < 0) {
-        pp->icm.dcpIlluminant = 0;
-    }
+    pp->icm.dcpIlluminant = rtengine::max<int>(dcpIll->get_active_row_number(), 0);
 
     if (onames->get_active_text() == M("TP_ICM_NOICM")) {
         pp->icm.output  = ColorManagementParams::NoICMString;
@@ -681,33 +661,10 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited)
     }
 
     pp->icm.freegamma = freegamma->get_active();
-
-    DCPProfile* dcp = nullptr;
-
-    if (ifromfile->get_active() && pp->icm.input.substr(0, 5) == "file:" && DCPStore::getInstance()->isValidDCPFileName(pp->icm.input.substr(5))) {
-        dcp = DCPStore::getInstance()->getProfile(pp->icm.input.substr(5));
-    } else if(icameraICC->get_active()) {
-        dcp = DCPStore::getInstance()->getStdProfile(camName);
-    }
-
-    if (dcp) {
-        if (dcp->getHasToneCurve()) {
-            pp->icm.toneCurve = ckbToneCurve->get_active ();
-        }
-
-        if (dcp->getHasLookTable()) {
-            pp->icm.applyLookTable = ckbApplyLookTable->get_active ();
-        }
-
-        if (dcp->getHasBaselineExposureOffset()) {
-            pp->icm.applyBaselineExposureOffset = ckbApplyBaselineExposureOffset->get_active ();
-        }
-
-        if (dcp->getHasHueSatMap()) {
-            pp->icm.applyHueSatMap = ckbApplyHueSatMap->get_active ();
-        }
-    }
-
+    pp->icm.toneCurve = ckbToneCurve->get_active ();
+    pp->icm.applyLookTable = ckbApplyLookTable->get_active ();
+    pp->icm.applyBaselineExposureOffset = ckbApplyBaselineExposureOffset->get_active ();
+    pp->icm.applyHueSatMap = ckbApplyHueSatMap->get_active ();
     pp->icm.blendCMSMatrix = ckbBlendCMSMatrix->get_active ();
     pp->icm.gampos = (double) gampos->getValue();
     pp->icm.slpos = (double) slpos->getValue();
@@ -786,7 +743,7 @@ void ICMPanel::gpChanged ()
 
 void ICMPanel::dcpIlluminantChanged()
 {
-    if (listener && !ignoreDcpSignal) {
+    if (listener) {
         listener->panelChanged (EvDCPIlluminant, dcpIll->get_active_text ());
     }
 }
@@ -1145,7 +1102,6 @@ void ICMPanel::setBatchMode (bool batchMode)
 {
 
     isBatchMode = true;
-    ignoreDcpSignal = false;
     ToolPanel::setBatchMode (batchMode);
     iunchanged = Gtk::manage (new Gtk::RadioButton (M("GENERAL_UNCHANGED")));
     iunchanged->set_group (opts);
diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h
index caab1771f..84171ae87 100644
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -73,16 +73,21 @@ private:
     Gtk::RadioButton*  ifromfile;
     Gtk::Label*        dcpIllLabel;
     MyComboBoxText*    dcpIll;
+    sigc::connection   dcpillconn;
     Gtk::CheckButton*  ckbToneCurve;
     Gtk::CheckButton*  ckbApplyLookTable;
     Gtk::CheckButton*  ckbApplyBaselineExposureOffset;
     Gtk::CheckButton*  ckbApplyHueSatMap;
     Gtk::CheckButton*  ckbBlendCMSMatrix;
     MyComboBoxText*    wnames;
+    sigc::connection   wnamesconn;
     MyComboBoxText*    wgamma;
+    sigc::connection   wgammaconn;
 
     MyComboBoxText*    onames;
+    sigc::connection   onamesconn;
     PopUpButton*       ointent;
+    sigc::connection   ointentconn;
     Gtk::RadioButton*  ofromdir;
     Gtk::RadioButton*  ofromfile;
     Gtk::RadioButton*  iunchanged;
@@ -93,7 +98,6 @@ private:
     Glib::ustring      oldip;
     ICMPanelListener*  icmplistener;
 
-    bool ignoreDcpSignal;
     double dcpTemperatures[2];
     bool enableLastICCWorkDirChange;
     Glib::ustring lastRefFilename;
diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc
index 3a9b3e81c..15a5361e7 100644
--- a/rtgui/iptcpanel.cc
+++ b/rtgui/iptcpanel.cc
@@ -20,67 +20,71 @@
 #include "clipboard.h"
 #include "rtimage.h"
 
-extern Glib::ustring argv0;
-
 using namespace rtengine;
 using namespace rtengine::procparams;
 
 IPTCPanel::IPTCPanel ()
 {
 
-    set_border_width (2);
+    set_border_width (0);
+    set_spacing (4);
 
-    Gtk::Table* iptc = Gtk::manage( new Gtk::Table (27, 2) );
+    Gtk::VBox* iptc = Gtk::manage( new Gtk::VBox () );
+    iptc->set_border_width (3);
+    iptc->set_spacing(3);
 
-    int row = 0;
-
-    Gtk::Label* capl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CAPTION") + ":") );
+    Gtk::Label* capl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_DESCRIPTION") + ":") );
+    capl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     captionText = Gtk::TextBuffer::create ();
     captionView = Gtk::manage( new Gtk::TextView (captionText) );
     Gtk::ScrolledWindow* scrolledWindowc = Gtk::manage( new Gtk::ScrolledWindow() );
     scrolledWindowc->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
     scrolledWindowc->add(*captionView);
-    capl->set_tooltip_text (M("IPTCPANEL_CAPTIONHINT"));
-    captionView->set_tooltip_text (M("IPTCPANEL_CAPTIONHINT"));
+    capl->set_tooltip_text (M("IPTCPANEL_DESCRIPTIONHINT"));
+    captionView->set_tooltip_text (M("IPTCPANEL_DESCRIPTIONHINT"));
     captionView->set_size_request(32, 80);
-    iptc->attach (*capl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*scrolledWindowc, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*capl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*scrolledWindowc, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
-    Gtk::Label* capwl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CAPTIONWRITER") + ":") );
+    Gtk::Label* capwl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_DESCRIPTIONWRITER") + ":") );
+    capwl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     captionWriter = Gtk::manage( new Gtk::Entry () );
-    capwl->set_tooltip_text (M("IPTCPANEL_CAPTIONWRITERHINT"));
-    captionWriter->set_tooltip_text (M("IPTCPANEL_CAPTIONWRITERHINT"));
-    iptc->attach (*capwl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*captionWriter, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    capwl->set_tooltip_text (M("IPTCPANEL_DESCRIPTIONWRITERHINT"));
+    captionWriter->set_tooltip_text (M("IPTCPANEL_DESCRIPTIONWRITERHINT"));
+    iptc->pack_start(*capwl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*captionWriter, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* headl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_HEADLINE") + ":") );
+    headl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     headline = Gtk::manage( new Gtk::Entry () );
     headl->set_tooltip_text (M("IPTCPANEL_HEADLINEHINT"));
     headline->set_tooltip_text (M("IPTCPANEL_HEADLINEHINT"));
-    iptc->attach (*headl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*headline, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*headl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*headline, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* instl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_INSTRUCTIONS") + ":") );
+    instl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     instructions = Gtk::manage( new Gtk::Entry () );
     instl->set_tooltip_text (M("IPTCPANEL_INSTRUCTIONSHINT"));
     instructions->set_tooltip_text (M("IPTCPANEL_INSTRUCTIONSHINT"));
-    iptc->attach (*instl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*instructions, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*instl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*instructions, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::HSeparator* hsep1 = Gtk::manage( new Gtk::HSeparator () );
-    iptc->attach (*hsep1, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*hsep1, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* keyl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_KEYWORDS") + ":"));
+    keyl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     keywords = Gtk::manage( new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE) );
     keywords->set_headers_visible (false);
     keywords->set_size_request (50, 80);
@@ -102,22 +106,24 @@ IPTCPanel::IPTCPanel ()
     kwhb->pack_start (*keyword);
     kwhb->pack_start (*addKW, Gtk::PACK_SHRINK, 2);
     kwhb->pack_start (*delKW, Gtk::PACK_SHRINK, 2);
-    iptc->attach (*keyl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*kwhb, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
-    iptc->attach (*scrolledWindowkw, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
+    iptc->pack_start(*keyl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*kwhb, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
+    iptc->pack_start(*scrolledWindowkw, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
 
     Gtk::HSeparator* hsep2 = Gtk::manage( new Gtk::HSeparator () );
-    iptc->attach (*hsep2, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
+    iptc->pack_start(*hsep2, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
 
     Gtk::Label* catl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CATEGORY") + ":") );
+    catl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     category = Gtk::manage( new Gtk::ComboBoxEntryText () );
     category->set_size_request (32, -1);
     catl->set_tooltip_text (M("IPTCPANEL_CATEGORYHINT"));
     category->set_tooltip_text (M("IPTCPANEL_CATEGORYHINT"));
     Gtk::Label* scl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_SUPPCATEGORIES") + ":") );
+    scl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     suppCategories = Gtk::manage( new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE) );
     suppCategories->set_headers_visible (false);
     suppCategories->set_size_request(50, 80);
@@ -139,122 +145,133 @@ IPTCPanel::IPTCPanel ()
     schb->pack_start (*suppCategory);
     schb->pack_start (*addSC, Gtk::PACK_SHRINK, 2);
     schb->pack_start (*delSC, Gtk::PACK_SHRINK, 2);
-    iptc->attach (*catl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*category, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
-    iptc->attach (*scl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*schb, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
-    iptc->attach (*scrolledWindowsc, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
+    iptc->pack_start(*catl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*category, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
+    iptc->pack_start(*scl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*schb, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
+    iptc->pack_start(*scrolledWindowsc, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
 
     Gtk::HSeparator* hsep3 = Gtk::manage( new Gtk::HSeparator () );
-    iptc->attach (*hsep3, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    row++;
+    iptc->pack_start(*hsep3, Gtk::PACK_EXPAND_WIDGET, 0);
+    // --------------------------
 
-    Gtk::Label* authl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_AUTHOR") + ":") );
-    author = Gtk::manage( new Gtk::Entry () );
-    authl->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
-    author->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
-    iptc->attach (*authl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*author, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    Gtk::Label* creatorLbl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CREATOR") + ":") );
+    creatorLbl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+    creator = Gtk::manage( new Gtk::Entry () );
+    creatorLbl->set_tooltip_text (M("IPTCPANEL_CREATORHINT"));
+    creator->set_tooltip_text (M("IPTCPANEL_CREATORHINT"));
+    iptc->pack_start(*creatorLbl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*creator, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
-    Gtk::Label* aupl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_AUTHORSPOSITION") + ":") );
-    authorPos = Gtk::manage(  new Gtk::Entry () );
-    aupl->set_tooltip_text (M("IPTCPANEL_AUTHORSPOSITIONHINT"));
-    authorPos->set_tooltip_text (M("IPTCPANEL_AUTHORSPOSITIONHINT"));
-    iptc->attach (*aupl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*authorPos, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    Gtk::Label* creatorJobTitleLbl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CREATORJOBTITLE") + ":") );
+    creatorJobTitleLbl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+    creatorJobTitle = Gtk::manage(  new Gtk::Entry () );
+    creatorJobTitleLbl->set_tooltip_text (M("IPTCPANEL_CREATORJOBTITLEHINT"));
+    creatorJobTitle->set_tooltip_text (M("IPTCPANEL_CREATORJOBTITLEHINT"));
+    iptc->pack_start(*creatorJobTitleLbl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*creatorJobTitle, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* credl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CREDIT") + ":") );
+    credl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     credit = Gtk::manage( new Gtk::Entry () );
     credl->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
     credit->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
-    iptc->attach (*credl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*credit, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*credl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*credit, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* sourl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_SOURCE") + ":") );
+    sourl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     source = Gtk::manage( new Gtk::Entry () );
     sourl->set_tooltip_text (M("IPTCPANEL_SOURCEHINT"));
     source->set_tooltip_text (M("IPTCPANEL_SOURCEHINT"));
-    iptc->attach (*sourl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*source, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*sourl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*source, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* cprl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_COPYRIGHT") + ":") );
+    cprl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     copyright = Gtk::manage( new Gtk::Entry () );
     cprl->set_tooltip_text (M("IPTCPANEL_COPYRIGHTHINT"));
     copyright->set_tooltip_text (M("IPTCPANEL_COPYRIGHTHINT"));
-    iptc->attach (*cprl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*copyright, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*cprl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*copyright, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::HSeparator* hsep4 = Gtk::manage( new Gtk::HSeparator () );
-    iptc->attach (*hsep4, 0, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*hsep4, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* cityl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CITY") + ":") );
+    cityl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     city = Gtk::manage( new Gtk::Entry () );
     cityl->set_tooltip_text (M("IPTCPANEL_CITYHINT"));
     city->set_tooltip_text (M("IPTCPANEL_CITYHINT"));
-    iptc->attach (*cityl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*city, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*cityl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*city, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* provl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_PROVINCE") + ":") );
+    provl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     province = Gtk::manage( new Gtk::Entry () );
     provl->set_tooltip_text (M("IPTCPANEL_PROVINCEHINT"));
     province->set_tooltip_text (M("IPTCPANEL_PROVINCEHINT"));
-    iptc->attach (*provl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*province, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*provl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*province, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* ctrl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_COUNTRY") + ":") );
+    ctrl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     country = Gtk::manage( new Gtk::Entry () );
     ctrl->set_tooltip_text (M("IPTCPANEL_COUNTRYHINT"));
     country->set_tooltip_text (M("IPTCPANEL_COUNTRYHINT"));
-    iptc->attach (*ctrl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*country, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*ctrl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*country, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* titll = Gtk::manage( new Gtk::Label (M("IPTCPANEL_TITLE") + ":") );
+    titll->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     title = Gtk::manage( new Gtk::Entry () );
     titll->set_tooltip_text (M("IPTCPANEL_TITLEHINT"));
     title->set_tooltip_text (M("IPTCPANEL_TITLEHINT"));
-    iptc->attach (*titll, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*title, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*titll, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*title, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* dcl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_DATECREATED") + ":") );
+    dcl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     dateCreated = Gtk::manage(  new Gtk::Entry () );
     dcl->set_tooltip_text (M("IPTCPANEL_DATECREATEDHINT"));
     dateCreated->set_tooltip_text (M("IPTCPANEL_DATECREATEDHINT"));
-    iptc->attach (*dcl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*dateCreated, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*dcl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*dateCreated, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::Label* trl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_TRANSREFERENCE") + ":") );
+    trl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
     transReference = Gtk::manage( new Gtk::Entry () );
     trl->set_tooltip_text (M("IPTCPANEL_TRANSREFERENCEHINT"));
     transReference->set_tooltip_text (M("IPTCPANEL_TRANSREFERENCEHINT"));
-    iptc->attach (*trl, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    iptc->attach (*transReference, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    iptc->pack_start(*trl, Gtk::PACK_EXPAND_PADDING, 0);
+    iptc->pack_start(*transReference, Gtk::PACK_EXPAND_WIDGET, 0);
 
-    row++;
+    // --------------------------
 
     Gtk::ScrolledWindow* scrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
     scrolledWindow->set_border_width(2);
@@ -309,8 +326,8 @@ IPTCPanel::IPTCPanel ()
     conns[2] = headline->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
     conns[3] = instructions->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
     conns[4] = category->get_entry()->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
-    conns[5] = author->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
-    conns[6] = authorPos->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
+    conns[5] = creator->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
+    conns[6] = creatorJobTitle->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
     conns[7] = credit->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
     conns[8] = source->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
     conns[9] = copyright->signal_changed().connect( sigc::mem_fun(*this, &IPTCPanel::updateChangeList) );
@@ -325,8 +342,8 @@ IPTCPanel::IPTCPanel ()
     keyword->get_entry()->set_max_length (64);
     captionWriter->set_max_length (32);
     instructions->set_max_length (256);
-    author->set_max_length (32);
-    authorPos->set_max_length (32);
+    creator->set_max_length (32);
+    creatorJobTitle->set_max_length (32);
     credit->set_max_length (32);
     source->set_max_length (32);
     copyright->set_max_length (128);
@@ -514,8 +531,8 @@ void IPTCPanel::updateChangeList ()
         changeList["SupplementalCategories"].push_back (suppCategories->get_text (i));
     }
 
-    changeList["Author"         ].push_back (author->get_text ());
-    changeList["AuthorsPosition"].push_back (authorPos->get_text ());
+    changeList["Creator"        ].push_back (creator->get_text ());
+    changeList["CreatorJobTitle"].push_back (creatorJobTitle->get_text ());
     changeList["Credit"         ].push_back (credit->get_text ());
     changeList["Source"         ].push_back (source->get_text ());
     changeList["Copyright"      ].push_back (copyright->get_text ());
@@ -543,8 +560,8 @@ void IPTCPanel::applyChangeList ()
     keywords->clear_items ();
     category->get_entry()->set_text ("");
     suppCategories->clear_items ();
-    author->set_text ("");
-    authorPos->set_text ("");
+    creator->set_text ("");
+    creatorJobTitle->set_text ("");
     credit->set_text ("");
     source->set_text ("");
     copyright->set_text ("");
@@ -576,10 +593,10 @@ void IPTCPanel::applyChangeList ()
             for (unsigned int j = 0; j < i->second.size(); j++) {
                 suppCategories->append_text (i->second.at(j));
             }
-        else if (i->first == "Author" && !i->second.empty()) {
-            author->set_text (i->second.at(0));
-        } else if (i->first == "AuthorsPosition" && !i->second.empty()) {
-            authorPos->set_text (i->second.at(0));
+        else if (i->first == "Creator" && !i->second.empty()) {
+            creator->set_text (i->second.at(0));
+        } else if (i->first == "CreatorJobTitle" && !i->second.empty()) {
+            creatorJobTitle->set_text (i->second.at(0));
         } else if (i->first == "Credit" && !i->second.empty()) {
             credit->set_text (i->second.at(0));
         } else if (i->first == "Source" && !i->second.empty()) {
diff --git a/rtgui/iptcpanel.h b/rtgui/iptcpanel.h
index 7c26aa7ca..951680014 100644
--- a/rtgui/iptcpanel.h
+++ b/rtgui/iptcpanel.h
@@ -46,8 +46,8 @@ private:
     Gtk::Button*    addSC;
     Gtk::Button*    delSC;
 
-    Gtk::Entry*     author;
-    Gtk::Entry*     authorPos;
+    Gtk::Entry*     creator;
+    Gtk::Entry*     creatorJobTitle;
     Gtk::Entry*     credit;
     Gtk::Entry*     source;
     Gtk::Entry*     copyright;
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 1b01a66db..397b5996a 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -356,10 +356,10 @@ void Options::setDefaults ()
     profilePath = "profiles";
     loadSaveProfilePath = "";           // will be corrected in load as otherwise construction fails
     version = "0.0.0.0";                // temporary value; will be correctly set in RTWindow::on_realize
-    thumbSize = 240;
-    thumbSizeTab = 180;
+    thumbSize = 160;
+    thumbSizeTab = 160;
     thumbSizeQueue = 160;
-    sameThumbSize = true;               // preferring speed of switch between file browser and single editor tab
+    sameThumbSize = false;               // preferring speed of switch between file browser and single editor tab
     showHistory = true;
     showFilePanelState = 0;             // Not used anymore ; was the thumb strip state
     showInfo = true;
@@ -632,6 +632,9 @@ void Options::setDefaults ()
     rtSettings.leveldnliss = 0;
     rtSettings.leveldnautsimpl = 0;
 
+    rtSettings.printerProfile = Glib::ustring();
+    rtSettings.printerIntent = rtengine::RI_RELATIVE;
+    rtSettings.printerBPC = true;
     rtSettings.monitorProfile = Glib::ustring();
     rtSettings.monitorIntent = rtengine::RI_RELATIVE;
     rtSettings.monitorBPC = true;
@@ -1450,6 +1453,18 @@ int Options::readFromFile (Glib::ustring fname)
                     rtSettings.iccDirectory         = keyFile.get_string ("Color Management", "ICCDirectory");
                 }
 
+                if (keyFile.has_key ("Color Management", "PrinterIntent")) {
+                    rtSettings.printerIntent   = static_cast<rtengine::RenderingIntent>(keyFile.get_integer("Color Management", "PrinterIntent"));
+                }
+
+                if (keyFile.has_key ("Color Management", "PrinterBPC")) {
+                    rtSettings.printerBPC           = keyFile.get_boolean("Color Management", "PrinterBPC");
+                }
+
+                if (keyFile.has_key ("Color Management", "PrinterProfile")) {
+                    rtSettings.printerProfile       = keyFile.get_string ("Color Management", "PrinterProfile");
+                }
+
                 if (keyFile.has_key ("Color Management", "MonitorProfile")) {
                     rtSettings.monitorProfile       = keyFile.get_string ("Color Management", "MonitorProfile");
                 }
@@ -2031,6 +2046,10 @@ int Options::saveToFile (Glib::ustring fname)
 
         keyFile.set_integer ("Crop Settings", "PPI", cropPPI);
 
+        keyFile.set_string  ("Color Management", "PrinterProfile", rtSettings.printerProfile);
+        keyFile.set_integer ("Color Management", "PrinterIntent", rtSettings.printerIntent);
+        keyFile.set_boolean ("Color Management", "PrinterBPC", rtSettings.printerBPC);
+
         keyFile.set_string  ("Color Management", "ICCDirectory", rtSettings.iccDirectory);
         keyFile.set_string  ("Color Management", "MonitorProfile", rtSettings.monitorProfile);
         keyFile.set_boolean ("Color Management", "AutoMonitorProfile", rtSettings.autoMonitorProfile);
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 748531f15..6c3515335 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -105,8 +105,7 @@ Preferences::~Preferences ()
 {
 
     profileStore.removeListener(this);
-    options.preferencesWidth = get_width();
-    options.preferencesHeight = get_height();
+    get_size(options.preferencesWidth, options.preferencesHeight);
 }
 
 Gtk::Widget* Preferences::getBatchProcPanel ()
@@ -686,63 +685,136 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 
     Gtk::VBox* mvbcm = Gtk::manage (new Gtk::VBox ());
     mvbcm->set_border_width (4);
+    mvbcm->set_spacing (4);
 
     iccDir = Gtk::manage (new Gtk::FileChooserButton (M("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
     Gtk::Label* pdlabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_ICCDIR") + ":", Gtk::ALIGN_LEFT));
 
+    Gtk::HBox* iccdhb = Gtk::manage (new Gtk::HBox ());
+    iccdhb->set_spacing(4);
+
+    iccdhb->pack_start(*pdlabel, Gtk::PACK_SHRINK);
+    iccdhb->pack_start(*iccDir, Gtk::PACK_EXPAND_WIDGET);
+
+    iccDir->signal_selection_changed ().connect (sigc::mem_fun (this, &Preferences::iccDirChanged));
+
+    mvbcm->pack_start(*iccdhb, Gtk::PACK_SHRINK);
+
+    //-------------------------  MONITOR ----------------------
+
+    Gtk::Frame* fmonitor = Gtk::manage( new Gtk::Frame (M("PREFERENCES_MONITOR")) );
+    Gtk::VBox* vbmonitor = Gtk::manage( new Gtk::VBox () );
+    vbmonitor->set_border_width (4);
+
     monProfile = Gtk::manage (new Gtk::ComboBoxText ());
     Gtk::Label* mplabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONPROFILE") + ":", Gtk::ALIGN_LEFT));
 
     monIntent = Gtk::manage (new Gtk::ComboBoxText ());
     Gtk::Label* milabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONINTENT")+":", Gtk::ALIGN_LEFT));
 
+    monProfile->set_size_request(80, -1);
     monProfile->append_text (M("PREFERENCES_PROFILE_NONE"));
     monProfile->set_active (0);
 
-    const std::vector<Glib::ustring> profiles = rtengine::ICCStore::getInstance ()->getProfiles (true);
-    for (std::vector<Glib::ustring>::const_iterator profile = profiles.begin (); profile != profiles.end (); ++profile)
-        monProfile->append_text (*profile);
+    const std::vector<Glib::ustring> profiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
+    for (const auto profile : profiles) {
+        monProfile->append_text (profile);
+    }
 
     // same order as the enum
     monIntent->append_text (M("PREFERENCES_INTENT_PERCEPTUAL"));
     monIntent->append_text (M("PREFERENCES_INTENT_RELATIVE"));
     monIntent->append_text (M("PREFERENCES_INTENT_ABSOLUTE"));
     monIntent->set_active (1);
+    monIntent->set_size_request(80, -1);
 
-    monBPC = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_MONBPC")));
+    monBPC = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_CMMBPC")));
     monBPC->set_active (true);
 
-    iccDir->signal_selection_changed ().connect (sigc::mem_fun (this, &Preferences::iccDirChanged));
-
 #if defined(WIN32) // Auto-detection not implemented for Linux, see issue 851
     cbAutoMonProfile = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_AUTOMONPROFILE")));
     autoMonProfileConn  = cbAutoMonProfile->signal_toggled().connect (sigc::mem_fun(*this, &Preferences::autoMonProfileToggled));
-#endif
 
     Gtk::Table* colt = Gtk::manage (new Gtk::Table (3, 2));
+#else
+    Gtk::Table* colt = Gtk::manage (new Gtk::Table (2, 2));
+#endif
     int row = 0;
-    colt->attach (*pdlabel, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
-    colt->attach (*iccDir, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-#if !defined(__APPLE__) // monitor profile not supported on apple
-    ++row;
     colt->attach (*mplabel, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
+#if defined(__APPLE__) // monitor profile not supported on apple
+    colt->attach (*Gtk::manage (new Gtk::Label (M("PREFERENCES_MONPROFILE_WARNOSX"), Gtk::ALIGN_LEFT)), 1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
+#else
     colt->attach (*monProfile, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+#endif
 #if defined(WIN32)
     ++row;
     colt->attach (*cbAutoMonProfile, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-#endif
 #endif
     ++row;
     colt->attach (*milabel, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
     colt->attach (*monIntent, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
-    mvbcm->pack_start (*colt, Gtk::PACK_SHRINK, 4);
+    vbmonitor->pack_start (*colt, Gtk::PACK_SHRINK, 4);
 
-    mvbcm->pack_start (*monBPC, Gtk::PACK_SHRINK, 4);
+    vbmonitor->pack_start (*monBPC, Gtk::PACK_SHRINK, 4);
 
 #if defined(WIN32)
     autoMonProfileToggled();
 #endif
 
+    fmonitor->add(*vbmonitor);
+
+    mvbcm->pack_start(*fmonitor, Gtk::PACK_SHRINK);
+
+    //-------------------------  PRINTER ----------------------
+
+    Gtk::Frame* fprinter = Gtk::manage( new Gtk::Frame (M("PREFERENCES_PRINTER")) );
+    Gtk::VBox* vbprinter = Gtk::manage( new Gtk::VBox () );
+    vbprinter->set_border_width (4);
+    prtProfile = Gtk::manage (new Gtk::ComboBoxText ());
+    Gtk::Label* pplabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_PRTPROFILE") + ":", Gtk::ALIGN_LEFT));
+
+    prtIntent = Gtk::manage (new Gtk::ComboBoxText ());
+    Gtk::Label* pilabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_PRTINTENT")+":", Gtk::ALIGN_LEFT));
+
+    prtProfile->set_size_request(80, -1);
+    prtProfile->append_text (M("PREFERENCES_PROFILE_NONE"));
+    prtProfile->set_active (0);
+
+    const std::vector<Glib::ustring> prtprofiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::PRINTER);
+    for (const auto prtprofile : prtprofiles)
+        prtProfile->append_text (prtprofile);
+
+    // same order as the enum
+    prtIntent->append_text (M("PREFERENCES_INTENT_PERCEPTUAL"));
+    prtIntent->append_text (M("PREFERENCES_INTENT_RELATIVE"));
+    prtIntent->append_text (M("PREFERENCES_INTENT_ABSOLUTE"));
+    prtIntent->set_active (1);
+    prtIntent->set_size_request(80, -1);
+
+    prtBPC = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_CMMBPC")));
+    prtBPC->set_active (true);
+
+    Gtk::Table* coltp = Gtk::manage (new Gtk::Table (2, 2));
+    row = 0;
+    coltp->attach (*pplabel, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
+    coltp->attach (*prtProfile, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    ++row;
+    coltp->attach (*pilabel, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
+    coltp->attach (*prtIntent, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+    vbprinter->pack_start (*coltp, Gtk::PACK_SHRINK, 4);
+
+    vbprinter->pack_start (*prtBPC, Gtk::PACK_SHRINK, 4);
+
+#if defined(WIN32)
+    autoMonProfileToggled();
+#endif
+
+    fprinter->add(*vbprinter);
+
+    mvbcm->pack_start(*fprinter, Gtk::PACK_SHRINK);
+
+    //-------------------------  CIECAM ----------------------
+
     Gtk::VBox* vbdp = Gtk::manage (new Gtk::VBox ());
     vbdp->set_border_width (4);
     Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_VIEW") + ":", Gtk::ALIGN_LEFT));
@@ -791,7 +863,7 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
     vbcielab->pack_start (*colo, Gtk::PACK_EXPAND_WIDGET, 4);
     fcielab->add (*vbcielab);
 
-    mvbcm->pack_start (*fcielab, Gtk::PACK_SHRINK, 4);
+    mvbcm->pack_start (*fcielab, Gtk::PACK_SHRINK);
 
     return mvbcm;
 }
@@ -1458,8 +1530,31 @@ void Preferences::storePreferences ()
     moptions.CPBPath = txtCustProfBuilderPath->get_text();
     moptions.CPBKeys = CPBKeyType(custProfBuilderLabelType->get_active_row_number());
 
+    if (!prtProfile->get_active_row_number()) {
+        moptions.rtSettings.printerProfile = "";
+    } else {
+        moptions.rtSettings.printerProfile = prtProfile->get_active_text ();
+    }
+    switch (prtIntent->get_active_row_number ()) {
+    default:
+    case 0:
+        moptions.rtSettings.printerIntent = rtengine::RI_PERCEPTUAL;
+        break;
+    case 1:
+        moptions.rtSettings.printerIntent = rtengine::RI_RELATIVE;
+        break;
+    case 2:
+        moptions.rtSettings.printerIntent = rtengine::RI_ABSOLUTE;
+        break;
+    }
+    moptions.rtSettings.printerBPC = prtBPC->get_active ();
+
 #if !defined(__APPLE__) // monitor profile not supported on apple
-    moptions.rtSettings.monitorProfile      = monProfile->get_active_text ();
+    if (!monProfile->get_active_row_number()) {
+        moptions.rtSettings.monitorProfile = "";
+    } else {
+        moptions.rtSettings.monitorProfile = monProfile->get_active_text ();
+    }
     switch (monIntent->get_active_row_number ()) {
     default:
     case 0:
@@ -1589,6 +1684,21 @@ void Preferences::fillPreferences ()
     rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
     ctiffserialize->set_active(moptions.serializeTiffRead);
 
+    setActiveTextOrIndex (*prtProfile, moptions.rtSettings.printerProfile, 0);
+    switch (moptions.rtSettings.printerIntent) {
+    default:
+    case rtengine::RI_PERCEPTUAL:
+        prtIntent->set_active (0);
+        break;
+    case rtengine::RI_RELATIVE:
+        prtIntent->set_active (1);
+        break;
+    case rtengine::RI_ABSOLUTE:
+        prtIntent->set_active (2);
+        break;
+    }
+    prtBPC->set_active (moptions.rtSettings.printerBPC);
+
 #if !defined(__APPLE__) // monitor profile not supported on apple
     setActiveTextOrIndex (*monProfile, moptions.rtSettings.monitorProfile, 0);
     switch (moptions.rtSettings.monitorIntent) {
@@ -1665,10 +1775,14 @@ void Preferences::fillPreferences ()
 
     if (Glib::file_test (moptions.gimpDir, Glib::FILE_TEST_IS_DIR)) {
         gimpDir->set_current_folder (moptions.gimpDir);
+    } else {
+        gimpDir->set_current_folder ("");
     }
 
     if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
         psDir->set_current_folder (moptions.psDir);
+    } else {
+        psDir->set_current_folder ("");
     }
 
 #elif defined __APPLE__
@@ -2097,6 +2211,14 @@ void Preferences::workflowUpdate ()
         parent->updateHistogramPosition(options.histogramPosition, moptions.histogramPosition);
     }
 
+    if(  moptions.rtSettings.printerProfile != options.rtSettings.printerProfile
+       ||moptions.rtSettings.printerBPC     != options.rtSettings.printerBPC
+       ||moptions.rtSettings.printerIntent  != options.rtSettings.printerIntent)
+    {
+        // Update the position of the Histogram
+        parent->updateProfiles(moptions.rtSettings.printerProfile, moptions.rtSettings.printerIntent, moptions.rtSettings.printerBPC);
+    }
+
 }
 
 void Preferences::switchFontTo(Glib::ustring newFont)
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index a94601663..66feb41f1 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -95,6 +95,9 @@ protected:
     Gtk::CheckButton* showExpComp;
 
     Gtk::FileChooserButton* iccDir;
+    Gtk::ComboBoxText* prtProfile;
+    Gtk::ComboBoxText* prtIntent;
+    Gtk::CheckButton* prtBPC;
     Gtk::ComboBoxText* monProfile;
     Gtk::ComboBoxText* monIntent;
     Gtk::CheckButton* monBPC;
diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index dd5048320..61d9073ae 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -105,7 +105,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
 
     std::vector<double> defaultCurve;
     rtengine::RetinexParams::getDefaulttransmissionCurve(defaultCurve);
-    transmissionShape = static_cast<FlatCurveEditor*>(transmissionCurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    transmissionShape = static_cast<FlatCurveEditor*>(transmissionCurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     transmissionShape->setIdentityValue(0.);
     transmissionShape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
     transmissionShape->setBottomBarBgGradient(milestones);
@@ -184,7 +184,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
 
 //    std::vector<double> defaultCurve;
     rtengine::RetinexParams::getDefaultgaintransmissionCurve(defaultCurve);
-    gaintransmissionShape = static_cast<FlatCurveEditor*>(gaintransmissionCurve->addCurve(CT_Flat, "", nullptr, false));
+    gaintransmissionShape = static_cast<FlatCurveEditor*>(gaintransmissionCurve->addCurve(CT_Flat, "", nullptr, false, false));
     gaintransmissionShape->setIdentityValue(0.);
     gaintransmissionShape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
     gaintransmissionShape->setBottomBarBgGradient(milestones);
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index b9538ceca..21bfb0886 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -690,8 +690,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event)
     ProfilePanel::cleanup();
 
     if (!options.windowMaximized) {
-        options.windowWidth = get_width();
-        options.windowHeight = get_height();
+        get_size(options.windowWidth, options.windowHeight);
         get_position (options.windowX, options.windowY);
     }
 
@@ -796,15 +795,22 @@ void RTWindow::MoveFileBrowserToEditor()
     }
 }
 
+void RTWindow::updateProfiles(const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC)
+{
+    epanel->updateProfiles(printerProfile, printerIntent, printerBPC);
+
+    for(auto panel : epanels) {
+        panel.second->updateProfiles(printerProfile, printerIntent, printerBPC);
+    }
+}
+
 void RTWindow::updateTPVScrollbar (bool hide)
 {
     fpanel->updateTPVScrollbar (hide);
     epanel->updateTPVScrollbar (hide);
 
-    std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
-
-    for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
-        ((*itr).second)->updateTPVScrollbar (hide);
+    for(auto panel : epanels) {
+        panel.second->updateTPVScrollbar (hide);
     }
 }
 
@@ -813,10 +819,8 @@ void RTWindow::updateTabsUsesIcons (bool useIcons)
     fpanel->updateTabsUsesIcons (useIcons);
     epanel->updateTabsUsesIcons (useIcons);
 
-    std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
-
-    for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
-        ((*itr).second)->updateTabsUsesIcons (useIcons);
+    for(auto panel : epanels) {
+        panel.second->updateTabsUsesIcons (useIcons);
     }
 }
 
@@ -834,10 +838,8 @@ void RTWindow::updateHistogramPosition (int oldPosition, int newPosition)
 {
     epanel->updateHistogramPosition (oldPosition, newPosition);
 
-    std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
-
-    for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
-        ((*itr).second)->updateHistogramPosition (oldPosition, newPosition);
+    for(auto panel : epanels) {
+        panel.second->updateHistogramPosition (oldPosition, newPosition);
     }
 }
 
diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h
index 70e80de4d..a8d8aa7c4 100644
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -104,6 +104,7 @@ public:
     void MoveFileBrowserToEditor();
     void MoveFileBrowserToMain();
 
+    void updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
     void updateTPVScrollbar (bool hide);
     void updateHistogramPosition (int oldPosition, int newPosition);
     void updateTabsUsesIcons (bool useIcons);
diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc
index 6af30c68b..b83b2c6d9 100644
--- a/rtgui/sharpening.cc
+++ b/rtgui/sharpening.cc
@@ -25,8 +25,6 @@ using namespace rtengine::procparams;
 Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
 {
 
-    setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
-
     Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
     hb->set_border_width (4);
     hb->show ();
diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc
index 2ca0ddf44..62e982436 100644
--- a/rtgui/sharpenmicro.cc
+++ b/rtgui/sharpenmicro.cc
@@ -28,8 +28,6 @@ using namespace rtengine::procparams;
 SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
 {
 
-    setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
-
     amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
     amount->setAdjusterListener (this);
 
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 892d8b8a0..2d7f6dd2e 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -27,111 +27,170 @@ using namespace rtengine;
 using namespace rtengine::procparams;
 extern Options options;
 
-Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"), true, true)
+namespace
+{
+
+    GradientMilestone makeHsvGm(double position, float h, float s, float v)
+    {
+        float r;
+        float g;
+        float b;
+        Color::hsv2rgb01(h, s, v, r, g, b);
+        return GradientMilestone(position, r, g, b);
+    }
+
+    std::vector<GradientMilestone> makeWholeHueRange()
+    {
+        std::vector<GradientMilestone> res;
+        res.reserve(7);
+
+        for (int i = 0; i < 7; ++i) {
+            const float x = static_cast<float>(i) / 6.0f;
+            res.push_back(makeHsvGm(x, x, 0.5f, 0.5f));
+        }
+
+        return res;
+    }
+
+}
+
+Wavelet::Wavelet() :
+    FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"), true, true),
+    curveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CONTEDIT"))),
+    CCWcurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CCURVE"))),
+    curveEditorRES(new CurveEditorGroup(options.lastWaveletCurvesDir)),
+    curveEditorGAM(new CurveEditorGroup(options.lastWaveletCurvesDir)),
+    separatorNeutral(Gtk::manage(new Gtk::HSeparator())),
+    separatoredge(Gtk::manage(new Gtk::HSeparator())),
+    opaCurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_COLORT"))),
+    opacityCurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITY"))),
+    opacityCurveEditorW(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITYW"))),
+    opacityCurveEditorWL(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITYWL"))),
+    median(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_MEDI")))),
+    medianlev(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_MEDILEV")))),
+    linkedg(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_LINKEDG")))),
+    cbenab(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_CBENAB")))),
+    lipst(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_LIPST")))),
+    avoid(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_AVOID")))),
+    tmr(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_BALCHRO")))),
+    neutralchButton(Gtk::manage(new Gtk::Button(M("TP_WAVELET_NEUTRAL")))),
+    rescon(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCON"), -100, 100, 1, 0))),
+    resconH(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCONH"), -100, 100, 1, 0))),
+    reschro(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCHRO"), -100, 100, 1, 0))),
+    tmrs(Gtk::manage(new Adjuster(M("TP_WAVELET_TMSTRENGTH"), -1.0, 2.0, 0.01, 0.0))),
+    gamma(Gtk::manage(new Adjuster(M("TP_WAVELET_COMPGAMMA"), 0.4, 2.0, 0.01, 1.0))),
+    sup(Gtk::manage(new Adjuster(M("TP_WAVELET_SUPE"), -100, 350, 1, 0))),
+    sky(Gtk::manage(new Adjuster(M("TP_WAVELET_SKY"), -100., 100.0, 1., 0.))),
+    thres(Gtk::manage(new Adjuster(M("TP_WAVELET_LEVELS"), 4, 9, 1, 7))),//3
+    chroma(Gtk::manage(new Adjuster(M("TP_WAVELET_CHRO"), 1, 9, 1, 5))),
+    chro(Gtk::manage(new Adjuster(M("TP_WAVELET_CHR"), 0., 100., 1., 0.))),
+    contrast(Gtk::manage(new Adjuster(M("TP_WAVELET_CONTRA"), -100, 100, 1, 0))),
+    thr(Gtk::manage(new Adjuster(M("TP_WAVELET_THR"), 0, 100, 1, 35))),
+    thrH(Gtk::manage(new Adjuster(M("TP_WAVELET_THRH"), 0, 100, 1, 65))),
+    skinprotect(Gtk::manage( new Adjuster(M("TP_WAVELET_SKIN"), -100, 100, 1, 0.) )),
+    edgrad(Gtk::manage( new Adjuster(M("TP_WAVELET_EDRAD"), 0, 100, 1, 15) )),
+    edgval(Gtk::manage( new Adjuster(M("TP_WAVELET_EDVAL"), 0, 100, 1, 0) )),
+    edgthresh(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGTHRESH"), -50, 100, 1, 10 ))),
+    strength(Gtk::manage(new Adjuster(M("TP_WAVELET_STRENGTH"), 0, 100, 1, 100))),
+    balance(Gtk::manage(new Adjuster(M("TP_WAVELET_BALANCE"), -30, 100, 1, 0))),
+    iter(Gtk::manage(new Adjuster(M("TP_WAVELET_ITER"), -3, 3, 1, 0))),
+    hueskin(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_HUESKIN"), -314., 314., -5., 25., 170., 120., 0, false))),
+    hueskin2(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_HUESKY"), -314., 314., -260., -250, -130., -140., 0, false))),
+    hllev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_HIGHLIGHT"), 0., 100., 50., 75., 100., 98., 0, false))),
+    bllev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LOWLIGHT"), 0., 100., 0., 2., 50., 25., 0, false))),
+    pastlev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_PASTEL"), 0., 70., 0., 2., 30., 20., 0, false))),
+    satlev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_SAT"), 0., 130., 30., 45., 130., 100., 0, false))),
+    edgcont(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_EDGCONT"), 0., 100., options.rtSettings.bot_left, options.rtSettings.top_left, options.rtSettings.bot_right, options.rtSettings.top_right, 0., false))),
+    level0noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVZERO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
+    level1noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVONE"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
+    level2noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVTWO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
+    level3noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVTHRE"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
+    threshold(Gtk::manage(new Adjuster(M("TP_WAVELET_THRESHOLD"), 1, 9, 1, 5))),
+    threshold2(Gtk::manage(new Adjuster(M("TP_WAVELET_THRESHOLD2"), 1, 9, 1, 4))),
+    edgedetect(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGEDETECT"), 0, 100, 1, 90))),
+    edgedetectthr(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGEDETECTTHR"), 0, 100, 1, 20))),
+    edgedetectthr2(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGEDETECTTHR2"), -10, 100, 1, 0))),
+    edgesensi(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGESENSI"), 0, 100, 1, 60))),
+    edgeampli(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGEAMPLI"), 0, 100, 1, 10))),
+    Lmethod(Gtk::manage(new MyComboBoxText())),
+    CHmethod(Gtk::manage(new MyComboBoxText())),
+    CHSLmethod(Gtk::manage(new MyComboBoxText())),
+    EDmethod(Gtk::manage(new MyComboBoxText())),
+    BAmethod(Gtk::manage(new MyComboBoxText())),
+    NPmethod(Gtk::manage(new MyComboBoxText())),
+    TMmethod(Gtk::manage(new MyComboBoxText())),
+    HSmethod(Gtk::manage(new MyComboBoxText())),
+    CLmethod(Gtk::manage(new MyComboBoxText())),
+    Backmethod(Gtk::manage(new MyComboBoxText())),
+    Tilesmethod(Gtk::manage(new MyComboBoxText())),
+    daubcoeffmethod(Gtk::manage(new MyComboBoxText())),
+    Dirmethod(Gtk::manage(new MyComboBoxText())),
+    Medgreinf(Gtk::manage(new MyComboBoxText())),
+    chanMixerHLFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_HIGHLIGHT")))),
+    chanMixerMidFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_MIDTONES")))),
+    chanMixerShadowsFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_SHADOWS")))),
+    wavLabels(Gtk::manage(new Gtk::Label("---", Gtk::ALIGN_CENTER))),
+    labmC(Gtk::manage(new Gtk::Label(M("TP_WAVELET_CTYPE") + ":"))),
+    labmNP(Gtk::manage(new Gtk::Label(M("TP_WAVELET_NPTYPE") + ":"))),
+    expchroma(new MyExpander(true, M("TP_WAVELET_LEVCH"))),
+    expcontrast(new MyExpander(true, M("TP_WAVELET_LEVF"))),
+    expedge(new MyExpander(true, M("TP_WAVELET_EDGE"))),
+    expfinal(new MyExpander(true, M("TP_WAVELET_FINAL"))),
+    expgamut(new MyExpander(false, M("TP_WAVELET_CONTR"))),
+    expnoise(new MyExpander(true, M("TP_WAVELET_NOISE"))),
+    expresid(new MyExpander(true, M("TP_WAVELET_RESID"))),
+    expsettings(new MyExpander(false, M("TP_WAVELET_SETTINGS"))),
+    exptoning(new MyExpander(true, M("TP_WAVELET_TON"))),
+    neutrHBox(Gtk::manage(new Gtk::HBox()))
 {
-    std::vector<GradientMilestone> milestones;
     CurveListener::setMulti(true);
     nextnlevel = 7.;
-    float r, g, b;
-    //from -PI to +PI (radians) convert to hsv and draw bottombar
-    Color::hsv2rgb01(0.4199, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.0   , r, g, b) ); // hsv: 0.4199   rad: -3.14
-    Color::hsv2rgb01(0.5000, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.054 , r, g, b) ); // hsv: 0.5   rad: -2.8
-    Color::hsv2rgb01(0.6000, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.1336, r, g, b) ); // hsv: 0.60   rad: -2.3
-    Color::hsv2rgb01(0.7500, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.3567, r, g, b) ); // hsv: 0.75   rad: -0.9
-    Color::hsv2rgb01(0.8560, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.4363, r, g, b) ); // hsv: 0.856  rad: -0.4
-    Color::hsv2rgb01(0.9200, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.4841, r, g, b) ); // hsv: 0.92   rad: -0.1
-    Color::hsv2rgb01(0.9300, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.5000, r, g, b) ); // hsv: 0.93   rad:  0
-    Color::hsv2rgb01(0.9600, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.5366, r, g, b) ); // hsv: 0.96   rad:  0.25
-    Color::hsv2rgb01(1.0000, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.5955, r, g, b) ); // hsv: 1.     rad:  0.6
-    Color::hsv2rgb01(0.0675, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.6911, r, g, b) ); // hsv: 0.0675 rad:  1.2
-    Color::hsv2rgb01(0.0900, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.7229, r, g, b) ); // hsv: 0.09   rad:  1.4
-    Color::hsv2rgb01(0.1700, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.7707, r, g, b) ); // hsv: 0.17   rad:  1.7
-    Color::hsv2rgb01(0.2650, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.8503, r, g, b) ); // hsv: 0.265  rad:  2.1
-    Color::hsv2rgb01(0.3240, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(0.8981, r, g, b) ); // hsv: 0.324  rad:  2.5
-    Color::hsv2rgb01(0.4197, 0.5, 0.5, r, g, b);
-    milestones.push_back( GradientMilestone(1.    , r, g, b) ); // hsv: 0.419  rad:  3.14
 
-    std::vector<GradientMilestone> milestones2;
-    milestones2.push_back( GradientMilestone(0.0, 0.0, 0.0, 0.0) );
-    milestones2.push_back( GradientMilestone(1.0, 1.0, 1.0, 1.0) );
-
-    std::vector<double> defaultCurve;
-
-    expsettings = new MyExpander (false, M("TP_WAVELET_SETTINGS"));
     expsettings->signal_button_release_event().connect_notify( sigc::bind( sigc::mem_fun(this, &Wavelet::foldAllButMe), expsettings) );
 
-    expcontrast = new MyExpander (true, M("TP_WAVELET_LEVF"));
     expcontrast->signal_button_release_event().connect_notify( sigc::bind( sigc::mem_fun(this, &Wavelet::foldAllButMe), expcontrast) );
     enableContrastConn = expcontrast->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expcontrast) );
 
-    expchroma = new MyExpander (true, M("TP_WAVELET_LEVCH"));
     expchroma->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expchroma) );
     enableChromaConn = expchroma->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expchroma) );
 
-    exptoning = new MyExpander (true, M("TP_WAVELET_TON"));
     exptoning->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), exptoning) );
     enableToningConn = exptoning->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), exptoning) );
 
-    expnoise = new MyExpander (true, M("TP_WAVELET_NOISE"));
     expnoise->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expnoise) );
     enableNoiseConn = expnoise->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expnoise) );
 
-    expedge = new MyExpander (true, M("TP_WAVELET_EDGE"));
     expedge->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expedge) );
     enableEdgeConn = expedge->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expedge) );
 
-    expgamut = new MyExpander (false, M("TP_WAVELET_CONTR"));
     expgamut->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expgamut) );
 
-    expresid = new MyExpander (true, M("TP_WAVELET_RESID"));
     expresid->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expresid) );
     enableResidConn = expresid->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expresid) );
 
-    expfinal = new MyExpander (true, M("TP_WAVELET_FINAL"));
     expfinal->signal_button_release_event().connect_notify( sigc::bind ( sigc::mem_fun(this, &Wavelet::foldAllButMe), expfinal) );
     enableFinalConn = expfinal->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expfinal) );
 
 // Wavelet Settings
-    settingsVBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const settingsVBox = Gtk::manage(new Gtk::VBox());
     settingsVBox->set_border_width(4);
     settingsVBox->set_spacing(2);
 
-    strength  = Gtk::manage (new Adjuster (M("TP_WAVELET_STRENGTH"), 0, 100, 1, 100));
     strength->setAdjusterListener (this);
 
-    thres = Gtk::manage (new Adjuster (M("TP_WAVELET_LEVELS"), 4, 9, 1, 7));//3
     thres->set_tooltip_text (M("TP_WAVELET_LEVELS_TOOLTIP"));
     thres->setAdjusterListener (this);
 
-    tilesizeHBox = Gtk::manage (new Gtk::HBox());
-    tilesizeLabel = Gtk::manage (new Gtk::Label (M("TP_WAVELET_TILESIZE") + ":"));
-    //tilesizeLabel->set_alignment(Gtk::ALIGN_START);
-    Tilesmethod = Gtk::manage (new MyComboBoxText ());
     Tilesmethod->append_text (M("TP_WAVELET_TILESFULL"));
     Tilesmethod->append_text (M("TP_WAVELET_TILESBIG"));
     Tilesmethod->append_text (M("TP_WAVELET_TILESLIT"));
     Tilesmethodconn = Tilesmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::TilesmethodChanged) );
     Tilesmethod->set_tooltip_text (M("TP_WAVELET_TILES_TOOLTIP"));
+    Gtk::HBox* const tilesizeHBox = Gtk::manage(new Gtk::HBox());
+    Gtk::Label* const tilesizeLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_TILESIZE") + ":"));
     tilesizeHBox->pack_start(*tilesizeLabel, Gtk::PACK_SHRINK, 4);
     tilesizeHBox->pack_start(*Tilesmethod);
 
-    daubcoeffHBox = Gtk::manage (new Gtk::HBox());
-    daubcoeffLabel = Gtk::manage (new Gtk::Label (M("TP_WAVELET_DAUB") + ":"));
-    daubcoeffmethod = Gtk::manage (new MyComboBoxText ());
     daubcoeffmethod->set_sensitive(true);
     daubcoeffmethod->append_text (M("TP_WAVELET_DAUB2"));
     daubcoeffmethod->append_text (M("TP_WAVELET_DAUB4"));
@@ -140,32 +199,30 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     daubcoeffmethod->append_text (M("TP_WAVELET_DAUB14"));
     daubcoeffmethodconn = daubcoeffmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::daubcoeffmethodChanged) );
     daubcoeffmethod->set_tooltip_text (M("TP_WAVELET_DAUB_TOOLTIP"));
+    Gtk::Label* const daubcoeffLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DAUB") + ":"));
+    Gtk::HBox* const daubcoeffHBox = Gtk::manage(new Gtk::HBox());
     daubcoeffHBox->pack_start(*daubcoeffLabel, Gtk::PACK_SHRINK, 4);
     daubcoeffHBox->pack_start(*daubcoeffmethod);
 
-    backgroundHBox = Gtk::manage (new Gtk::HBox());
-    Backmethod = Gtk::manage (new MyComboBoxText ());
     Backmethod->append_text (M("TP_WAVELET_B0"));
     Backmethod->append_text (M("TP_WAVELET_B1"));
     Backmethod->append_text (M("TP_WAVELET_B2"));
     Backmethodconn = Backmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::BackmethodChanged) );
-    backgroundLabel = Gtk::manage (new Gtk::Label (M("TP_WAVELET_BACKGROUND") + ":"));
+    Gtk::HBox* const backgroundHBox = Gtk::manage(new Gtk::HBox());
+    Gtk::Label* const backgroundLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_BACKGROUND") + ":"));
     backgroundHBox->pack_start(*backgroundLabel, Gtk::PACK_SHRINK, 4);
     backgroundHBox->pack_start(*Backmethod);
 
-    levdirMainHBox = Gtk::manage (new Gtk::HBox());
-    CLmethod = Gtk::manage (new MyComboBoxText ());
     CLmethod->append_text (M("TP_WAVELET_LEVDIR_ONE"));
     CLmethod->append_text (M("TP_WAVELET_LEVDIR_INF"));
     CLmethod->append_text (M("TP_WAVELET_LEVDIR_SUP"));
     CLmethod->append_text (M("TP_WAVELET_LEVDIR_ALL"));
     CLmethodconn = CLmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::CLmethodChanged) );
-    levdirMainLabel = Gtk::manage (new Gtk::Label (M("TP_WAVELET_PROC") + ":"));
+    Gtk::HBox* const levdirMainHBox = Gtk::manage(new Gtk::HBox());
+    Gtk::Label* const levdirMainLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_PROC") + ":"));
     levdirMainHBox->pack_start(*levdirMainLabel, Gtk::PACK_SHRINK, 4);
     levdirMainHBox->pack_start(*CLmethod); //same
 
-    levdirSubHBox = Gtk::manage (new Gtk::HBox());
-    Lmethod = Gtk::manage (new MyComboBoxText ());
     Lmethod->set_sensitive(false);
     Lmethod->set_sensitive(false);
     Lmethod->append_text (M("TP_WAVELET_1"));
@@ -180,7 +237,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     Lmethod->append_text (M("TP_WAVELET_SUPE"));
     Lmethod->append_text (M("TP_WAVELET_RESID"));
     Lmethod->set_active(0);
-    Dirmethod = Gtk::manage (new MyComboBoxText ());
     Dirmethod->set_sensitive(false);
     Dirmethod->append_text (M("TP_WAVELET_DONE"));
     Dirmethod->append_text (M("TP_WAVELET_DTWO"));
@@ -188,6 +244,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     Dirmethod->append_text (M("TP_WAVELET_DALL"));
     Lmethodconn = Lmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::LmethodChanged) );
     Dirmethodconn = Dirmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::DirmethodChanged) );
+    Gtk::HBox* const levdirSubHBox = Gtk::manage(new Gtk::HBox());
     levdirSubHBox->pack_start(*Lmethod);
     levdirSubHBox->pack_start(*Dirmethod, Gtk::PACK_EXPAND_WIDGET, 2); // same, but 2 not 4?
 
@@ -200,24 +257,23 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     settingsVBox->pack_start(*levdirSubHBox);
 
 // Contrast
-    Gtk::VBox * levBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const levBox = Gtk::manage (new Gtk::VBox());
     levBox->set_border_width(4);
     levBox->set_spacing(2);
 
 
-    Gtk::HBox * buttonBox = Gtk::manage (new Gtk::HBox(true, 10));
-    wavLabels = Gtk::manage(new Gtk::Label("---", Gtk::ALIGN_CENTER));
+    Gtk::HBox* const buttonBox = Gtk::manage (new Gtk::HBox(true, 10));
     levBox->pack_start(*buttonBox, Gtk::PACK_SHRINK, 2);
 
-    Gtk::Button * contrastMinusButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_CONTRAST_MINUS")));
+    Gtk::Button* const contrastMinusButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_CONTRAST_MINUS")));
     buttonBox->pack_start(*contrastMinusButton);
     contrastMinusPressedConn = contrastMinusButton->signal_pressed().connect( sigc::mem_fun(*this, &Wavelet::contrastMinusPressed));
 
-    Gtk::Button * neutralButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_NEUTRAL")));
+    Gtk::Button* const neutralButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_NEUTRAL")));
     buttonBox->pack_start(*neutralButton);
     neutralPressedConn = neutralButton->signal_pressed().connect( sigc::mem_fun(*this, &Wavelet::neutralPressed));
 
-    Gtk::Button * contrastPlusButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_CONTRAST_PLUS")));
+    Gtk::Button* const contrastPlusButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_CONTRAST_PLUS")));
     buttonBox->pack_start(*contrastPlusButton);
     contrastPlusPressedConn = contrastPlusButton->signal_pressed().connect( sigc::mem_fun(*this, &Wavelet::contrastPlusPressed));
 
@@ -244,35 +300,33 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
         levBox->pack_start(*correction[i]);
     }
 
-    sup  = Gtk::manage (new Adjuster (M("TP_WAVELET_SUPE"), -100, 350, 1, 0));
     levBox->pack_start(*sup);
     sup->setAdjusterListener (this);
     wavLabels->show();
     levBox->pack_start (*wavLabels);
 
-    contrastSHFrame = Gtk::manage (new Gtk::Frame (M("TP_WAVELET_APPLYTO")));
-    contrastSHVBox = Gtk::manage (new Gtk::VBox);
+    Gtk::VBox* const contrastSHVBox = Gtk::manage(new Gtk::VBox);
     contrastSHVBox->set_border_width(4);
     contrastSHVBox->set_spacing(2);
 
-    HSmethod = Gtk::manage (new MyComboBoxText ());
     HSmethod->append_text (M("TP_WAVELET_HS1"));
     HSmethod->append_text (M("TP_WAVELET_HS2"));
     HSmethodconn = HSmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::HSmethodChanged) );
 
-    hllev = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HIGHLIGHT"), 0., 100., 50., 75., 100., 98., 0, false));
+    const std::vector<GradientMilestone> milestones2 = {
+        GradientMilestone(0.0, 0.0, 0.0, 0.0),
+        GradientMilestone(1.0, 1.0, 1.0, 1.0)
+    };
+
     hllev->setAdjusterListener (this);
     hllev->setBgGradient(milestones2);
 
-    threshold = Gtk::manage (new Adjuster (M("TP_WAVELET_THRESHOLD"), 1, 9, 1, 5));
     threshold->setAdjusterListener (this);
     threshold->set_tooltip_text (M("TP_WAVELET_THRESHOLD_TOOLTIP"));
 
-    bllev = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_LOWLIGHT"), 0., 100., 0., 2., 50., 25., 0, false));
     bllev->setAdjusterListener (this);
     bllev->setBgGradient(milestones2);
 
-    threshold2 = Gtk::manage (new Adjuster (M("TP_WAVELET_THRESHOLD2"), 1, 9, 1, 4));
     threshold2->setAdjusterListener (this);
     threshold2->set_tooltip_text (M("TP_WAVELET_THRESHOLD2_TOOLTIP"));
 
@@ -281,19 +335,19 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     contrastSHVBox->pack_start(*threshold);
     contrastSHVBox->pack_start(*bllev);
     contrastSHVBox->pack_start(*threshold2);
+    Gtk::Frame* const contrastSHFrame = Gtk::manage(new Gtk::Frame(M("TP_WAVELET_APPLYTO")));
     contrastSHFrame->add(*contrastSHVBox);
     levBox->pack_start(*contrastSHFrame);
 
 // Chromaticity
-    Gtk::VBox * chBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const chBox = Gtk::manage (new Gtk::VBox());
     chBox->set_border_width(4);
     chBox->set_spacing(2);
 
-    ctboxch = Gtk::manage (new Gtk::HBox ());
-    labmch = Gtk::manage (new Gtk::Label (M("TP_WAVELET_CHTYPE") + ":"));
+    Gtk::Label* const labmch = Gtk::manage(new Gtk::Label(M("TP_WAVELET_CHTYPE") + ":"));
+    Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox());
     ctboxch->pack_start (*labmch, Gtk::PACK_SHRINK, 1);
 
-    CHmethod = Gtk::manage (new MyComboBoxText ());
     CHmethod->append_text (M("TP_WAVELET_CH1"));
     CHmethod->append_text (M("TP_WAVELET_CH2"));
     CHmethod->append_text (M("TP_WAVELET_CH3"));
@@ -301,44 +355,36 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     ctboxch->pack_start(*CHmethod);
     chBox->pack_start(*ctboxch);
 
-    ctboxCH = Gtk::manage (new Gtk::HBox ());
-    labmC = Gtk::manage (new Gtk::Label (M("TP_WAVELET_CTYPE") + ":"));
+    Gtk::HBox* const ctboxCH = Gtk::manage(new Gtk::HBox());
     ctboxCH->pack_start (*labmC, Gtk::PACK_SHRINK, 1);
 
-    CHSLmethod = Gtk::manage (new MyComboBoxText ());
     CHSLmethod->append_text (M("TP_WAVELET_CHSL"));
     CHSLmethod->append_text (M("TP_WAVELET_CHCU"));
     CHSLmethodconn = CHSLmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::CHSLmethodChanged) );
     ctboxCH->pack_start(*CHSLmethod);
 
-    Gtk::HSeparator *separatorChromaMethod = Gtk::manage (new Gtk::HSeparator());
+    Gtk::HSeparator* const separatorChromaMethod = Gtk::manage (new Gtk::HSeparator());
     chBox->pack_start(*separatorChromaMethod, Gtk::PACK_SHRINK, 2);
 
-    chroma  = Gtk::manage (new Adjuster (M("TP_WAVELET_CHRO"), 1, 9, 1, 5));
     chroma->set_tooltip_text (M("TP_WAVELET_CHRO_TOOLTIP"));
     chBox->pack_start(*chroma);
     chroma->setAdjusterListener (this);
 
-    satlev = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_SAT"), 0., 130., 30., 45., 130., 100., 0, false));
     satlev->setAdjusterListener (this);
     satlev->setBgGradient(milestones2);
 
-    pastlev = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_PASTEL"), 0., 70., 0., 2., 30., 20., 0, false));
     pastlev->setAdjusterListener (this);
     pastlev->setBgGradient(milestones2);
 
     chBox->pack_start(*pastlev);
     chBox->pack_start(*satlev);
 
-    chro  = Gtk::manage (new Adjuster (M("TP_WAVELET_CHR"), 0., 100., 1., 0.));
     chro->set_tooltip_text (M("TP_WAVELET_CHR_TOOLTIP"));
     chBox->pack_start(*chro);
     chro->setAdjusterListener (this);
 
-    Gtk::HBox * buttonchBox = Gtk::manage (new Gtk::HBox(true, 10));
-    neutralchButton = Gtk::manage (new Gtk::Button(M("TP_WAVELET_NEUTRAL")));
+    Gtk::HBox* const buttonchBox = Gtk::manage (new Gtk::HBox(true, 10));
     neutralchPressedConn = neutralchButton->signal_pressed().connect( sigc::mem_fun(*this, &Wavelet::neutralchPressed));
-    separatorNeutral = Gtk::manage (new Gtk::HSeparator());
     chBox->pack_start(*separatorNeutral, Gtk::PACK_SHRINK, 2);
     buttonchBox->pack_start(*neutralchButton);
     buttonchBox->show_all_children();
@@ -366,15 +412,16 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     }
 
 // Toning
-    Gtk::VBox * tonBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const tonBox = Gtk::manage (new Gtk::VBox());
     tonBox->set_border_width(4);
     tonBox->set_spacing(2);
 
-    opaCurveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_COLORT"));
     opaCurveEditorG->setCurveListener (this);
 
+    std::vector<double> defaultCurve;
+
     rtengine::WaveletParams::getDefaultOpacityCurveRG(defaultCurve);
-    opacityShapeRG = static_cast<FlatCurveEditor*>(opaCurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    opacityShapeRG = static_cast<FlatCurveEditor*>(opaCurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     opacityShapeRG->setIdentityValue(0.);
     opacityShapeRG->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
 
@@ -383,11 +430,10 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     tonBox->pack_start( *opaCurveEditorG, Gtk::PACK_SHRINK, 2);
 
-    opacityCurveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITY"));
     opacityCurveEditorG->setCurveListener (this);
 
     rtengine::WaveletParams::getDefaultOpacityCurveBY(defaultCurve);
-    opacityShapeBY = static_cast<FlatCurveEditor*>(opacityCurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    opacityShapeBY = static_cast<FlatCurveEditor*>(opacityCurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
     opacityShapeBY->setIdentityValue(0.);
     opacityShapeBY->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
 
@@ -397,28 +443,23 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     tonBox->pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2);
 
 // Denoise and Refine
-    Gtk::VBox * noiseBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const noiseBox = Gtk::manage (new Gtk::VBox());
     noiseBox->set_border_width(4);
     noiseBox->set_spacing(2);
 
-    linkedg = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_LINKEDG")));
     linkedg->set_active (true);
     linkedgConn = linkedg->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::linkedgToggled) );
     noiseBox->pack_start(*linkedg);
 
-    level0noise = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_LEVZERO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false));
     level0noise->setAdjusterListener (this);
     level0noise->setUpdatePolicy(RTUP_DYNAMIC);
 
-    level1noise = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_LEVONE"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false));
     level1noise->setAdjusterListener (this);
     level1noise->setUpdatePolicy(RTUP_DYNAMIC);
 
-    level2noise = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_LEVTWO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false));
     level2noise->setAdjusterListener (this);
     level2noise->setUpdatePolicy(RTUP_DYNAMIC);
 
-    level3noise = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_LEVTHRE"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false));
     level3noise->setAdjusterListener (this);
     level3noise->setUpdatePolicy(RTUP_DYNAMIC);
 
@@ -428,29 +469,25 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     noiseBox->pack_start( *level3noise, Gtk::PACK_SHRINK, 0);
 
 // Edge Sharpness
-    Gtk::VBox * edgBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const edgBox = Gtk::manage (new Gtk::VBox());
     edgBox->set_border_width(4);
     edgBox->set_spacing(2);
 
-    edgval = Gtk::manage ( new Adjuster (M("TP_WAVELET_EDVAL"), 0, 100, 1, 0) );
     edgval->setAdjusterListener(this);
     edgBox->pack_start(*edgval);
 
-    edgrad = Gtk::manage ( new Adjuster (M("TP_WAVELET_EDRAD"), 0, 100, 1, 15) );
     edgrad->setAdjusterListener(this);
     edgBox->pack_start(*edgrad);
     edgrad->set_tooltip_markup (M("TP_WAVELET_EDRAD_TOOLTIP"));
 
-    edgthresh = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGTHRESH"), -50, 100, 1, 10 ));
     edgthresh->setAdjusterListener (this);
     edgthresh->set_tooltip_markup (M("TP_WAVELET_EDGTHRESH_TOOLTIP"));
     edgBox->pack_start (*edgthresh);
 
-    edbox = Gtk::manage (new Gtk::HBox ());
-    labmedgr = Gtk::manage (new Gtk::Label (M("TP_WAVELET_MEDGREINF") + ":"));
+    Gtk::Label* const labmedgr = Gtk::manage(new Gtk::Label(M("TP_WAVELET_MEDGREINF") + ":"));
+    Gtk::HBox* const edbox = Gtk::manage(new Gtk::HBox());
     edbox->pack_start (*labmedgr, Gtk::PACK_SHRINK, 1);
 
-    Medgreinf = Gtk::manage (new MyComboBoxText ());
     Medgreinf->append_text (M("TP_WAVELET_RE1"));
     Medgreinf->append_text (M("TP_WAVELET_RE2"));
     Medgreinf->append_text (M("TP_WAVELET_RE3"));
@@ -459,35 +496,28 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     edbox->pack_start(*Medgreinf);
     edgBox->pack_start(*edbox);
 
-    Gtk::HSeparator *separatorlc = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatorlc = Gtk::manage (new  Gtk::HSeparator());
     edgBox->pack_start(*separatorlc, Gtk::PACK_SHRINK, 2);
 
-    ctboxED = Gtk::manage (new Gtk::HBox ());
-    labmED = Gtk::manage (new Gtk::Label (M("TP_WAVELET_EDTYPE") + ":"));
+    Gtk::Label* const labmED = Gtk::manage(new Gtk::Label(M("TP_WAVELET_EDTYPE") + ":"));
+    Gtk::HBox* const ctboxED = Gtk::manage(new Gtk::HBox());
     ctboxED->pack_start (*labmED, Gtk::PACK_SHRINK, 1);
 
-    EDmethod = Gtk::manage (new MyComboBoxText ());
     EDmethod->append_text (M("TP_WAVELET_EDSL"));
     EDmethod->append_text (M("TP_WAVELET_EDCU"));
     EDmethodconn = EDmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::EDmethodChanged) );
     ctboxED->pack_start(*EDmethod);
     edgBox->pack_start (*ctboxED);
-    tr = options.rtSettings.top_right;
-    br = options.rtSettings.bot_right;
-    tl = options.rtSettings.top_left;
-    bl = options.rtSettings.bot_left;
 
-    edgcont = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_EDGCONT"), 0., 100., bl, tl, br, tr, 0., false));
     edgcont->setAdjusterListener (this);
     edgcont->setBgGradient(milestones2);
     edgcont->set_tooltip_markup (M("TP_WAVELET_EDGCONT_TOOLTIP"));
 
     // <-- Edge Sharpness  Local Contrast curve
-    CCWcurveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_CCURVE"));
     CCWcurveEditorG->setCurveListener (this);
 
     rtengine::WaveletParams::getDefaultCCWCurve(defaultCurve);
-    ccshape = static_cast<FlatCurveEditor*>(CCWcurveEditorG->addCurve(CT_Flat, "", nullptr, false));
+    ccshape = static_cast<FlatCurveEditor*>(CCWcurveEditorG->addCurve(CT_Flat, "", nullptr, false, false));
 
     ccshape->setIdentityValue(0.);
     ccshape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
@@ -500,66 +530,53 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     edgBox->pack_start (*edgcont);
     edgBox->pack_start(*CCWcurveEditorG, Gtk::PACK_SHRINK, 4);
 
-    medianlev = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_MEDILEV")));
     medianlev->set_active (true);
     medianlevConn = medianlev->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::medianlevToggled) );
     medianlev->set_tooltip_text (M("TP_WAVELET_MEDILEV_TOOLTIP"));
 
-    Gtk::HSeparator *separatored1 = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatored1 = Gtk::manage (new  Gtk::HSeparator());
     edgBox->pack_start(*separatored1, Gtk::PACK_SHRINK, 2);
 
-    eddebox = Gtk::manage (new Gtk::HBox ());
-
+    Gtk::HBox* const eddebox = Gtk::manage(new Gtk::HBox());
     edgBox->pack_start (*eddebox);
     edgBox->pack_start(*medianlev);
 
-    edgedetect = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGEDETECT"), 0, 100, 1, 90));
     edgedetect->setAdjusterListener (this);
     edgedetect->set_tooltip_text (M("TP_WAVELET_EDGEDETECT_TOOLTIP"));
     edgBox->pack_start(*edgedetect);
 
-    edgedetectthr = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGEDETECTTHR"), 0, 100, 1, 20));
     edgedetectthr->setAdjusterListener (this);
     edgedetectthr->set_tooltip_text (M("TP_WAVELET_EDGEDETECTTHR_TOOLTIP"));
     edgBox->pack_start(*edgedetectthr);
 
 
-    edgedetectthr2 = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGEDETECTTHR2"), -10, 100, 1, 0));
     edgedetectthr2->setAdjusterListener (this);
     edgBox->pack_start(*edgedetectthr2);
 
 
-    separatoredge = Gtk::manage (new Gtk::HSeparator());
-
     edgBox->pack_start(*separatoredge, Gtk::PACK_SHRINK, 2);
 
-    lipst = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_LIPST")));
     lipst->set_active (true);
     lipstConn = lipst->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::lipstToggled) );
 //  lipst->set_tooltip_text (M("TP_WAVELET_LIPST_TOOLTIP"));
     edgBox->pack_start(*lipst);
 
-    edgesensi = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGESENSI"), 0, 100, 1, 60));
     edgesensi->setAdjusterListener (this);
     edgBox->pack_start(*edgesensi);
 
 
-    edgeampli = Gtk::manage (new Adjuster (M("TP_WAVELET_EDGEAMPLI"), 0, 100, 1, 10));
     edgeampli->setAdjusterListener (this);
     edgBox->pack_start(*edgeampli);
 
 
-    Gtk::VBox * ctboxES = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const ctboxES = Gtk::manage (new Gtk::VBox());
 
     ctboxES->set_border_width(4);
     ctboxES->set_spacing(2);
 
-    ctboxNP = Gtk::manage (new Gtk::HBox());
-
-    labmNP = Gtk::manage (new Gtk::Label (M("TP_WAVELET_NPTYPE") + ":"));
+    Gtk::HBox* const ctboxNP = Gtk::manage(new Gtk::HBox());
     ctboxNP->pack_start (*labmNP, Gtk::PACK_SHRINK, 1);
 
-    NPmethod = Gtk::manage (new MyComboBoxText ());
     NPmethod->append_text (M("TP_WAVELET_NPNONE"));
     NPmethod->append_text (M("TP_WAVELET_NPLOW"));
     NPmethod->append_text (M("TP_WAVELET_NPHIGH"));
@@ -572,28 +589,43 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     edgBox->pack_start(*ctboxES);
 
 // Gamut
-    Gtk::VBox * conBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const conBox = Gtk::manage (new Gtk::VBox());
     conBox->set_border_width(4);
     conBox->set_spacing(2);
 
-    median = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_MEDI")));
     median->set_active (true);
     medianConn = median->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::medianToggled) );
     conBox->pack_start(*median);
 
-    hueskin = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKIN"), -314., 314., -5., 25., 170., 120., 0, false));
     hueskin->set_tooltip_markup (M("TP_WAVELET_HUESKIN_TOOLTIP"));
 
+    //from -PI to +PI (radians) convert to hsv and draw bottombar
+    const std::vector<GradientMilestone> milestones = {
+        makeHsvGm(0.0000, 0.4199f, 0.5f, 0.5f), // hsv: 0.4199 rad: -3.14
+        makeHsvGm(0.0540, 0.5000f, 0.5f, 0.5f), // hsv: 0.5    rad: -2.8
+        makeHsvGm(0.1336, 0.6000f, 0.5f, 0.5f), // hsv: 0.60   rad: -2.3
+        makeHsvGm(0.3567, 0.7500f, 0.5f, 0.5f), // hsv: 0.75   rad: -0.9
+        makeHsvGm(0.4363, 0.8560f, 0.5f, 0.5f), // hsv: 0.856  rad: -0.4
+        makeHsvGm(0.4841, 0.9200f, 0.5f, 0.5f), // hsv: 0.92   rad: -0.1
+        makeHsvGm(0.5000, 0.9300f, 0.5f, 0.5f), // hsv: 0.93   rad:  0
+        makeHsvGm(0.5366, 0.9600f, 0.5f, 0.5f), // hsv: 0.96   rad:  0.25
+        makeHsvGm(0.5955, 1.0000f, 0.5f, 0.5f), // hsv: 1.     rad:  0.6
+        makeHsvGm(0.6911, 0.0675f, 0.5f, 0.5f), // hsv: 0.0675 rad:  1.2
+        makeHsvGm(0.7229, 0.0900f, 0.5f, 0.5f), // hsv: 0.09   rad:  1.4
+        makeHsvGm(0.7707, 0.1700f, 0.5f, 0.5f), // hsv: 0.17   rad:  1.7
+        makeHsvGm(0.8503, 0.2650f, 0.5f, 0.5f), // hsv: 0.265  rad:  2.1
+        makeHsvGm(0.8981, 0.3240f, 0.5f, 0.5f), // hsv: 0.324  rad:  2.5
+        makeHsvGm(1.0000, 0.4197f, 0.5f, 0.5f)  // hsv: 0.419  rad:  3.14
+    };
+
     hueskin->setBgGradient(milestones);
     conBox->pack_start(*hueskin);
     hueskin->setAdjusterListener (this);
 
-    skinprotect = Gtk::manage ( new Adjuster (M("TP_WAVELET_SKIN"), -100, 100, 1, 0.) );
     skinprotect->setAdjusterListener(this);
     conBox->pack_start(*skinprotect);
     skinprotect->set_tooltip_markup (M("TP_WAVELET_SKIN_TOOLTIP"));
 
-    curveEditorGAM = new CurveEditorGroup (options.lastWaveletCurvesDir);
     curveEditorGAM->setCurveListener (this);
 
     Chshape = static_cast<FlatCurveEditor*>(curveEditorGAM->addCurve(CT_Flat, M("TP_WAVELET_CURVEEDITOR_CH")));
@@ -604,138 +636,115 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     conBox->pack_start (*curveEditorGAM, Gtk::PACK_SHRINK, 4);
 
-    avoid = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_AVOID")));
     avoid->set_active (true);
     avoidConn = avoid->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::avoidToggled) );
     conBox->pack_start(*avoid);
 
 // Residual Image
-    Gtk::VBox * resBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const resBox = Gtk::manage (new Gtk::VBox());
     resBox->set_border_width(4);
     resBox->set_spacing(2);
 
-    rescon  = Gtk::manage (new Adjuster (M("TP_WAVELET_RESCON"), -100, 100, 1, 0));
     rescon->setAdjusterListener (this);
     resBox->pack_start(*rescon, Gtk::PACK_SHRINK);
 
-    thr  = Gtk::manage (new Adjuster (M("TP_WAVELET_THR"), 0, 100, 1, 35));
     resBox->pack_start(*thr);
     thr->setAdjusterListener (this);
 
-    resconH  = Gtk::manage (new Adjuster (M("TP_WAVELET_RESCONH"), -100, 100, 1, 0));
     resconH->setAdjusterListener (this);
     resBox->pack_start(*resconH, Gtk::PACK_SHRINK);
 
-    thrH  = Gtk::manage (new Adjuster (M("TP_WAVELET_THRH"), 0, 100, 1, 65));
     thrH->setAdjusterListener (this);
     resBox->pack_start(*thrH, Gtk::PACK_SHRINK);
 
-    contrast  = Gtk::manage (new Adjuster (M("TP_WAVELET_CONTRA"), -100, 100, 1, 0));
     contrast->set_tooltip_text (M("TP_WAVELET_CONTRA_TOOLTIP"));
     contrast->setAdjusterListener (this);
     resBox->pack_start(*contrast);  //keep the possibility to reinstall
 
-    reschro  = Gtk::manage (new Adjuster (M("TP_WAVELET_RESCHRO"), -100, 100, 1, 0));
     reschro->setAdjusterListener (this);
     resBox->pack_start(*reschro);
 
 
-    ctboxTM = Gtk::manage (new Gtk::HBox ());
-    labmTM = Gtk::manage (new Gtk::Label (M("TP_WAVELET_TMTYPE") + ":"));
+    Gtk::Label* const labmTM = Gtk::manage(new Gtk::Label(M("TP_WAVELET_TMTYPE") + ":"));
+    Gtk::HBox* const ctboxTM = Gtk::manage(new Gtk::HBox());
     ctboxTM->pack_start (*labmTM, Gtk::PACK_SHRINK, 1);
 
-    Gtk::HSeparator *separatorR0 = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatorR0 = Gtk::manage (new  Gtk::HSeparator());
     resBox->pack_start(*separatorR0, Gtk::PACK_SHRINK, 2);
 
-    TMmethod = Gtk::manage (new MyComboBoxText ());
     TMmethod->append_text (M("TP_WAVELET_COMPCONT"));
     TMmethod->append_text (M("TP_WAVELET_COMPTM"));
     TMmethodconn = TMmethod->signal_changed().connect ( sigc::mem_fun(*this, &Wavelet::TMmethodChanged) );
     ctboxTM->pack_start(*TMmethod);
     resBox->pack_start (*ctboxTM);
 
-    tmrs = Gtk::manage(new Adjuster (M("TP_WAVELET_TMSTRENGTH"), -1.0, 2.0, 0.01, 0.0));
     tmrs->set_tooltip_text (M("TP_WAVELET_TMSTRENGTH_TOOLTIP"));
 
     resBox->pack_start(*tmrs);
     tmrs->setAdjusterListener (this);
 
-    gamma = Gtk::manage(new Adjuster (M("TP_WAVELET_COMPGAMMA"), 0.4, 2.0, 0.01, 1.0));
     gamma->set_tooltip_text (M("TP_WAVELET_COMPGAMMA_TOOLTIP"));
     resBox->pack_start(*gamma);
     gamma->setAdjusterListener (this);
 
-    Gtk::HSeparator *separatorR1 = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatorR1 = Gtk::manage (new  Gtk::HSeparator());
     resBox->pack_start(*separatorR1, Gtk::PACK_SHRINK, 2);
 
-    hueskin2 = Gtk::manage (new ThresholdAdjuster (M("TP_WAVELET_HUESKY"), -314., 314., -260., -250, -130., -140., 0, false));
     hueskin2->set_tooltip_markup (M("TP_WAVELET_HUESKY_TOOLTIP"));
     hueskin2->setBgGradient(milestones);
     resBox->pack_start(*hueskin2);
     hueskin2->setAdjusterListener (this);
 
-    sky  = Gtk::manage (new Adjuster (M("TP_WAVELET_SKY"), -100., 100.0, 1., 0.));
     sky->set_tooltip_text (M("TP_WAVELET_SKY_TOOLTIP"));
     sky->setAdjusterListener (this);
 
     resBox->pack_start(*sky);
 
     // whole hue range
-    milestones.clear();
+    const std::vector<GradientMilestone> milestones3 = makeWholeHueRange();
 
-    for (int i = 0; i < 7; i++) {
-        float R, G, B;
-        float x = float(i) * (1.0f / 6.0);
-        Color::hsv2rgb01(x, 0.5f, 0.5f, R, G, B);
-        milestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) );
-    }
-
-    curveEditorRES = new CurveEditorGroup (options.lastWaveletCurvesDir);
     curveEditorRES->setCurveListener (this);
 
     hhshape = static_cast<FlatCurveEditor*>(curveEditorRES->addCurve(CT_Flat, M("TP_WAVELET_CURVEEDITOR_HH")));
     hhshape->setTooltip(M("TP_WAVELET_CURVEEDITOR_HH_TOOLTIP"));
     hhshape->setCurveColorProvider(this, 5);
     curveEditorRES->curveListComplete();
-    hhshape->setBottomBarBgGradient(milestones);
+    hhshape->setBottomBarBgGradient(milestones3);
 
     resBox->pack_start (*curveEditorRES, Gtk::PACK_SHRINK, 4);
 
     // Toning and Color Balance
-    Gtk::HSeparator *separatorCB = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatorCB = Gtk::manage (new  Gtk::HSeparator());
 
-    Gtk::VBox *chanMixerHLBox = Gtk::manage (new Gtk::VBox());
-    Gtk::VBox *chanMixerMidBox = Gtk::manage (new Gtk::VBox());
-    Gtk::VBox *chanMixerShadowsBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const chanMixerHLBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const chanMixerMidBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const chanMixerShadowsBox = Gtk::manage (new Gtk::VBox());
 
-    cbenab  = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_CBENAB")));
     cbenab->set_active (true);
     cbenabConn = cbenab->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::cbenabToggled) );
     cbenab->set_tooltip_text (M("TP_WAVELET_CB_TOOLTIP"));
 
-    Gtk::Image* iblueR   = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
-    Gtk::Image* iyelL    = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
-    Gtk::Image* imagL    = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
-    Gtk::Image* igreenR  = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+    Gtk::Image* const iblueR   = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
+    Gtk::Image* const iyelL    = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
+    Gtk::Image* const imagL    = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
+    Gtk::Image* const igreenR  = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
 
-    Gtk::Image* iblueRm  = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
-    Gtk::Image* iyelLm   = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
-    Gtk::Image* imagLm   = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
-    Gtk::Image* igreenRm = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+    Gtk::Image* const  iblueRm  = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
+    Gtk::Image* const  iyelLm   = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
+    Gtk::Image* const  imagLm   = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
+    Gtk::Image* const  igreenRm = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
 
-    Gtk::Image* iblueRh  = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
-    Gtk::Image* iyelLh   = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
-    Gtk::Image* imagLh   = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
-    Gtk::Image* igreenRh = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+    Gtk::Image* const iblueRh  = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
+    Gtk::Image* const iyelLh   = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
+    Gtk::Image* const imagLh   = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
+    Gtk::Image* const igreenRh = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
 
     greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., igreenRh, imagLh));
-    bluehigh  = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueRh, iyelLh));
-
-    greenmed  = Gtk::manage (new Adjuster ("", -100., 100., 1., 0.,  igreenRm, imagLm));
-    bluemed   = Gtk::manage (new Adjuster ("", -100., 100., 1., 0. , iblueRm , iyelLm));
-
-    greenlow  = Gtk::manage (new Adjuster ("", -100., 100., 1., 0.,  igreenR, imagL));
-    bluelow   = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueR , iyelL));
+    bluehigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueRh, iyelLh));
+    greenmed = Gtk::manage (new Adjuster ("", -100., 100., 1., 0.,  igreenRm, imagLm));
+    bluemed = Gtk::manage (new Adjuster ("", -100., 100., 1., 0. , iblueRm , iyelLm));
+    greenlow = Gtk::manage (new Adjuster ("", -100., 100., 1., 0.,  igreenR, imagL));
+    bluelow = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueR , iyelL));
 
     chanMixerHLBox->pack_start (*greenhigh);
     chanMixerHLBox->pack_start (*bluehigh);
@@ -753,10 +762,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     resBox->pack_start(*separatorCB, Gtk::PACK_SHRINK);
 
-    chanMixerHLFrame = Gtk::manage (new Gtk::Frame(M("TP_COLORTONING_HIGHLIGHT")));
-    chanMixerMidFrame = Gtk::manage (new Gtk::Frame(M("TP_COLORTONING_MIDTONES")));
-    chanMixerShadowsFrame = Gtk::manage (new Gtk::Frame(M("TP_COLORTONING_SHADOWS")));
-
     chanMixerHLFrame->add(*chanMixerHLBox);
     chanMixerMidFrame->add(*chanMixerMidBox);
     chanMixerShadowsFrame->add(*chanMixerShadowsBox);
@@ -767,12 +772,11 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     resBox->pack_start(*chanMixerShadowsFrame, Gtk::PACK_SHRINK);
 
     // Reset sliders
-    neutrHBox = Gtk::manage (new Gtk::HBox ());
     neutrHBox->set_border_width (2);
 
-    neutral = Gtk::manage (new Gtk::Button (M("TP_COLORTONING_NEUTRAL")));
     //RTImage *resetImg = Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"));
     //neutral->set_image(*resetImg);
+    Gtk::Button* const neutral = Gtk::manage(new Gtk::Button(M("TP_COLORTONING_NEUTRAL")));
     neutral->set_tooltip_text (M("TP_COLORTONING_NEUTRAL_TIP"));
     neutralconn = neutral->signal_pressed().connect( sigc::mem_fun(*this, &Wavelet::neutral_pressed) );
     neutral->show();
@@ -781,19 +785,17 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     resBox->pack_start (*neutrHBox);
 
 // Final Touchup
-    Gtk::VBox * ctboxBA = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const ctboxBA = Gtk::manage (new Gtk::VBox());
 
     ctboxBA->set_border_width(4);
     ctboxBA->set_spacing(2);
 
     //Gtk::HSeparator *separatorfin = Gtk::manage (new  Gtk::HSeparator());
     //ctboxBA->pack_start(*separatorfin, Gtk::PACK_SHRINK, 2);
-    ctboxFI = Gtk::manage (new Gtk::HBox());
-
-    labmBA = Gtk::manage (new Gtk::Label (M("TP_WAVELET_BATYPE") + ":"));
+    Gtk::Label* const labmBA = Gtk::manage(new Gtk::Label(M("TP_WAVELET_BATYPE") + ":"));
+    Gtk::HBox* const ctboxFI = Gtk::manage(new Gtk::HBox());
     ctboxFI->pack_start (*labmBA, Gtk::PACK_SHRINK, 1);
 
-    BAmethod = Gtk::manage (new MyComboBoxText ());
     BAmethod->append_text (M("TP_WAVELET_BANONE"));
     BAmethod->append_text (M("TP_WAVELET_BASLI"));
     BAmethod->append_text (M("TP_WAVELET_BACUR"));
@@ -801,39 +803,30 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     ctboxFI->pack_start(*BAmethod);
     ctboxBA->pack_start(*ctboxFI);
 
-    balance  = Gtk::manage (new Adjuster (M("TP_WAVELET_BALANCE"), -30, 100, 1, 0));
     balance->setAdjusterListener (this);
     balance->set_tooltip_text (M("TP_WAVELET_BALANCE_TOOLTIP"));
-    std::vector<GradientMilestone> milestonesW;
 
-    milestonesW.clear();
-    milestonesW.push_back( GradientMilestone(0., 0., 0., 0.) );
-    milestonesW.push_back( GradientMilestone(1., 1., 1., 1.) );
-
-    opacityCurveEditorW = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITYW"));
     opacityCurveEditorW->setCurveListener (this);
 
     rtengine::WaveletParams::getDefaultOpacityCurveW(defaultCurve);
-    opacityShape = static_cast<FlatCurveEditor*>(opacityCurveEditorW->addCurve(CT_Flat, "", nullptr, false));
+    opacityShape = static_cast<FlatCurveEditor*>(opacityCurveEditorW->addCurve(CT_Flat, "", nullptr, false, false));
     opacityShape->setIdentityValue(0.);
     opacityShape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
-    opacityShape->setBottomBarBgGradient(milestonesW);
+    opacityShape->setBottomBarBgGradient(milestones2);
 
     // This will add the reset button at the end of the curveType buttons
     opacityCurveEditorW->curveListComplete();
     opacityCurveEditorW->show();
 
-    iter  = Gtk::manage (new Adjuster (M("TP_WAVELET_ITER"), -3, 3, 1, 0));
     iter->setAdjusterListener (this);
     iter->set_tooltip_text (M("TP_WAVELET_ITER_TOOLTIP"));
 
-    Gtk::HSeparator *separatorbalend = Gtk::manage (new  Gtk::HSeparator());
+    Gtk::HSeparator* const separatorbalend = Gtk::manage (new  Gtk::HSeparator());
 
-    opacityCurveEditorWL = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITYWL"));
     opacityCurveEditorWL->setCurveListener (this);
 
     rtengine::WaveletParams::getDefaultOpacityCurveWL(defaultCurve);
-    opacityShapeWL = static_cast<FlatCurveEditor*>(opacityCurveEditorWL->addCurve(CT_Flat, "", nullptr, false));
+    opacityShapeWL = static_cast<FlatCurveEditor*>(opacityCurveEditorWL->addCurve(CT_Flat, "", nullptr, false, false));
     opacityShapeWL->setIdentityValue(0.);
     opacityShapeWL->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
     opacityShapeWL->setTooltip(M("TP_WAVELET_OPACITYWL_TOOLTIP"));
@@ -842,26 +835,20 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     opacityCurveEditorWL->curveListComplete();
     opacityCurveEditorWL->show();
 
-    curveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_CONTEDIT"));
     curveEditorG->setCurveListener (this);
 
     clshape = static_cast<DiagonalCurveEditor*>(curveEditorG->addCurve(CT_Diagonal, M("TP_WAVELET_CURVEEDITOR_CL")));
     clshape->setTooltip(M("TP_WAVELET_CURVEEDITOR_CL_TOOLTIP"));
-    std::vector<GradientMilestone> milestones22;
-
-    milestones22.push_back( GradientMilestone(0., 0., 0., 0.) );
-    milestones22.push_back( GradientMilestone(1., 1., 1., 1.) );
-    clshape->setBottomBarBgGradient(milestones22);
-    clshape->setLeftBarBgGradient(milestones22);
+    clshape->setBottomBarBgGradient(milestones2);
+    clshape->setLeftBarBgGradient(milestones2);
 
     curveEditorG->curveListComplete();
 
-    tmr = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_BALCHRO")));
     tmr->set_active (true);
     tmr->set_tooltip_text (M("TP_WAVELET_BALCHRO_TOOLTIP"));
     tmrConn = tmr->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::tmrToggled) );
 
-    Gtk::VBox * finalBox = Gtk::manage (new Gtk::VBox());
+    Gtk::VBox* const finalBox = Gtk::manage (new Gtk::VBox());
     finalBox->set_border_width(4);
     finalBox->set_spacing(2);
 
diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h
index 554298e08..ff0964731 100644
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -17,8 +17,7 @@
  *  2014 Jacques Desmis <jdesmis@gmail.com>
  */
 
-#ifndef WAVELET_H_INCLUDED
-#define WAVELET_H_INCLUDED
+#pragma once
 
 #include <gtkmm.h>
 #include "adjuster.h"
@@ -30,208 +29,15 @@
 #include "guiutils.h"
 #include "options.h"
 
-class Wavelet : public ToolParamBlock, public ThresholdAdjusterListener, public AdjusterListener, public CurveListener,  public ColorProvider, public rtengine::WaveletListener, public FoldableToolPanel
+class Wavelet :
+    public ToolParamBlock,
+    public ThresholdAdjusterListener,
+    public AdjusterListener,
+    public CurveListener,
+    public ColorProvider,
+    public rtengine::WaveletListener,
+    public FoldableToolPanel
 {
-protected:
-    Glib::RefPtr<Gtk::Tooltip> bgTTips;
-    Glib::RefPtr<Gtk::Tooltip> srTTips;
-    Glib::RefPtr<Gdk::Pixbuf> bgPixbuf;
-    Glib::RefPtr<Gdk::Pixbuf> srPixbuf;
-    CurveEditorGroup* curveEditorG;
-
-    CurveEditorGroup* CCWcurveEditorG;
-    CurveEditorGroup* curveEditorRES;
-    CurveEditorGroup* curveEditorGAM;
-    Gtk::HSeparator* colorSep;
-    Gtk::HSeparator* separator3;
-    Gtk::HSeparator* separatorCB;
-    Gtk::HSeparator* separatorNeutral;
-    Gtk::HSeparator* separatoredge;
-
-    CurveEditorGroup* opaCurveEditorG;
-    FlatCurveEditor* opacityShapeRG;
-    CurveEditorGroup* opacityCurveEditorG;
-    FlatCurveEditor* opacityShapeBY;
-    CurveEditorGroup* opacityCurveEditorW;
-    CurveEditorGroup* opacityCurveEditorWL;
-    FlatCurveEditor* opacityShape;
-    FlatCurveEditor* opacityShapeWL;
-    FlatCurveEditor*   hhshape;
-    FlatCurveEditor*   Chshape;
-    DiagonalCurveEditor* clshape;
-    Gtk::VBox* chanMixerBox;
-
-    FlatCurveEditor* ccshape;
-    Gtk::CheckButton * display;
-    Gtk::CheckButton * displaylevel;
-    Gtk::CheckButton * displaychro;
-    Gtk::CheckButton * displaygam;
-    Gtk::CheckButton * displayres;
-    Gtk::CheckButton * median;
-    Gtk::CheckButton * medianlev;
-    Gtk::CheckButton * linkedg;
-    Gtk::CheckButton * cbenab;
-    Gtk::CheckButton * lipst;
-    Gtk::CheckButton * avoid;
-    Gtk::CheckButton * tmr;
-
-    Gtk::Button * neutralchButton;
-    Adjuster* correction[9];
-    Adjuster* correctionch[9];
-    Adjuster* rescon;
-    Adjuster* resconH;
-    Adjuster* reschro;
-    Adjuster* tmrs;
-    Adjuster* gamma;
-    Adjuster* sup;
-    Adjuster* sky;
-    Adjuster* thres;
-    Adjuster* chroma;
-    Adjuster* chro;
-    Adjuster* contrast;
-    Adjuster* thr;
-    Adjuster* thrH;
-    Adjuster* skinprotect;
-    Adjuster* edgrad;
-    Adjuster* edgval;
-    Adjuster* edgthresh;
-    Adjuster* strength;
-    Adjuster* balance;
-    Adjuster* iter;
-    Adjuster* greenlow;
-    Adjuster* bluelow;
-    Adjuster* greenmed;
-    Adjuster* bluemed;
-    Adjuster* greenhigh;
-    Adjuster* bluehigh;
-
-    ThresholdAdjuster* hueskin;
-    ThresholdAdjuster* hueskin2;
-    ThresholdAdjuster* hllev;
-    ThresholdAdjuster* bllev;
-    ThresholdAdjuster* pastlev;
-    ThresholdAdjuster* satlev;
-    ThresholdAdjuster* edgcont;
-    ThresholdAdjuster* level0noise;
-    ThresholdAdjuster* level1noise;
-    ThresholdAdjuster* level2noise;
-    ThresholdAdjuster* level3noise;
-
-    Adjuster* threshold;
-    Adjuster* threshold2;
-    Adjuster* edgedetect;
-    Adjuster* edgedetectthr;
-    Adjuster* edgedetectthr2;
-    Adjuster* edgesensi;
-    Adjuster* edgeampli;
-    MyComboBoxText*   Lmethod;
-    sigc::connection  Lmethodconn;
-    MyComboBoxText*   CHmethod;
-    sigc::connection  CHmethodconn;
-    MyComboBoxText*   CHSLmethod;
-    sigc::connection  CHSLmethodconn;
-    MyComboBoxText*   EDmethod;
-    sigc::connection  EDmethodconn;
-    MyComboBoxText*   BAmethod;
-    sigc::connection  BAmethodconn;
-    MyComboBoxText*   NPmethod;
-    sigc::connection  NPmethodconn;
-    MyComboBoxText*   TMmethod;
-    sigc::connection  TMmethodconn;
-    MyComboBoxText*   HSmethod;
-    sigc::connection  HSmethodconn;
-    MyComboBoxText*   CLmethod;
-    sigc::connection  CLmethodconn;
-    MyComboBoxText*   Backmethod;
-    sigc::connection  Backmethodconn;
-    MyComboBoxText*   Tilesmethod;
-    sigc::connection  Tilesmethodconn;
-    MyComboBoxText*   daubcoeffmethod;
-    sigc::connection  daubcoeffmethodconn;
-    MyComboBoxText*   Dirmethod;
-    sigc::connection  Dirmethodconn;
-    MyComboBoxText*   Medgreinf;
-    sigc::connection  MedgreinfConn;
-    Gtk::Frame* settingsFrame;
-    Gtk::Frame* toningFrame;
-    Gtk::Frame* residualFrame;
-    Gtk::Frame* dispFrame;
-    Gtk::Frame* levelFrame;
-    Gtk::Frame* chromaFrame;
-    Gtk::Frame* controlFrame;
-    Gtk::Frame* edgeFrame;
-    Gtk::Frame* noiseFrame;
-    Gtk::Frame* contrastSHFrame;
-    Gtk::Frame* finalFrame;
-    Gtk::Frame *chanMixerHLFrame;
-    Gtk::Frame *chanMixerMidFrame;
-    Gtk::Frame *chanMixerShadowsFrame;
-    Gtk::Frame *dFrame;
-
-    Gtk::Label* colLabel;
-    Gtk::Label* interLabel;
-    Gtk::Label* wavLabels;
-    Gtk::Label* hsmethodLabel;
-    Gtk::Label* daubcoeffLabel;
-    Gtk::Label* ColorBalanceLabel;
-    Gtk::Label* labmC;
-    Gtk::Label* labmch;
-    Gtk::Label* labmED;
-    Gtk::Label* labmTM;
-    Gtk::Label* labmBA;
-    Gtk::Label* labmNP;
-    Gtk::Label* labmedgr;
-    Gtk::Label* labmednois;
-    MyExpander* expchroma;
-    MyExpander* expcontrast;
-    MyExpander* expedge;
-    MyExpander* expfinal;
-    MyExpander* expgamut;
-    MyExpander* expnoise;
-    MyExpander* expresid;
-    MyExpander* expsettings;
-    MyExpander* exptoning;
-    Gtk::HBox* ctboxCB;
-    Gtk::HBox* ctboxCH;
-    Gtk::HBox* ctboxED;
-    Gtk::HBox* ctboxTM;
-    Gtk::HBox* hbresid;
-    Gtk::HBox* backgroundHBox;
-    Gtk::HBox* daubcoeffHBox;
-    Gtk::HBox* hsmethodHBox;
-    Gtk::HBox* levdirMainHBox;
-    Gtk::HBox* levdirSubHBox;
-    Gtk::HBox* tilesizeHBox;
-
-    Gtk::HBox* ctboxFI;
-    Gtk::HBox* ctboxNP;
-    Gtk::HBox* ctboxch;
-    Gtk::HBox* edbox;
-    Gtk::HBox* ednoisbox;
-    Gtk::HBox* eddebox;
-    Gtk::VBox* settingsVBox;
-    Gtk::VBox* contrastSHVBox;
-    Gtk::Label* tilesizeLabel;
-    Gtk::Label* levdirMainLabel;
-    Gtk::Label* backgroundLabel;
-    Gtk::Button* neutral;
-    Gtk::HBox* neutrHBox;
-
-    sigc::connection enableChromaConn, enableContrastConn, enableEdgeConn, enableFinalConn;
-    sigc::connection enableNoiseConn, enableResidConn, enableToningConn;
-    sigc::connection expConn,  medianConn, avoidConn, tmrConn, medianlevConn, linkedgConn, lipstConn, cbenabConn, neutralconn;
-    sigc::connection neutralPressedConn;
-    sigc::connection contrastPlusPressedConn;
-    sigc::connection contrastMinusPressedConn;
-    sigc::connection neutralchPressedConn;
-
-    bool lastdisplay, lastdisplaygam, lastdisplayres, lastdisplaychro, lastdisplaylevel, lastmedian, lastmedianlev, lastlinkedg, lastavoid, lastlipst, lasttmr, lastcbenab;
-    int nextnlevel;
-    double tr;
-    double br;
-    double tl;
-    double bl;
-
 public:
     Wavelet ();
     virtual ~Wavelet ();
@@ -251,7 +57,6 @@ public:
     void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
     void writeOptions (std::vector<int> &tpOpen);
 
-
 private:
     void foldAllButMe (GdkEventButton* event, MyExpander *expander);
 
@@ -306,8 +111,141 @@ private:
     void cbenabUpdateUI ();
     void lipstUpdateUI ();
 
-
     void enableToggled(MyExpander *expander);
-};
 
-#endif
+    CurveEditorGroup* const curveEditorG;
+
+    CurveEditorGroup* const CCWcurveEditorG;
+    CurveEditorGroup* const curveEditorRES;
+    CurveEditorGroup* const curveEditorGAM;
+    Gtk::HSeparator* const separatorNeutral;
+    Gtk::HSeparator* const separatoredge;
+
+    CurveEditorGroup* const opaCurveEditorG;
+    FlatCurveEditor* opacityShapeRG;
+    CurveEditorGroup* const opacityCurveEditorG;
+    FlatCurveEditor* opacityShapeBY;
+    CurveEditorGroup* const opacityCurveEditorW;
+    CurveEditorGroup* const opacityCurveEditorWL;
+    FlatCurveEditor* opacityShape;
+    FlatCurveEditor* opacityShapeWL;
+    FlatCurveEditor* hhshape;
+    FlatCurveEditor* Chshape;
+    DiagonalCurveEditor* clshape;
+
+    FlatCurveEditor* ccshape;
+    Gtk::CheckButton* const median;
+    Gtk::CheckButton* const medianlev;
+    Gtk::CheckButton* const linkedg;
+    Gtk::CheckButton* const cbenab;
+    Gtk::CheckButton* const lipst;
+    Gtk::CheckButton* const avoid;
+    Gtk::CheckButton* const tmr;
+
+    Gtk::Button* const neutralchButton;
+    Adjuster* correction[9];
+    Adjuster* correctionch[9];
+    Adjuster* const rescon;
+    Adjuster* const resconH;
+    Adjuster* const reschro;
+    Adjuster* const tmrs;
+    Adjuster* const gamma;
+    Adjuster* const sup;
+    Adjuster* const sky;
+    Adjuster* const thres;
+    Adjuster* const chroma;
+    Adjuster* const chro;
+    Adjuster* const contrast;
+    Adjuster* const thr;
+    Adjuster* const thrH;
+    Adjuster* const skinprotect;
+    Adjuster* const edgrad;
+    Adjuster* const edgval;
+    Adjuster* const edgthresh;
+    Adjuster* const strength;
+    Adjuster* const balance;
+    Adjuster* const iter;
+    Adjuster* greenlow;
+    Adjuster* bluelow;
+    Adjuster* greenmed;
+    Adjuster* bluemed;
+    Adjuster* greenhigh;
+    Adjuster* bluehigh;
+
+    ThresholdAdjuster* const hueskin;
+    ThresholdAdjuster* const hueskin2;
+    ThresholdAdjuster* const hllev;
+    ThresholdAdjuster* const bllev;
+    ThresholdAdjuster* const pastlev;
+    ThresholdAdjuster* const satlev;
+    ThresholdAdjuster* const edgcont;
+    ThresholdAdjuster* const level0noise;
+    ThresholdAdjuster* const level1noise;
+    ThresholdAdjuster* const level2noise;
+    ThresholdAdjuster* const level3noise;
+
+    Adjuster* const threshold;
+    Adjuster* const threshold2;
+    Adjuster* const edgedetect;
+    Adjuster* const edgedetectthr;
+    Adjuster* const edgedetectthr2;
+    Adjuster* const edgesensi;
+    Adjuster* const edgeampli;
+    MyComboBoxText* const Lmethod;
+    sigc::connection  Lmethodconn;
+    MyComboBoxText* const CHmethod;
+    sigc::connection  CHmethodconn;
+    MyComboBoxText* const CHSLmethod;
+    sigc::connection  CHSLmethodconn;
+    MyComboBoxText* const EDmethod;
+    sigc::connection  EDmethodconn;
+    MyComboBoxText* const BAmethod;
+    sigc::connection  BAmethodconn;
+    MyComboBoxText* const NPmethod;
+    sigc::connection  NPmethodconn;
+    MyComboBoxText* const TMmethod;
+    sigc::connection  TMmethodconn;
+    MyComboBoxText* const HSmethod;
+    sigc::connection  HSmethodconn;
+    MyComboBoxText* const CLmethod;
+    sigc::connection  CLmethodconn;
+    MyComboBoxText* const Backmethod;
+    sigc::connection  Backmethodconn;
+    MyComboBoxText* const Tilesmethod;
+    sigc::connection  Tilesmethodconn;
+    MyComboBoxText* const daubcoeffmethod;
+    sigc::connection  daubcoeffmethodconn;
+    MyComboBoxText* const Dirmethod;
+    sigc::connection  Dirmethodconn;
+    MyComboBoxText* const Medgreinf;
+    sigc::connection  MedgreinfConn;
+    Gtk::Frame* const chanMixerHLFrame;
+    Gtk::Frame* const chanMixerMidFrame;
+    Gtk::Frame* const chanMixerShadowsFrame;
+
+    Gtk::Label* const wavLabels;
+    Gtk::Label* const labmC;
+    Gtk::Label* const labmNP;
+    MyExpander* const expchroma;
+    MyExpander* const expcontrast;
+    MyExpander* const expedge;
+    MyExpander* const expfinal;
+    MyExpander* const expgamut;
+    MyExpander* const expnoise;
+    MyExpander* const expresid;
+    MyExpander* const expsettings;
+    MyExpander* const exptoning;
+
+    Gtk::HBox* const neutrHBox;
+
+    sigc::connection enableChromaConn, enableContrastConn, enableEdgeConn, enableFinalConn;
+    sigc::connection enableNoiseConn, enableResidConn, enableToningConn;
+    sigc::connection medianConn, avoidConn, tmrConn, medianlevConn, linkedgConn, lipstConn, cbenabConn, neutralconn;
+    sigc::connection neutralPressedConn;
+    sigc::connection contrastPlusPressedConn;
+    sigc::connection contrastMinusPressedConn;
+    sigc::connection neutralchPressedConn;
+
+    bool lastmedian, lastmedianlev, lastlinkedg, lastavoid, lastlipst, lasttmr, lastcbenab;
+    int nextnlevel;
+};
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 75873b680..e000e6738 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -151,6 +151,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
 {
 
     Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ());
+    hbox->set_spacing(4);
     hbox->show ();
     Gtk::Label* lab = Gtk::manage (new Gtk::Label (M("TP_WBALANCE_METHOD")));
     lab->show ();
@@ -238,14 +239,19 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
     method->pack_start(methodColumns.colIcon, false);
     method->pack_start(methodColumns.colLabel, true);
 
+    std::vector<Gtk::CellRenderer*> cells = method->get_cells();
+    Gtk::CellRendererText* cellRenderer = dynamic_cast<Gtk::CellRendererText*>(cells.at(1));
+    cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE;
+
     method->set_active (0); // Camera
     method->show ();
-    hbox->pack_start (*lab, Gtk::PACK_SHRINK, 4);
+    hbox->pack_start (*lab, Gtk::PACK_SHRINK, 0);
     hbox->pack_start (*method);
-    pack_start (*hbox, Gtk::PACK_SHRINK, 4);
+    pack_start (*hbox, Gtk::PACK_SHRINK, 0);
     opt = 0;
 
     Gtk::HBox* spotbox = Gtk::manage (new Gtk::HBox ());
+    spotbox->set_spacing(4);
     spotbox->show ();
 
     spotbutton = Gtk::manage (new Gtk::Button (M("TP_WBALANCE_SPOTWB")));
@@ -291,10 +297,10 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
         spotsize->set_active(4);
     }
 
-    spotbox->pack_end (*spotsize, Gtk::PACK_EXPAND_WIDGET, 4);
-    spotbox->pack_end (*slab, Gtk::PACK_SHRINK, 4);
+    spotbox->pack_end (*spotsize, Gtk::PACK_EXPAND_WIDGET, 0);
+    spotbox->pack_end (*slab, Gtk::PACK_SHRINK, 0);
 
-    pack_start (*spotbox, Gtk::PACK_SHRINK, 4);
+    pack_start (*spotbox, Gtk::PACK_SHRINK, 0);
 
     Gtk::Image* itempL =  Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
     Gtk::Image* itempR =  Gtk::manage (new RTImage ("ajd-wb-temp2.png"));