diff --git a/AUTHORS.txt b/AUTHORS.txt
index fe3405128..a9f501919 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -5,6 +5,7 @@ Project initiator:
Development contributors, in last name alphabetical order:
+ Roel Baars
Martin Burri
Javier Celaya
Jacques Desmis
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dcf6793d..ea95d818c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,8 @@
-if(WIN32)
- cmake_minimum_required(VERSION 2.8.4)
-elseif(APPLE)
+if(APPLE)
cmake_minimum_required(VERSION 3.3)
CMAKE_POLICY(SET CMP0025 NEW)
else()
- cmake_minimum_required(VERSION 2.6)
+ cmake_minimum_required(VERSION 2.8.8)
endif()
# Must stay before the PROJECT() command:
@@ -318,9 +316,9 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
pkg_check_modules(EXPAT REQUIRED expat>=2.1)
pkg_check_modules(FFTW3F REQUIRED fftw3f)
pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
+pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
-find_package(TIFF REQUIRED)
find_package(ZLIB REQUIRED)
if(WITH_SYSTEM_KLT)
find_package(KLT REQUIRED)
diff --git a/rawtherapee.astylerc b/rawtherapee.astylerc
new file mode 100644
index 000000000..3d49d821f
--- /dev/null
+++ b/rawtherapee.astylerc
@@ -0,0 +1,8 @@
+style=1tbs
+indent=spaces=4
+indent-switches
+break-blocks
+pad-oper
+convert-tabs
+pad-header
+unpad-paren
diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt
index e320969c3..f8efa1523 100644
--- a/rtdata/CMakeLists.txt
+++ b/rtdata/CMakeLists.txt
@@ -1,4 +1,3 @@
-
file(GLOB LANGUAGEFILES "languages/*")
file(GLOB SOUNDFILES "sounds/*")
file(GLOB INPUTICCFILES "iccprofiles/input/*")
@@ -7,11 +6,17 @@ file(GLOB DCPFILES "dcpprofiles/*")
file(GLOB FONTS "fonts/*")
set(PROFILESDIR "profiles")
-set(IMAGESDIR "images")
-
-# THEMEDIR includes subfolders for image resources for some themes; doing the normal glob won't work.
set(THEMEDIR "themes")
+# Images, mostly icons, which are generated using the generatePngIcons script:
+set(IMAGES_THEMED
+ "images/themed/png/dark"
+ "images/themed/png/light"
+ )
+
+# Other images which are generated manually:
+file(GLOB IMAGES_NONTHEMED "images/non-themed/png/*")
+
if(WIN32)
set(OPTIONSFILE "options/options.win")
elseif(APPLE)
@@ -25,17 +30,15 @@ if(WIN32)
endif()
if(UNIX)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/icons/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR})
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi16-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi24-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi32-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/32x32/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi48-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi128-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi256-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-16.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-24.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-48.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-128.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-256.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
endif()
-install(FILES ${IMAGEFILES} DESTINATION "${DATADIR}/images")
install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")
install(FILES ${SOUNDFILES} DESTINATION "${DATADIR}/sounds")
install(FILES ${INPUTICCFILES} DESTINATION "${DATADIR}/iccprofiles/input")
@@ -48,8 +51,14 @@ endif()
install(DIRECTORY ${PROFILESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.pp3")
install(DIRECTORY ${THEMEDIR} DESTINATION "${DATADIR}")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "index.theme")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.png")
+
+foreach(theme ${IMAGES_THEMED})
+ install(DIRECTORY ${theme} DESTINATION "${DATADIR}/images")
+endforeach()
+
+#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images" FILES_MATCHING PATTERN "*.png")
+#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images/")
+install(FILES ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images")
if(APPLE)
# CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='
diff --git a/rtdata/iccprofiles/output/ACES.icc b/rtdata/iccprofiles/output/ACES.icc
deleted file mode 100644
index cb87b8bf2..000000000
Binary files a/rtdata/iccprofiles/output/ACES.icc and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_Large_g10.icc b/rtdata/iccprofiles/output/RT_Large_g10.icc
deleted file mode 100644
index 1889a5457..000000000
Binary files a/rtdata/iccprofiles/output/RT_Large_g10.icc and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_Large_gBT709.icc b/rtdata/iccprofiles/output/RT_Large_gBT709.icc
deleted file mode 100644
index bd9785f14..000000000
Binary files a/rtdata/iccprofiles/output/RT_Large_gBT709.icc and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_Large_gsRGB.icc b/rtdata/iccprofiles/output/RT_Large_gsRGB.icc
deleted file mode 100644
index 11be3c733..000000000
Binary files a/rtdata/iccprofiles/output/RT_Large_gsRGB.icc and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_Medium_gsRGB.icc b/rtdata/iccprofiles/output/RT_Medium_gsRGB.icc
deleted file mode 100644
index 6c6233d74..000000000
Binary files a/rtdata/iccprofiles/output/RT_Medium_gsRGB.icc and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_sRGB.icm b/rtdata/iccprofiles/output/RT_sRGB.icm
deleted file mode 100644
index 3d0822ef7..000000000
Binary files a/rtdata/iccprofiles/output/RT_sRGB.icm and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_sRGB_g10.icm b/rtdata/iccprofiles/output/RT_sRGB_g10.icm
deleted file mode 100644
index f8afb8e17..000000000
Binary files a/rtdata/iccprofiles/output/RT_sRGB_g10.icm and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RT_sRGB_gBT709.icm b/rtdata/iccprofiles/output/RT_sRGB_gBT709.icm
deleted file mode 100644
index c5c44b7a4..000000000
Binary files a/rtdata/iccprofiles/output/RT_sRGB_gBT709.icm and /dev/null differ
diff --git a/rtdata/iccprofiles/output/RTv2_ACES-AP0.icc b/rtdata/iccprofiles/output/RTv2_ACES-AP0.icc
new file mode 100644
index 000000000..34363781f
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_ACES-AP0.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_ACES-AP1.icc b/rtdata/iccprofiles/output/RTv2_ACES-AP1.icc
new file mode 100644
index 000000000..413360817
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_ACES-AP1.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Best.icc b/rtdata/iccprofiles/output/RTv2_Best.icc
new file mode 100644
index 000000000..3f9db89e0
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Best.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Beta.icc b/rtdata/iccprofiles/output/RTv2_Beta.icc
new file mode 100644
index 000000000..ebd5005e2
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Beta.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Bruce.icc b/rtdata/iccprofiles/output/RTv2_Bruce.icc
new file mode 100644
index 000000000..c795da140
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Bruce.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Large.icc b/rtdata/iccprofiles/output/RTv2_Large.icc
new file mode 100644
index 000000000..40f86fcf1
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Large.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Medium.icc b/rtdata/iccprofiles/output/RTv2_Medium.icc
new file mode 100644
index 000000000..59bdf6706
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Medium.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Rec2020.icc b/rtdata/iccprofiles/output/RTv2_Rec2020.icc
new file mode 100644
index 000000000..b6969a6f1
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Rec2020.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_Wide.icc b/rtdata/iccprofiles/output/RTv2_Wide.icc
new file mode 100644
index 000000000..32ce13c7d
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_Wide.icc differ
diff --git a/rtdata/iccprofiles/output/RTv2_sRGB.icc b/rtdata/iccprofiles/output/RTv2_sRGB.icc
new file mode 100644
index 000000000..5efc365f8
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv2_sRGB.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_ACES-AP0.icc b/rtdata/iccprofiles/output/RTv4_ACES-AP0.icc
new file mode 100644
index 000000000..30df95eac
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_ACES-AP0.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_ACES-AP1.icc b/rtdata/iccprofiles/output/RTv4_ACES-AP1.icc
new file mode 100644
index 000000000..5dfb4cb0d
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_ACES-AP1.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Best.icc b/rtdata/iccprofiles/output/RTv4_Best.icc
new file mode 100644
index 000000000..c67688686
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Best.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Beta.icc b/rtdata/iccprofiles/output/RTv4_Beta.icc
new file mode 100644
index 000000000..86825164a
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Beta.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Bruce.icc b/rtdata/iccprofiles/output/RTv4_Bruce.icc
new file mode 100644
index 000000000..c3a01b116
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Bruce.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Large.icc b/rtdata/iccprofiles/output/RTv4_Large.icc
new file mode 100644
index 000000000..176bff9a7
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Large.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Medium.icc b/rtdata/iccprofiles/output/RTv4_Medium.icc
new file mode 100644
index 000000000..d63965fa5
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Medium.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Rec2020.icc b/rtdata/iccprofiles/output/RTv4_Rec2020.icc
new file mode 100644
index 000000000..27b1f8c49
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Rec2020.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_Wide.icc b/rtdata/iccprofiles/output/RTv4_Wide.icc
new file mode 100644
index 000000000..f95587797
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_Wide.icc differ
diff --git a/rtdata/iccprofiles/output/RTv4_sRGB.icc b/rtdata/iccprofiles/output/RTv4_sRGB.icc
new file mode 100644
index 000000000..af95e0fd4
Binary files /dev/null and b/rtdata/iccprofiles/output/RTv4_sRGB.icc differ
diff --git a/rtdata/iccprofiles/output/Rec2020.icm b/rtdata/iccprofiles/output/Rec2020.icm
deleted file mode 100644
index 0decaf6dc..000000000
Binary files a/rtdata/iccprofiles/output/Rec2020.icm and /dev/null differ
diff --git a/rtdata/icons/hi128-app-rawtherapee.png b/rtdata/icons/hi128-app-rawtherapee.png
deleted file mode 100644
index 979183116..000000000
Binary files a/rtdata/icons/hi128-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/icons/hi16-app-rawtherapee.png b/rtdata/icons/hi16-app-rawtherapee.png
deleted file mode 100644
index 8c4731848..000000000
Binary files a/rtdata/icons/hi16-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/icons/hi24-app-rawtherapee.png b/rtdata/icons/hi24-app-rawtherapee.png
deleted file mode 100644
index f6c8ef1a0..000000000
Binary files a/rtdata/icons/hi24-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/icons/hi256-app-rawtherapee.png b/rtdata/icons/hi256-app-rawtherapee.png
deleted file mode 100644
index 5cb7d751f..000000000
Binary files a/rtdata/icons/hi256-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/icons/hi32-app-rawtherapee.png b/rtdata/icons/hi32-app-rawtherapee.png
deleted file mode 100644
index 380429e13..000000000
Binary files a/rtdata/icons/hi32-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/icons/hi48-app-rawtherapee.png b/rtdata/icons/hi48-app-rawtherapee.png
deleted file mode 100644
index fc82d5ae3..000000000
Binary files a/rtdata/icons/hi48-app-rawtherapee.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-B.png b/rtdata/images/Chanmixer-B.png
deleted file mode 100644
index 0e12209f2..000000000
Binary files a/rtdata/images/Chanmixer-B.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-BB.png b/rtdata/images/Chanmixer-BB.png
deleted file mode 100644
index 6804bdf4a..000000000
Binary files a/rtdata/images/Chanmixer-BB.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-BG.png b/rtdata/images/Chanmixer-BG.png
deleted file mode 100644
index 58012aa55..000000000
Binary files a/rtdata/images/Chanmixer-BG.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-BR.png b/rtdata/images/Chanmixer-BR.png
deleted file mode 100644
index 1c3457e14..000000000
Binary files a/rtdata/images/Chanmixer-BR.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-BY.png b/rtdata/images/Chanmixer-BY.png
deleted file mode 100644
index c630ffb29..000000000
Binary files a/rtdata/images/Chanmixer-BY.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-C.png b/rtdata/images/Chanmixer-C.png
deleted file mode 100644
index 15aa0c08c..000000000
Binary files a/rtdata/images/Chanmixer-C.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-G.png b/rtdata/images/Chanmixer-G.png
deleted file mode 100644
index 566babb8b..000000000
Binary files a/rtdata/images/Chanmixer-G.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-GB.png b/rtdata/images/Chanmixer-GB.png
deleted file mode 100644
index cfceceaea..000000000
Binary files a/rtdata/images/Chanmixer-GB.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-GG.png b/rtdata/images/Chanmixer-GG.png
deleted file mode 100644
index 00f928236..000000000
Binary files a/rtdata/images/Chanmixer-GG.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-GR.png b/rtdata/images/Chanmixer-GR.png
deleted file mode 100644
index 827210e97..000000000
Binary files a/rtdata/images/Chanmixer-GR.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-M.png b/rtdata/images/Chanmixer-M.png
deleted file mode 100644
index b10dc5790..000000000
Binary files a/rtdata/images/Chanmixer-M.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-O.png b/rtdata/images/Chanmixer-O.png
deleted file mode 100644
index 8f90ae8bb..000000000
Binary files a/rtdata/images/Chanmixer-O.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-P.png b/rtdata/images/Chanmixer-P.png
deleted file mode 100644
index c3c412807..000000000
Binary files a/rtdata/images/Chanmixer-P.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-R.png b/rtdata/images/Chanmixer-R.png
deleted file mode 100644
index 5a75d9f88..000000000
Binary files a/rtdata/images/Chanmixer-R.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-RB.png b/rtdata/images/Chanmixer-RB.png
deleted file mode 100644
index 42cf9bd1b..000000000
Binary files a/rtdata/images/Chanmixer-RB.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-RG.png b/rtdata/images/Chanmixer-RG.png
deleted file mode 100644
index f74600517..000000000
Binary files a/rtdata/images/Chanmixer-RG.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-RR.png b/rtdata/images/Chanmixer-RR.png
deleted file mode 100644
index 300b0429e..000000000
Binary files a/rtdata/images/Chanmixer-RR.png and /dev/null differ
diff --git a/rtdata/images/Chanmixer-Y.png b/rtdata/images/Chanmixer-Y.png
deleted file mode 100644
index 98d9b6f83..000000000
Binary files a/rtdata/images/Chanmixer-Y.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/Chanmixer-Bgamma.png b/rtdata/images/Dark/actions/Chanmixer-Bgamma.png
deleted file mode 100644
index 8698988a9..000000000
Binary files a/rtdata/images/Dark/actions/Chanmixer-Bgamma.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/Chanmixer-Ggamma.png b/rtdata/images/Dark/actions/Chanmixer-Ggamma.png
deleted file mode 100644
index d0539758c..000000000
Binary files a/rtdata/images/Dark/actions/Chanmixer-Ggamma.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/Chanmixer-Rgamma.png b/rtdata/images/Dark/actions/Chanmixer-Rgamma.png
deleted file mode 100644
index b1b7fb604..000000000
Binary files a/rtdata/images/Dark/actions/Chanmixer-Rgamma.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/HDR-thumbnail.png b/rtdata/images/Dark/actions/HDR-thumbnail.png
deleted file mode 100644
index 182e603e8..000000000
Binary files a/rtdata/images/Dark/actions/HDR-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/PanelEnding.png b/rtdata/images/Dark/actions/PanelEnding.png
deleted file mode 100644
index be7729164..000000000
Binary files a/rtdata/images/Dark/actions/PanelEnding.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/PixelShift-thumbnail.png b/rtdata/images/Dark/actions/PixelShift-thumbnail.png
deleted file mode 100644
index 4bbea1aee..000000000
Binary files a/rtdata/images/Dark/actions/PixelShift-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/adj-black.png b/rtdata/images/Dark/actions/adj-black.png
deleted file mode 100644
index bf5459fa5..000000000
Binary files a/rtdata/images/Dark/actions/adj-black.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/adj-white.png b/rtdata/images/Dark/actions/adj-white.png
deleted file mode 100644
index 03028934e..000000000
Binary files a/rtdata/images/Dark/actions/adj-white.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-ca-blue1.png b/rtdata/images/Dark/actions/ajd-ca-blue1.png
deleted file mode 100644
index 7a47267df..000000000
Binary files a/rtdata/images/Dark/actions/ajd-ca-blue1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-ca-blue2.png b/rtdata/images/Dark/actions/ajd-ca-blue2.png
deleted file mode 100644
index dfb458300..000000000
Binary files a/rtdata/images/Dark/actions/ajd-ca-blue2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-ca-red1.png b/rtdata/images/Dark/actions/ajd-ca-red1.png
deleted file mode 100644
index 1e45c5035..000000000
Binary files a/rtdata/images/Dark/actions/ajd-ca-red1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-ca-red2.png b/rtdata/images/Dark/actions/ajd-ca-red2.png
deleted file mode 100644
index e5da9e005..000000000
Binary files a/rtdata/images/Dark/actions/ajd-ca-red2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-bluered1.png b/rtdata/images/Dark/actions/ajd-wb-bluered1.png
deleted file mode 100644
index 3c8473451..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-bluered1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-bluered2.png b/rtdata/images/Dark/actions/ajd-wb-bluered2.png
deleted file mode 100644
index 0f06a770e..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-bluered2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-green1.png b/rtdata/images/Dark/actions/ajd-wb-green1.png
deleted file mode 100644
index 4f33551d6..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-green1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-green2.png b/rtdata/images/Dark/actions/ajd-wb-green2.png
deleted file mode 100644
index a9a7e8553..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-green2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-temp1.png b/rtdata/images/Dark/actions/ajd-wb-temp1.png
deleted file mode 100644
index 3c8473451..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-temp1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ajd-wb-temp2.png b/rtdata/images/Dark/actions/ajd-wb-temp2.png
deleted file mode 100644
index 2b0c7c0ef..000000000
Binary files a/rtdata/images/Dark/actions/ajd-wb-temp2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-down-small.png b/rtdata/images/Dark/actions/arrow-down-small.png
deleted file mode 100644
index d631a72f5..000000000
Binary files a/rtdata/images/Dark/actions/arrow-down-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-down.png b/rtdata/images/Dark/actions/arrow-down.png
deleted file mode 100644
index 417038d15..000000000
Binary files a/rtdata/images/Dark/actions/arrow-down.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-left-small.png b/rtdata/images/Dark/actions/arrow-left-small.png
deleted file mode 100644
index d61abd8a3..000000000
Binary files a/rtdata/images/Dark/actions/arrow-left-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-left.png b/rtdata/images/Dark/actions/arrow-left.png
deleted file mode 100644
index a30aeadef..000000000
Binary files a/rtdata/images/Dark/actions/arrow-left.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-right-small.png b/rtdata/images/Dark/actions/arrow-right-small.png
deleted file mode 100644
index fa0741927..000000000
Binary files a/rtdata/images/Dark/actions/arrow-right-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-right.png b/rtdata/images/Dark/actions/arrow-right.png
deleted file mode 100644
index 2f426f9f1..000000000
Binary files a/rtdata/images/Dark/actions/arrow-right.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-up-small.png b/rtdata/images/Dark/actions/arrow-up-small.png
deleted file mode 100644
index 21f8f61eb..000000000
Binary files a/rtdata/images/Dark/actions/arrow-up-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/arrow-up.png b/rtdata/images/Dark/actions/arrow-up.png
deleted file mode 100644
index 2f4a9d228..000000000
Binary files a/rtdata/images/Dark/actions/arrow-up.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/atom.png b/rtdata/images/Dark/actions/atom.png
deleted file mode 100644
index 1e7ce3da0..000000000
Binary files a/rtdata/images/Dark/actions/atom.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/beforeafter.png b/rtdata/images/Dark/actions/beforeafter.png
deleted file mode 100644
index cd4e1a792..000000000
Binary files a/rtdata/images/Dark/actions/beforeafter.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel0.png b/rtdata/images/Dark/actions/cglabel0.png
deleted file mode 100644
index af4abc914..000000000
Binary files a/rtdata/images/Dark/actions/cglabel0.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel1.png b/rtdata/images/Dark/actions/cglabel1.png
deleted file mode 100644
index 6337a6476..000000000
Binary files a/rtdata/images/Dark/actions/cglabel1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel2.png b/rtdata/images/Dark/actions/cglabel2.png
deleted file mode 100644
index a5b843c0c..000000000
Binary files a/rtdata/images/Dark/actions/cglabel2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel3.png b/rtdata/images/Dark/actions/cglabel3.png
deleted file mode 100644
index a3f3da7a9..000000000
Binary files a/rtdata/images/Dark/actions/cglabel3.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel4.png b/rtdata/images/Dark/actions/cglabel4.png
deleted file mode 100644
index 3e048f36c..000000000
Binary files a/rtdata/images/Dark/actions/cglabel4.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/cglabel5.png b/rtdata/images/Dark/actions/cglabel5.png
deleted file mode 100644
index 323be0cb9..000000000
Binary files a/rtdata/images/Dark/actions/cglabel5.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel0.png b/rtdata/images/Dark/actions/clabel0.png
deleted file mode 100644
index 5c2484a36..000000000
Binary files a/rtdata/images/Dark/actions/clabel0.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel1.png b/rtdata/images/Dark/actions/clabel1.png
deleted file mode 100644
index 87bd0ea83..000000000
Binary files a/rtdata/images/Dark/actions/clabel1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel2.png b/rtdata/images/Dark/actions/clabel2.png
deleted file mode 100644
index b8ca4f72b..000000000
Binary files a/rtdata/images/Dark/actions/clabel2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel3.png b/rtdata/images/Dark/actions/clabel3.png
deleted file mode 100644
index d9dced467..000000000
Binary files a/rtdata/images/Dark/actions/clabel3.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel4.png b/rtdata/images/Dark/actions/clabel4.png
deleted file mode 100644
index 2afb44650..000000000
Binary files a/rtdata/images/Dark/actions/clabel4.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/clabel5.png b/rtdata/images/Dark/actions/clabel5.png
deleted file mode 100644
index aef022fce..000000000
Binary files a/rtdata/images/Dark/actions/clabel5.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/closedhand.png b/rtdata/images/Dark/actions/closedhand.png
deleted file mode 100644
index e9560f5a7..000000000
Binary files a/rtdata/images/Dark/actions/closedhand.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/colorPickers-hide.png b/rtdata/images/Dark/actions/colorPickers-hide.png
deleted file mode 100644
index 54b33a7fb..000000000
Binary files a/rtdata/images/Dark/actions/colorPickers-hide.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/colorPickers-show.png b/rtdata/images/Dark/actions/colorPickers-show.png
deleted file mode 100644
index d9d039c2b..000000000
Binary files a/rtdata/images/Dark/actions/colorPickers-show.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/colour.png b/rtdata/images/Dark/actions/colour.png
deleted file mode 100644
index e518dfa3a..000000000
Binary files a/rtdata/images/Dark/actions/colour.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/crop-auto.png b/rtdata/images/Dark/actions/crop-auto.png
deleted file mode 100644
index 8cb57e799..000000000
Binary files a/rtdata/images/Dark/actions/crop-auto.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/crop.png b/rtdata/images/Dark/actions/crop.png
deleted file mode 100644
index a9a339020..000000000
Binary files a/rtdata/images/Dark/actions/crop.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/crossed-arrows-in.png b/rtdata/images/Dark/actions/crossed-arrows-in.png
deleted file mode 100644
index b2a2d8820..000000000
Binary files a/rtdata/images/Dark/actions/crossed-arrows-in.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/crossed-arrows-out.png b/rtdata/images/Dark/actions/crossed-arrows-out.png
deleted file mode 100644
index e552d55ca..000000000
Binary files a/rtdata/images/Dark/actions/crossed-arrows-out.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-NURBS.png b/rtdata/images/Dark/actions/curveType-NURBS.png
deleted file mode 100644
index b891c89c7..000000000
Binary files a/rtdata/images/Dark/actions/curveType-NURBS.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-controlPoints.png b/rtdata/images/Dark/actions/curveType-controlPoints.png
deleted file mode 100644
index 54dbcc540..000000000
Binary files a/rtdata/images/Dark/actions/curveType-controlPoints.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-flatLinear.png b/rtdata/images/Dark/actions/curveType-flatLinear.png
deleted file mode 100644
index 6049e658c..000000000
Binary files a/rtdata/images/Dark/actions/curveType-flatLinear.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-linear.png b/rtdata/images/Dark/actions/curveType-linear.png
deleted file mode 100644
index 67ff4390c..000000000
Binary files a/rtdata/images/Dark/actions/curveType-linear.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-parametric.png b/rtdata/images/Dark/actions/curveType-parametric.png
deleted file mode 100644
index dcf7b02b5..000000000
Binary files a/rtdata/images/Dark/actions/curveType-parametric.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/curveType-spline.png b/rtdata/images/Dark/actions/curveType-spline.png
deleted file mode 100644
index b9c0527d3..000000000
Binary files a/rtdata/images/Dark/actions/curveType-spline.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/detail.png b/rtdata/images/Dark/actions/detail.png
deleted file mode 100644
index b1af89c9e..000000000
Binary files a/rtdata/images/Dark/actions/detail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/distorsion.png b/rtdata/images/Dark/actions/distorsion.png
deleted file mode 100644
index fc5200391..000000000
Binary files a/rtdata/images/Dark/actions/distorsion.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/distortion-auto.png b/rtdata/images/Dark/actions/distortion-auto.png
deleted file mode 100644
index cc5ced965..000000000
Binary files a/rtdata/images/Dark/actions/distortion-auto.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/distortion-barrel.png b/rtdata/images/Dark/actions/distortion-barrel.png
deleted file mode 100644
index 0a19ac097..000000000
Binary files a/rtdata/images/Dark/actions/distortion-barrel.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/distortion-pincushion.png b/rtdata/images/Dark/actions/distortion-pincushion.png
deleted file mode 100644
index cfdcfaf63..000000000
Binary files a/rtdata/images/Dark/actions/distortion-pincushion.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/document-open-recent.png b/rtdata/images/Dark/actions/document-open-recent.png
deleted file mode 100644
index f2c126cb7..000000000
Binary files a/rtdata/images/Dark/actions/document-open-recent.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/document-open.png b/rtdata/images/Dark/actions/document-open.png
deleted file mode 100644
index 6d2ea0f34..000000000
Binary files a/rtdata/images/Dark/actions/document-open.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/edit-copy.png b/rtdata/images/Dark/actions/edit-copy.png
deleted file mode 100644
index 4736313a2..000000000
Binary files a/rtdata/images/Dark/actions/edit-copy.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/edit-find.png b/rtdata/images/Dark/actions/edit-find.png
deleted file mode 100644
index d560c644b..000000000
Binary files a/rtdata/images/Dark/actions/edit-find.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/edit-paste.png b/rtdata/images/Dark/actions/edit-paste.png
deleted file mode 100644
index 38871deec..000000000
Binary files a/rtdata/images/Dark/actions/edit-paste.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/edited-small.png b/rtdata/images/Dark/actions/edited-small.png
deleted file mode 100644
index f25997a59..000000000
Binary files a/rtdata/images/Dark/actions/edited-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/edited.png b/rtdata/images/Dark/actions/edited.png
deleted file mode 100644
index 95d058454..000000000
Binary files a/rtdata/images/Dark/actions/edited.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/editedg-small.png b/rtdata/images/Dark/actions/editedg-small.png
deleted file mode 100644
index 9eb229e75..000000000
Binary files a/rtdata/images/Dark/actions/editedg-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/editednot-small.png b/rtdata/images/Dark/actions/editednot-small.png
deleted file mode 100644
index 410bff81b..000000000
Binary files a/rtdata/images/Dark/actions/editednot-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/editednotg-small.png b/rtdata/images/Dark/actions/editednotg-small.png
deleted file mode 100644
index 55bc28f2b..000000000
Binary files a/rtdata/images/Dark/actions/editednotg-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/editmodehand.png b/rtdata/images/Dark/actions/editmodehand.png
deleted file mode 100644
index 2b231db06..000000000
Binary files a/rtdata/images/Dark/actions/editmodehand.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/equalizer-narrow.png b/rtdata/images/Dark/actions/equalizer-narrow.png
deleted file mode 100644
index dcf484ea7..000000000
Binary files a/rtdata/images/Dark/actions/equalizer-narrow.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/equalizer-wide.png b/rtdata/images/Dark/actions/equalizer-wide.png
deleted file mode 100644
index 50cfed8fa..000000000
Binary files a/rtdata/images/Dark/actions/equalizer-wide.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/expanderClosed.png b/rtdata/images/Dark/actions/expanderClosed.png
deleted file mode 100644
index 559f201db..000000000
Binary files a/rtdata/images/Dark/actions/expanderClosed.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/expanderDisabled.png b/rtdata/images/Dark/actions/expanderDisabled.png
deleted file mode 100644
index 7e35c7266..000000000
Binary files a/rtdata/images/Dark/actions/expanderDisabled.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/expanderEnabled.png b/rtdata/images/Dark/actions/expanderEnabled.png
deleted file mode 100644
index 33e8515af..000000000
Binary files a/rtdata/images/Dark/actions/expanderEnabled.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/expanderInconsistent.png b/rtdata/images/Dark/actions/expanderInconsistent.png
deleted file mode 100644
index e19f8e106..000000000
Binary files a/rtdata/images/Dark/actions/expanderInconsistent.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/expanderOpened.png b/rtdata/images/Dark/actions/expanderOpened.png
deleted file mode 100644
index 9a7f161ee..000000000
Binary files a/rtdata/images/Dark/actions/expanderOpened.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/exposure.png b/rtdata/images/Dark/actions/exposure.png
deleted file mode 100644
index f6abf8b87..000000000
Binary files a/rtdata/images/Dark/actions/exposure.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/filter-original-1.png b/rtdata/images/Dark/actions/filter-original-1.png
deleted file mode 100644
index 9b4e47ce9..000000000
Binary files a/rtdata/images/Dark/actions/filter-original-1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/filter-original-2.png b/rtdata/images/Dark/actions/filter-original-2.png
deleted file mode 100644
index 03531e921..000000000
Binary files a/rtdata/images/Dark/actions/filter-original-2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/filter.png b/rtdata/images/Dark/actions/filter.png
deleted file mode 100644
index bd5dcb5f4..000000000
Binary files a/rtdata/images/Dark/actions/filter.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/filterclear.png b/rtdata/images/Dark/actions/filterclear.png
deleted file mode 100644
index 28c93061e..000000000
Binary files a/rtdata/images/Dark/actions/filterclear.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/fullscreen-exit.png b/rtdata/images/Dark/actions/fullscreen-exit.png
deleted file mode 100644
index 55eb8e06d..000000000
Binary files a/rtdata/images/Dark/actions/fullscreen-exit.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/fullscreen.png b/rtdata/images/Dark/actions/fullscreen.png
deleted file mode 100644
index 963409e9a..000000000
Binary files a/rtdata/images/Dark/actions/fullscreen.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gamut-hist.png b/rtdata/images/Dark/actions/gamut-hist.png
deleted file mode 100644
index 8a60118dd..000000000
Binary files a/rtdata/images/Dark/actions/gamut-hist.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gamut-softproof.png b/rtdata/images/Dark/actions/gamut-softproof.png
deleted file mode 100644
index d61874507..000000000
Binary files a/rtdata/images/Dark/actions/gamut-softproof.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gamut-warning.png b/rtdata/images/Dark/actions/gamut-warning.png
deleted file mode 100644
index f6bb292a9..000000000
Binary files a/rtdata/images/Dark/actions/gamut-warning.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/grayrated.png b/rtdata/images/Dark/actions/grayrated.png
deleted file mode 100644
index 6866bc1d6..000000000
Binary files a/rtdata/images/Dark/actions/grayrated.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-add.png b/rtdata/images/Dark/actions/gtk-add.png
deleted file mode 100644
index 80abd6bfd..000000000
Binary files a/rtdata/images/Dark/actions/gtk-add.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-apply.png b/rtdata/images/Dark/actions/gtk-apply.png
deleted file mode 100644
index 4790895e7..000000000
Binary files a/rtdata/images/Dark/actions/gtk-apply.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-cancel.png b/rtdata/images/Dark/actions/gtk-cancel.png
deleted file mode 100644
index c76033ee9..000000000
Binary files a/rtdata/images/Dark/actions/gtk-cancel.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-close-small.png b/rtdata/images/Dark/actions/gtk-close-small.png
deleted file mode 100644
index 7abb7a95a..000000000
Binary files a/rtdata/images/Dark/actions/gtk-close-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-close.png b/rtdata/images/Dark/actions/gtk-close.png
deleted file mode 100644
index c76033ee9..000000000
Binary files a/rtdata/images/Dark/actions/gtk-close.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-color-picker-add.png b/rtdata/images/Dark/actions/gtk-color-picker-add.png
deleted file mode 100644
index 77a30c250..000000000
Binary files a/rtdata/images/Dark/actions/gtk-color-picker-add.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-color-picker-small.png b/rtdata/images/Dark/actions/gtk-color-picker-small.png
deleted file mode 100644
index f10b7f0fe..000000000
Binary files a/rtdata/images/Dark/actions/gtk-color-picker-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-color-picker.png b/rtdata/images/Dark/actions/gtk-color-picker.png
deleted file mode 100644
index c79c3f3e9..000000000
Binary files a/rtdata/images/Dark/actions/gtk-color-picker.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-copy.png b/rtdata/images/Dark/actions/gtk-copy.png
deleted file mode 100644
index 4736313a2..000000000
Binary files a/rtdata/images/Dark/actions/gtk-copy.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-edit.png b/rtdata/images/Dark/actions/gtk-edit.png
deleted file mode 100644
index 8eabf5f09..000000000
Binary files a/rtdata/images/Dark/actions/gtk-edit.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-find.png b/rtdata/images/Dark/actions/gtk-find.png
deleted file mode 100644
index d560c644b..000000000
Binary files a/rtdata/images/Dark/actions/gtk-find.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-media-play.png b/rtdata/images/Dark/actions/gtk-media-play.png
deleted file mode 100644
index 2bd7ded54..000000000
Binary files a/rtdata/images/Dark/actions/gtk-media-play.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-media-stop.png b/rtdata/images/Dark/actions/gtk-media-stop.png
deleted file mode 100644
index 9d3b25ba0..000000000
Binary files a/rtdata/images/Dark/actions/gtk-media-stop.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-ok.png b/rtdata/images/Dark/actions/gtk-ok.png
deleted file mode 100644
index 4790895e7..000000000
Binary files a/rtdata/images/Dark/actions/gtk-ok.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-open.png b/rtdata/images/Dark/actions/gtk-open.png
deleted file mode 100644
index 6d2ea0f34..000000000
Binary files a/rtdata/images/Dark/actions/gtk-open.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-paste.png b/rtdata/images/Dark/actions/gtk-paste.png
deleted file mode 100644
index 38871deec..000000000
Binary files a/rtdata/images/Dark/actions/gtk-paste.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-preferences.png b/rtdata/images/Dark/actions/gtk-preferences.png
deleted file mode 100644
index 1d3c0f398..000000000
Binary files a/rtdata/images/Dark/actions/gtk-preferences.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-remove.png b/rtdata/images/Dark/actions/gtk-remove.png
deleted file mode 100644
index b789b5130..000000000
Binary files a/rtdata/images/Dark/actions/gtk-remove.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-save-large.png b/rtdata/images/Dark/actions/gtk-save-large.png
deleted file mode 100644
index 9b1ba463e..000000000
Binary files a/rtdata/images/Dark/actions/gtk-save-large.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-save.png b/rtdata/images/Dark/actions/gtk-save.png
deleted file mode 100644
index d72b9a2ad..000000000
Binary files a/rtdata/images/Dark/actions/gtk-save.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undo-ltr-small.png b/rtdata/images/Dark/actions/gtk-undo-ltr-small.png
deleted file mode 100644
index b0dbf0b98..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undo-ltr-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undo-ltr.png b/rtdata/images/Dark/actions/gtk-undo-ltr.png
deleted file mode 100644
index f66791abb..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undo-ltr.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undo-rtl-small.png b/rtdata/images/Dark/actions/gtk-undo-rtl-small.png
deleted file mode 100644
index 7ef3d5f67..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undo-rtl-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undo-rtl.png b/rtdata/images/Dark/actions/gtk-undo-rtl.png
deleted file mode 100644
index 1c6fc0537..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undo-rtl.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undoall-ltr.png b/rtdata/images/Dark/actions/gtk-undoall-ltr.png
deleted file mode 100644
index 00c61c2a8..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undoall-ltr.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-undoall-rtl.png b/rtdata/images/Dark/actions/gtk-undoall-rtl.png
deleted file mode 100644
index cf92a7017..000000000
Binary files a/rtdata/images/Dark/actions/gtk-undoall-rtl.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-100-small.png b/rtdata/images/Dark/actions/gtk-zoom-100-small.png
deleted file mode 100644
index 43abd73a4..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-100-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-100.png b/rtdata/images/Dark/actions/gtk-zoom-100.png
deleted file mode 100644
index a00a78d68..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-100.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-crop.png b/rtdata/images/Dark/actions/gtk-zoom-crop.png
deleted file mode 100644
index f20e826ba..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-crop.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-fit.png b/rtdata/images/Dark/actions/gtk-zoom-fit.png
deleted file mode 100644
index 670515eb4..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-fit.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-in-small.png b/rtdata/images/Dark/actions/gtk-zoom-in-small.png
deleted file mode 100644
index 291c8ecac..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-in-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-in.png b/rtdata/images/Dark/actions/gtk-zoom-in.png
deleted file mode 100644
index ee8688d43..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-in.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-out-small.png b/rtdata/images/Dark/actions/gtk-zoom-out-small.png
deleted file mode 100644
index 93b771182..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-out-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/gtk-zoom-out.png b/rtdata/images/Dark/actions/gtk-zoom-out.png
deleted file mode 100644
index aeec6b0fc..000000000
Binary files a/rtdata/images/Dark/actions/gtk-zoom-out.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histBar.png b/rtdata/images/Dark/actions/histBar.png
deleted file mode 100644
index 24ef6b45f..000000000
Binary files a/rtdata/images/Dark/actions/histBar.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histBarg.png b/rtdata/images/Dark/actions/histBarg.png
deleted file mode 100644
index 89d20ccff..000000000
Binary files a/rtdata/images/Dark/actions/histBarg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histBlue.png b/rtdata/images/Dark/actions/histBlue.png
deleted file mode 100644
index 53c447a1c..000000000
Binary files a/rtdata/images/Dark/actions/histBlue.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histBlueg.png b/rtdata/images/Dark/actions/histBlueg.png
deleted file mode 100644
index ac205219d..000000000
Binary files a/rtdata/images/Dark/actions/histBlueg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histChro.png b/rtdata/images/Dark/actions/histChro.png
deleted file mode 100644
index 021a18222..000000000
Binary files a/rtdata/images/Dark/actions/histChro.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histChrog.png b/rtdata/images/Dark/actions/histChrog.png
deleted file mode 100644
index 342311f5f..000000000
Binary files a/rtdata/images/Dark/actions/histChrog.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histFull.png b/rtdata/images/Dark/actions/histFull.png
deleted file mode 100644
index 78f9ee96c..000000000
Binary files a/rtdata/images/Dark/actions/histFull.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histFullg.png b/rtdata/images/Dark/actions/histFullg.png
deleted file mode 100644
index ffbbe1c2b..000000000
Binary files a/rtdata/images/Dark/actions/histFullg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histGreen.png b/rtdata/images/Dark/actions/histGreen.png
deleted file mode 100644
index 54eebe37e..000000000
Binary files a/rtdata/images/Dark/actions/histGreen.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histGreeng.png b/rtdata/images/Dark/actions/histGreeng.png
deleted file mode 100644
index 33c138cae..000000000
Binary files a/rtdata/images/Dark/actions/histGreeng.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histRaw.png b/rtdata/images/Dark/actions/histRaw.png
deleted file mode 100644
index 36e1a5a31..000000000
Binary files a/rtdata/images/Dark/actions/histRaw.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histRawg.png b/rtdata/images/Dark/actions/histRawg.png
deleted file mode 100644
index 1b9d286b3..000000000
Binary files a/rtdata/images/Dark/actions/histRawg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histRed.png b/rtdata/images/Dark/actions/histRed.png
deleted file mode 100644
index ce7fddcd3..000000000
Binary files a/rtdata/images/Dark/actions/histRed.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histRedg.png b/rtdata/images/Dark/actions/histRedg.png
deleted file mode 100644
index b75a66995..000000000
Binary files a/rtdata/images/Dark/actions/histRedg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histValue.png b/rtdata/images/Dark/actions/histValue.png
deleted file mode 100644
index 451004889..000000000
Binary files a/rtdata/images/Dark/actions/histValue.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/histValueg.png b/rtdata/images/Dark/actions/histValueg.png
deleted file mode 100644
index 31d6f63e5..000000000
Binary files a/rtdata/images/Dark/actions/histValueg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/image-editor.png b/rtdata/images/Dark/actions/image-editor.png
deleted file mode 100644
index cf87bc311..000000000
Binary files a/rtdata/images/Dark/actions/image-editor.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/info.png b/rtdata/images/Dark/actions/info.png
deleted file mode 100644
index 6ce41bad3..000000000
Binary files a/rtdata/images/Dark/actions/info.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/intent-absolute.png b/rtdata/images/Dark/actions/intent-absolute.png
deleted file mode 100644
index 6d274a2c0..000000000
Binary files a/rtdata/images/Dark/actions/intent-absolute.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/intent-perceptual.png b/rtdata/images/Dark/actions/intent-perceptual.png
deleted file mode 100644
index 821a714ae..000000000
Binary files a/rtdata/images/Dark/actions/intent-perceptual.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/intent-relative.png b/rtdata/images/Dark/actions/intent-relative.png
deleted file mode 100644
index d586b47b2..000000000
Binary files a/rtdata/images/Dark/actions/intent-relative.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/intent-saturation.png b/rtdata/images/Dark/actions/intent-saturation.png
deleted file mode 100644
index 0654f78b6..000000000
Binary files a/rtdata/images/Dark/actions/intent-saturation.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/list-add-small.png b/rtdata/images/Dark/actions/list-add-small.png
deleted file mode 100644
index 15002fe13..000000000
Binary files a/rtdata/images/Dark/actions/list-add-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/list-add.png b/rtdata/images/Dark/actions/list-add.png
deleted file mode 100644
index 80abd6bfd..000000000
Binary files a/rtdata/images/Dark/actions/list-add.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/list-remove-red-small.png b/rtdata/images/Dark/actions/list-remove-red-small.png
deleted file mode 100644
index 71650328f..000000000
Binary files a/rtdata/images/Dark/actions/list-remove-red-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/list-remove.png b/rtdata/images/Dark/actions/list-remove.png
deleted file mode 100644
index b789b5130..000000000
Binary files a/rtdata/images/Dark/actions/list-remove.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/lock-off.png b/rtdata/images/Dark/actions/lock-off.png
deleted file mode 100644
index c4dbfe1af..000000000
Binary files a/rtdata/images/Dark/actions/lock-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/lock-on.png b/rtdata/images/Dark/actions/lock-on.png
deleted file mode 100644
index 23366d571..000000000
Binary files a/rtdata/images/Dark/actions/lock-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/media-usb.png b/rtdata/images/Dark/actions/media-usb.png
deleted file mode 100644
index 5c46c9464..000000000
Binary files a/rtdata/images/Dark/actions/media-usb.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/meta.png b/rtdata/images/Dark/actions/meta.png
deleted file mode 100644
index 5c9c05d3f..000000000
Binary files a/rtdata/images/Dark/actions/meta.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/nav-next.png b/rtdata/images/Dark/actions/nav-next.png
deleted file mode 100644
index a3e8ed0b0..000000000
Binary files a/rtdata/images/Dark/actions/nav-next.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/nav-prev.png b/rtdata/images/Dark/actions/nav-prev.png
deleted file mode 100644
index cd621d372..000000000
Binary files a/rtdata/images/Dark/actions/nav-prev.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/nav-sync.png b/rtdata/images/Dark/actions/nav-sync.png
deleted file mode 100644
index cbad9711e..000000000
Binary files a/rtdata/images/Dark/actions/nav-sync.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/new-detail-window.png b/rtdata/images/Dark/actions/new-detail-window.png
deleted file mode 100644
index 43b39decf..000000000
Binary files a/rtdata/images/Dark/actions/new-detail-window.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/openhand.png b/rtdata/images/Dark/actions/openhand.png
deleted file mode 100644
index 66c13d890..000000000
Binary files a/rtdata/images/Dark/actions/openhand.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/panel-to-bottom.png b/rtdata/images/Dark/actions/panel-to-bottom.png
deleted file mode 100644
index 7e4905a9c..000000000
Binary files a/rtdata/images/Dark/actions/panel-to-bottom.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/panel-to-left.png b/rtdata/images/Dark/actions/panel-to-left.png
deleted file mode 100644
index 97f7494a1..000000000
Binary files a/rtdata/images/Dark/actions/panel-to-left.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/panel-to-right.png b/rtdata/images/Dark/actions/panel-to-right.png
deleted file mode 100644
index d6af36001..000000000
Binary files a/rtdata/images/Dark/actions/panel-to-right.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/panel-to-top.png b/rtdata/images/Dark/actions/panel-to-top.png
deleted file mode 100644
index d628cc598..000000000
Binary files a/rtdata/images/Dark/actions/panel-to-top.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/perspective-h1.png b/rtdata/images/Dark/actions/perspective-h1.png
deleted file mode 100644
index ea470842d..000000000
Binary files a/rtdata/images/Dark/actions/perspective-h1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/perspective-h2.png b/rtdata/images/Dark/actions/perspective-h2.png
deleted file mode 100644
index 5cd371dfc..000000000
Binary files a/rtdata/images/Dark/actions/perspective-h2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/perspective-v1.png b/rtdata/images/Dark/actions/perspective-v1.png
deleted file mode 100644
index e42755116..000000000
Binary files a/rtdata/images/Dark/actions/perspective-v1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/perspective-v2.png b/rtdata/images/Dark/actions/perspective-v2.png
deleted file mode 100644
index 489e3bd02..000000000
Binary files a/rtdata/images/Dark/actions/perspective-v2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/popuparrow.png b/rtdata/images/Dark/actions/popuparrow.png
deleted file mode 100644
index 6e67d45b4..000000000
Binary files a/rtdata/images/Dark/actions/popuparrow.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeB-off.png b/rtdata/images/Dark/actions/previewmodeB-off.png
deleted file mode 100644
index 0c9890437..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeB-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeB-on.png b/rtdata/images/Dark/actions/previewmodeB-on.png
deleted file mode 100644
index 466192b3a..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeB-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC0-off.png b/rtdata/images/Dark/actions/previewmodeBC0-off.png
deleted file mode 100644
index 28c024555..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC0-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC0-on.png b/rtdata/images/Dark/actions/previewmodeBC0-on.png
deleted file mode 100644
index f5e0b8000..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC0-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC1-off.png b/rtdata/images/Dark/actions/previewmodeBC1-off.png
deleted file mode 100644
index 4ac160b05..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC1-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC1-on.png b/rtdata/images/Dark/actions/previewmodeBC1-on.png
deleted file mode 100644
index 3e9b6874c..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC1-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC2-off.png b/rtdata/images/Dark/actions/previewmodeBC2-off.png
deleted file mode 100644
index bf3d97b2d..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC2-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC2-on.png b/rtdata/images/Dark/actions/previewmodeBC2-on.png
deleted file mode 100644
index 457453166..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC2-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC3-off.png b/rtdata/images/Dark/actions/previewmodeBC3-off.png
deleted file mode 100644
index 487ec777e..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC3-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeBC3-on.png b/rtdata/images/Dark/actions/previewmodeBC3-on.png
deleted file mode 100644
index 670b5b8b4..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeBC3-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeF-focusScreen-off.png b/rtdata/images/Dark/actions/previewmodeF-focusScreen-off.png
deleted file mode 100644
index 75a285de2..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeF-focusScreen-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeF-focusScreen-on.png b/rtdata/images/Dark/actions/previewmodeF-focusScreen-on.png
deleted file mode 100644
index 3d46dedc7..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeF-focusScreen-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeF-off.png b/rtdata/images/Dark/actions/previewmodeF-off.png
deleted file mode 100644
index 5d52af569..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeF-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeF-on.png b/rtdata/images/Dark/actions/previewmodeF-on.png
deleted file mode 100644
index f0d0ef230..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeF-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeG-off.png b/rtdata/images/Dark/actions/previewmodeG-off.png
deleted file mode 100644
index 5c076c989..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeG-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeG-on.png b/rtdata/images/Dark/actions/previewmodeG-on.png
deleted file mode 100644
index ecc75c8e7..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeG-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeL-off.png b/rtdata/images/Dark/actions/previewmodeL-off.png
deleted file mode 100644
index 939dec642..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeL-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeL-on.png b/rtdata/images/Dark/actions/previewmodeL-on.png
deleted file mode 100644
index 92fe937e8..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeL-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeR-off.png b/rtdata/images/Dark/actions/previewmodeR-off.png
deleted file mode 100644
index b96e22c31..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeR-off.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/previewmodeR-on.png b/rtdata/images/Dark/actions/previewmodeR-on.png
deleted file mode 100644
index fb1e46e98..000000000
Binary files a/rtdata/images/Dark/actions/previewmodeR-on.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/processing-pause.png b/rtdata/images/Dark/actions/processing-pause.png
deleted file mode 100644
index 967c4a339..000000000
Binary files a/rtdata/images/Dark/actions/processing-pause.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/processing-play.png b/rtdata/images/Dark/actions/processing-play.png
deleted file mode 100644
index d959d4a7c..000000000
Binary files a/rtdata/images/Dark/actions/processing-play.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/processing-thumbnail.png b/rtdata/images/Dark/actions/processing-thumbnail.png
deleted file mode 100644
index 15a8af3f1..000000000
Binary files a/rtdata/images/Dark/actions/processing-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/processing.png b/rtdata/images/Dark/actions/processing.png
deleted file mode 100644
index 78592c44a..000000000
Binary files a/rtdata/images/Dark/actions/processing.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/profile-filled.png b/rtdata/images/Dark/actions/profile-filled.png
deleted file mode 100644
index 8e39de5f2..000000000
Binary files a/rtdata/images/Dark/actions/profile-filled.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/profile-partial.png b/rtdata/images/Dark/actions/profile-partial.png
deleted file mode 100644
index 70c77fdff..000000000
Binary files a/rtdata/images/Dark/actions/profile-partial.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rated.png b/rtdata/images/Dark/actions/rated.png
deleted file mode 100644
index ff1b949d2..000000000
Binary files a/rtdata/images/Dark/actions/rated.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ratednot.png b/rtdata/images/Dark/actions/ratednot.png
deleted file mode 100644
index 82af59b91..000000000
Binary files a/rtdata/images/Dark/actions/ratednot.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/ratednotg.png b/rtdata/images/Dark/actions/ratednotg.png
deleted file mode 100644
index 4bf6f1a0c..000000000
Binary files a/rtdata/images/Dark/actions/ratednotg.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/raw.png b/rtdata/images/Dark/actions/raw.png
deleted file mode 100644
index d42599483..000000000
Binary files a/rtdata/images/Dark/actions/raw.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/refresh-red.png b/rtdata/images/Dark/actions/refresh-red.png
deleted file mode 100644
index 8850fe544..000000000
Binary files a/rtdata/images/Dark/actions/refresh-red.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/refresh-white.png b/rtdata/images/Dark/actions/refresh-white.png
deleted file mode 100644
index 40f625275..000000000
Binary files a/rtdata/images/Dark/actions/refresh-white.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-left-1.png b/rtdata/images/Dark/actions/rotate-left-1.png
deleted file mode 100644
index 937598ca3..000000000
Binary files a/rtdata/images/Dark/actions/rotate-left-1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-left-2.png b/rtdata/images/Dark/actions/rotate-left-2.png
deleted file mode 100644
index 20b3ff5da..000000000
Binary files a/rtdata/images/Dark/actions/rotate-left-2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-left-3.png b/rtdata/images/Dark/actions/rotate-left-3.png
deleted file mode 100644
index 635a50da6..000000000
Binary files a/rtdata/images/Dark/actions/rotate-left-3.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-left.png b/rtdata/images/Dark/actions/rotate-left.png
deleted file mode 100644
index 2f28a8cff..000000000
Binary files a/rtdata/images/Dark/actions/rotate-left.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-right-1.png b/rtdata/images/Dark/actions/rotate-right-1.png
deleted file mode 100644
index 5bd9960ad..000000000
Binary files a/rtdata/images/Dark/actions/rotate-right-1.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-right-2.png b/rtdata/images/Dark/actions/rotate-right-2.png
deleted file mode 100644
index 5da99f01e..000000000
Binary files a/rtdata/images/Dark/actions/rotate-right-2.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-right-3.png b/rtdata/images/Dark/actions/rotate-right-3.png
deleted file mode 100644
index 9d2dd0e4f..000000000
Binary files a/rtdata/images/Dark/actions/rotate-right-3.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rotate-right.png b/rtdata/images/Dark/actions/rotate-right.png
deleted file mode 100644
index b28d601c5..000000000
Binary files a/rtdata/images/Dark/actions/rotate-right.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/rtwindow.png b/rtdata/images/Dark/actions/rtwindow.png
deleted file mode 100644
index 8fcc7a7c4..000000000
Binary files a/rtdata/images/Dark/actions/rtwindow.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/softProof.png b/rtdata/images/Dark/actions/softProof.png
deleted file mode 100644
index 5f17df3ea..000000000
Binary files a/rtdata/images/Dark/actions/softProof.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/spGamutCheck.png b/rtdata/images/Dark/actions/spGamutCheck.png
deleted file mode 100644
index ab812272a..000000000
Binary files a/rtdata/images/Dark/actions/spGamutCheck.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/stock-flip-horizontal.png b/rtdata/images/Dark/actions/stock-flip-horizontal.png
deleted file mode 100644
index a963c9d6f..000000000
Binary files a/rtdata/images/Dark/actions/stock-flip-horizontal.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/stock-flip-vertical.png b/rtdata/images/Dark/actions/stock-flip-vertical.png
deleted file mode 100644
index 65779151a..000000000
Binary files a/rtdata/images/Dark/actions/stock-flip-vertical.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/stock-rotate-270.png b/rtdata/images/Dark/actions/stock-rotate-270.png
deleted file mode 100644
index cb6d50093..000000000
Binary files a/rtdata/images/Dark/actions/stock-rotate-270.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/stock-rotate-90.png b/rtdata/images/Dark/actions/stock-rotate-90.png
deleted file mode 100644
index bb697dc3a..000000000
Binary files a/rtdata/images/Dark/actions/stock-rotate-90.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/straighten-small.png b/rtdata/images/Dark/actions/straighten-small.png
deleted file mode 100644
index b7a2be89e..000000000
Binary files a/rtdata/images/Dark/actions/straighten-small.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/straighten.png b/rtdata/images/Dark/actions/straighten.png
deleted file mode 100644
index a1bfdf507..000000000
Binary files a/rtdata/images/Dark/actions/straighten.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/toleftend.png b/rtdata/images/Dark/actions/toleftend.png
deleted file mode 100644
index a37b37d41..000000000
Binary files a/rtdata/images/Dark/actions/toleftend.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/torightend.png b/rtdata/images/Dark/actions/torightend.png
deleted file mode 100644
index 3ae0d4edd..000000000
Binary files a/rtdata/images/Dark/actions/torightend.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/transform.png b/rtdata/images/Dark/actions/transform.png
deleted file mode 100644
index ed030de57..000000000
Binary files a/rtdata/images/Dark/actions/transform.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/trash-hide-deleted.png b/rtdata/images/Dark/actions/trash-hide-deleted.png
deleted file mode 100644
index 59137cf35..000000000
Binary files a/rtdata/images/Dark/actions/trash-hide-deleted.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/trash-show-empty.png b/rtdata/images/Dark/actions/trash-show-empty.png
deleted file mode 100644
index 0c5da5cda..000000000
Binary files a/rtdata/images/Dark/actions/trash-show-empty.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/trash-show-full.png b/rtdata/images/Dark/actions/trash-show-full.png
deleted file mode 100644
index cc374db46..000000000
Binary files a/rtdata/images/Dark/actions/trash-show-full.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/trash-thumbnail.png b/rtdata/images/Dark/actions/trash-thumbnail.png
deleted file mode 100644
index fad0363e0..000000000
Binary files a/rtdata/images/Dark/actions/trash-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/trash.png b/rtdata/images/Dark/actions/trash.png
deleted file mode 100644
index 0c5da5cda..000000000
Binary files a/rtdata/images/Dark/actions/trash.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/unchanged-18.png b/rtdata/images/Dark/actions/unchanged-18.png
deleted file mode 100644
index 9d08dda26..000000000
Binary files a/rtdata/images/Dark/actions/unchanged-18.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/unchanged-22.png b/rtdata/images/Dark/actions/unchanged-22.png
deleted file mode 100644
index db03d456a..000000000
Binary files a/rtdata/images/Dark/actions/unchanged-22.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/undelete-rtl.png b/rtdata/images/Dark/actions/undelete-rtl.png
deleted file mode 100644
index c8e052aed..000000000
Binary files a/rtdata/images/Dark/actions/undelete-rtl.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/undelete-thumbnail-rtl.png b/rtdata/images/Dark/actions/undelete-thumbnail-rtl.png
deleted file mode 100644
index adcf65e9a..000000000
Binary files a/rtdata/images/Dark/actions/undelete-thumbnail-rtl.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/undelete-thumbnail.png b/rtdata/images/Dark/actions/undelete-thumbnail.png
deleted file mode 100644
index adcf65e9a..000000000
Binary files a/rtdata/images/Dark/actions/undelete-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/undelete.png b/rtdata/images/Dark/actions/undelete.png
deleted file mode 100644
index c8e052aed..000000000
Binary files a/rtdata/images/Dark/actions/undelete.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/warnhl.png b/rtdata/images/Dark/actions/warnhl.png
deleted file mode 100644
index 4ca870ec5..000000000
Binary files a/rtdata/images/Dark/actions/warnhl.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/warnsh.png b/rtdata/images/Dark/actions/warnsh.png
deleted file mode 100644
index d8d558ccf..000000000
Binary files a/rtdata/images/Dark/actions/warnsh.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wavelet.png b/rtdata/images/Dark/actions/wavelet.png
deleted file mode 100644
index 97f4ce673..000000000
Binary files a/rtdata/images/Dark/actions/wavelet.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-auto.png b/rtdata/images/Dark/actions/wb-auto.png
deleted file mode 100644
index be4114604..000000000
Binary files a/rtdata/images/Dark/actions/wb-auto.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-camera.png b/rtdata/images/Dark/actions/wb-camera.png
deleted file mode 100644
index 372fd14bb..000000000
Binary files a/rtdata/images/Dark/actions/wb-camera.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-cloudy.png b/rtdata/images/Dark/actions/wb-cloudy.png
deleted file mode 100644
index cdef40096..000000000
Binary files a/rtdata/images/Dark/actions/wb-cloudy.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-custom.png b/rtdata/images/Dark/actions/wb-custom.png
deleted file mode 100644
index cc7b6ef3c..000000000
Binary files a/rtdata/images/Dark/actions/wb-custom.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-flash.png b/rtdata/images/Dark/actions/wb-flash.png
deleted file mode 100644
index e8115b3d4..000000000
Binary files a/rtdata/images/Dark/actions/wb-flash.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-fluorescent.png b/rtdata/images/Dark/actions/wb-fluorescent.png
deleted file mode 100644
index 4861c54b4..000000000
Binary files a/rtdata/images/Dark/actions/wb-fluorescent.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-lamp.png b/rtdata/images/Dark/actions/wb-lamp.png
deleted file mode 100644
index 5086e362b..000000000
Binary files a/rtdata/images/Dark/actions/wb-lamp.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-led.png b/rtdata/images/Dark/actions/wb-led.png
deleted file mode 100644
index 749b2e703..000000000
Binary files a/rtdata/images/Dark/actions/wb-led.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-shade.png b/rtdata/images/Dark/actions/wb-shade.png
deleted file mode 100644
index 3b908909c..000000000
Binary files a/rtdata/images/Dark/actions/wb-shade.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-sun.png b/rtdata/images/Dark/actions/wb-sun.png
deleted file mode 100644
index 880fd13f0..000000000
Binary files a/rtdata/images/Dark/actions/wb-sun.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-tungsten.png b/rtdata/images/Dark/actions/wb-tungsten.png
deleted file mode 100644
index 48aef24a3..000000000
Binary files a/rtdata/images/Dark/actions/wb-tungsten.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/wb-water.png b/rtdata/images/Dark/actions/wb-water.png
deleted file mode 100644
index 196869abf..000000000
Binary files a/rtdata/images/Dark/actions/wb-water.png and /dev/null differ
diff --git a/rtdata/images/Dark/actions/zoom-100-identifier.png b/rtdata/images/Dark/actions/zoom-100-identifier.png
deleted file mode 100644
index 7452d50dd..000000000
Binary files a/rtdata/images/Dark/actions/zoom-100-identifier.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/computer.png b/rtdata/images/Dark/devices/computer.png
deleted file mode 100644
index 4bd0885b7..000000000
Binary files a/rtdata/images/Dark/devices/computer.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/drive-harddisk.png b/rtdata/images/Dark/devices/drive-harddisk.png
deleted file mode 100644
index 4bd0885b7..000000000
Binary files a/rtdata/images/Dark/devices/drive-harddisk.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/drive-optical.png b/rtdata/images/Dark/devices/drive-optical.png
deleted file mode 100644
index b4d20cc2e..000000000
Binary files a/rtdata/images/Dark/devices/drive-optical.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/drive-removable-media.png b/rtdata/images/Dark/devices/drive-removable-media.png
deleted file mode 100644
index ee41f6a5c..000000000
Binary files a/rtdata/images/Dark/devices/drive-removable-media.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/gtk-cdrom.png b/rtdata/images/Dark/devices/gtk-cdrom.png
deleted file mode 100644
index b4d20cc2e..000000000
Binary files a/rtdata/images/Dark/devices/gtk-cdrom.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-flash.png b/rtdata/images/Dark/devices/media-flash.png
deleted file mode 100644
index 4bd0885b7..000000000
Binary files a/rtdata/images/Dark/devices/media-flash.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-floppy.png b/rtdata/images/Dark/devices/media-floppy.png
deleted file mode 100644
index ee41f6a5c..000000000
Binary files a/rtdata/images/Dark/devices/media-floppy.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-optical-bd.png b/rtdata/images/Dark/devices/media-optical-bd.png
deleted file mode 100644
index b4d20cc2e..000000000
Binary files a/rtdata/images/Dark/devices/media-optical-bd.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-optical-dvd.png b/rtdata/images/Dark/devices/media-optical-dvd.png
deleted file mode 100644
index b4d20cc2e..000000000
Binary files a/rtdata/images/Dark/devices/media-optical-dvd.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-optical.png b/rtdata/images/Dark/devices/media-optical.png
deleted file mode 100644
index b4d20cc2e..000000000
Binary files a/rtdata/images/Dark/devices/media-optical.png and /dev/null differ
diff --git a/rtdata/images/Dark/devices/media-tape.png b/rtdata/images/Dark/devices/media-tape.png
deleted file mode 100644
index 4bd0885b7..000000000
Binary files a/rtdata/images/Dark/devices/media-tape.png and /dev/null differ
diff --git a/rtdata/images/Dark/index.theme b/rtdata/images/Dark/index.theme
deleted file mode 100644
index 8912f3f5d..000000000
--- a/rtdata/images/Dark/index.theme
+++ /dev/null
@@ -1,42 +0,0 @@
-[Icon Theme]
-Name=RawTherapee-Dark
-Comment=Dark theme for RawTherapee
-Inherits=hicolor
-Example=folder
-
-Directories=actions,apps,categories,devices,emblems,places,status
-
-[actions]
-Size=22
-Context=Actions
-Type=Fixed
-
-[apps]
-Size=22
-Context=Applications
-Type=Fixed
-
-[categories]
-Size=22
-Context=Categories
-Type=Fixed
-
-[devices]
-Size=22
-Context=Devices
-Type=Fixed
-
-[emblems]
-Size=22
-Context=Emblems
-Type=Fixed
-
-[places]
-Size=22
-Context=Places
-Type=Fixed
-
-[status]
-Size=22
-Context=Status
-Type=Fixed
diff --git a/rtdata/images/Dark/places/folder.png b/rtdata/images/Dark/places/folder.png
deleted file mode 100644
index cc268ed89..000000000
Binary files a/rtdata/images/Dark/places/folder.png and /dev/null differ
diff --git a/rtdata/images/Dark/places/gtk-directory.png b/rtdata/images/Dark/places/gtk-directory.png
deleted file mode 100644
index cc268ed89..000000000
Binary files a/rtdata/images/Dark/places/gtk-directory.png and /dev/null differ
diff --git a/rtdata/images/Dark/places/user-desktop.png b/rtdata/images/Dark/places/user-desktop.png
deleted file mode 100644
index e973ac169..000000000
Binary files a/rtdata/images/Dark/places/user-desktop.png and /dev/null differ
diff --git a/rtdata/images/Dark/places/user-home.png b/rtdata/images/Dark/places/user-home.png
deleted file mode 100644
index 93d09835d..000000000
Binary files a/rtdata/images/Dark/places/user-home.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/Chanmixer-Bgamma.png b/rtdata/images/Light/actions/Chanmixer-Bgamma.png
deleted file mode 100644
index 95503a367..000000000
Binary files a/rtdata/images/Light/actions/Chanmixer-Bgamma.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/Chanmixer-Ggamma.png b/rtdata/images/Light/actions/Chanmixer-Ggamma.png
deleted file mode 100644
index 13f937ae0..000000000
Binary files a/rtdata/images/Light/actions/Chanmixer-Ggamma.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/Chanmixer-Rgamma.png b/rtdata/images/Light/actions/Chanmixer-Rgamma.png
deleted file mode 100644
index 5e423fe18..000000000
Binary files a/rtdata/images/Light/actions/Chanmixer-Rgamma.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/HDR-thumbnail.png b/rtdata/images/Light/actions/HDR-thumbnail.png
deleted file mode 100644
index 182e603e8..000000000
Binary files a/rtdata/images/Light/actions/HDR-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/PanelEnding.png b/rtdata/images/Light/actions/PanelEnding.png
deleted file mode 100644
index d7c3cc37d..000000000
Binary files a/rtdata/images/Light/actions/PanelEnding.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/PixelShift-thumbnail.png b/rtdata/images/Light/actions/PixelShift-thumbnail.png
deleted file mode 100644
index 4bbea1aee..000000000
Binary files a/rtdata/images/Light/actions/PixelShift-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/adj-black.png b/rtdata/images/Light/actions/adj-black.png
deleted file mode 100644
index bf5459fa5..000000000
Binary files a/rtdata/images/Light/actions/adj-black.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/adj-white.png b/rtdata/images/Light/actions/adj-white.png
deleted file mode 100644
index 03028934e..000000000
Binary files a/rtdata/images/Light/actions/adj-white.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-ca-blue1.png b/rtdata/images/Light/actions/ajd-ca-blue1.png
deleted file mode 100644
index 7a47267df..000000000
Binary files a/rtdata/images/Light/actions/ajd-ca-blue1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-ca-blue2.png b/rtdata/images/Light/actions/ajd-ca-blue2.png
deleted file mode 100644
index dfb458300..000000000
Binary files a/rtdata/images/Light/actions/ajd-ca-blue2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-ca-red1.png b/rtdata/images/Light/actions/ajd-ca-red1.png
deleted file mode 100644
index 1e45c5035..000000000
Binary files a/rtdata/images/Light/actions/ajd-ca-red1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-ca-red2.png b/rtdata/images/Light/actions/ajd-ca-red2.png
deleted file mode 100644
index e5da9e005..000000000
Binary files a/rtdata/images/Light/actions/ajd-ca-red2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-bluered1.png b/rtdata/images/Light/actions/ajd-wb-bluered1.png
deleted file mode 100644
index 3c8473451..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-bluered1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-bluered2.png b/rtdata/images/Light/actions/ajd-wb-bluered2.png
deleted file mode 100644
index 0f06a770e..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-bluered2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-green1.png b/rtdata/images/Light/actions/ajd-wb-green1.png
deleted file mode 100644
index 4f33551d6..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-green1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-green2.png b/rtdata/images/Light/actions/ajd-wb-green2.png
deleted file mode 100644
index a9a7e8553..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-green2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-temp1.png b/rtdata/images/Light/actions/ajd-wb-temp1.png
deleted file mode 100644
index 3c8473451..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-temp1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ajd-wb-temp2.png b/rtdata/images/Light/actions/ajd-wb-temp2.png
deleted file mode 100644
index 2b0c7c0ef..000000000
Binary files a/rtdata/images/Light/actions/ajd-wb-temp2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-down-small.png b/rtdata/images/Light/actions/arrow-down-small.png
deleted file mode 100644
index 21f25626c..000000000
Binary files a/rtdata/images/Light/actions/arrow-down-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-down.png b/rtdata/images/Light/actions/arrow-down.png
deleted file mode 100644
index 36c366bd3..000000000
Binary files a/rtdata/images/Light/actions/arrow-down.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-left-small.png b/rtdata/images/Light/actions/arrow-left-small.png
deleted file mode 100644
index 5dfd88f09..000000000
Binary files a/rtdata/images/Light/actions/arrow-left-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-left.png b/rtdata/images/Light/actions/arrow-left.png
deleted file mode 100644
index 711ad1016..000000000
Binary files a/rtdata/images/Light/actions/arrow-left.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-right-small.png b/rtdata/images/Light/actions/arrow-right-small.png
deleted file mode 100644
index 310e87b9c..000000000
Binary files a/rtdata/images/Light/actions/arrow-right-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-right.png b/rtdata/images/Light/actions/arrow-right.png
deleted file mode 100644
index 933e84025..000000000
Binary files a/rtdata/images/Light/actions/arrow-right.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-up-small.png b/rtdata/images/Light/actions/arrow-up-small.png
deleted file mode 100644
index 9b8884c5e..000000000
Binary files a/rtdata/images/Light/actions/arrow-up-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/arrow-up.png b/rtdata/images/Light/actions/arrow-up.png
deleted file mode 100644
index df6b022a3..000000000
Binary files a/rtdata/images/Light/actions/arrow-up.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/atom.png b/rtdata/images/Light/actions/atom.png
deleted file mode 100644
index 55feaf8d7..000000000
Binary files a/rtdata/images/Light/actions/atom.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/beforeafter.png b/rtdata/images/Light/actions/beforeafter.png
deleted file mode 100644
index cdbc49dc4..000000000
Binary files a/rtdata/images/Light/actions/beforeafter.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel0.png b/rtdata/images/Light/actions/cglabel0.png
deleted file mode 100644
index 72cb8f15b..000000000
Binary files a/rtdata/images/Light/actions/cglabel0.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel1.png b/rtdata/images/Light/actions/cglabel1.png
deleted file mode 100644
index 6337a6476..000000000
Binary files a/rtdata/images/Light/actions/cglabel1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel2.png b/rtdata/images/Light/actions/cglabel2.png
deleted file mode 100644
index a5b843c0c..000000000
Binary files a/rtdata/images/Light/actions/cglabel2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel3.png b/rtdata/images/Light/actions/cglabel3.png
deleted file mode 100644
index a3f3da7a9..000000000
Binary files a/rtdata/images/Light/actions/cglabel3.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel4.png b/rtdata/images/Light/actions/cglabel4.png
deleted file mode 100644
index 3e048f36c..000000000
Binary files a/rtdata/images/Light/actions/cglabel4.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/cglabel5.png b/rtdata/images/Light/actions/cglabel5.png
deleted file mode 100644
index 323be0cb9..000000000
Binary files a/rtdata/images/Light/actions/cglabel5.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel0.png b/rtdata/images/Light/actions/clabel0.png
deleted file mode 100644
index 64de8ead0..000000000
Binary files a/rtdata/images/Light/actions/clabel0.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel1.png b/rtdata/images/Light/actions/clabel1.png
deleted file mode 100644
index 73e267c2a..000000000
Binary files a/rtdata/images/Light/actions/clabel1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel2.png b/rtdata/images/Light/actions/clabel2.png
deleted file mode 100644
index 3e6eca725..000000000
Binary files a/rtdata/images/Light/actions/clabel2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel3.png b/rtdata/images/Light/actions/clabel3.png
deleted file mode 100644
index e291a0df6..000000000
Binary files a/rtdata/images/Light/actions/clabel3.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel4.png b/rtdata/images/Light/actions/clabel4.png
deleted file mode 100644
index 89066bc43..000000000
Binary files a/rtdata/images/Light/actions/clabel4.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/clabel5.png b/rtdata/images/Light/actions/clabel5.png
deleted file mode 100644
index 9944eaf69..000000000
Binary files a/rtdata/images/Light/actions/clabel5.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/closedhand.png b/rtdata/images/Light/actions/closedhand.png
deleted file mode 100644
index a1aea95f2..000000000
Binary files a/rtdata/images/Light/actions/closedhand.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/colorPickers-hide.png b/rtdata/images/Light/actions/colorPickers-hide.png
deleted file mode 100644
index 434087f1c..000000000
Binary files a/rtdata/images/Light/actions/colorPickers-hide.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/colorPickers-show.png b/rtdata/images/Light/actions/colorPickers-show.png
deleted file mode 100644
index d93deb3eb..000000000
Binary files a/rtdata/images/Light/actions/colorPickers-show.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/colour.png b/rtdata/images/Light/actions/colour.png
deleted file mode 100644
index d473e8a0b..000000000
Binary files a/rtdata/images/Light/actions/colour.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/crop-auto.png b/rtdata/images/Light/actions/crop-auto.png
deleted file mode 100644
index a4c6c897e..000000000
Binary files a/rtdata/images/Light/actions/crop-auto.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/crop.png b/rtdata/images/Light/actions/crop.png
deleted file mode 100644
index 16ca56996..000000000
Binary files a/rtdata/images/Light/actions/crop.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/crossed-arrows-in.png b/rtdata/images/Light/actions/crossed-arrows-in.png
deleted file mode 100644
index da0e44b8b..000000000
Binary files a/rtdata/images/Light/actions/crossed-arrows-in.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/crossed-arrows-out.png b/rtdata/images/Light/actions/crossed-arrows-out.png
deleted file mode 100644
index 8bc1a8819..000000000
Binary files a/rtdata/images/Light/actions/crossed-arrows-out.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-NURBS.png b/rtdata/images/Light/actions/curveType-NURBS.png
deleted file mode 100644
index 2a025b1ba..000000000
Binary files a/rtdata/images/Light/actions/curveType-NURBS.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-controlPoints.png b/rtdata/images/Light/actions/curveType-controlPoints.png
deleted file mode 100644
index eae5a3875..000000000
Binary files a/rtdata/images/Light/actions/curveType-controlPoints.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-flatLinear.png b/rtdata/images/Light/actions/curveType-flatLinear.png
deleted file mode 100644
index 6fb01eba8..000000000
Binary files a/rtdata/images/Light/actions/curveType-flatLinear.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-linear.png b/rtdata/images/Light/actions/curveType-linear.png
deleted file mode 100644
index f58b3ab51..000000000
Binary files a/rtdata/images/Light/actions/curveType-linear.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-parametric.png b/rtdata/images/Light/actions/curveType-parametric.png
deleted file mode 100644
index 287a37ab0..000000000
Binary files a/rtdata/images/Light/actions/curveType-parametric.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/curveType-spline.png b/rtdata/images/Light/actions/curveType-spline.png
deleted file mode 100644
index e3e5e08d9..000000000
Binary files a/rtdata/images/Light/actions/curveType-spline.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/detail.png b/rtdata/images/Light/actions/detail.png
deleted file mode 100644
index 1fc314fd3..000000000
Binary files a/rtdata/images/Light/actions/detail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/distorsion.png b/rtdata/images/Light/actions/distorsion.png
deleted file mode 100644
index 18b4a01df..000000000
Binary files a/rtdata/images/Light/actions/distorsion.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/distortion-auto.png b/rtdata/images/Light/actions/distortion-auto.png
deleted file mode 100644
index 759c8e463..000000000
Binary files a/rtdata/images/Light/actions/distortion-auto.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/distortion-barrel.png b/rtdata/images/Light/actions/distortion-barrel.png
deleted file mode 100644
index 836be0ac2..000000000
Binary files a/rtdata/images/Light/actions/distortion-barrel.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/distortion-pincushion.png b/rtdata/images/Light/actions/distortion-pincushion.png
deleted file mode 100644
index f64574151..000000000
Binary files a/rtdata/images/Light/actions/distortion-pincushion.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/document-open-recent.png b/rtdata/images/Light/actions/document-open-recent.png
deleted file mode 100644
index 5ef8724f2..000000000
Binary files a/rtdata/images/Light/actions/document-open-recent.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/document-open.png b/rtdata/images/Light/actions/document-open.png
deleted file mode 100644
index f7b57849a..000000000
Binary files a/rtdata/images/Light/actions/document-open.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/edit-copy.png b/rtdata/images/Light/actions/edit-copy.png
deleted file mode 100644
index 12e49387f..000000000
Binary files a/rtdata/images/Light/actions/edit-copy.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/edit-find.png b/rtdata/images/Light/actions/edit-find.png
deleted file mode 100644
index d15687e7d..000000000
Binary files a/rtdata/images/Light/actions/edit-find.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/edit-paste.png b/rtdata/images/Light/actions/edit-paste.png
deleted file mode 100644
index d7e924562..000000000
Binary files a/rtdata/images/Light/actions/edit-paste.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/edited-small.png b/rtdata/images/Light/actions/edited-small.png
deleted file mode 100644
index f25997a59..000000000
Binary files a/rtdata/images/Light/actions/edited-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/edited.png b/rtdata/images/Light/actions/edited.png
deleted file mode 100644
index 95d058454..000000000
Binary files a/rtdata/images/Light/actions/edited.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/editedg-small.png b/rtdata/images/Light/actions/editedg-small.png
deleted file mode 100644
index 9eb229e75..000000000
Binary files a/rtdata/images/Light/actions/editedg-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/editednot-small.png b/rtdata/images/Light/actions/editednot-small.png
deleted file mode 100644
index 410bff81b..000000000
Binary files a/rtdata/images/Light/actions/editednot-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/editednotg-small.png b/rtdata/images/Light/actions/editednotg-small.png
deleted file mode 100644
index 55bc28f2b..000000000
Binary files a/rtdata/images/Light/actions/editednotg-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/editmodehand.png b/rtdata/images/Light/actions/editmodehand.png
deleted file mode 100644
index a3ec816bb..000000000
Binary files a/rtdata/images/Light/actions/editmodehand.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/equalizer-narrow.png b/rtdata/images/Light/actions/equalizer-narrow.png
deleted file mode 100644
index c9e2c5b26..000000000
Binary files a/rtdata/images/Light/actions/equalizer-narrow.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/equalizer-wide.png b/rtdata/images/Light/actions/equalizer-wide.png
deleted file mode 100644
index f5b0aca68..000000000
Binary files a/rtdata/images/Light/actions/equalizer-wide.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/expanderClosed.png b/rtdata/images/Light/actions/expanderClosed.png
deleted file mode 100644
index 81a7d85ab..000000000
Binary files a/rtdata/images/Light/actions/expanderClosed.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/expanderDisabled.png b/rtdata/images/Light/actions/expanderDisabled.png
deleted file mode 100644
index 8fcef1b01..000000000
Binary files a/rtdata/images/Light/actions/expanderDisabled.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/expanderEnabled.png b/rtdata/images/Light/actions/expanderEnabled.png
deleted file mode 100644
index 7e2006eb3..000000000
Binary files a/rtdata/images/Light/actions/expanderEnabled.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/expanderInconsistent.png b/rtdata/images/Light/actions/expanderInconsistent.png
deleted file mode 100644
index 3c2339b60..000000000
Binary files a/rtdata/images/Light/actions/expanderInconsistent.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/expanderOpened.png b/rtdata/images/Light/actions/expanderOpened.png
deleted file mode 100644
index 5b003e3f7..000000000
Binary files a/rtdata/images/Light/actions/expanderOpened.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/exposure.png b/rtdata/images/Light/actions/exposure.png
deleted file mode 100644
index 8675d8e15..000000000
Binary files a/rtdata/images/Light/actions/exposure.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/filter-original-1.png b/rtdata/images/Light/actions/filter-original-1.png
deleted file mode 100644
index 2daef11fb..000000000
Binary files a/rtdata/images/Light/actions/filter-original-1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/filter-original-2.png b/rtdata/images/Light/actions/filter-original-2.png
deleted file mode 100644
index 37727f3be..000000000
Binary files a/rtdata/images/Light/actions/filter-original-2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/filter.png b/rtdata/images/Light/actions/filter.png
deleted file mode 100644
index 7c69d18ee..000000000
Binary files a/rtdata/images/Light/actions/filter.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/filterclear.png b/rtdata/images/Light/actions/filterclear.png
deleted file mode 100644
index bd4f651f8..000000000
Binary files a/rtdata/images/Light/actions/filterclear.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/fullscreen-exit.png b/rtdata/images/Light/actions/fullscreen-exit.png
deleted file mode 100644
index 01df3044c..000000000
Binary files a/rtdata/images/Light/actions/fullscreen-exit.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/fullscreen.png b/rtdata/images/Light/actions/fullscreen.png
deleted file mode 100644
index e08067584..000000000
Binary files a/rtdata/images/Light/actions/fullscreen.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gamut-hist.png b/rtdata/images/Light/actions/gamut-hist.png
deleted file mode 100644
index 8c81e0213..000000000
Binary files a/rtdata/images/Light/actions/gamut-hist.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gamut-softproof.png b/rtdata/images/Light/actions/gamut-softproof.png
deleted file mode 100644
index e745d8dd6..000000000
Binary files a/rtdata/images/Light/actions/gamut-softproof.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gamut-warning.png b/rtdata/images/Light/actions/gamut-warning.png
deleted file mode 100644
index cbbf89a56..000000000
Binary files a/rtdata/images/Light/actions/gamut-warning.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/grayrated.png b/rtdata/images/Light/actions/grayrated.png
deleted file mode 100644
index 813af1cee..000000000
Binary files a/rtdata/images/Light/actions/grayrated.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-add.png b/rtdata/images/Light/actions/gtk-add.png
deleted file mode 100644
index 9a982056c..000000000
Binary files a/rtdata/images/Light/actions/gtk-add.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-apply.png b/rtdata/images/Light/actions/gtk-apply.png
deleted file mode 100644
index e1224bca3..000000000
Binary files a/rtdata/images/Light/actions/gtk-apply.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-cancel.png b/rtdata/images/Light/actions/gtk-cancel.png
deleted file mode 100644
index 65740aaf1..000000000
Binary files a/rtdata/images/Light/actions/gtk-cancel.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-close-small.png b/rtdata/images/Light/actions/gtk-close-small.png
deleted file mode 100644
index ef2ac03d8..000000000
Binary files a/rtdata/images/Light/actions/gtk-close-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-close.png b/rtdata/images/Light/actions/gtk-close.png
deleted file mode 100644
index 65740aaf1..000000000
Binary files a/rtdata/images/Light/actions/gtk-close.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-color-picker-add.png b/rtdata/images/Light/actions/gtk-color-picker-add.png
deleted file mode 100644
index 01d2b6a0b..000000000
Binary files a/rtdata/images/Light/actions/gtk-color-picker-add.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-color-picker-small.png b/rtdata/images/Light/actions/gtk-color-picker-small.png
deleted file mode 100644
index 834848607..000000000
Binary files a/rtdata/images/Light/actions/gtk-color-picker-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-color-picker.png b/rtdata/images/Light/actions/gtk-color-picker.png
deleted file mode 100644
index f2fbc5cf9..000000000
Binary files a/rtdata/images/Light/actions/gtk-color-picker.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-copy.png b/rtdata/images/Light/actions/gtk-copy.png
deleted file mode 100644
index 12e49387f..000000000
Binary files a/rtdata/images/Light/actions/gtk-copy.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-edit.png b/rtdata/images/Light/actions/gtk-edit.png
deleted file mode 100644
index d76e57227..000000000
Binary files a/rtdata/images/Light/actions/gtk-edit.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-find.png b/rtdata/images/Light/actions/gtk-find.png
deleted file mode 100644
index d15687e7d..000000000
Binary files a/rtdata/images/Light/actions/gtk-find.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-media-play.png b/rtdata/images/Light/actions/gtk-media-play.png
deleted file mode 100644
index 2f97b3fec..000000000
Binary files a/rtdata/images/Light/actions/gtk-media-play.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-media-stop.png b/rtdata/images/Light/actions/gtk-media-stop.png
deleted file mode 100644
index ea1b0e8a1..000000000
Binary files a/rtdata/images/Light/actions/gtk-media-stop.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-ok.png b/rtdata/images/Light/actions/gtk-ok.png
deleted file mode 100644
index e1224bca3..000000000
Binary files a/rtdata/images/Light/actions/gtk-ok.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-open.png b/rtdata/images/Light/actions/gtk-open.png
deleted file mode 100644
index f7b57849a..000000000
Binary files a/rtdata/images/Light/actions/gtk-open.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-paste.png b/rtdata/images/Light/actions/gtk-paste.png
deleted file mode 100644
index d7e924562..000000000
Binary files a/rtdata/images/Light/actions/gtk-paste.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-preferences.png b/rtdata/images/Light/actions/gtk-preferences.png
deleted file mode 100644
index edb354e1a..000000000
Binary files a/rtdata/images/Light/actions/gtk-preferences.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-remove.png b/rtdata/images/Light/actions/gtk-remove.png
deleted file mode 100644
index f198bce68..000000000
Binary files a/rtdata/images/Light/actions/gtk-remove.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-save-large.png b/rtdata/images/Light/actions/gtk-save-large.png
deleted file mode 100644
index a55dfe04c..000000000
Binary files a/rtdata/images/Light/actions/gtk-save-large.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-save.png b/rtdata/images/Light/actions/gtk-save.png
deleted file mode 100644
index 64f9e44a2..000000000
Binary files a/rtdata/images/Light/actions/gtk-save.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undo-ltr-small.png b/rtdata/images/Light/actions/gtk-undo-ltr-small.png
deleted file mode 100644
index 86d0fa28f..000000000
Binary files a/rtdata/images/Light/actions/gtk-undo-ltr-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undo-ltr.png b/rtdata/images/Light/actions/gtk-undo-ltr.png
deleted file mode 100644
index ee15060e9..000000000
Binary files a/rtdata/images/Light/actions/gtk-undo-ltr.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undo-rtl-small.png b/rtdata/images/Light/actions/gtk-undo-rtl-small.png
deleted file mode 100644
index f8b4d4586..000000000
Binary files a/rtdata/images/Light/actions/gtk-undo-rtl-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undo-rtl.png b/rtdata/images/Light/actions/gtk-undo-rtl.png
deleted file mode 100644
index 22c6f2212..000000000
Binary files a/rtdata/images/Light/actions/gtk-undo-rtl.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undoall-ltr.png b/rtdata/images/Light/actions/gtk-undoall-ltr.png
deleted file mode 100644
index dca3f3d01..000000000
Binary files a/rtdata/images/Light/actions/gtk-undoall-ltr.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-undoall-rtl.png b/rtdata/images/Light/actions/gtk-undoall-rtl.png
deleted file mode 100644
index ac051c8e6..000000000
Binary files a/rtdata/images/Light/actions/gtk-undoall-rtl.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-100-small.png b/rtdata/images/Light/actions/gtk-zoom-100-small.png
deleted file mode 100644
index 23e694f6e..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-100-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-100.png b/rtdata/images/Light/actions/gtk-zoom-100.png
deleted file mode 100644
index 656274a75..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-100.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-crop.png b/rtdata/images/Light/actions/gtk-zoom-crop.png
deleted file mode 100644
index c83bac4fe..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-crop.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-fit.png b/rtdata/images/Light/actions/gtk-zoom-fit.png
deleted file mode 100644
index 7f3452eed..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-fit.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-in-small.png b/rtdata/images/Light/actions/gtk-zoom-in-small.png
deleted file mode 100644
index f5e381ca8..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-in-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-in.png b/rtdata/images/Light/actions/gtk-zoom-in.png
deleted file mode 100644
index 0cafb1e36..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-in.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-out-small.png b/rtdata/images/Light/actions/gtk-zoom-out-small.png
deleted file mode 100644
index 4605917bc..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-out-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gtk-zoom-out.png b/rtdata/images/Light/actions/gtk-zoom-out.png
deleted file mode 100644
index f3d914d93..000000000
Binary files a/rtdata/images/Light/actions/gtk-zoom-out.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histBar.png b/rtdata/images/Light/actions/histBar.png
deleted file mode 100644
index 84bbecad8..000000000
Binary files a/rtdata/images/Light/actions/histBar.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histBarg.png b/rtdata/images/Light/actions/histBarg.png
deleted file mode 100644
index 789ee931c..000000000
Binary files a/rtdata/images/Light/actions/histBarg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histBlue.png b/rtdata/images/Light/actions/histBlue.png
deleted file mode 100644
index 53c447a1c..000000000
Binary files a/rtdata/images/Light/actions/histBlue.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histBlueg.png b/rtdata/images/Light/actions/histBlueg.png
deleted file mode 100644
index ac205219d..000000000
Binary files a/rtdata/images/Light/actions/histBlueg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histChro.png b/rtdata/images/Light/actions/histChro.png
deleted file mode 100644
index efbf75aa5..000000000
Binary files a/rtdata/images/Light/actions/histChro.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histChrog.png b/rtdata/images/Light/actions/histChrog.png
deleted file mode 100644
index 8349d5089..000000000
Binary files a/rtdata/images/Light/actions/histChrog.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histFull.png b/rtdata/images/Light/actions/histFull.png
deleted file mode 100644
index edabaa2bd..000000000
Binary files a/rtdata/images/Light/actions/histFull.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histFullg.png b/rtdata/images/Light/actions/histFullg.png
deleted file mode 100644
index ce3cf8ddc..000000000
Binary files a/rtdata/images/Light/actions/histFullg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histGreen.png b/rtdata/images/Light/actions/histGreen.png
deleted file mode 100644
index 54eebe37e..000000000
Binary files a/rtdata/images/Light/actions/histGreen.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histGreeng.png b/rtdata/images/Light/actions/histGreeng.png
deleted file mode 100644
index 33c138cae..000000000
Binary files a/rtdata/images/Light/actions/histGreeng.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histRaw.png b/rtdata/images/Light/actions/histRaw.png
deleted file mode 100644
index 36e1a5a31..000000000
Binary files a/rtdata/images/Light/actions/histRaw.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histRawg.png b/rtdata/images/Light/actions/histRawg.png
deleted file mode 100644
index 1b9d286b3..000000000
Binary files a/rtdata/images/Light/actions/histRawg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histRed.png b/rtdata/images/Light/actions/histRed.png
deleted file mode 100644
index ce7fddcd3..000000000
Binary files a/rtdata/images/Light/actions/histRed.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histRedg.png b/rtdata/images/Light/actions/histRedg.png
deleted file mode 100644
index b75a66995..000000000
Binary files a/rtdata/images/Light/actions/histRedg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histValue.png b/rtdata/images/Light/actions/histValue.png
deleted file mode 100644
index 7f807ec9b..000000000
Binary files a/rtdata/images/Light/actions/histValue.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/histValueg.png b/rtdata/images/Light/actions/histValueg.png
deleted file mode 100644
index 28f5dbe18..000000000
Binary files a/rtdata/images/Light/actions/histValueg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/image-editor.png b/rtdata/images/Light/actions/image-editor.png
deleted file mode 100644
index 3061ad89e..000000000
Binary files a/rtdata/images/Light/actions/image-editor.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/info.png b/rtdata/images/Light/actions/info.png
deleted file mode 100644
index db3f654de..000000000
Binary files a/rtdata/images/Light/actions/info.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/intent-absolute.png b/rtdata/images/Light/actions/intent-absolute.png
deleted file mode 100644
index fb5919181..000000000
Binary files a/rtdata/images/Light/actions/intent-absolute.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/intent-perceptual.png b/rtdata/images/Light/actions/intent-perceptual.png
deleted file mode 100644
index 88de7b5e9..000000000
Binary files a/rtdata/images/Light/actions/intent-perceptual.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/intent-relative.png b/rtdata/images/Light/actions/intent-relative.png
deleted file mode 100644
index f952f4ab7..000000000
Binary files a/rtdata/images/Light/actions/intent-relative.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/intent-saturation.png b/rtdata/images/Light/actions/intent-saturation.png
deleted file mode 100644
index 92908b030..000000000
Binary files a/rtdata/images/Light/actions/intent-saturation.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/list-add-small.png b/rtdata/images/Light/actions/list-add-small.png
deleted file mode 100644
index 9d06f0303..000000000
Binary files a/rtdata/images/Light/actions/list-add-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/list-add.png b/rtdata/images/Light/actions/list-add.png
deleted file mode 100644
index 9a982056c..000000000
Binary files a/rtdata/images/Light/actions/list-add.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/list-remove-red-small.png b/rtdata/images/Light/actions/list-remove-red-small.png
deleted file mode 100644
index 866a2b2d2..000000000
Binary files a/rtdata/images/Light/actions/list-remove-red-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/list-remove.png b/rtdata/images/Light/actions/list-remove.png
deleted file mode 100644
index f198bce68..000000000
Binary files a/rtdata/images/Light/actions/list-remove.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/lock-off.png b/rtdata/images/Light/actions/lock-off.png
deleted file mode 100644
index af4489e34..000000000
Binary files a/rtdata/images/Light/actions/lock-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/lock-on.png b/rtdata/images/Light/actions/lock-on.png
deleted file mode 100644
index 3c664e73e..000000000
Binary files a/rtdata/images/Light/actions/lock-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/media-usb.png b/rtdata/images/Light/actions/media-usb.png
deleted file mode 100644
index e8b990a03..000000000
Binary files a/rtdata/images/Light/actions/media-usb.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/meta.png b/rtdata/images/Light/actions/meta.png
deleted file mode 100644
index a2f61665a..000000000
Binary files a/rtdata/images/Light/actions/meta.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/nav-next.png b/rtdata/images/Light/actions/nav-next.png
deleted file mode 100644
index d68e1df60..000000000
Binary files a/rtdata/images/Light/actions/nav-next.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/nav-prev.png b/rtdata/images/Light/actions/nav-prev.png
deleted file mode 100644
index ad37367ba..000000000
Binary files a/rtdata/images/Light/actions/nav-prev.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/nav-sync.png b/rtdata/images/Light/actions/nav-sync.png
deleted file mode 100644
index eb8445a40..000000000
Binary files a/rtdata/images/Light/actions/nav-sync.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/new-detail-window.png b/rtdata/images/Light/actions/new-detail-window.png
deleted file mode 100644
index 23ae12faf..000000000
Binary files a/rtdata/images/Light/actions/new-detail-window.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/openhand.png b/rtdata/images/Light/actions/openhand.png
deleted file mode 100644
index 28da9e5e6..000000000
Binary files a/rtdata/images/Light/actions/openhand.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/panel-to-bottom.png b/rtdata/images/Light/actions/panel-to-bottom.png
deleted file mode 100644
index cc3b45b64..000000000
Binary files a/rtdata/images/Light/actions/panel-to-bottom.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/panel-to-left.png b/rtdata/images/Light/actions/panel-to-left.png
deleted file mode 100644
index 2562b8f00..000000000
Binary files a/rtdata/images/Light/actions/panel-to-left.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/panel-to-right.png b/rtdata/images/Light/actions/panel-to-right.png
deleted file mode 100644
index 3e05a3813..000000000
Binary files a/rtdata/images/Light/actions/panel-to-right.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/panel-to-top.png b/rtdata/images/Light/actions/panel-to-top.png
deleted file mode 100644
index ff453efac..000000000
Binary files a/rtdata/images/Light/actions/panel-to-top.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/perspective-h1.png b/rtdata/images/Light/actions/perspective-h1.png
deleted file mode 100644
index c857a1df5..000000000
Binary files a/rtdata/images/Light/actions/perspective-h1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/perspective-h2.png b/rtdata/images/Light/actions/perspective-h2.png
deleted file mode 100644
index 0fb23ea9c..000000000
Binary files a/rtdata/images/Light/actions/perspective-h2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/perspective-v1.png b/rtdata/images/Light/actions/perspective-v1.png
deleted file mode 100644
index eb94f4b9b..000000000
Binary files a/rtdata/images/Light/actions/perspective-v1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/perspective-v2.png b/rtdata/images/Light/actions/perspective-v2.png
deleted file mode 100644
index 1b983a78d..000000000
Binary files a/rtdata/images/Light/actions/perspective-v2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/popuparrow.png b/rtdata/images/Light/actions/popuparrow.png
deleted file mode 100644
index ba3956421..000000000
Binary files a/rtdata/images/Light/actions/popuparrow.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeB-off.png b/rtdata/images/Light/actions/previewmodeB-off.png
deleted file mode 100644
index 0c9890437..000000000
Binary files a/rtdata/images/Light/actions/previewmodeB-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeB-on.png b/rtdata/images/Light/actions/previewmodeB-on.png
deleted file mode 100644
index 466192b3a..000000000
Binary files a/rtdata/images/Light/actions/previewmodeB-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC0-off.png b/rtdata/images/Light/actions/previewmodeBC0-off.png
deleted file mode 100644
index 28c024555..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC0-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC0-on.png b/rtdata/images/Light/actions/previewmodeBC0-on.png
deleted file mode 100644
index f5e0b8000..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC0-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC1-off.png b/rtdata/images/Light/actions/previewmodeBC1-off.png
deleted file mode 100644
index 4ac160b05..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC1-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC1-on.png b/rtdata/images/Light/actions/previewmodeBC1-on.png
deleted file mode 100644
index 3e9b6874c..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC1-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC2-off.png b/rtdata/images/Light/actions/previewmodeBC2-off.png
deleted file mode 100644
index bf3d97b2d..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC2-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC2-on.png b/rtdata/images/Light/actions/previewmodeBC2-on.png
deleted file mode 100644
index 457453166..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC2-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC3-off.png b/rtdata/images/Light/actions/previewmodeBC3-off.png
deleted file mode 100644
index 487ec777e..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC3-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeBC3-on.png b/rtdata/images/Light/actions/previewmodeBC3-on.png
deleted file mode 100644
index 670b5b8b4..000000000
Binary files a/rtdata/images/Light/actions/previewmodeBC3-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeF-focusScreen-off.png b/rtdata/images/Light/actions/previewmodeF-focusScreen-off.png
deleted file mode 100644
index 0aa81a705..000000000
Binary files a/rtdata/images/Light/actions/previewmodeF-focusScreen-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeF-focusScreen-on.png b/rtdata/images/Light/actions/previewmodeF-focusScreen-on.png
deleted file mode 100644
index 3d46dedc7..000000000
Binary files a/rtdata/images/Light/actions/previewmodeF-focusScreen-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeF-off.png b/rtdata/images/Light/actions/previewmodeF-off.png
deleted file mode 100644
index 5d52af569..000000000
Binary files a/rtdata/images/Light/actions/previewmodeF-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeF-on.png b/rtdata/images/Light/actions/previewmodeF-on.png
deleted file mode 100644
index f0d0ef230..000000000
Binary files a/rtdata/images/Light/actions/previewmodeF-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeG-off.png b/rtdata/images/Light/actions/previewmodeG-off.png
deleted file mode 100644
index 5c076c989..000000000
Binary files a/rtdata/images/Light/actions/previewmodeG-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeG-on.png b/rtdata/images/Light/actions/previewmodeG-on.png
deleted file mode 100644
index ecc75c8e7..000000000
Binary files a/rtdata/images/Light/actions/previewmodeG-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeL-off.png b/rtdata/images/Light/actions/previewmodeL-off.png
deleted file mode 100644
index 939dec642..000000000
Binary files a/rtdata/images/Light/actions/previewmodeL-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeL-on.png b/rtdata/images/Light/actions/previewmodeL-on.png
deleted file mode 100644
index 92fe937e8..000000000
Binary files a/rtdata/images/Light/actions/previewmodeL-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeR-off.png b/rtdata/images/Light/actions/previewmodeR-off.png
deleted file mode 100644
index b96e22c31..000000000
Binary files a/rtdata/images/Light/actions/previewmodeR-off.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/previewmodeR-on.png b/rtdata/images/Light/actions/previewmodeR-on.png
deleted file mode 100644
index fb1e46e98..000000000
Binary files a/rtdata/images/Light/actions/previewmodeR-on.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/processing-pause.png b/rtdata/images/Light/actions/processing-pause.png
deleted file mode 100644
index 36660d7e6..000000000
Binary files a/rtdata/images/Light/actions/processing-pause.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/processing-play.png b/rtdata/images/Light/actions/processing-play.png
deleted file mode 100644
index 5e1acbac7..000000000
Binary files a/rtdata/images/Light/actions/processing-play.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/processing-thumbnail.png b/rtdata/images/Light/actions/processing-thumbnail.png
deleted file mode 100644
index c95ce2ffa..000000000
Binary files a/rtdata/images/Light/actions/processing-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/processing.png b/rtdata/images/Light/actions/processing.png
deleted file mode 100644
index 28a598856..000000000
Binary files a/rtdata/images/Light/actions/processing.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/profile-filled.png b/rtdata/images/Light/actions/profile-filled.png
deleted file mode 100644
index 7e5ae44bf..000000000
Binary files a/rtdata/images/Light/actions/profile-filled.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/profile-partial.png b/rtdata/images/Light/actions/profile-partial.png
deleted file mode 100644
index 9bb666ae3..000000000
Binary files a/rtdata/images/Light/actions/profile-partial.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rated.png b/rtdata/images/Light/actions/rated.png
deleted file mode 100644
index 6b238da70..000000000
Binary files a/rtdata/images/Light/actions/rated.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ratednot.png b/rtdata/images/Light/actions/ratednot.png
deleted file mode 100644
index 33bc1935f..000000000
Binary files a/rtdata/images/Light/actions/ratednot.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/ratednotg.png b/rtdata/images/Light/actions/ratednotg.png
deleted file mode 100644
index ff55f1646..000000000
Binary files a/rtdata/images/Light/actions/ratednotg.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/raw.png b/rtdata/images/Light/actions/raw.png
deleted file mode 100644
index bf3e8f631..000000000
Binary files a/rtdata/images/Light/actions/raw.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/refresh-red.png b/rtdata/images/Light/actions/refresh-red.png
deleted file mode 100644
index 157c4bd70..000000000
Binary files a/rtdata/images/Light/actions/refresh-red.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/refresh-white.png b/rtdata/images/Light/actions/refresh-white.png
deleted file mode 100644
index 4536ce00d..000000000
Binary files a/rtdata/images/Light/actions/refresh-white.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-left-1.png b/rtdata/images/Light/actions/rotate-left-1.png
deleted file mode 100644
index 869c9ed4a..000000000
Binary files a/rtdata/images/Light/actions/rotate-left-1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-left-2.png b/rtdata/images/Light/actions/rotate-left-2.png
deleted file mode 100644
index 7aa5bd1ba..000000000
Binary files a/rtdata/images/Light/actions/rotate-left-2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-left-3.png b/rtdata/images/Light/actions/rotate-left-3.png
deleted file mode 100644
index 5bf87bb2b..000000000
Binary files a/rtdata/images/Light/actions/rotate-left-3.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-left.png b/rtdata/images/Light/actions/rotate-left.png
deleted file mode 100644
index f3851ba12..000000000
Binary files a/rtdata/images/Light/actions/rotate-left.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-right-1.png b/rtdata/images/Light/actions/rotate-right-1.png
deleted file mode 100644
index 9d4d477cb..000000000
Binary files a/rtdata/images/Light/actions/rotate-right-1.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-right-2.png b/rtdata/images/Light/actions/rotate-right-2.png
deleted file mode 100644
index bb4d98c66..000000000
Binary files a/rtdata/images/Light/actions/rotate-right-2.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-right-3.png b/rtdata/images/Light/actions/rotate-right-3.png
deleted file mode 100644
index 4bf41091c..000000000
Binary files a/rtdata/images/Light/actions/rotate-right-3.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rotate-right.png b/rtdata/images/Light/actions/rotate-right.png
deleted file mode 100644
index f9a728b8a..000000000
Binary files a/rtdata/images/Light/actions/rotate-right.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/rtwindow.png b/rtdata/images/Light/actions/rtwindow.png
deleted file mode 100644
index 19dfa521a..000000000
Binary files a/rtdata/images/Light/actions/rtwindow.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/softProof.png b/rtdata/images/Light/actions/softProof.png
deleted file mode 100644
index 3e5eb2f18..000000000
Binary files a/rtdata/images/Light/actions/softProof.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/spGamutCheck.png b/rtdata/images/Light/actions/spGamutCheck.png
deleted file mode 100644
index b1ae3e423..000000000
Binary files a/rtdata/images/Light/actions/spGamutCheck.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/stock-flip-horizontal.png b/rtdata/images/Light/actions/stock-flip-horizontal.png
deleted file mode 100644
index af8b4ac95..000000000
Binary files a/rtdata/images/Light/actions/stock-flip-horizontal.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/stock-flip-vertical.png b/rtdata/images/Light/actions/stock-flip-vertical.png
deleted file mode 100644
index baf393fed..000000000
Binary files a/rtdata/images/Light/actions/stock-flip-vertical.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/stock-rotate-270.png b/rtdata/images/Light/actions/stock-rotate-270.png
deleted file mode 100644
index ae46db66d..000000000
Binary files a/rtdata/images/Light/actions/stock-rotate-270.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/stock-rotate-90.png b/rtdata/images/Light/actions/stock-rotate-90.png
deleted file mode 100644
index a125fe413..000000000
Binary files a/rtdata/images/Light/actions/stock-rotate-90.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/straighten-small.png b/rtdata/images/Light/actions/straighten-small.png
deleted file mode 100644
index 5090d70f9..000000000
Binary files a/rtdata/images/Light/actions/straighten-small.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/straighten.png b/rtdata/images/Light/actions/straighten.png
deleted file mode 100644
index 3810c5e8a..000000000
Binary files a/rtdata/images/Light/actions/straighten.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/toleftend.png b/rtdata/images/Light/actions/toleftend.png
deleted file mode 100644
index 3fae3eae5..000000000
Binary files a/rtdata/images/Light/actions/toleftend.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/torightend.png b/rtdata/images/Light/actions/torightend.png
deleted file mode 100644
index a6b33af2d..000000000
Binary files a/rtdata/images/Light/actions/torightend.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/transform.png b/rtdata/images/Light/actions/transform.png
deleted file mode 100644
index 48f23e0b6..000000000
Binary files a/rtdata/images/Light/actions/transform.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/trash-hide-deleted.png b/rtdata/images/Light/actions/trash-hide-deleted.png
deleted file mode 100644
index 95aaecdba..000000000
Binary files a/rtdata/images/Light/actions/trash-hide-deleted.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/trash-show-empty.png b/rtdata/images/Light/actions/trash-show-empty.png
deleted file mode 100644
index dd35e4b30..000000000
Binary files a/rtdata/images/Light/actions/trash-show-empty.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/trash-show-full.png b/rtdata/images/Light/actions/trash-show-full.png
deleted file mode 100644
index fd6eff338..000000000
Binary files a/rtdata/images/Light/actions/trash-show-full.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/trash-thumbnail.png b/rtdata/images/Light/actions/trash-thumbnail.png
deleted file mode 100644
index 4adf53ebf..000000000
Binary files a/rtdata/images/Light/actions/trash-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/trash.png b/rtdata/images/Light/actions/trash.png
deleted file mode 100644
index dd35e4b30..000000000
Binary files a/rtdata/images/Light/actions/trash.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/unchanged-18.png b/rtdata/images/Light/actions/unchanged-18.png
deleted file mode 100644
index 9d08dda26..000000000
Binary files a/rtdata/images/Light/actions/unchanged-18.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/unchanged-22.png b/rtdata/images/Light/actions/unchanged-22.png
deleted file mode 100644
index db03d456a..000000000
Binary files a/rtdata/images/Light/actions/unchanged-22.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/undelete-rtl.png b/rtdata/images/Light/actions/undelete-rtl.png
deleted file mode 100644
index 27f273bd6..000000000
Binary files a/rtdata/images/Light/actions/undelete-rtl.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/undelete-thumbnail-rtl.png b/rtdata/images/Light/actions/undelete-thumbnail-rtl.png
deleted file mode 100644
index 7c26653a8..000000000
Binary files a/rtdata/images/Light/actions/undelete-thumbnail-rtl.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/undelete-thumbnail.png b/rtdata/images/Light/actions/undelete-thumbnail.png
deleted file mode 100644
index 7c26653a8..000000000
Binary files a/rtdata/images/Light/actions/undelete-thumbnail.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/undelete.png b/rtdata/images/Light/actions/undelete.png
deleted file mode 100644
index 27f273bd6..000000000
Binary files a/rtdata/images/Light/actions/undelete.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/warnhl.png b/rtdata/images/Light/actions/warnhl.png
deleted file mode 100644
index 066241abc..000000000
Binary files a/rtdata/images/Light/actions/warnhl.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/warnsh.png b/rtdata/images/Light/actions/warnsh.png
deleted file mode 100644
index 5621b88b4..000000000
Binary files a/rtdata/images/Light/actions/warnsh.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wavelet.png b/rtdata/images/Light/actions/wavelet.png
deleted file mode 100644
index 3de85a8f1..000000000
Binary files a/rtdata/images/Light/actions/wavelet.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-auto.png b/rtdata/images/Light/actions/wb-auto.png
deleted file mode 100644
index fa5c582ad..000000000
Binary files a/rtdata/images/Light/actions/wb-auto.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-camera.png b/rtdata/images/Light/actions/wb-camera.png
deleted file mode 100644
index e3f4b9a01..000000000
Binary files a/rtdata/images/Light/actions/wb-camera.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-cloudy.png b/rtdata/images/Light/actions/wb-cloudy.png
deleted file mode 100644
index a04cc56b5..000000000
Binary files a/rtdata/images/Light/actions/wb-cloudy.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-custom.png b/rtdata/images/Light/actions/wb-custom.png
deleted file mode 100644
index 2cc95a999..000000000
Binary files a/rtdata/images/Light/actions/wb-custom.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-flash.png b/rtdata/images/Light/actions/wb-flash.png
deleted file mode 100644
index 35f643e46..000000000
Binary files a/rtdata/images/Light/actions/wb-flash.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-fluorescent.png b/rtdata/images/Light/actions/wb-fluorescent.png
deleted file mode 100644
index f0da5ba72..000000000
Binary files a/rtdata/images/Light/actions/wb-fluorescent.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-lamp.png b/rtdata/images/Light/actions/wb-lamp.png
deleted file mode 100644
index 47f12d904..000000000
Binary files a/rtdata/images/Light/actions/wb-lamp.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-led.png b/rtdata/images/Light/actions/wb-led.png
deleted file mode 100644
index 5c2ef46d7..000000000
Binary files a/rtdata/images/Light/actions/wb-led.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-shade.png b/rtdata/images/Light/actions/wb-shade.png
deleted file mode 100644
index 617123893..000000000
Binary files a/rtdata/images/Light/actions/wb-shade.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-sun.png b/rtdata/images/Light/actions/wb-sun.png
deleted file mode 100644
index 115c8a0cb..000000000
Binary files a/rtdata/images/Light/actions/wb-sun.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-tungsten.png b/rtdata/images/Light/actions/wb-tungsten.png
deleted file mode 100644
index 61ad022c4..000000000
Binary files a/rtdata/images/Light/actions/wb-tungsten.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/wb-water.png b/rtdata/images/Light/actions/wb-water.png
deleted file mode 100644
index a1ae414af..000000000
Binary files a/rtdata/images/Light/actions/wb-water.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/zoom-100-identifier.png b/rtdata/images/Light/actions/zoom-100-identifier.png
deleted file mode 100644
index a07b63b83..000000000
Binary files a/rtdata/images/Light/actions/zoom-100-identifier.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/computer.png b/rtdata/images/Light/devices/computer.png
deleted file mode 100644
index 5969fae78..000000000
Binary files a/rtdata/images/Light/devices/computer.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/drive-harddisk.png b/rtdata/images/Light/devices/drive-harddisk.png
deleted file mode 100644
index 5969fae78..000000000
Binary files a/rtdata/images/Light/devices/drive-harddisk.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/drive-optical.png b/rtdata/images/Light/devices/drive-optical.png
deleted file mode 100644
index 5e4ba680d..000000000
Binary files a/rtdata/images/Light/devices/drive-optical.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/drive-removable-media.png b/rtdata/images/Light/devices/drive-removable-media.png
deleted file mode 100644
index 378f0cbbe..000000000
Binary files a/rtdata/images/Light/devices/drive-removable-media.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/gtk-cdrom.png b/rtdata/images/Light/devices/gtk-cdrom.png
deleted file mode 100644
index 5e4ba680d..000000000
Binary files a/rtdata/images/Light/devices/gtk-cdrom.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-flash.png b/rtdata/images/Light/devices/media-flash.png
deleted file mode 100644
index 5969fae78..000000000
Binary files a/rtdata/images/Light/devices/media-flash.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-floppy.png b/rtdata/images/Light/devices/media-floppy.png
deleted file mode 100644
index 378f0cbbe..000000000
Binary files a/rtdata/images/Light/devices/media-floppy.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-optical-bd.png b/rtdata/images/Light/devices/media-optical-bd.png
deleted file mode 100644
index 5e4ba680d..000000000
Binary files a/rtdata/images/Light/devices/media-optical-bd.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-optical-dvd.png b/rtdata/images/Light/devices/media-optical-dvd.png
deleted file mode 100644
index 5e4ba680d..000000000
Binary files a/rtdata/images/Light/devices/media-optical-dvd.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-optical.png b/rtdata/images/Light/devices/media-optical.png
deleted file mode 100644
index 5e4ba680d..000000000
Binary files a/rtdata/images/Light/devices/media-optical.png and /dev/null differ
diff --git a/rtdata/images/Light/devices/media-tape.png b/rtdata/images/Light/devices/media-tape.png
deleted file mode 100644
index 5969fae78..000000000
Binary files a/rtdata/images/Light/devices/media-tape.png and /dev/null differ
diff --git a/rtdata/images/Light/index.theme b/rtdata/images/Light/index.theme
deleted file mode 100644
index 1188aa465..000000000
--- a/rtdata/images/Light/index.theme
+++ /dev/null
@@ -1,42 +0,0 @@
-[Icon Theme]
-Name=RawTherapee-Light
-Comment=Light theme for RawTherapee
-Inherits=hicolor
-Example=folder
-
-Directories=actions,apps,categories,devices,emblems,places,status
-
-[actions]
-Size=22
-Context=Actions
-Type=Fixed
-
-[apps]
-Size=22
-Context=Applications
-Type=Fixed
-
-[categories]
-Size=22
-Context=Categories
-Type=Fixed
-
-[devices]
-Size=22
-Context=Devices
-Type=Fixed
-
-[emblems]
-Size=22
-Context=Emblems
-Type=Fixed
-
-[places]
-Size=22
-Context=Places
-Type=Fixed
-
-[status]
-Size=22
-Context=Status
-Type=Fixed
diff --git a/rtdata/images/Light/places/folder.png b/rtdata/images/Light/places/folder.png
deleted file mode 100644
index 19ea93f4c..000000000
Binary files a/rtdata/images/Light/places/folder.png and /dev/null differ
diff --git a/rtdata/images/Light/places/gtk-directory.png b/rtdata/images/Light/places/gtk-directory.png
deleted file mode 100644
index 19ea93f4c..000000000
Binary files a/rtdata/images/Light/places/gtk-directory.png and /dev/null differ
diff --git a/rtdata/images/Light/places/user-desktop.png b/rtdata/images/Light/places/user-desktop.png
deleted file mode 100644
index e11d7388e..000000000
Binary files a/rtdata/images/Light/places/user-desktop.png and /dev/null differ
diff --git a/rtdata/images/Light/places/user-home.png b/rtdata/images/Light/places/user-home.png
deleted file mode 100644
index 69868e8d5..000000000
Binary files a/rtdata/images/Light/places/user-home.png and /dev/null differ
diff --git a/rtdata/images/PanelEnding.png b/rtdata/images/PanelEnding.png
deleted file mode 100644
index b540adc66..000000000
Binary files a/rtdata/images/PanelEnding.png and /dev/null differ
diff --git a/rtdata/images/beforeafter.png b/rtdata/images/beforeafter.png
deleted file mode 100644
index a4b3fac7b..000000000
Binary files a/rtdata/images/beforeafter.png and /dev/null differ
diff --git a/rtdata/images/cglabel0.png b/rtdata/images/cglabel0.png
deleted file mode 100644
index f3f0a3b27..000000000
Binary files a/rtdata/images/cglabel0.png and /dev/null differ
diff --git a/rtdata/images/cglabel1.png b/rtdata/images/cglabel1.png
deleted file mode 100644
index 3d5d745b2..000000000
Binary files a/rtdata/images/cglabel1.png and /dev/null differ
diff --git a/rtdata/images/cglabel2.png b/rtdata/images/cglabel2.png
deleted file mode 100644
index f0bfb2e02..000000000
Binary files a/rtdata/images/cglabel2.png and /dev/null differ
diff --git a/rtdata/images/cglabel3.png b/rtdata/images/cglabel3.png
deleted file mode 100644
index 84aeceb47..000000000
Binary files a/rtdata/images/cglabel3.png and /dev/null differ
diff --git a/rtdata/images/cglabel4.png b/rtdata/images/cglabel4.png
deleted file mode 100644
index c6d2286ed..000000000
Binary files a/rtdata/images/cglabel4.png and /dev/null differ
diff --git a/rtdata/images/cglabel5.png b/rtdata/images/cglabel5.png
deleted file mode 100644
index 48568972d..000000000
Binary files a/rtdata/images/cglabel5.png and /dev/null differ
diff --git a/rtdata/images/clabel0.png b/rtdata/images/clabel0.png
deleted file mode 100644
index 65410ff22..000000000
Binary files a/rtdata/images/clabel0.png and /dev/null differ
diff --git a/rtdata/images/clabel1.png b/rtdata/images/clabel1.png
deleted file mode 100644
index 39d679aaa..000000000
Binary files a/rtdata/images/clabel1.png and /dev/null differ
diff --git a/rtdata/images/clabel2.png b/rtdata/images/clabel2.png
deleted file mode 100644
index b9316398a..000000000
Binary files a/rtdata/images/clabel2.png and /dev/null differ
diff --git a/rtdata/images/clabel3.png b/rtdata/images/clabel3.png
deleted file mode 100644
index e804d36a1..000000000
Binary files a/rtdata/images/clabel3.png and /dev/null differ
diff --git a/rtdata/images/clabel4.png b/rtdata/images/clabel4.png
deleted file mode 100644
index 5ac41db81..000000000
Binary files a/rtdata/images/clabel4.png and /dev/null differ
diff --git a/rtdata/images/clabel5.png b/rtdata/images/clabel5.png
deleted file mode 100644
index dbe190966..000000000
Binary files a/rtdata/images/clabel5.png and /dev/null differ
diff --git a/rtdata/images/closedhand.png b/rtdata/images/closedhand.png
deleted file mode 100644
index a08542071..000000000
Binary files a/rtdata/images/closedhand.png and /dev/null differ
diff --git a/rtdata/images/colour.png b/rtdata/images/colour.png
deleted file mode 100644
index e38094f02..000000000
Binary files a/rtdata/images/colour.png and /dev/null differ
diff --git a/rtdata/images/crop-auto.png b/rtdata/images/crop-auto.png
deleted file mode 100644
index 015a9555e..000000000
Binary files a/rtdata/images/crop-auto.png and /dev/null differ
diff --git a/rtdata/images/crop.png b/rtdata/images/crop.png
deleted file mode 100644
index 345fa209e..000000000
Binary files a/rtdata/images/crop.png and /dev/null differ
diff --git a/rtdata/images/cross.png b/rtdata/images/cross.png
deleted file mode 100644
index 6be9dde06..000000000
Binary files a/rtdata/images/cross.png and /dev/null differ
diff --git a/rtdata/images/crossed-arrows-out.png b/rtdata/images/crossed-arrows-out.png
deleted file mode 100644
index d4b8c2f8f..000000000
Binary files a/rtdata/images/crossed-arrows-out.png and /dev/null differ
diff --git a/rtdata/images/curveType-NURBS.png b/rtdata/images/curveType-NURBS.png
deleted file mode 100644
index b18128159..000000000
Binary files a/rtdata/images/curveType-NURBS.png and /dev/null differ
diff --git a/rtdata/images/curveType-controlPoints.png b/rtdata/images/curveType-controlPoints.png
deleted file mode 100644
index b8c4f447e..000000000
Binary files a/rtdata/images/curveType-controlPoints.png and /dev/null differ
diff --git a/rtdata/images/curveType-flatLinear.png b/rtdata/images/curveType-flatLinear.png
deleted file mode 100644
index ad061ef27..000000000
Binary files a/rtdata/images/curveType-flatLinear.png and /dev/null differ
diff --git a/rtdata/images/curveType-linear.png b/rtdata/images/curveType-linear.png
deleted file mode 100644
index a76331321..000000000
Binary files a/rtdata/images/curveType-linear.png and /dev/null differ
diff --git a/rtdata/images/curveType-parametric.png b/rtdata/images/curveType-parametric.png
deleted file mode 100644
index e1df7b699..000000000
Binary files a/rtdata/images/curveType-parametric.png and /dev/null differ
diff --git a/rtdata/images/curveType-spline.png b/rtdata/images/curveType-spline.png
deleted file mode 100644
index a179b901d..000000000
Binary files a/rtdata/images/curveType-spline.png and /dev/null differ
diff --git a/rtdata/images/detail.png b/rtdata/images/detail.png
deleted file mode 100644
index f4ad6e440..000000000
Binary files a/rtdata/images/detail.png and /dev/null differ
diff --git a/rtdata/images/distortion-auto.png b/rtdata/images/distortion-auto.png
deleted file mode 100644
index a0b9c114d..000000000
Binary files a/rtdata/images/distortion-auto.png and /dev/null differ
diff --git a/rtdata/images/edited-small.png b/rtdata/images/edited-small.png
deleted file mode 100644
index 7d6ecdede..000000000
Binary files a/rtdata/images/edited-small.png and /dev/null differ
diff --git a/rtdata/images/edited.png b/rtdata/images/edited.png
deleted file mode 100644
index 85c81b2e1..000000000
Binary files a/rtdata/images/edited.png and /dev/null differ
diff --git a/rtdata/images/editedg-small.png b/rtdata/images/editedg-small.png
deleted file mode 100644
index 1de271128..000000000
Binary files a/rtdata/images/editedg-small.png and /dev/null differ
diff --git a/rtdata/images/editednot-small.png b/rtdata/images/editednot-small.png
deleted file mode 100644
index c1a0299ed..000000000
Binary files a/rtdata/images/editednot-small.png and /dev/null differ
diff --git a/rtdata/images/editednotg-small.png b/rtdata/images/editednotg-small.png
deleted file mode 100644
index fa0de4fdf..000000000
Binary files a/rtdata/images/editednotg-small.png and /dev/null differ
diff --git a/rtdata/images/empty.png b/rtdata/images/empty.png
deleted file mode 100644
index fc5838fdb..000000000
Binary files a/rtdata/images/empty.png and /dev/null differ
diff --git a/rtdata/images/exposure.png b/rtdata/images/exposure.png
deleted file mode 100644
index 0579cdd75..000000000
Binary files a/rtdata/images/exposure.png and /dev/null differ
diff --git a/rtdata/images/filter.png b/rtdata/images/filter.png
deleted file mode 100644
index 1059a8122..000000000
Binary files a/rtdata/images/filter.png and /dev/null differ
diff --git a/rtdata/images/filterclear.png b/rtdata/images/filterclear.png
deleted file mode 100644
index 47b3f2725..000000000
Binary files a/rtdata/images/filterclear.png and /dev/null differ
diff --git a/rtdata/images/folder.png b/rtdata/images/folder.png
deleted file mode 100644
index 551db978a..000000000
Binary files a/rtdata/images/folder.png and /dev/null differ
diff --git a/rtdata/images/fullscreen-exit.png b/rtdata/images/fullscreen-exit.png
deleted file mode 100644
index 2946010be..000000000
Binary files a/rtdata/images/fullscreen-exit.png and /dev/null differ
diff --git a/rtdata/images/fullscreen.png b/rtdata/images/fullscreen.png
deleted file mode 100644
index 3d9fccc28..000000000
Binary files a/rtdata/images/fullscreen.png and /dev/null differ
diff --git a/rtdata/images/grayrated.png b/rtdata/images/grayrated.png
deleted file mode 100644
index c71a6d0c0..000000000
Binary files a/rtdata/images/grayrated.png and /dev/null differ
diff --git a/rtdata/images/gtk-add.png b/rtdata/images/gtk-add.png
deleted file mode 100644
index 21fc43cf3..000000000
Binary files a/rtdata/images/gtk-add.png and /dev/null differ
diff --git a/rtdata/images/gtk-apply.png b/rtdata/images/gtk-apply.png
deleted file mode 100644
index f0bb96bfe..000000000
Binary files a/rtdata/images/gtk-apply.png and /dev/null differ
diff --git a/rtdata/images/gtk-close-small.png b/rtdata/images/gtk-close-small.png
deleted file mode 100644
index b92be85b1..000000000
Binary files a/rtdata/images/gtk-close-small.png and /dev/null differ
diff --git a/rtdata/images/gtk-close.png b/rtdata/images/gtk-close.png
deleted file mode 100644
index a25b8c29a..000000000
Binary files a/rtdata/images/gtk-close.png and /dev/null differ
diff --git a/rtdata/images/gtk-color-picker-small.png b/rtdata/images/gtk-color-picker-small.png
deleted file mode 100644
index 2f7b6cc87..000000000
Binary files a/rtdata/images/gtk-color-picker-small.png and /dev/null differ
diff --git a/rtdata/images/gtk-color-picker.png b/rtdata/images/gtk-color-picker.png
deleted file mode 100644
index 0ad9bc4f6..000000000
Binary files a/rtdata/images/gtk-color-picker.png and /dev/null differ
diff --git a/rtdata/images/gtk-open.png b/rtdata/images/gtk-open.png
deleted file mode 100644
index 5e6286c37..000000000
Binary files a/rtdata/images/gtk-open.png and /dev/null differ
diff --git a/rtdata/images/gtk-save-large.png b/rtdata/images/gtk-save-large.png
deleted file mode 100644
index 11170bd22..000000000
Binary files a/rtdata/images/gtk-save-large.png and /dev/null differ
diff --git a/rtdata/images/gtk-undo-ltr.png b/rtdata/images/gtk-undo-ltr.png
deleted file mode 100644
index 343eda063..000000000
Binary files a/rtdata/images/gtk-undo-ltr.png and /dev/null differ
diff --git a/rtdata/images/gtk-undo-rtl.png b/rtdata/images/gtk-undo-rtl.png
deleted file mode 100644
index 404ec98a5..000000000
Binary files a/rtdata/images/gtk-undo-rtl.png and /dev/null differ
diff --git a/rtdata/images/gtk-undoall-ltr.png b/rtdata/images/gtk-undoall-ltr.png
deleted file mode 100644
index 4a9a30d39..000000000
Binary files a/rtdata/images/gtk-undoall-ltr.png and /dev/null differ
diff --git a/rtdata/images/gtk-undoall-rtl.png b/rtdata/images/gtk-undoall-rtl.png
deleted file mode 100644
index 35303720e..000000000
Binary files a/rtdata/images/gtk-undoall-rtl.png and /dev/null differ
diff --git a/rtdata/images/gtk-zoom-100.png b/rtdata/images/gtk-zoom-100.png
deleted file mode 100644
index c7fae09c3..000000000
Binary files a/rtdata/images/gtk-zoom-100.png and /dev/null differ
diff --git a/rtdata/images/gtk-zoom-fit.png b/rtdata/images/gtk-zoom-fit.png
deleted file mode 100644
index 799a99ba0..000000000
Binary files a/rtdata/images/gtk-zoom-fit.png and /dev/null differ
diff --git a/rtdata/images/gtk-zoom-in.png b/rtdata/images/gtk-zoom-in.png
deleted file mode 100644
index 913e61968..000000000
Binary files a/rtdata/images/gtk-zoom-in.png and /dev/null differ
diff --git a/rtdata/images/gtk-zoom-out.png b/rtdata/images/gtk-zoom-out.png
deleted file mode 100644
index 298138baa..000000000
Binary files a/rtdata/images/gtk-zoom-out.png and /dev/null differ
diff --git a/rtdata/images/histBar.png b/rtdata/images/histBar.png
deleted file mode 100644
index 8ebdf4fab..000000000
Binary files a/rtdata/images/histBar.png and /dev/null differ
diff --git a/rtdata/images/histBlue.png b/rtdata/images/histBlue.png
deleted file mode 100644
index b49a01dc7..000000000
Binary files a/rtdata/images/histBlue.png and /dev/null differ
diff --git a/rtdata/images/histGreen.png b/rtdata/images/histGreen.png
deleted file mode 100644
index 559b7d78a..000000000
Binary files a/rtdata/images/histGreen.png and /dev/null differ
diff --git a/rtdata/images/histRaw.png b/rtdata/images/histRaw.png
deleted file mode 100644
index 30e10cf09..000000000
Binary files a/rtdata/images/histRaw.png and /dev/null differ
diff --git a/rtdata/images/histRed.png b/rtdata/images/histRed.png
deleted file mode 100644
index 91bb9f2f5..000000000
Binary files a/rtdata/images/histRed.png and /dev/null differ
diff --git a/rtdata/images/histValue.png b/rtdata/images/histValue.png
deleted file mode 100644
index 36d47564e..000000000
Binary files a/rtdata/images/histValue.png and /dev/null differ
diff --git a/rtdata/images/image-editor.png b/rtdata/images/image-editor.png
deleted file mode 100644
index 9f9a335dc..000000000
Binary files a/rtdata/images/image-editor.png and /dev/null differ
diff --git a/rtdata/images/info.png b/rtdata/images/info.png
deleted file mode 100644
index 94245aefd..000000000
Binary files a/rtdata/images/info.png and /dev/null differ
diff --git a/rtdata/images/list-add-small.png b/rtdata/images/list-add-small.png
deleted file mode 100644
index d26852798..000000000
Binary files a/rtdata/images/list-add-small.png and /dev/null differ
diff --git a/rtdata/images/list-remove-red-small.png b/rtdata/images/list-remove-red-small.png
deleted file mode 100644
index ea67d1221..000000000
Binary files a/rtdata/images/list-remove-red-small.png and /dev/null differ
diff --git a/rtdata/images/list-remove.png b/rtdata/images/list-remove.png
deleted file mode 100644
index 85e1c30b3..000000000
Binary files a/rtdata/images/list-remove.png and /dev/null differ
diff --git a/rtdata/images/lock-off.png b/rtdata/images/lock-off.png
deleted file mode 100644
index 976af2977..000000000
Binary files a/rtdata/images/lock-off.png and /dev/null differ
diff --git a/rtdata/images/lock-on.png b/rtdata/images/lock-on.png
deleted file mode 100644
index 9c4bcd046..000000000
Binary files a/rtdata/images/lock-on.png and /dev/null differ
diff --git a/rtdata/images/logoicon-wind.png b/rtdata/images/logoicon-wind.png
deleted file mode 100644
index 39e2819da..000000000
Binary files a/rtdata/images/logoicon-wind.png and /dev/null differ
diff --git a/rtdata/images/media-usb.png b/rtdata/images/media-usb.png
deleted file mode 100644
index e9a279da1..000000000
Binary files a/rtdata/images/media-usb.png and /dev/null differ
diff --git a/rtdata/images/meta.png b/rtdata/images/meta.png
deleted file mode 100644
index 6f0c4185d..000000000
Binary files a/rtdata/images/meta.png and /dev/null differ
diff --git a/rtdata/images/move-1D-h.png b/rtdata/images/move-1D-h.png
deleted file mode 100644
index 44babcfb4..000000000
Binary files a/rtdata/images/move-1D-h.png and /dev/null differ
diff --git a/rtdata/images/move-1D-v.png b/rtdata/images/move-1D-v.png
deleted file mode 100644
index cbc1c7e68..000000000
Binary files a/rtdata/images/move-1D-v.png and /dev/null differ
diff --git a/rtdata/images/move-2D.png b/rtdata/images/move-2D.png
deleted file mode 100644
index 27e7c1e67..000000000
Binary files a/rtdata/images/move-2D.png and /dev/null differ
diff --git a/rtdata/images/move-rotate.png b/rtdata/images/move-rotate.png
deleted file mode 100644
index 70309972b..000000000
Binary files a/rtdata/images/move-rotate.png and /dev/null differ
diff --git a/rtdata/images/network.png b/rtdata/images/network.png
deleted file mode 100644
index 8a77e5d92..000000000
Binary files a/rtdata/images/network.png and /dev/null differ
diff --git a/rtdata/images/nocolorlabel.png b/rtdata/images/nocolorlabel.png
deleted file mode 100644
index be61570b0..000000000
Binary files a/rtdata/images/nocolorlabel.png and /dev/null differ
diff --git a/rtdata/images/non-themed/png/empty.png b/rtdata/images/non-themed/png/empty.png
new file mode 100644
index 000000000..534ddcb72
Binary files /dev/null and b/rtdata/images/non-themed/png/empty.png differ
diff --git a/rtdata/images/non-themed/png/rawtherapee-logo-128.png b/rtdata/images/non-themed/png/rawtherapee-logo-128.png
new file mode 100644
index 000000000..0a224b3d9
Binary files /dev/null and b/rtdata/images/non-themed/png/rawtherapee-logo-128.png differ
diff --git a/rtdata/images/non-themed/png/rawtherapee-logo-16.png b/rtdata/images/non-themed/png/rawtherapee-logo-16.png
new file mode 100644
index 000000000..7b67f7408
Binary files /dev/null and b/rtdata/images/non-themed/png/rawtherapee-logo-16.png differ
diff --git a/rtdata/images/non-themed/png/rawtherapee-logo-24.png b/rtdata/images/non-themed/png/rawtherapee-logo-24.png
new file mode 100644
index 000000000..6b13e0c98
Binary files /dev/null and b/rtdata/images/non-themed/png/rawtherapee-logo-24.png differ
diff --git a/rtdata/images/non-themed/png/rawtherapee-logo-256.png b/rtdata/images/non-themed/png/rawtherapee-logo-256.png
new file mode 100644
index 000000000..00fdb390f
Binary files /dev/null and b/rtdata/images/non-themed/png/rawtherapee-logo-256.png differ
diff --git a/rtdata/images/non-themed/png/rawtherapee-logo-48.png b/rtdata/images/non-themed/png/rawtherapee-logo-48.png
new file mode 100644
index 000000000..cbd46b20e
Binary files /dev/null and b/rtdata/images/non-themed/png/rawtherapee-logo-48.png differ
diff --git a/rtdata/images/splash.png b/rtdata/images/non-themed/png/splash.png
similarity index 100%
rename from rtdata/images/splash.png
rename to rtdata/images/non-themed/png/splash.png
diff --git a/rtdata/icons/RT.ico b/rtdata/images/non-themed/rawtherapee.ico
similarity index 100%
rename from rtdata/icons/RT.ico
rename to rtdata/images/non-themed/rawtherapee.ico
diff --git a/rtdata/images/non-themed/rt-logo.svg b/rtdata/images/non-themed/rt-logo.svg
new file mode 100644
index 000000000..b257e1eb2
--- /dev/null
+++ b/rtdata/images/non-themed/rt-logo.svg
@@ -0,0 +1,1060 @@
+
+
+
+
diff --git a/rtdata/images/rt_splash.svg b/rtdata/images/non-themed/rt-splash.svg
similarity index 100%
rename from rtdata/images/rt_splash.svg
rename to rtdata/images/non-themed/rt-splash.svg
diff --git a/rtdata/images/openhand.png b/rtdata/images/openhand.png
deleted file mode 100644
index e52a28067..000000000
Binary files a/rtdata/images/openhand.png and /dev/null differ
diff --git a/rtdata/images/panel-to-bottom.png b/rtdata/images/panel-to-bottom.png
deleted file mode 100644
index 4e3b6057d..000000000
Binary files a/rtdata/images/panel-to-bottom.png and /dev/null differ
diff --git a/rtdata/images/panel-to-left.png b/rtdata/images/panel-to-left.png
deleted file mode 100644
index 99821881d..000000000
Binary files a/rtdata/images/panel-to-left.png and /dev/null differ
diff --git a/rtdata/images/panel-to-right.png b/rtdata/images/panel-to-right.png
deleted file mode 100644
index 6037c1fa9..000000000
Binary files a/rtdata/images/panel-to-right.png and /dev/null differ
diff --git a/rtdata/images/panel-to-top.png b/rtdata/images/panel-to-top.png
deleted file mode 100644
index b129e9d4c..000000000
Binary files a/rtdata/images/panel-to-top.png and /dev/null differ
diff --git a/rtdata/images/popuparrow.png b/rtdata/images/popuparrow.png
deleted file mode 100644
index f933a71ca..000000000
Binary files a/rtdata/images/popuparrow.png and /dev/null differ
diff --git a/rtdata/images/processing-pause.png b/rtdata/images/processing-pause.png
deleted file mode 100644
index dc3c6b633..000000000
Binary files a/rtdata/images/processing-pause.png and /dev/null differ
diff --git a/rtdata/images/processing-play.png b/rtdata/images/processing-play.png
deleted file mode 100644
index e653de0f1..000000000
Binary files a/rtdata/images/processing-play.png and /dev/null differ
diff --git a/rtdata/images/processing.png b/rtdata/images/processing.png
deleted file mode 100644
index 2a602d656..000000000
Binary files a/rtdata/images/processing.png and /dev/null differ
diff --git a/rtdata/images/rated.png b/rtdata/images/rated.png
deleted file mode 100644
index 99d6b73ba..000000000
Binary files a/rtdata/images/rated.png and /dev/null differ
diff --git a/rtdata/images/ratednot.png b/rtdata/images/ratednot.png
deleted file mode 100644
index ed7c561df..000000000
Binary files a/rtdata/images/ratednot.png and /dev/null differ
diff --git a/rtdata/images/ratednotg.png b/rtdata/images/ratednotg.png
deleted file mode 100644
index 2f619d755..000000000
Binary files a/rtdata/images/ratednotg.png and /dev/null differ
diff --git a/rtdata/images/raw.png b/rtdata/images/raw.png
deleted file mode 100644
index aa8d0bb6d..000000000
Binary files a/rtdata/images/raw.png and /dev/null differ
diff --git a/rtdata/images/recent-save.png b/rtdata/images/recent-save.png
deleted file mode 100644
index be5de85d9..000000000
Binary files a/rtdata/images/recent-save.png and /dev/null differ
diff --git a/rtdata/images/refresh-red.png b/rtdata/images/refresh-red.png
deleted file mode 100644
index 24dc27e64..000000000
Binary files a/rtdata/images/refresh-red.png and /dev/null differ
diff --git a/rtdata/images/refresh-white.png b/rtdata/images/refresh-white.png
deleted file mode 100644
index c4143da34..000000000
Binary files a/rtdata/images/refresh-white.png and /dev/null differ
diff --git a/rtdata/images/rt-logo-large.png b/rtdata/images/rt-logo-large.png
deleted file mode 100644
index f2cde46b7..000000000
Binary files a/rtdata/images/rt-logo-large.png and /dev/null differ
diff --git a/rtdata/images/rt-logo-medium.png b/rtdata/images/rt-logo-medium.png
deleted file mode 100644
index a2c2366f1..000000000
Binary files a/rtdata/images/rt-logo-medium.png and /dev/null differ
diff --git a/rtdata/images/rt-logo-small.png b/rtdata/images/rt-logo-small.png
deleted file mode 100644
index cf306e433..000000000
Binary files a/rtdata/images/rt-logo-small.png and /dev/null differ
diff --git a/rtdata/images/rt-logo-tiny.png b/rtdata/images/rt-logo-tiny.png
deleted file mode 100644
index f1034f149..000000000
Binary files a/rtdata/images/rt-logo-tiny.png and /dev/null differ
diff --git a/rtdata/images/saved.png b/rtdata/images/saved.png
deleted file mode 100644
index 2a465c0f2..000000000
Binary files a/rtdata/images/saved.png and /dev/null differ
diff --git a/rtdata/images/savedg.png b/rtdata/images/savedg.png
deleted file mode 100644
index 6855b7c2e..000000000
Binary files a/rtdata/images/savedg.png and /dev/null differ
diff --git a/rtdata/images/savednot.png b/rtdata/images/savednot.png
deleted file mode 100644
index 532e8b366..000000000
Binary files a/rtdata/images/savednot.png and /dev/null differ
diff --git a/rtdata/images/savednotg.png b/rtdata/images/savednotg.png
deleted file mode 100644
index c6079a1ed..000000000
Binary files a/rtdata/images/savednotg.png and /dev/null differ
diff --git a/rtdata/images/stock-flip-horizontal.png b/rtdata/images/stock-flip-horizontal.png
deleted file mode 100644
index 9c42f276e..000000000
Binary files a/rtdata/images/stock-flip-horizontal.png and /dev/null differ
diff --git a/rtdata/images/stock-flip-vertical.png b/rtdata/images/stock-flip-vertical.png
deleted file mode 100644
index 2b838c15b..000000000
Binary files a/rtdata/images/stock-flip-vertical.png and /dev/null differ
diff --git a/rtdata/images/stock-rotate-270.png b/rtdata/images/stock-rotate-270.png
deleted file mode 100644
index 2c6e23d37..000000000
Binary files a/rtdata/images/stock-rotate-270.png and /dev/null differ
diff --git a/rtdata/images/stock-rotate-90.png b/rtdata/images/stock-rotate-90.png
deleted file mode 100644
index 31cd17760..000000000
Binary files a/rtdata/images/stock-rotate-90.png and /dev/null differ
diff --git a/rtdata/images/straighten-small.png b/rtdata/images/straighten-small.png
deleted file mode 100644
index c750356ab..000000000
Binary files a/rtdata/images/straighten-small.png and /dev/null differ
diff --git a/rtdata/images/straighten.png b/rtdata/images/straighten.png
deleted file mode 100644
index 955af8f0a..000000000
Binary files a/rtdata/images/straighten.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/add-small.png b/rtdata/images/themed/png/dark/add-small.png
new file mode 100644
index 000000000..44a3d8639
Binary files /dev/null and b/rtdata/images/themed/png/dark/add-small.png differ
diff --git a/rtdata/images/themed/png/dark/add.png b/rtdata/images/themed/png/dark/add.png
new file mode 100644
index 000000000..6b401bc87
Binary files /dev/null and b/rtdata/images/themed/png/dark/add.png differ
diff --git a/rtdata/images/themed/png/dark/aperture.png b/rtdata/images/themed/png/dark/aperture.png
new file mode 100644
index 000000000..a80fda199
Binary files /dev/null and b/rtdata/images/themed/png/dark/aperture.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-down-small.png b/rtdata/images/themed/png/dark/arrow-down-small.png
new file mode 100644
index 000000000..3c1b4033a
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow-down-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-left-small.png b/rtdata/images/themed/png/dark/arrow-left-small.png
new file mode 100644
index 000000000..b8245b953
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-right-small.png b/rtdata/images/themed/png/dark/arrow-right-small.png
new file mode 100644
index 000000000..83177a23a
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-up-small.png b/rtdata/images/themed/png/dark/arrow-up-small.png
new file mode 100644
index 000000000..0483b3e73
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow-up-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-updown.png b/rtdata/images/themed/png/dark/arrow-updown.png
new file mode 100644
index 000000000..cd2c0b14e
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow-updown.png differ
diff --git a/rtdata/images/themed/png/dark/arrow2-left.png b/rtdata/images/themed/png/dark/arrow2-left.png
new file mode 100644
index 000000000..dd0c0c3d7
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow2-left.png differ
diff --git a/rtdata/images/themed/png/dark/arrow2-right.png b/rtdata/images/themed/png/dark/arrow2-right.png
new file mode 100644
index 000000000..2ee87ec71
Binary files /dev/null and b/rtdata/images/themed/png/dark/arrow2-right.png differ
diff --git a/rtdata/images/themed/png/dark/atom.png b/rtdata/images/themed/png/dark/atom.png
new file mode 100644
index 000000000..9de042fbb
Binary files /dev/null and b/rtdata/images/themed/png/dark/atom.png differ
diff --git a/rtdata/images/themed/png/dark/bayer.png b/rtdata/images/themed/png/dark/bayer.png
new file mode 100644
index 000000000..035318b9a
Binary files /dev/null and b/rtdata/images/themed/png/dark/bayer.png differ
diff --git a/rtdata/images/themed/png/dark/beforeafter.png b/rtdata/images/themed/png/dark/beforeafter.png
new file mode 100644
index 000000000..25bd64b5a
Binary files /dev/null and b/rtdata/images/themed/png/dark/beforeafter.png differ
diff --git a/rtdata/images/themed/png/dark/cancel-small.png b/rtdata/images/themed/png/dark/cancel-small.png
new file mode 100644
index 000000000..8a812e8f3
Binary files /dev/null and b/rtdata/images/themed/png/dark/cancel-small.png differ
diff --git a/rtdata/images/themed/png/dark/cancel.png b/rtdata/images/themed/png/dark/cancel.png
new file mode 100644
index 000000000..6eda05c50
Binary files /dev/null and b/rtdata/images/themed/png/dark/cancel.png differ
diff --git a/rtdata/images/themed/png/dark/circle-black-small.png b/rtdata/images/themed/png/dark/circle-black-small.png
new file mode 100644
index 000000000..f18a415b6
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-black-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-green-small.png b/rtdata/images/themed/png/dark/circle-blue-green-small.png
new file mode 100644
index 000000000..247931823
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-blue-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-red-small.png b/rtdata/images/themed/png/dark/circle-blue-red-small.png
new file mode 100644
index 000000000..d88a01330
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-blue-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-small.png b/rtdata/images/themed/png/dark/circle-blue-small.png
new file mode 100644
index 000000000..2c8ff48fd
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-yellow-small.png b/rtdata/images/themed/png/dark/circle-blue-yellow-small.png
new file mode 100644
index 000000000..0585b2195
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-blue-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-cyan-red-small.png b/rtdata/images/themed/png/dark/circle-cyan-red-small.png
new file mode 100644
index 000000000..ed7003161
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-cyan-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-cyan-small.png b/rtdata/images/themed/png/dark/circle-cyan-small.png
new file mode 100644
index 000000000..84f873a2c
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-cyan-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/dark/circle-darkgray-small.png
new file mode 100644
index 000000000..e706b1eba
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-blue-small.png b/rtdata/images/themed/png/dark/circle-empty-blue-small.png
new file mode 100644
index 000000000..d53b3516e
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png b/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png
new file mode 100644
index 000000000..4f0f0f4c7
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-gray-small.png b/rtdata/images/themed/png/dark/circle-empty-gray-small.png
new file mode 100644
index 000000000..b3a57c83b
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-gray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-green-small.png b/rtdata/images/themed/png/dark/circle-empty-green-small.png
new file mode 100644
index 000000000..3b1444d37
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-purple-small.png b/rtdata/images/themed/png/dark/circle-empty-purple-small.png
new file mode 100644
index 000000000..e61da8e9f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-purple-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-red-small.png b/rtdata/images/themed/png/dark/circle-empty-red-small.png
new file mode 100644
index 000000000..bf8035931
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-yellow-small.png b/rtdata/images/themed/png/dark/circle-empty-yellow-small.png
new file mode 100644
index 000000000..9a3ca9bd8
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-blue-small.png b/rtdata/images/themed/png/dark/circle-gray-blue-small.png
new file mode 100644
index 000000000..01d5da881
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-green-small.png b/rtdata/images/themed/png/dark/circle-gray-green-small.png
new file mode 100644
index 000000000..2290b708f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-red-small.png b/rtdata/images/themed/png/dark/circle-gray-red-small.png
new file mode 100644
index 000000000..29afda33b
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/dark/circle-gray-small.png
new file mode 100644
index 000000000..18ad6330a
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green-blue-small.png b/rtdata/images/themed/png/dark/circle-green-blue-small.png
new file mode 100644
index 000000000..1d6e60252
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-green-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green-red-small.png b/rtdata/images/themed/png/dark/circle-green-red-small.png
new file mode 100644
index 000000000..96f86b1b9
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-green-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green-small.png b/rtdata/images/themed/png/dark/circle-green-small.png
new file mode 100644
index 000000000..88270e0cb
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-magenta-small.png b/rtdata/images/themed/png/dark/circle-magenta-small.png
new file mode 100644
index 000000000..cce26e1f2
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-magenta-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-orange-small.png b/rtdata/images/themed/png/dark/circle-orange-small.png
new file mode 100644
index 000000000..5894f0987
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-orange-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-purple-small.png b/rtdata/images/themed/png/dark/circle-purple-small.png
new file mode 100644
index 000000000..9fe4eb0d6
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-purple-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-blue-small.png b/rtdata/images/themed/png/dark/circle-red-blue-small.png
new file mode 100644
index 000000000..e70ef22f6
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-cyan-small.png b/rtdata/images/themed/png/dark/circle-red-cyan-small.png
new file mode 100644
index 000000000..92b03b953
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-cyan-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-green-small.png b/rtdata/images/themed/png/dark/circle-red-green-small.png
new file mode 100644
index 000000000..4572e019f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-small.png b/rtdata/images/themed/png/dark/circle-red-small.png
new file mode 100644
index 000000000..a8c9cecec
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-white-small.png b/rtdata/images/themed/png/dark/circle-white-small.png
new file mode 100644
index 000000000..acf4f8b76
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-white-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-yellow-blue-small.png b/rtdata/images/themed/png/dark/circle-yellow-blue-small.png
new file mode 100644
index 000000000..1f7aec9f2
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-yellow-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-yellow-small.png b/rtdata/images/themed/png/dark/circle-yellow-small.png
new file mode 100644
index 000000000..1c5678ac2
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/color-circles.png b/rtdata/images/themed/png/dark/color-circles.png
new file mode 100644
index 000000000..f4b974b13
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-circles.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png
new file mode 100644
index 000000000..5dcdacf1f
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-add.png b/rtdata/images/themed/png/dark/color-picker-add.png
new file mode 100644
index 000000000..fc4b040e2
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-add.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-bars.png b/rtdata/images/themed/png/dark/color-picker-bars.png
new file mode 100644
index 000000000..66e749864
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-bars.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-hicontrast.png
new file mode 100644
index 000000000..c7bfb850b
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-hide.png b/rtdata/images/themed/png/dark/color-picker-hide.png
new file mode 100644
index 000000000..0bd4fafba
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-hide.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker.png b/rtdata/images/themed/png/dark/color-picker.png
new file mode 100644
index 000000000..f0174fd44
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker.png differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-off.png b/rtdata/images/themed/png/dark/contrastmask-off.png
new file mode 100644
index 000000000..f551f5413
Binary files /dev/null and b/rtdata/images/themed/png/dark/contrastmask-off.png differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-on.png b/rtdata/images/themed/png/dark/contrastmask-on.png
new file mode 100644
index 000000000..28ea71f52
Binary files /dev/null and b/rtdata/images/themed/png/dark/contrastmask-on.png differ
diff --git a/rtdata/images/themed/png/dark/copy.png b/rtdata/images/themed/png/dark/copy.png
new file mode 100644
index 000000000..3b51949ed
Binary files /dev/null and b/rtdata/images/themed/png/dark/copy.png differ
diff --git a/rtdata/images/themed/png/dark/crop-auto-small.png b/rtdata/images/themed/png/dark/crop-auto-small.png
new file mode 100644
index 000000000..d7942888d
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-auto-small.png differ
diff --git a/rtdata/images/themed/png/dark/crop-auto.png b/rtdata/images/themed/png/dark/crop-auto.png
new file mode 100644
index 000000000..52cbd9e77
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-auto.png differ
diff --git a/rtdata/images/themed/png/dark/crop-point-hicontrast.png b/rtdata/images/themed/png/dark/crop-point-hicontrast.png
new file mode 100644
index 000000000..65aa29856
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-point-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/crop-small.png b/rtdata/images/themed/png/dark/crop-small.png
new file mode 100644
index 000000000..aa278c16c
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-small.png differ
diff --git a/rtdata/images/themed/png/dark/crop.png b/rtdata/images/themed/png/dark/crop.png
new file mode 100644
index 000000000..d8a290eec
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop.png differ
diff --git a/rtdata/images/themed/png/dark/crossed-arrows-in.png b/rtdata/images/themed/png/dark/crossed-arrows-in.png
new file mode 100644
index 000000000..531803679
Binary files /dev/null and b/rtdata/images/themed/png/dark/crossed-arrows-in.png differ
diff --git a/rtdata/images/themed/png/dark/crossed-arrows-out.png b/rtdata/images/themed/png/dark/crossed-arrows-out.png
new file mode 100644
index 000000000..c05eb3fe8
Binary files /dev/null and b/rtdata/images/themed/png/dark/crossed-arrows-out.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair-adjust.png b/rtdata/images/themed/png/dark/crosshair-adjust.png
new file mode 100644
index 000000000..8536e8f09
Binary files /dev/null and b/rtdata/images/themed/png/dark/crosshair-adjust.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair-hicontrast.png b/rtdata/images/themed/png/dark/crosshair-hicontrast.png
new file mode 100644
index 000000000..078512803
Binary files /dev/null and b/rtdata/images/themed/png/dark/crosshair-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair-node-curve.png b/rtdata/images/themed/png/dark/crosshair-node-curve.png
new file mode 100644
index 000000000..08d6e00ff
Binary files /dev/null and b/rtdata/images/themed/png/dark/crosshair-node-curve.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair-small.png b/rtdata/images/themed/png/dark/crosshair-small.png
new file mode 100644
index 000000000..66db0bd42
Binary files /dev/null and b/rtdata/images/themed/png/dark/crosshair-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-controlpoints-small.png b/rtdata/images/themed/png/dark/curve-controlpoints-small.png
new file mode 100644
index 000000000..e4107e5e4
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-controlpoints-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-controlpoints.png b/rtdata/images/themed/png/dark/curve-controlpoints.png
new file mode 100644
index 000000000..e85d1a214
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-controlpoints.png differ
diff --git a/rtdata/images/themed/png/dark/curve-flat-small.png b/rtdata/images/themed/png/dark/curve-flat-small.png
new file mode 100644
index 000000000..61893e320
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-flat-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-flat.png b/rtdata/images/themed/png/dark/curve-flat.png
new file mode 100644
index 000000000..7621dd8a0
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-flat.png differ
diff --git a/rtdata/images/themed/png/dark/curve-linear-small.png b/rtdata/images/themed/png/dark/curve-linear-small.png
new file mode 100644
index 000000000..723d29e93
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-linear-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-linear.png b/rtdata/images/themed/png/dark/curve-linear.png
new file mode 100644
index 000000000..60a8b3d73
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-linear.png differ
diff --git a/rtdata/images/themed/png/dark/curve-nurbs-small.png b/rtdata/images/themed/png/dark/curve-nurbs-small.png
new file mode 100644
index 000000000..0ba221d92
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-nurbs-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-nurbs.png b/rtdata/images/themed/png/dark/curve-nurbs.png
new file mode 100644
index 000000000..8d9425a0b
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-nurbs.png differ
diff --git a/rtdata/images/themed/png/dark/curve-parametric-small.png b/rtdata/images/themed/png/dark/curve-parametric-small.png
new file mode 100644
index 000000000..237b76125
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-parametric-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-parametric.png b/rtdata/images/themed/png/dark/curve-parametric.png
new file mode 100644
index 000000000..97f3ac96b
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-parametric.png differ
diff --git a/rtdata/images/themed/png/dark/curve-spline-small.png b/rtdata/images/themed/png/dark/curve-spline-small.png
new file mode 100644
index 000000000..763beda56
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-spline-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-spline.png b/rtdata/images/themed/png/dark/curve-spline.png
new file mode 100644
index 000000000..c86105d46
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-spline.png differ
diff --git a/rtdata/images/themed/png/dark/detail.png b/rtdata/images/themed/png/dark/detail.png
new file mode 100644
index 000000000..73ee6a9f0
Binary files /dev/null and b/rtdata/images/themed/png/dark/detail.png differ
diff --git a/rtdata/images/themed/png/dark/device-floppy.png b/rtdata/images/themed/png/dark/device-floppy.png
new file mode 100644
index 000000000..939a6d63e
Binary files /dev/null and b/rtdata/images/themed/png/dark/device-floppy.png differ
diff --git a/rtdata/images/themed/png/dark/device-hdd.png b/rtdata/images/themed/png/dark/device-hdd.png
new file mode 100644
index 000000000..92ddc0e01
Binary files /dev/null and b/rtdata/images/themed/png/dark/device-hdd.png differ
diff --git a/rtdata/images/themed/png/dark/device-network.png b/rtdata/images/themed/png/dark/device-network.png
new file mode 100644
index 000000000..4aa2516ef
Binary files /dev/null and b/rtdata/images/themed/png/dark/device-network.png differ
diff --git a/rtdata/images/themed/png/dark/device-optical.png b/rtdata/images/themed/png/dark/device-optical.png
new file mode 100644
index 000000000..e5cd69a02
Binary files /dev/null and b/rtdata/images/themed/png/dark/device-optical.png differ
diff --git a/rtdata/images/themed/png/dark/device-usb.png b/rtdata/images/themed/png/dark/device-usb.png
new file mode 100644
index 000000000..a19b591e6
Binary files /dev/null and b/rtdata/images/themed/png/dark/device-usb.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-auto-small.png b/rtdata/images/themed/png/dark/distortion-auto-small.png
new file mode 100644
index 000000000..e002a4ae7
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-auto-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-auto.png b/rtdata/images/themed/png/dark/distortion-auto.png
new file mode 100644
index 000000000..28c89da36
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-auto.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-barrel-small.png b/rtdata/images/themed/png/dark/distortion-barrel-small.png
new file mode 100644
index 000000000..531fd93d9
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-barrel-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-barrel.png b/rtdata/images/themed/png/dark/distortion-barrel.png
new file mode 100644
index 000000000..44f312dc9
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-barrel.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-pincushion-small.png b/rtdata/images/themed/png/dark/distortion-pincushion-small.png
new file mode 100644
index 000000000..c33205d78
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-pincushion-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-pincushion.png b/rtdata/images/themed/png/dark/distortion-pincushion.png
new file mode 100644
index 000000000..219dc6d37
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-pincushion.png differ
diff --git a/rtdata/images/themed/png/dark/edit-point.png b/rtdata/images/themed/png/dark/edit-point.png
new file mode 100644
index 000000000..8ead1ea66
Binary files /dev/null and b/rtdata/images/themed/png/dark/edit-point.png differ
diff --git a/rtdata/images/themed/png/dark/equilizer-narrow.png b/rtdata/images/themed/png/dark/equilizer-narrow.png
new file mode 100644
index 000000000..6ee072ae5
Binary files /dev/null and b/rtdata/images/themed/png/dark/equilizer-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/equilizer-wide.png b/rtdata/images/themed/png/dark/equilizer-wide.png
new file mode 100644
index 000000000..37c07c605
Binary files /dev/null and b/rtdata/images/themed/png/dark/equilizer-wide.png differ
diff --git a/rtdata/images/themed/png/dark/expander-closed-small.png b/rtdata/images/themed/png/dark/expander-closed-small.png
new file mode 100644
index 000000000..b59480cd5
Binary files /dev/null and b/rtdata/images/themed/png/dark/expander-closed-small.png differ
diff --git a/rtdata/images/themed/png/dark/expander-open-small.png b/rtdata/images/themed/png/dark/expander-open-small.png
new file mode 100644
index 000000000..15b74149a
Binary files /dev/null and b/rtdata/images/themed/png/dark/expander-open-small.png differ
diff --git a/rtdata/images/themed/png/dark/exposure.png b/rtdata/images/themed/png/dark/exposure.png
new file mode 100644
index 000000000..f7cc6e155
Binary files /dev/null and b/rtdata/images/themed/png/dark/exposure.png differ
diff --git a/rtdata/images/themed/png/dark/filetype-hdr.png b/rtdata/images/themed/png/dark/filetype-hdr.png
new file mode 100644
index 000000000..a333858d5
Binary files /dev/null and b/rtdata/images/themed/png/dark/filetype-hdr.png differ
diff --git a/rtdata/images/themed/png/dark/filetype-ps.png b/rtdata/images/themed/png/dark/filetype-ps.png
new file mode 100644
index 000000000..414530cdd
Binary files /dev/null and b/rtdata/images/themed/png/dark/filetype-ps.png differ
diff --git a/rtdata/images/themed/png/dark/filter-clear.png b/rtdata/images/themed/png/dark/filter-clear.png
new file mode 100644
index 000000000..acb729f11
Binary files /dev/null and b/rtdata/images/themed/png/dark/filter-clear.png differ
diff --git a/rtdata/images/themed/png/dark/filter-original.png b/rtdata/images/themed/png/dark/filter-original.png
new file mode 100644
index 000000000..9f538fab4
Binary files /dev/null and b/rtdata/images/themed/png/dark/filter-original.png differ
diff --git a/rtdata/images/themed/png/dark/filter-original2.png b/rtdata/images/themed/png/dark/filter-original2.png
new file mode 100644
index 000000000..7617380b2
Binary files /dev/null and b/rtdata/images/themed/png/dark/filter-original2.png differ
diff --git a/rtdata/images/themed/png/dark/filter.png b/rtdata/images/themed/png/dark/filter.png
new file mode 100644
index 000000000..af0060c9a
Binary files /dev/null and b/rtdata/images/themed/png/dark/filter.png differ
diff --git a/rtdata/images/themed/png/dark/flip-horizontal.png b/rtdata/images/themed/png/dark/flip-horizontal.png
new file mode 100644
index 000000000..fe53cefe7
Binary files /dev/null and b/rtdata/images/themed/png/dark/flip-horizontal.png differ
diff --git a/rtdata/images/themed/png/dark/flip-vertical.png b/rtdata/images/themed/png/dark/flip-vertical.png
new file mode 100644
index 000000000..85e7ccd02
Binary files /dev/null and b/rtdata/images/themed/png/dark/flip-vertical.png differ
diff --git a/rtdata/images/themed/png/dark/focusscreen-off.png b/rtdata/images/themed/png/dark/focusscreen-off.png
new file mode 100644
index 000000000..5ee597b3b
Binary files /dev/null and b/rtdata/images/themed/png/dark/focusscreen-off.png differ
diff --git a/rtdata/images/themed/png/dark/focusscreen-on.png b/rtdata/images/themed/png/dark/focusscreen-on.png
new file mode 100644
index 000000000..f9c418b92
Binary files /dev/null and b/rtdata/images/themed/png/dark/focusscreen-on.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-home-small.png b/rtdata/images/themed/png/dark/folder-closed-home-small.png
new file mode 100644
index 000000000..06aeea67a
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed-home-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-home.png b/rtdata/images/themed/png/dark/folder-closed-home.png
new file mode 100644
index 000000000..88f801d24
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed-home.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-recent-small.png b/rtdata/images/themed/png/dark/folder-closed-recent-small.png
new file mode 100644
index 000000000..fdf1696b3
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed-recent-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-recent.png b/rtdata/images/themed/png/dark/folder-closed-recent.png
new file mode 100644
index 000000000..fe23eea9f
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed-recent.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-small.png b/rtdata/images/themed/png/dark/folder-closed-small.png
new file mode 100644
index 000000000..de543f67f
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed.png b/rtdata/images/themed/png/dark/folder-closed.png
new file mode 100644
index 000000000..2ec2d9717
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-closed.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-recent-small.png b/rtdata/images/themed/png/dark/folder-open-recent-small.png
new file mode 100644
index 000000000..3fac2f496
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-open-recent-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-recent.png b/rtdata/images/themed/png/dark/folder-open-recent.png
new file mode 100644
index 000000000..acf421774
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-open-recent.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-small.png b/rtdata/images/themed/png/dark/folder-open-small.png
new file mode 100644
index 000000000..56eca1923
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-open-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open.png b/rtdata/images/themed/png/dark/folder-open.png
new file mode 100644
index 000000000..df99ec1a2
Binary files /dev/null and b/rtdata/images/themed/png/dark/folder-open.png differ
diff --git a/rtdata/images/themed/png/dark/fullscreen-enter.png b/rtdata/images/themed/png/dark/fullscreen-enter.png
new file mode 100644
index 000000000..2986358eb
Binary files /dev/null and b/rtdata/images/themed/png/dark/fullscreen-enter.png differ
diff --git a/rtdata/images/themed/png/dark/fullscreen-leave.png b/rtdata/images/themed/png/dark/fullscreen-leave.png
new file mode 100644
index 000000000..5844f0e85
Binary files /dev/null and b/rtdata/images/themed/png/dark/fullscreen-leave.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-hist.png b/rtdata/images/themed/png/dark/gamut-hist.png
new file mode 100644
index 000000000..346ae6225
Binary files /dev/null and b/rtdata/images/themed/png/dark/gamut-hist.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-plus.png b/rtdata/images/themed/png/dark/gamut-plus.png
new file mode 100644
index 000000000..a83f5e603
Binary files /dev/null and b/rtdata/images/themed/png/dark/gamut-plus.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-softproof.png b/rtdata/images/themed/png/dark/gamut-softproof.png
new file mode 100644
index 000000000..b130cc275
Binary files /dev/null and b/rtdata/images/themed/png/dark/gamut-softproof.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-warning.png b/rtdata/images/themed/png/dark/gamut-warning.png
new file mode 100644
index 000000000..cf09ff17d
Binary files /dev/null and b/rtdata/images/themed/png/dark/gamut-warning.png differ
diff --git a/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png
new file mode 100644
index 000000000..8e131b1dd
Binary files /dev/null and b/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png differ
diff --git a/rtdata/images/themed/png/dark/gears-pause.png b/rtdata/images/themed/png/dark/gears-pause.png
new file mode 100644
index 000000000..e9cb6a535
Binary files /dev/null and b/rtdata/images/themed/png/dark/gears-pause.png differ
diff --git a/rtdata/images/themed/png/dark/gears-play.png b/rtdata/images/themed/png/dark/gears-play.png
new file mode 100644
index 000000000..917130261
Binary files /dev/null and b/rtdata/images/themed/png/dark/gears-play.png differ
diff --git a/rtdata/images/themed/png/dark/gears-small.png b/rtdata/images/themed/png/dark/gears-small.png
new file mode 100644
index 000000000..70186dd18
Binary files /dev/null and b/rtdata/images/themed/png/dark/gears-small.png differ
diff --git a/rtdata/images/themed/png/dark/gears.png b/rtdata/images/themed/png/dark/gears.png
new file mode 100644
index 000000000..e21456d9f
Binary files /dev/null and b/rtdata/images/themed/png/dark/gears.png differ
diff --git a/rtdata/images/themed/png/dark/goto-end-small.png b/rtdata/images/themed/png/dark/goto-end-small.png
new file mode 100644
index 000000000..13f626635
Binary files /dev/null and b/rtdata/images/themed/png/dark/goto-end-small.png differ
diff --git a/rtdata/images/themed/png/dark/goto-start-small.png b/rtdata/images/themed/png/dark/goto-start-small.png
new file mode 100644
index 000000000..70cc10bf4
Binary files /dev/null and b/rtdata/images/themed/png/dark/goto-start-small.png differ
diff --git a/rtdata/images/themed/png/dark/hand-closed-hicontrast.png b/rtdata/images/themed/png/dark/hand-closed-hicontrast.png
new file mode 100644
index 000000000..590d95096
Binary files /dev/null and b/rtdata/images/themed/png/dark/hand-closed-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/hand-open-hicontrast.png b/rtdata/images/themed/png/dark/hand-open-hicontrast.png
new file mode 100644
index 000000000..2ee26e375
Binary files /dev/null and b/rtdata/images/themed/png/dark/hand-open-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/hand-open.png b/rtdata/images/themed/png/dark/hand-open.png
new file mode 100644
index 000000000..85fcaaacc
Binary files /dev/null and b/rtdata/images/themed/png/dark/hand-open.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bar-off-small.png b/rtdata/images/themed/png/dark/histogram-bar-off-small.png
new file mode 100644
index 000000000..5c9c21e72
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-bar-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bar-on-small.png b/rtdata/images/themed/png/dark/histogram-bar-on-small.png
new file mode 100644
index 000000000..f8a5bddf6
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-bar-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bayer-off-small.png b/rtdata/images/themed/png/dark/histogram-bayer-off-small.png
new file mode 100644
index 000000000..af1369145
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-bayer-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bayer-on-small.png b/rtdata/images/themed/png/dark/histogram-bayer-on-small.png
new file mode 100644
index 000000000..44e23b51b
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-bayer-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-blue-off-small.png b/rtdata/images/themed/png/dark/histogram-blue-off-small.png
new file mode 100644
index 000000000..8b368ed63
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-blue-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-blue-on-small.png b/rtdata/images/themed/png/dark/histogram-blue-on-small.png
new file mode 100644
index 000000000..537153043
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-blue-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-gold-off-small.png b/rtdata/images/themed/png/dark/histogram-gold-off-small.png
new file mode 100644
index 000000000..4272c3ff7
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-gold-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-gold-on-small.png b/rtdata/images/themed/png/dark/histogram-gold-on-small.png
new file mode 100644
index 000000000..8f32203fd
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-gold-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-green-off-small.png b/rtdata/images/themed/png/dark/histogram-green-off-small.png
new file mode 100644
index 000000000..395fcac9e
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-green-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-green-on-small.png b/rtdata/images/themed/png/dark/histogram-green-on-small.png
new file mode 100644
index 000000000..db3f89ef5
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-green-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-linear-small.png b/rtdata/images/themed/png/dark/histogram-mode-linear-small.png
new file mode 100644
index 000000000..507be4c3e
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-mode-linear-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-logx-small.png b/rtdata/images/themed/png/dark/histogram-mode-logx-small.png
new file mode 100644
index 000000000..2a0b7cc6a
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-mode-logx-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png b/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png
new file mode 100644
index 000000000..23bf705ac
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-red-off-small.png b/rtdata/images/themed/png/dark/histogram-red-off-small.png
new file mode 100644
index 000000000..7d5ea5352
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-red-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-red-on-small.png b/rtdata/images/themed/png/dark/histogram-red-on-small.png
new file mode 100644
index 000000000..deee136a2
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-red-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-silver-off-small.png b/rtdata/images/themed/png/dark/histogram-silver-off-small.png
new file mode 100644
index 000000000..d88e879bc
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-silver-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-silver-on-small.png b/rtdata/images/themed/png/dark/histogram-silver-on-small.png
new file mode 100644
index 000000000..bdef06144
Binary files /dev/null and b/rtdata/images/themed/png/dark/histogram-silver-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/info.png b/rtdata/images/themed/png/dark/info.png
new file mode 100644
index 000000000..4d7ad53bb
Binary files /dev/null and b/rtdata/images/themed/png/dark/info.png differ
diff --git a/rtdata/images/themed/png/dark/intent-absolute.png b/rtdata/images/themed/png/dark/intent-absolute.png
new file mode 100644
index 000000000..14cc9f44b
Binary files /dev/null and b/rtdata/images/themed/png/dark/intent-absolute.png differ
diff --git a/rtdata/images/themed/png/dark/intent-perceptual.png b/rtdata/images/themed/png/dark/intent-perceptual.png
new file mode 100644
index 000000000..44507d85f
Binary files /dev/null and b/rtdata/images/themed/png/dark/intent-perceptual.png differ
diff --git a/rtdata/images/themed/png/dark/intent-relative.png b/rtdata/images/themed/png/dark/intent-relative.png
new file mode 100644
index 000000000..895c335c1
Binary files /dev/null and b/rtdata/images/themed/png/dark/intent-relative.png differ
diff --git a/rtdata/images/themed/png/dark/intent-saturation.png b/rtdata/images/themed/png/dark/intent-saturation.png
new file mode 100644
index 000000000..fb33221e4
Binary files /dev/null and b/rtdata/images/themed/png/dark/intent-saturation.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-1to1-small.png b/rtdata/images/themed/png/dark/magnifier-1to1-small.png
new file mode 100644
index 000000000..b68d5d975
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-1to1-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-1to1.png b/rtdata/images/themed/png/dark/magnifier-1to1.png
new file mode 100644
index 000000000..b111f5cb6
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-1to1.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-crop.png b/rtdata/images/themed/png/dark/magnifier-crop.png
new file mode 100644
index 000000000..1302ac7f9
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-crop.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-fit.png b/rtdata/images/themed/png/dark/magnifier-fit.png
new file mode 100644
index 000000000..d3c238338
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-fit.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-minus-small.png b/rtdata/images/themed/png/dark/magnifier-minus-small.png
new file mode 100644
index 000000000..dd1b65589
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-minus-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-minus.png b/rtdata/images/themed/png/dark/magnifier-minus.png
new file mode 100644
index 000000000..1f60a292a
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-minus.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-plus-small.png b/rtdata/images/themed/png/dark/magnifier-plus-small.png
new file mode 100644
index 000000000..532f9c426
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-plus-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-plus.png b/rtdata/images/themed/png/dark/magnifier-plus.png
new file mode 100644
index 000000000..b8d6a2a7a
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier-plus.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier.png b/rtdata/images/themed/png/dark/magnifier.png
new file mode 100644
index 000000000..6ae59fd55
Binary files /dev/null and b/rtdata/images/themed/png/dark/magnifier.png differ
diff --git a/rtdata/images/themed/png/dark/metadata.png b/rtdata/images/themed/png/dark/metadata.png
new file mode 100644
index 000000000..48fccde79
Binary files /dev/null and b/rtdata/images/themed/png/dark/metadata.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/dark/node-move-nw-se-hicontrast.png
new file mode 100644
index 000000000..b802c5849
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-nw-se-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/dark/node-move-sw-ne-hicontrast.png
new file mode 100644
index 000000000..2e51e88a3
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-sw-ne-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-x-hicontrast.png b/rtdata/images/themed/png/dark/node-move-x-hicontrast.png
new file mode 100644
index 000000000..1cc871dbb
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-x-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png b/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png
new file mode 100644
index 000000000..8b843958d
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-y-hicontrast.png b/rtdata/images/themed/png/dark/node-move-y-hicontrast.png
new file mode 100644
index 000000000..f80690851
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-y-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/one-to-one-small.png b/rtdata/images/themed/png/dark/one-to-one-small.png
new file mode 100644
index 000000000..50cda2db5
Binary files /dev/null and b/rtdata/images/themed/png/dark/one-to-one-small.png differ
diff --git a/rtdata/images/themed/png/dark/ornament1.png b/rtdata/images/themed/png/dark/ornament1.png
new file mode 100644
index 000000000..2acdd19e8
Binary files /dev/null and b/rtdata/images/themed/png/dark/ornament1.png differ
diff --git a/rtdata/images/themed/png/dark/padlock-locked-small.png b/rtdata/images/themed/png/dark/padlock-locked-small.png
new file mode 100644
index 000000000..8f7c12169
Binary files /dev/null and b/rtdata/images/themed/png/dark/padlock-locked-small.png differ
diff --git a/rtdata/images/themed/png/dark/padlock-unlocked-small.png b/rtdata/images/themed/png/dark/padlock-unlocked-small.png
new file mode 100644
index 000000000..ad27326c7
Binary files /dev/null and b/rtdata/images/themed/png/dark/padlock-unlocked-small.png differ
diff --git a/rtdata/images/themed/png/dark/palette-brush.png b/rtdata/images/themed/png/dark/palette-brush.png
new file mode 100644
index 000000000..592521db0
Binary files /dev/null and b/rtdata/images/themed/png/dark/palette-brush.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-bottom.png b/rtdata/images/themed/png/dark/panel-to-bottom.png
new file mode 100644
index 000000000..a8ed862f1
Binary files /dev/null and b/rtdata/images/themed/png/dark/panel-to-bottom.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-left.png b/rtdata/images/themed/png/dark/panel-to-left.png
new file mode 100644
index 000000000..51eb8b845
Binary files /dev/null and b/rtdata/images/themed/png/dark/panel-to-left.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-right.png b/rtdata/images/themed/png/dark/panel-to-right.png
new file mode 100644
index 000000000..372607970
Binary files /dev/null and b/rtdata/images/themed/png/dark/panel-to-right.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-top.png b/rtdata/images/themed/png/dark/panel-to-top.png
new file mode 100644
index 000000000..fc92ca1f6
Binary files /dev/null and b/rtdata/images/themed/png/dark/panel-to-top.png differ
diff --git a/rtdata/images/themed/png/dark/paste.png b/rtdata/images/themed/png/dark/paste.png
new file mode 100644
index 000000000..fba618a86
Binary files /dev/null and b/rtdata/images/themed/png/dark/paste.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png b/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png
new file mode 100644
index 000000000..039485fe3
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left.png b/rtdata/images/themed/png/dark/perspective-horizontal-left.png
new file mode 100644
index 000000000..b2b169840
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-left.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png b/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png
new file mode 100644
index 000000000..a917cf458
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right.png b/rtdata/images/themed/png/dark/perspective-horizontal-right.png
new file mode 100644
index 000000000..6ab911949
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-right.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png
new file mode 100644
index 000000000..f45a38c3e
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-bottom.png b/rtdata/images/themed/png/dark/perspective-vertical-bottom.png
new file mode 100644
index 000000000..0e508882b
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-vertical-bottom.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top-small.png b/rtdata/images/themed/png/dark/perspective-vertical-top-small.png
new file mode 100644
index 000000000..ab96d5596
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-vertical-top-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top.png b/rtdata/images/themed/png/dark/perspective-vertical-top.png
new file mode 100644
index 000000000..6084254a5
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-vertical-top.png differ
diff --git a/rtdata/images/themed/png/dark/power-inconsistent-small.png b/rtdata/images/themed/png/dark/power-inconsistent-small.png
new file mode 100644
index 000000000..75f9c7a58
Binary files /dev/null and b/rtdata/images/themed/png/dark/power-inconsistent-small.png differ
diff --git a/rtdata/images/themed/png/dark/power-off-small.png b/rtdata/images/themed/png/dark/power-off-small.png
new file mode 100644
index 000000000..9b3118c50
Binary files /dev/null and b/rtdata/images/themed/png/dark/power-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/power-on-small.png b/rtdata/images/themed/png/dark/power-on-small.png
new file mode 100644
index 000000000..c54e0d50e
Binary files /dev/null and b/rtdata/images/themed/png/dark/power-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/preferences.png b/rtdata/images/themed/png/dark/preferences.png
new file mode 100644
index 000000000..b88c501e5
Binary files /dev/null and b/rtdata/images/themed/png/dark/preferences.png differ
diff --git a/rtdata/images/themed/png/dark/profile-filled.png b/rtdata/images/themed/png/dark/profile-filled.png
new file mode 100644
index 000000000..e806c99f5
Binary files /dev/null and b/rtdata/images/themed/png/dark/profile-filled.png differ
diff --git a/rtdata/images/themed/png/dark/profile-partial.png b/rtdata/images/themed/png/dark/profile-partial.png
new file mode 100644
index 000000000..335a0238a
Binary files /dev/null and b/rtdata/images/themed/png/dark/profile-partial.png differ
diff --git a/rtdata/images/themed/png/dark/redo-all.png b/rtdata/images/themed/png/dark/redo-all.png
new file mode 100644
index 000000000..e293010d0
Binary files /dev/null and b/rtdata/images/themed/png/dark/redo-all.png differ
diff --git a/rtdata/images/themed/png/dark/redo-small.png b/rtdata/images/themed/png/dark/redo-small.png
new file mode 100644
index 000000000..84a5988ef
Binary files /dev/null and b/rtdata/images/themed/png/dark/redo-small.png differ
diff --git a/rtdata/images/themed/png/dark/redo.png b/rtdata/images/themed/png/dark/redo.png
new file mode 100644
index 000000000..c75b63620
Binary files /dev/null and b/rtdata/images/themed/png/dark/redo.png differ
diff --git a/rtdata/images/themed/png/dark/refresh-red-small.png b/rtdata/images/themed/png/dark/refresh-red-small.png
new file mode 100644
index 000000000..296035883
Binary files /dev/null and b/rtdata/images/themed/png/dark/refresh-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/refresh-small.png b/rtdata/images/themed/png/dark/refresh-small.png
new file mode 100644
index 000000000..b8f2e67d5
Binary files /dev/null and b/rtdata/images/themed/png/dark/refresh-small.png differ
diff --git a/rtdata/images/themed/png/dark/refresh.png b/rtdata/images/themed/png/dark/refresh.png
new file mode 100644
index 000000000..6981fbefb
Binary files /dev/null and b/rtdata/images/themed/png/dark/refresh.png differ
diff --git a/rtdata/images/themed/png/dark/remove-small.png b/rtdata/images/themed/png/dark/remove-small.png
new file mode 100644
index 000000000..996823902
Binary files /dev/null and b/rtdata/images/themed/png/dark/remove-small.png differ
diff --git a/rtdata/images/themed/png/dark/remove.png b/rtdata/images/themed/png/dark/remove.png
new file mode 100644
index 000000000..8d9715ac5
Binary files /dev/null and b/rtdata/images/themed/png/dark/remove.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png
new file mode 100644
index 000000000..d8929ac42
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode.png b/rtdata/images/themed/png/dark/rotate-aroundnode.png
new file mode 100644
index 000000000..50db200a6
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-aroundnode.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left-90.png b/rtdata/images/themed/png/dark/rotate-left-90.png
new file mode 100644
index 000000000..fa238e339
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-left-90.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left-small.png b/rtdata/images/themed/png/dark/rotate-left-small.png
new file mode 100644
index 000000000..659dc6344
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left.png b/rtdata/images/themed/png/dark/rotate-left.png
new file mode 100644
index 000000000..739b39c0b
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-left.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right-90.png b/rtdata/images/themed/png/dark/rotate-right-90.png
new file mode 100644
index 000000000..126232d2f
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-right-90.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right-small.png b/rtdata/images/themed/png/dark/rotate-right-small.png
new file mode 100644
index 000000000..c59152c81
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right.png b/rtdata/images/themed/png/dark/rotate-right.png
new file mode 100644
index 000000000..8f99d9b05
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-right.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-straighten-small.png b/rtdata/images/themed/png/dark/rotate-straighten-small.png
new file mode 100644
index 000000000..d57dcb7c7
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-straighten-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-straighten.png b/rtdata/images/themed/png/dark/rotate-straighten.png
new file mode 100644
index 000000000..457282758
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-straighten.png differ
diff --git a/rtdata/images/themed/png/dark/save-small.png b/rtdata/images/themed/png/dark/save-small.png
new file mode 100644
index 000000000..e4912f5d2
Binary files /dev/null and b/rtdata/images/themed/png/dark/save-small.png differ
diff --git a/rtdata/images/themed/png/dark/save.png b/rtdata/images/themed/png/dark/save.png
new file mode 100644
index 000000000..2d52cdaeb
Binary files /dev/null and b/rtdata/images/themed/png/dark/save.png differ
diff --git a/rtdata/images/themed/png/dark/saved-no-small.png b/rtdata/images/themed/png/dark/saved-no-small.png
new file mode 100644
index 000000000..417f27624
Binary files /dev/null and b/rtdata/images/themed/png/dark/saved-no-small.png differ
diff --git a/rtdata/images/themed/png/dark/saved-yes-small.png b/rtdata/images/themed/png/dark/saved-yes-small.png
new file mode 100644
index 000000000..953c7f8cc
Binary files /dev/null and b/rtdata/images/themed/png/dark/saved-yes-small.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png
new file mode 100644
index 000000000..ff6adb675
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png
new file mode 100644
index 000000000..5d6e35c3d
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png
new file mode 100644
index 000000000..2a9741c0f
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png
new file mode 100644
index 000000000..e52337d33
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png
new file mode 100644
index 000000000..7e009920f
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png
new file mode 100644
index 000000000..64289008a
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png
new file mode 100644
index 000000000..f55cbb8c3
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png
new file mode 100644
index 000000000..0c8b9522d
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png
new file mode 100644
index 000000000..c6dfe8410
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png
new file mode 100644
index 000000000..b45b608d9
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png
new file mode 100644
index 000000000..99730ee4b
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png
new file mode 100644
index 000000000..e0b91d8b3
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png
new file mode 100644
index 000000000..449946648
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png
new file mode 100644
index 000000000..e59257824
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png
new file mode 100644
index 000000000..b2e5e3611
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png
new file mode 100644
index 000000000..7ff59d927
Binary files /dev/null and b/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png b/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png
new file mode 100644
index 000000000..b0ce704d6
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/star-gold-hollow-small.png b/rtdata/images/themed/png/dark/star-gold-hollow-small.png
new file mode 100644
index 000000000..478055c2b
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-gold-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-gold-narrow.png b/rtdata/images/themed/png/dark/star-gold-narrow.png
new file mode 100644
index 000000000..32710fb9d
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-gold-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/star-gold-small.png b/rtdata/images/themed/png/dark/star-gold-small.png
new file mode 100644
index 000000000..da02a823e
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-gold-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-hollow-narrow.png b/rtdata/images/themed/png/dark/star-hollow-narrow.png
new file mode 100644
index 000000000..b9c978350
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-hollow-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/star-hollow-small.png b/rtdata/images/themed/png/dark/star-hollow-small.png
new file mode 100644
index 000000000..b5cf648ca
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-narrow.png b/rtdata/images/themed/png/dark/star-narrow.png
new file mode 100644
index 000000000..bdcc73bfe
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png
new file mode 100644
index 000000000..db895d932
Binary files /dev/null and b/rtdata/images/themed/png/dark/star-small.png differ
diff --git a/rtdata/images/themed/png/dark/template-16.png b/rtdata/images/themed/png/dark/template-16.png
new file mode 100644
index 000000000..1c50ead9e
Binary files /dev/null and b/rtdata/images/themed/png/dark/template-16.png differ
diff --git a/rtdata/images/themed/png/dark/template-24.png b/rtdata/images/themed/png/dark/template-24.png
new file mode 100644
index 000000000..7ab9e8c0f
Binary files /dev/null and b/rtdata/images/themed/png/dark/template-24.png differ
diff --git a/rtdata/images/themed/png/dark/template-narrow.png b/rtdata/images/themed/png/dark/template-narrow.png
new file mode 100644
index 000000000..78c374503
Binary files /dev/null and b/rtdata/images/themed/png/dark/template-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green-hollow-small.png b/rtdata/images/themed/png/dark/tick-green-hollow-small.png
new file mode 100644
index 000000000..176bf5489
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-green-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green-hollow.png b/rtdata/images/themed/png/dark/tick-green-hollow.png
new file mode 100644
index 000000000..7cac33dc0
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-green-hollow.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green-small.png b/rtdata/images/themed/png/dark/tick-green-small.png
new file mode 100644
index 000000000..54cf5d024
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green.png b/rtdata/images/themed/png/dark/tick-green.png
new file mode 100644
index 000000000..2458734b2
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-green.png differ
diff --git a/rtdata/images/themed/png/dark/tick-hollow-small.png b/rtdata/images/themed/png/dark/tick-hollow-small.png
new file mode 100644
index 000000000..e5e492deb
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-small.png b/rtdata/images/themed/png/dark/tick-small.png
new file mode 100644
index 000000000..8ee5e5516
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick.png b/rtdata/images/themed/png/dark/tick.png
new file mode 100644
index 000000000..5318ae4d5
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick.png differ
diff --git a/rtdata/images/themed/png/dark/transform.png b/rtdata/images/themed/png/dark/transform.png
new file mode 100644
index 000000000..30cd76dd6
Binary files /dev/null and b/rtdata/images/themed/png/dark/transform.png differ
diff --git a/rtdata/images/themed/png/dark/trash-delete.png b/rtdata/images/themed/png/dark/trash-delete.png
new file mode 100644
index 000000000..1a7c084aa
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-delete.png differ
diff --git a/rtdata/images/themed/png/dark/trash-empty-show.png b/rtdata/images/themed/png/dark/trash-empty-show.png
new file mode 100644
index 000000000..983979634
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-empty-show.png differ
diff --git a/rtdata/images/themed/png/dark/trash-empty.png b/rtdata/images/themed/png/dark/trash-empty.png
new file mode 100644
index 000000000..a1b92354e
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-empty.png differ
diff --git a/rtdata/images/themed/png/dark/trash-full-show.png b/rtdata/images/themed/png/dark/trash-full-show.png
new file mode 100644
index 000000000..1c1c7aa17
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-full-show.png differ
diff --git a/rtdata/images/themed/png/dark/trash-full.png b/rtdata/images/themed/png/dark/trash-full.png
new file mode 100644
index 000000000..699d2b8ac
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-full.png differ
diff --git a/rtdata/images/themed/png/dark/trash-hide-deleted.png b/rtdata/images/themed/png/dark/trash-hide-deleted.png
new file mode 100644
index 000000000..ffbb9f391
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-hide-deleted.png differ
diff --git a/rtdata/images/themed/png/dark/trash-remove-small.png b/rtdata/images/themed/png/dark/trash-remove-small.png
new file mode 100644
index 000000000..75fd6493c
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-remove-small.png differ
diff --git a/rtdata/images/themed/png/dark/trash-remove.png b/rtdata/images/themed/png/dark/trash-remove.png
new file mode 100644
index 000000000..f9dc4bde7
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-remove.png differ
diff --git a/rtdata/images/themed/png/dark/trash-small.png b/rtdata/images/themed/png/dark/trash-small.png
new file mode 100644
index 000000000..2a19f041c
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-small.png differ
diff --git a/rtdata/images/themed/png/dark/undo-all.png b/rtdata/images/themed/png/dark/undo-all.png
new file mode 100644
index 000000000..7f577140b
Binary files /dev/null and b/rtdata/images/themed/png/dark/undo-all.png differ
diff --git a/rtdata/images/themed/png/dark/undo-small.png b/rtdata/images/themed/png/dark/undo-small.png
new file mode 100644
index 000000000..0908ba6d5
Binary files /dev/null and b/rtdata/images/themed/png/dark/undo-small.png differ
diff --git a/rtdata/images/themed/png/dark/undo.png b/rtdata/images/themed/png/dark/undo.png
new file mode 100644
index 000000000..3e0a28d1e
Binary files /dev/null and b/rtdata/images/themed/png/dark/undo.png differ
diff --git a/rtdata/images/themed/png/dark/warning-highlights.png b/rtdata/images/themed/png/dark/warning-highlights.png
new file mode 100644
index 000000000..61ec734ca
Binary files /dev/null and b/rtdata/images/themed/png/dark/warning-highlights.png differ
diff --git a/rtdata/images/themed/png/dark/warning-shadows.png b/rtdata/images/themed/png/dark/warning-shadows.png
new file mode 100644
index 000000000..c5e83dad6
Binary files /dev/null and b/rtdata/images/themed/png/dark/warning-shadows.png differ
diff --git a/rtdata/images/themed/png/dark/wavelets.png b/rtdata/images/themed/png/dark/wavelets.png
new file mode 100644
index 000000000..664fa8196
Binary files /dev/null and b/rtdata/images/themed/png/dark/wavelets.png differ
diff --git a/rtdata/images/themed/png/dark/wb-auto-small.png b/rtdata/images/themed/png/dark/wb-auto-small.png
new file mode 100644
index 000000000..e557048eb
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-auto-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-auto.png b/rtdata/images/themed/png/dark/wb-auto.png
new file mode 100644
index 000000000..e2f033360
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-auto.png differ
diff --git a/rtdata/images/themed/png/dark/wb-camera-small.png b/rtdata/images/themed/png/dark/wb-camera-small.png
new file mode 100644
index 000000000..69c869445
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-camera-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-camera.png b/rtdata/images/themed/png/dark/wb-camera.png
new file mode 100644
index 000000000..8749579d0
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-camera.png differ
diff --git a/rtdata/images/themed/png/dark/wb-cloudy-small.png b/rtdata/images/themed/png/dark/wb-cloudy-small.png
new file mode 100644
index 000000000..175d88f1a
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-cloudy-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-cloudy.png b/rtdata/images/themed/png/dark/wb-cloudy.png
new file mode 100644
index 000000000..1c394b709
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-cloudy.png differ
diff --git a/rtdata/images/themed/png/dark/wb-custom-small.png b/rtdata/images/themed/png/dark/wb-custom-small.png
new file mode 100644
index 000000000..2f3fcb517
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-custom-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-custom.png b/rtdata/images/themed/png/dark/wb-custom.png
new file mode 100644
index 000000000..db9abc03c
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-custom.png differ
diff --git a/rtdata/images/themed/png/dark/wb-flash-small.png b/rtdata/images/themed/png/dark/wb-flash-small.png
new file mode 100644
index 000000000..1bc051cd4
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-flash-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-flash.png b/rtdata/images/themed/png/dark/wb-flash.png
new file mode 100644
index 000000000..d460a0569
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-flash.png differ
diff --git a/rtdata/images/themed/png/dark/wb-fluorescent-small.png b/rtdata/images/themed/png/dark/wb-fluorescent-small.png
new file mode 100644
index 000000000..3c7882252
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-fluorescent-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-fluorescent.png b/rtdata/images/themed/png/dark/wb-fluorescent.png
new file mode 100644
index 000000000..c994ee9dd
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-fluorescent.png differ
diff --git a/rtdata/images/themed/png/dark/wb-lamp-small.png b/rtdata/images/themed/png/dark/wb-lamp-small.png
new file mode 100644
index 000000000..ea5f790c3
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-lamp-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-lamp.png b/rtdata/images/themed/png/dark/wb-lamp.png
new file mode 100644
index 000000000..b0d3df3e5
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-lamp.png differ
diff --git a/rtdata/images/themed/png/dark/wb-led-small.png b/rtdata/images/themed/png/dark/wb-led-small.png
new file mode 100644
index 000000000..dc4385c94
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-led-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-led.png b/rtdata/images/themed/png/dark/wb-led.png
new file mode 100644
index 000000000..dfdb25191
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-led.png differ
diff --git a/rtdata/images/themed/png/dark/wb-shade-small.png b/rtdata/images/themed/png/dark/wb-shade-small.png
new file mode 100644
index 000000000..255c021a6
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-shade-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-shade.png b/rtdata/images/themed/png/dark/wb-shade.png
new file mode 100644
index 000000000..2be98acf6
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-shade.png differ
diff --git a/rtdata/images/themed/png/dark/wb-sun-small.png b/rtdata/images/themed/png/dark/wb-sun-small.png
new file mode 100644
index 000000000..a7de769df
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-sun-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-sun.png b/rtdata/images/themed/png/dark/wb-sun.png
new file mode 100644
index 000000000..e65ee2a80
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-sun.png differ
diff --git a/rtdata/images/themed/png/dark/wb-tungsten-small.png b/rtdata/images/themed/png/dark/wb-tungsten-small.png
new file mode 100644
index 000000000..6f958cd59
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-tungsten-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-tungsten.png b/rtdata/images/themed/png/dark/wb-tungsten.png
new file mode 100644
index 000000000..2c71f66ef
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-tungsten.png differ
diff --git a/rtdata/images/themed/png/dark/wb-water-small.png b/rtdata/images/themed/png/dark/wb-water-small.png
new file mode 100644
index 000000000..2ecb58552
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-water-small.png differ
diff --git a/rtdata/images/themed/png/dark/wb-water.png b/rtdata/images/themed/png/dark/wb-water.png
new file mode 100644
index 000000000..7bc55c153
Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-water.png differ
diff --git a/rtdata/images/themed/png/dark/window-add.png b/rtdata/images/themed/png/dark/window-add.png
new file mode 100644
index 000000000..4364b1a13
Binary files /dev/null and b/rtdata/images/themed/png/dark/window-add.png differ
diff --git a/rtdata/images/themed/png/light/add-small.png b/rtdata/images/themed/png/light/add-small.png
new file mode 100644
index 000000000..59211ace6
Binary files /dev/null and b/rtdata/images/themed/png/light/add-small.png differ
diff --git a/rtdata/images/themed/png/light/add.png b/rtdata/images/themed/png/light/add.png
new file mode 100644
index 000000000..88b1c285d
Binary files /dev/null and b/rtdata/images/themed/png/light/add.png differ
diff --git a/rtdata/images/themed/png/light/aperture.png b/rtdata/images/themed/png/light/aperture.png
new file mode 100644
index 000000000..70e8e0be5
Binary files /dev/null and b/rtdata/images/themed/png/light/aperture.png differ
diff --git a/rtdata/images/themed/png/light/arrow-down-small.png b/rtdata/images/themed/png/light/arrow-down-small.png
new file mode 100644
index 000000000..ab76bb3cc
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow-down-small.png differ
diff --git a/rtdata/images/themed/png/light/arrow-left-small.png b/rtdata/images/themed/png/light/arrow-left-small.png
new file mode 100644
index 000000000..2673b7445
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow-left-small.png differ
diff --git a/rtdata/images/themed/png/light/arrow-right-small.png b/rtdata/images/themed/png/light/arrow-right-small.png
new file mode 100644
index 000000000..228cecd3d
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow-right-small.png differ
diff --git a/rtdata/images/themed/png/light/arrow-up-small.png b/rtdata/images/themed/png/light/arrow-up-small.png
new file mode 100644
index 000000000..6e8061207
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow-up-small.png differ
diff --git a/rtdata/images/themed/png/light/arrow-updown.png b/rtdata/images/themed/png/light/arrow-updown.png
new file mode 100644
index 000000000..bb0ccc5dc
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow-updown.png differ
diff --git a/rtdata/images/themed/png/light/arrow2-left.png b/rtdata/images/themed/png/light/arrow2-left.png
new file mode 100644
index 000000000..4ac761b76
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow2-left.png differ
diff --git a/rtdata/images/themed/png/light/arrow2-right.png b/rtdata/images/themed/png/light/arrow2-right.png
new file mode 100644
index 000000000..75d150843
Binary files /dev/null and b/rtdata/images/themed/png/light/arrow2-right.png differ
diff --git a/rtdata/images/themed/png/light/atom.png b/rtdata/images/themed/png/light/atom.png
new file mode 100644
index 000000000..df3dc8bdf
Binary files /dev/null and b/rtdata/images/themed/png/light/atom.png differ
diff --git a/rtdata/images/themed/png/light/bayer.png b/rtdata/images/themed/png/light/bayer.png
new file mode 100644
index 000000000..c85ce844e
Binary files /dev/null and b/rtdata/images/themed/png/light/bayer.png differ
diff --git a/rtdata/images/themed/png/light/beforeafter.png b/rtdata/images/themed/png/light/beforeafter.png
new file mode 100644
index 000000000..fb7e7ce55
Binary files /dev/null and b/rtdata/images/themed/png/light/beforeafter.png differ
diff --git a/rtdata/images/themed/png/light/cancel-small.png b/rtdata/images/themed/png/light/cancel-small.png
new file mode 100644
index 000000000..8c5d91145
Binary files /dev/null and b/rtdata/images/themed/png/light/cancel-small.png differ
diff --git a/rtdata/images/themed/png/light/cancel.png b/rtdata/images/themed/png/light/cancel.png
new file mode 100644
index 000000000..1a48a2e44
Binary files /dev/null and b/rtdata/images/themed/png/light/cancel.png differ
diff --git a/rtdata/images/themed/png/light/circle-black-small.png b/rtdata/images/themed/png/light/circle-black-small.png
new file mode 100644
index 000000000..f18a415b6
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-black-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-green-small.png b/rtdata/images/themed/png/light/circle-blue-green-small.png
new file mode 100644
index 000000000..247931823
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-red-small.png b/rtdata/images/themed/png/light/circle-blue-red-small.png
new file mode 100644
index 000000000..d88a01330
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-small.png b/rtdata/images/themed/png/light/circle-blue-small.png
new file mode 100644
index 000000000..2c8ff48fd
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-yellow-small.png b/rtdata/images/themed/png/light/circle-blue-yellow-small.png
new file mode 100644
index 000000000..0585b2195
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-cyan-red-small.png b/rtdata/images/themed/png/light/circle-cyan-red-small.png
new file mode 100644
index 000000000..ed7003161
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-cyan-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-cyan-small.png b/rtdata/images/themed/png/light/circle-cyan-small.png
new file mode 100644
index 000000000..84f873a2c
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-cyan-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-darkgray-small.png b/rtdata/images/themed/png/light/circle-darkgray-small.png
new file mode 100644
index 000000000..e706b1eba
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-blue-small.png b/rtdata/images/themed/png/light/circle-empty-blue-small.png
new file mode 100644
index 000000000..d53b3516e
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-darkgray-small.png b/rtdata/images/themed/png/light/circle-empty-darkgray-small.png
new file mode 100644
index 000000000..4f0f0f4c7
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-gray-small.png b/rtdata/images/themed/png/light/circle-empty-gray-small.png
new file mode 100644
index 000000000..b3a57c83b
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-gray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-green-small.png b/rtdata/images/themed/png/light/circle-empty-green-small.png
new file mode 100644
index 000000000..3b1444d37
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-purple-small.png b/rtdata/images/themed/png/light/circle-empty-purple-small.png
new file mode 100644
index 000000000..e61da8e9f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-purple-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-red-small.png b/rtdata/images/themed/png/light/circle-empty-red-small.png
new file mode 100644
index 000000000..bf8035931
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-yellow-small.png b/rtdata/images/themed/png/light/circle-empty-yellow-small.png
new file mode 100644
index 000000000..9a3ca9bd8
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-blue-small.png b/rtdata/images/themed/png/light/circle-gray-blue-small.png
new file mode 100644
index 000000000..01d5da881
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-green-small.png b/rtdata/images/themed/png/light/circle-gray-green-small.png
new file mode 100644
index 000000000..2290b708f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-red-small.png b/rtdata/images/themed/png/light/circle-gray-red-small.png
new file mode 100644
index 000000000..29afda33b
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/light/circle-gray-small.png
new file mode 100644
index 000000000..18ad6330a
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green-blue-small.png b/rtdata/images/themed/png/light/circle-green-blue-small.png
new file mode 100644
index 000000000..1d6e60252
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-green-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green-red-small.png b/rtdata/images/themed/png/light/circle-green-red-small.png
new file mode 100644
index 000000000..96f86b1b9
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-green-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green-small.png b/rtdata/images/themed/png/light/circle-green-small.png
new file mode 100644
index 000000000..88270e0cb
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-magenta-small.png b/rtdata/images/themed/png/light/circle-magenta-small.png
new file mode 100644
index 000000000..cce26e1f2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-magenta-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-orange-small.png b/rtdata/images/themed/png/light/circle-orange-small.png
new file mode 100644
index 000000000..5894f0987
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-orange-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-purple-small.png b/rtdata/images/themed/png/light/circle-purple-small.png
new file mode 100644
index 000000000..9fe4eb0d6
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-purple-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-blue-small.png b/rtdata/images/themed/png/light/circle-red-blue-small.png
new file mode 100644
index 000000000..e70ef22f6
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-cyan-small.png b/rtdata/images/themed/png/light/circle-red-cyan-small.png
new file mode 100644
index 000000000..92b03b953
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-cyan-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-green-small.png b/rtdata/images/themed/png/light/circle-red-green-small.png
new file mode 100644
index 000000000..4572e019f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-small.png b/rtdata/images/themed/png/light/circle-red-small.png
new file mode 100644
index 000000000..a8c9cecec
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-white-small.png b/rtdata/images/themed/png/light/circle-white-small.png
new file mode 100644
index 000000000..acf4f8b76
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-white-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-yellow-blue-small.png b/rtdata/images/themed/png/light/circle-yellow-blue-small.png
new file mode 100644
index 000000000..1f7aec9f2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-yellow-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-yellow-small.png b/rtdata/images/themed/png/light/circle-yellow-small.png
new file mode 100644
index 000000000..1c5678ac2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/color-circles.png b/rtdata/images/themed/png/light/color-circles.png
new file mode 100644
index 000000000..0be8fdacc
Binary files /dev/null and b/rtdata/images/themed/png/light/color-circles.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-add-hicontrast.png b/rtdata/images/themed/png/light/color-picker-add-hicontrast.png
new file mode 100644
index 000000000..5dcdacf1f
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-add-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-add.png b/rtdata/images/themed/png/light/color-picker-add.png
new file mode 100644
index 000000000..593e69b3d
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-add.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-bars.png b/rtdata/images/themed/png/light/color-picker-bars.png
new file mode 100644
index 000000000..a7a9b0f07
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-bars.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-hicontrast.png b/rtdata/images/themed/png/light/color-picker-hicontrast.png
new file mode 100644
index 000000000..c7bfb850b
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-hide.png b/rtdata/images/themed/png/light/color-picker-hide.png
new file mode 100644
index 000000000..418b5b929
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-hide.png differ
diff --git a/rtdata/images/themed/png/light/color-picker.png b/rtdata/images/themed/png/light/color-picker.png
new file mode 100644
index 000000000..0d01785a0
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker.png differ
diff --git a/rtdata/images/themed/png/light/contrastmask-off.png b/rtdata/images/themed/png/light/contrastmask-off.png
new file mode 100644
index 000000000..b3df60148
Binary files /dev/null and b/rtdata/images/themed/png/light/contrastmask-off.png differ
diff --git a/rtdata/images/themed/png/light/contrastmask-on.png b/rtdata/images/themed/png/light/contrastmask-on.png
new file mode 100644
index 000000000..064ed7e9b
Binary files /dev/null and b/rtdata/images/themed/png/light/contrastmask-on.png differ
diff --git a/rtdata/images/themed/png/light/copy.png b/rtdata/images/themed/png/light/copy.png
new file mode 100644
index 000000000..bd4523ea2
Binary files /dev/null and b/rtdata/images/themed/png/light/copy.png differ
diff --git a/rtdata/images/themed/png/light/crop-auto-small.png b/rtdata/images/themed/png/light/crop-auto-small.png
new file mode 100644
index 000000000..bc3de2dc2
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-auto-small.png differ
diff --git a/rtdata/images/themed/png/light/crop-auto.png b/rtdata/images/themed/png/light/crop-auto.png
new file mode 100644
index 000000000..5499df93f
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-auto.png differ
diff --git a/rtdata/images/themed/png/light/crop-point-hicontrast.png b/rtdata/images/themed/png/light/crop-point-hicontrast.png
new file mode 100644
index 000000000..65aa29856
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-point-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/crop-small.png b/rtdata/images/themed/png/light/crop-small.png
new file mode 100644
index 000000000..9f345a6ef
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-small.png differ
diff --git a/rtdata/images/themed/png/light/crop.png b/rtdata/images/themed/png/light/crop.png
new file mode 100644
index 000000000..83ef5a955
Binary files /dev/null and b/rtdata/images/themed/png/light/crop.png differ
diff --git a/rtdata/images/themed/png/light/crossed-arrows-in.png b/rtdata/images/themed/png/light/crossed-arrows-in.png
new file mode 100644
index 000000000..f10a4a058
Binary files /dev/null and b/rtdata/images/themed/png/light/crossed-arrows-in.png differ
diff --git a/rtdata/images/themed/png/light/crossed-arrows-out.png b/rtdata/images/themed/png/light/crossed-arrows-out.png
new file mode 100644
index 000000000..410e65f3d
Binary files /dev/null and b/rtdata/images/themed/png/light/crossed-arrows-out.png differ
diff --git a/rtdata/images/themed/png/light/crosshair-adjust.png b/rtdata/images/themed/png/light/crosshair-adjust.png
new file mode 100644
index 000000000..b8b17dfa1
Binary files /dev/null and b/rtdata/images/themed/png/light/crosshair-adjust.png differ
diff --git a/rtdata/images/themed/png/light/crosshair-hicontrast.png b/rtdata/images/themed/png/light/crosshair-hicontrast.png
new file mode 100644
index 000000000..078512803
Binary files /dev/null and b/rtdata/images/themed/png/light/crosshair-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/crosshair-node-curve.png b/rtdata/images/themed/png/light/crosshair-node-curve.png
new file mode 100644
index 000000000..0af7379c2
Binary files /dev/null and b/rtdata/images/themed/png/light/crosshair-node-curve.png differ
diff --git a/rtdata/images/themed/png/light/crosshair-small.png b/rtdata/images/themed/png/light/crosshair-small.png
new file mode 100644
index 000000000..a898a2fdb
Binary files /dev/null and b/rtdata/images/themed/png/light/crosshair-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-controlpoints-small.png b/rtdata/images/themed/png/light/curve-controlpoints-small.png
new file mode 100644
index 000000000..2be1333ff
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-controlpoints-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-controlpoints.png b/rtdata/images/themed/png/light/curve-controlpoints.png
new file mode 100644
index 000000000..cdd7cdd3a
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-controlpoints.png differ
diff --git a/rtdata/images/themed/png/light/curve-flat-small.png b/rtdata/images/themed/png/light/curve-flat-small.png
new file mode 100644
index 000000000..17959e6ac
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-flat-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-flat.png b/rtdata/images/themed/png/light/curve-flat.png
new file mode 100644
index 000000000..976281d49
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-flat.png differ
diff --git a/rtdata/images/themed/png/light/curve-linear-small.png b/rtdata/images/themed/png/light/curve-linear-small.png
new file mode 100644
index 000000000..53b07f616
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-linear-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-linear.png b/rtdata/images/themed/png/light/curve-linear.png
new file mode 100644
index 000000000..a3d9105dd
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-linear.png differ
diff --git a/rtdata/images/themed/png/light/curve-nurbs-small.png b/rtdata/images/themed/png/light/curve-nurbs-small.png
new file mode 100644
index 000000000..f970852b5
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-nurbs-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-nurbs.png b/rtdata/images/themed/png/light/curve-nurbs.png
new file mode 100644
index 000000000..ad9b3eb87
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-nurbs.png differ
diff --git a/rtdata/images/themed/png/light/curve-parametric-small.png b/rtdata/images/themed/png/light/curve-parametric-small.png
new file mode 100644
index 000000000..2acba010c
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-parametric-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-parametric.png b/rtdata/images/themed/png/light/curve-parametric.png
new file mode 100644
index 000000000..a29a7529b
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-parametric.png differ
diff --git a/rtdata/images/themed/png/light/curve-spline-small.png b/rtdata/images/themed/png/light/curve-spline-small.png
new file mode 100644
index 000000000..6ea7b93c9
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-spline-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-spline.png b/rtdata/images/themed/png/light/curve-spline.png
new file mode 100644
index 000000000..c7318df5a
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-spline.png differ
diff --git a/rtdata/images/themed/png/light/detail.png b/rtdata/images/themed/png/light/detail.png
new file mode 100644
index 000000000..45ef517d0
Binary files /dev/null and b/rtdata/images/themed/png/light/detail.png differ
diff --git a/rtdata/images/themed/png/light/device-floppy.png b/rtdata/images/themed/png/light/device-floppy.png
new file mode 100644
index 000000000..bc0ec8c30
Binary files /dev/null and b/rtdata/images/themed/png/light/device-floppy.png differ
diff --git a/rtdata/images/themed/png/light/device-hdd.png b/rtdata/images/themed/png/light/device-hdd.png
new file mode 100644
index 000000000..4477bfb21
Binary files /dev/null and b/rtdata/images/themed/png/light/device-hdd.png differ
diff --git a/rtdata/images/themed/png/light/device-network.png b/rtdata/images/themed/png/light/device-network.png
new file mode 100644
index 000000000..3d2f69efe
Binary files /dev/null and b/rtdata/images/themed/png/light/device-network.png differ
diff --git a/rtdata/images/themed/png/light/device-optical.png b/rtdata/images/themed/png/light/device-optical.png
new file mode 100644
index 000000000..ca6c5bd32
Binary files /dev/null and b/rtdata/images/themed/png/light/device-optical.png differ
diff --git a/rtdata/images/themed/png/light/device-usb.png b/rtdata/images/themed/png/light/device-usb.png
new file mode 100644
index 000000000..30a43f7fe
Binary files /dev/null and b/rtdata/images/themed/png/light/device-usb.png differ
diff --git a/rtdata/images/themed/png/light/distortion-auto-small.png b/rtdata/images/themed/png/light/distortion-auto-small.png
new file mode 100644
index 000000000..385c37307
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-auto-small.png differ
diff --git a/rtdata/images/themed/png/light/distortion-auto.png b/rtdata/images/themed/png/light/distortion-auto.png
new file mode 100644
index 000000000..242791d1b
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-auto.png differ
diff --git a/rtdata/images/themed/png/light/distortion-barrel-small.png b/rtdata/images/themed/png/light/distortion-barrel-small.png
new file mode 100644
index 000000000..5ec7c232b
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-barrel-small.png differ
diff --git a/rtdata/images/themed/png/light/distortion-barrel.png b/rtdata/images/themed/png/light/distortion-barrel.png
new file mode 100644
index 000000000..ab04051ea
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-barrel.png differ
diff --git a/rtdata/images/themed/png/light/distortion-pincushion-small.png b/rtdata/images/themed/png/light/distortion-pincushion-small.png
new file mode 100644
index 000000000..12bbe630d
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-pincushion-small.png differ
diff --git a/rtdata/images/themed/png/light/distortion-pincushion.png b/rtdata/images/themed/png/light/distortion-pincushion.png
new file mode 100644
index 000000000..a927e90c2
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-pincushion.png differ
diff --git a/rtdata/images/themed/png/light/edit-point.png b/rtdata/images/themed/png/light/edit-point.png
new file mode 100644
index 000000000..b75f3670a
Binary files /dev/null and b/rtdata/images/themed/png/light/edit-point.png differ
diff --git a/rtdata/images/themed/png/light/equilizer-narrow.png b/rtdata/images/themed/png/light/equilizer-narrow.png
new file mode 100644
index 000000000..3e40c173c
Binary files /dev/null and b/rtdata/images/themed/png/light/equilizer-narrow.png differ
diff --git a/rtdata/images/themed/png/light/equilizer-wide.png b/rtdata/images/themed/png/light/equilizer-wide.png
new file mode 100644
index 000000000..41b0f72f0
Binary files /dev/null and b/rtdata/images/themed/png/light/equilizer-wide.png differ
diff --git a/rtdata/images/themed/png/light/expander-closed-small.png b/rtdata/images/themed/png/light/expander-closed-small.png
new file mode 100644
index 000000000..23fcef4a1
Binary files /dev/null and b/rtdata/images/themed/png/light/expander-closed-small.png differ
diff --git a/rtdata/images/themed/png/light/expander-open-small.png b/rtdata/images/themed/png/light/expander-open-small.png
new file mode 100644
index 000000000..d4ab66ab6
Binary files /dev/null and b/rtdata/images/themed/png/light/expander-open-small.png differ
diff --git a/rtdata/images/themed/png/light/exposure.png b/rtdata/images/themed/png/light/exposure.png
new file mode 100644
index 000000000..1259b9a5c
Binary files /dev/null and b/rtdata/images/themed/png/light/exposure.png differ
diff --git a/rtdata/images/themed/png/light/filetype-hdr.png b/rtdata/images/themed/png/light/filetype-hdr.png
new file mode 100644
index 000000000..7365fb560
Binary files /dev/null and b/rtdata/images/themed/png/light/filetype-hdr.png differ
diff --git a/rtdata/images/themed/png/light/filetype-ps.png b/rtdata/images/themed/png/light/filetype-ps.png
new file mode 100644
index 000000000..982ed9736
Binary files /dev/null and b/rtdata/images/themed/png/light/filetype-ps.png differ
diff --git a/rtdata/images/themed/png/light/filter-clear.png b/rtdata/images/themed/png/light/filter-clear.png
new file mode 100644
index 000000000..f07e3a901
Binary files /dev/null and b/rtdata/images/themed/png/light/filter-clear.png differ
diff --git a/rtdata/images/themed/png/light/filter-original.png b/rtdata/images/themed/png/light/filter-original.png
new file mode 100644
index 000000000..5de915274
Binary files /dev/null and b/rtdata/images/themed/png/light/filter-original.png differ
diff --git a/rtdata/images/themed/png/light/filter-original2.png b/rtdata/images/themed/png/light/filter-original2.png
new file mode 100644
index 000000000..c20c214aa
Binary files /dev/null and b/rtdata/images/themed/png/light/filter-original2.png differ
diff --git a/rtdata/images/themed/png/light/filter.png b/rtdata/images/themed/png/light/filter.png
new file mode 100644
index 000000000..4a0c95916
Binary files /dev/null and b/rtdata/images/themed/png/light/filter.png differ
diff --git a/rtdata/images/themed/png/light/flip-horizontal.png b/rtdata/images/themed/png/light/flip-horizontal.png
new file mode 100644
index 000000000..9d5993527
Binary files /dev/null and b/rtdata/images/themed/png/light/flip-horizontal.png differ
diff --git a/rtdata/images/themed/png/light/flip-vertical.png b/rtdata/images/themed/png/light/flip-vertical.png
new file mode 100644
index 000000000..6249c98b4
Binary files /dev/null and b/rtdata/images/themed/png/light/flip-vertical.png differ
diff --git a/rtdata/images/themed/png/light/focusscreen-off.png b/rtdata/images/themed/png/light/focusscreen-off.png
new file mode 100644
index 000000000..106ec4035
Binary files /dev/null and b/rtdata/images/themed/png/light/focusscreen-off.png differ
diff --git a/rtdata/images/themed/png/light/focusscreen-on.png b/rtdata/images/themed/png/light/focusscreen-on.png
new file mode 100644
index 000000000..f9c418b92
Binary files /dev/null and b/rtdata/images/themed/png/light/focusscreen-on.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed-home-small.png b/rtdata/images/themed/png/light/folder-closed-home-small.png
new file mode 100644
index 000000000..fff07d768
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed-home-small.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed-home.png b/rtdata/images/themed/png/light/folder-closed-home.png
new file mode 100644
index 000000000..27eb6d355
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed-home.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed-recent-small.png b/rtdata/images/themed/png/light/folder-closed-recent-small.png
new file mode 100644
index 000000000..400f79a67
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed-recent-small.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed-recent.png b/rtdata/images/themed/png/light/folder-closed-recent.png
new file mode 100644
index 000000000..4f3755700
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed-recent.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed-small.png b/rtdata/images/themed/png/light/folder-closed-small.png
new file mode 100644
index 000000000..89939d9d0
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed-small.png differ
diff --git a/rtdata/images/themed/png/light/folder-closed.png b/rtdata/images/themed/png/light/folder-closed.png
new file mode 100644
index 000000000..3f14b84fc
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-closed.png differ
diff --git a/rtdata/images/themed/png/light/folder-open-recent-small.png b/rtdata/images/themed/png/light/folder-open-recent-small.png
new file mode 100644
index 000000000..48aed8e40
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-open-recent-small.png differ
diff --git a/rtdata/images/themed/png/light/folder-open-recent.png b/rtdata/images/themed/png/light/folder-open-recent.png
new file mode 100644
index 000000000..25eabe0d8
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-open-recent.png differ
diff --git a/rtdata/images/themed/png/light/folder-open-small.png b/rtdata/images/themed/png/light/folder-open-small.png
new file mode 100644
index 000000000..6cb4fb877
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-open-small.png differ
diff --git a/rtdata/images/themed/png/light/folder-open.png b/rtdata/images/themed/png/light/folder-open.png
new file mode 100644
index 000000000..0a857b1fd
Binary files /dev/null and b/rtdata/images/themed/png/light/folder-open.png differ
diff --git a/rtdata/images/themed/png/light/fullscreen-enter.png b/rtdata/images/themed/png/light/fullscreen-enter.png
new file mode 100644
index 000000000..b8f52bda8
Binary files /dev/null and b/rtdata/images/themed/png/light/fullscreen-enter.png differ
diff --git a/rtdata/images/themed/png/light/fullscreen-leave.png b/rtdata/images/themed/png/light/fullscreen-leave.png
new file mode 100644
index 000000000..3a96de2dd
Binary files /dev/null and b/rtdata/images/themed/png/light/fullscreen-leave.png differ
diff --git a/rtdata/images/themed/png/light/gamut-hist.png b/rtdata/images/themed/png/light/gamut-hist.png
new file mode 100644
index 000000000..c1faf7b2e
Binary files /dev/null and b/rtdata/images/themed/png/light/gamut-hist.png differ
diff --git a/rtdata/images/themed/png/light/gamut-plus.png b/rtdata/images/themed/png/light/gamut-plus.png
new file mode 100644
index 000000000..c41e5a39b
Binary files /dev/null and b/rtdata/images/themed/png/light/gamut-plus.png differ
diff --git a/rtdata/images/themed/png/light/gamut-softproof.png b/rtdata/images/themed/png/light/gamut-softproof.png
new file mode 100644
index 000000000..832b231fe
Binary files /dev/null and b/rtdata/images/themed/png/light/gamut-softproof.png differ
diff --git a/rtdata/images/themed/png/light/gamut-warning.png b/rtdata/images/themed/png/light/gamut-warning.png
new file mode 100644
index 000000000..882a59530
Binary files /dev/null and b/rtdata/images/themed/png/light/gamut-warning.png differ
diff --git a/rtdata/images/themed/png/light/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/light/gamut_srgb_prophoto_xy.png
new file mode 100644
index 000000000..46e8becb9
Binary files /dev/null and b/rtdata/images/themed/png/light/gamut_srgb_prophoto_xy.png differ
diff --git a/rtdata/images/themed/png/light/gears-pause.png b/rtdata/images/themed/png/light/gears-pause.png
new file mode 100644
index 000000000..ef10159f4
Binary files /dev/null and b/rtdata/images/themed/png/light/gears-pause.png differ
diff --git a/rtdata/images/themed/png/light/gears-play.png b/rtdata/images/themed/png/light/gears-play.png
new file mode 100644
index 000000000..c7d534f55
Binary files /dev/null and b/rtdata/images/themed/png/light/gears-play.png differ
diff --git a/rtdata/images/themed/png/light/gears-small.png b/rtdata/images/themed/png/light/gears-small.png
new file mode 100644
index 000000000..84b70358b
Binary files /dev/null and b/rtdata/images/themed/png/light/gears-small.png differ
diff --git a/rtdata/images/themed/png/light/gears.png b/rtdata/images/themed/png/light/gears.png
new file mode 100644
index 000000000..ff76d0cb0
Binary files /dev/null and b/rtdata/images/themed/png/light/gears.png differ
diff --git a/rtdata/images/themed/png/light/goto-end-small.png b/rtdata/images/themed/png/light/goto-end-small.png
new file mode 100644
index 000000000..29d81c231
Binary files /dev/null and b/rtdata/images/themed/png/light/goto-end-small.png differ
diff --git a/rtdata/images/themed/png/light/goto-start-small.png b/rtdata/images/themed/png/light/goto-start-small.png
new file mode 100644
index 000000000..671666740
Binary files /dev/null and b/rtdata/images/themed/png/light/goto-start-small.png differ
diff --git a/rtdata/images/themed/png/light/hand-closed-hicontrast.png b/rtdata/images/themed/png/light/hand-closed-hicontrast.png
new file mode 100644
index 000000000..590d95096
Binary files /dev/null and b/rtdata/images/themed/png/light/hand-closed-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/hand-open-hicontrast.png b/rtdata/images/themed/png/light/hand-open-hicontrast.png
new file mode 100644
index 000000000..2ee26e375
Binary files /dev/null and b/rtdata/images/themed/png/light/hand-open-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/hand-open.png b/rtdata/images/themed/png/light/hand-open.png
new file mode 100644
index 000000000..bb01eac88
Binary files /dev/null and b/rtdata/images/themed/png/light/hand-open.png differ
diff --git a/rtdata/images/themed/png/light/histogram-bar-off-small.png b/rtdata/images/themed/png/light/histogram-bar-off-small.png
new file mode 100644
index 000000000..b7f022a0a
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-bar-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-bar-on-small.png b/rtdata/images/themed/png/light/histogram-bar-on-small.png
new file mode 100644
index 000000000..e38fe436f
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-bar-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-bayer-off-small.png b/rtdata/images/themed/png/light/histogram-bayer-off-small.png
new file mode 100644
index 000000000..af1369145
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-bayer-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-bayer-on-small.png b/rtdata/images/themed/png/light/histogram-bayer-on-small.png
new file mode 100644
index 000000000..44e23b51b
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-bayer-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-blue-off-small.png b/rtdata/images/themed/png/light/histogram-blue-off-small.png
new file mode 100644
index 000000000..8b368ed63
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-blue-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-blue-on-small.png b/rtdata/images/themed/png/light/histogram-blue-on-small.png
new file mode 100644
index 000000000..537153043
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-blue-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-gold-off-small.png b/rtdata/images/themed/png/light/histogram-gold-off-small.png
new file mode 100644
index 000000000..4272c3ff7
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-gold-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-gold-on-small.png b/rtdata/images/themed/png/light/histogram-gold-on-small.png
new file mode 100644
index 000000000..8f32203fd
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-gold-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-green-off-small.png b/rtdata/images/themed/png/light/histogram-green-off-small.png
new file mode 100644
index 000000000..395fcac9e
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-green-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-green-on-small.png b/rtdata/images/themed/png/light/histogram-green-on-small.png
new file mode 100644
index 000000000..db3f89ef5
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-green-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-mode-linear-small.png b/rtdata/images/themed/png/light/histogram-mode-linear-small.png
new file mode 100644
index 000000000..4eafc3c15
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-mode-linear-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-mode-logx-small.png b/rtdata/images/themed/png/light/histogram-mode-logx-small.png
new file mode 100644
index 000000000..2e33b16d7
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-mode-logx-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-mode-logxy-small.png b/rtdata/images/themed/png/light/histogram-mode-logxy-small.png
new file mode 100644
index 000000000..29431e3b4
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-mode-logxy-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-red-off-small.png b/rtdata/images/themed/png/light/histogram-red-off-small.png
new file mode 100644
index 000000000..7d5ea5352
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-red-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-red-on-small.png b/rtdata/images/themed/png/light/histogram-red-on-small.png
new file mode 100644
index 000000000..deee136a2
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-red-on-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-silver-off-small.png b/rtdata/images/themed/png/light/histogram-silver-off-small.png
new file mode 100644
index 000000000..d88e879bc
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-silver-off-small.png differ
diff --git a/rtdata/images/themed/png/light/histogram-silver-on-small.png b/rtdata/images/themed/png/light/histogram-silver-on-small.png
new file mode 100644
index 000000000..bdef06144
Binary files /dev/null and b/rtdata/images/themed/png/light/histogram-silver-on-small.png differ
diff --git a/rtdata/images/themed/png/light/info.png b/rtdata/images/themed/png/light/info.png
new file mode 100644
index 000000000..10235714f
Binary files /dev/null and b/rtdata/images/themed/png/light/info.png differ
diff --git a/rtdata/images/themed/png/light/intent-absolute.png b/rtdata/images/themed/png/light/intent-absolute.png
new file mode 100644
index 000000000..ee04d0a11
Binary files /dev/null and b/rtdata/images/themed/png/light/intent-absolute.png differ
diff --git a/rtdata/images/themed/png/light/intent-perceptual.png b/rtdata/images/themed/png/light/intent-perceptual.png
new file mode 100644
index 000000000..1c1e0c283
Binary files /dev/null and b/rtdata/images/themed/png/light/intent-perceptual.png differ
diff --git a/rtdata/images/themed/png/light/intent-relative.png b/rtdata/images/themed/png/light/intent-relative.png
new file mode 100644
index 000000000..4d212b6ab
Binary files /dev/null and b/rtdata/images/themed/png/light/intent-relative.png differ
diff --git a/rtdata/images/themed/png/light/intent-saturation.png b/rtdata/images/themed/png/light/intent-saturation.png
new file mode 100644
index 000000000..26ab655dc
Binary files /dev/null and b/rtdata/images/themed/png/light/intent-saturation.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-1to1-small.png b/rtdata/images/themed/png/light/magnifier-1to1-small.png
new file mode 100644
index 000000000..cfd75532a
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-1to1-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-1to1.png b/rtdata/images/themed/png/light/magnifier-1to1.png
new file mode 100644
index 000000000..b547f0944
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-1to1.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-crop.png b/rtdata/images/themed/png/light/magnifier-crop.png
new file mode 100644
index 000000000..7f4f906f0
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-crop.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-fit.png b/rtdata/images/themed/png/light/magnifier-fit.png
new file mode 100644
index 000000000..fdc0bef5f
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-fit.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-minus-small.png b/rtdata/images/themed/png/light/magnifier-minus-small.png
new file mode 100644
index 000000000..76b55f975
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-minus-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-minus.png b/rtdata/images/themed/png/light/magnifier-minus.png
new file mode 100644
index 000000000..22db961c3
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-minus.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-plus-small.png b/rtdata/images/themed/png/light/magnifier-plus-small.png
new file mode 100644
index 000000000..54d989e63
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-plus-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-plus.png b/rtdata/images/themed/png/light/magnifier-plus.png
new file mode 100644
index 000000000..e45ce8d81
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier-plus.png differ
diff --git a/rtdata/images/themed/png/light/magnifier.png b/rtdata/images/themed/png/light/magnifier.png
new file mode 100644
index 000000000..a7fbdbeda
Binary files /dev/null and b/rtdata/images/themed/png/light/magnifier.png differ
diff --git a/rtdata/images/themed/png/light/metadata.png b/rtdata/images/themed/png/light/metadata.png
new file mode 100644
index 000000000..ba114f5c1
Binary files /dev/null and b/rtdata/images/themed/png/light/metadata.png differ
diff --git a/rtdata/images/themed/png/light/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/light/node-move-nw-se-hicontrast.png
new file mode 100644
index 000000000..b802c5849
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-nw-se-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/light/node-move-sw-ne-hicontrast.png
new file mode 100644
index 000000000..2e51e88a3
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-sw-ne-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-x-hicontrast.png b/rtdata/images/themed/png/light/node-move-x-hicontrast.png
new file mode 100644
index 000000000..1cc871dbb
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-x-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-xy-hicontrast.png b/rtdata/images/themed/png/light/node-move-xy-hicontrast.png
new file mode 100644
index 000000000..8b843958d
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-xy-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-y-hicontrast.png b/rtdata/images/themed/png/light/node-move-y-hicontrast.png
new file mode 100644
index 000000000..f80690851
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-y-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/one-to-one-small.png b/rtdata/images/themed/png/light/one-to-one-small.png
new file mode 100644
index 000000000..8c506609c
Binary files /dev/null and b/rtdata/images/themed/png/light/one-to-one-small.png differ
diff --git a/rtdata/images/themed/png/light/ornament1.png b/rtdata/images/themed/png/light/ornament1.png
new file mode 100644
index 000000000..71b3f1c78
Binary files /dev/null and b/rtdata/images/themed/png/light/ornament1.png differ
diff --git a/rtdata/images/themed/png/light/padlock-locked-small.png b/rtdata/images/themed/png/light/padlock-locked-small.png
new file mode 100644
index 000000000..1b1198f01
Binary files /dev/null and b/rtdata/images/themed/png/light/padlock-locked-small.png differ
diff --git a/rtdata/images/themed/png/light/padlock-unlocked-small.png b/rtdata/images/themed/png/light/padlock-unlocked-small.png
new file mode 100644
index 000000000..96b75f093
Binary files /dev/null and b/rtdata/images/themed/png/light/padlock-unlocked-small.png differ
diff --git a/rtdata/images/themed/png/light/palette-brush.png b/rtdata/images/themed/png/light/palette-brush.png
new file mode 100644
index 000000000..bd208f059
Binary files /dev/null and b/rtdata/images/themed/png/light/palette-brush.png differ
diff --git a/rtdata/images/themed/png/light/panel-to-bottom.png b/rtdata/images/themed/png/light/panel-to-bottom.png
new file mode 100644
index 000000000..e2d532a16
Binary files /dev/null and b/rtdata/images/themed/png/light/panel-to-bottom.png differ
diff --git a/rtdata/images/themed/png/light/panel-to-left.png b/rtdata/images/themed/png/light/panel-to-left.png
new file mode 100644
index 000000000..196fed3c9
Binary files /dev/null and b/rtdata/images/themed/png/light/panel-to-left.png differ
diff --git a/rtdata/images/themed/png/light/panel-to-right.png b/rtdata/images/themed/png/light/panel-to-right.png
new file mode 100644
index 000000000..a9e3b7667
Binary files /dev/null and b/rtdata/images/themed/png/light/panel-to-right.png differ
diff --git a/rtdata/images/themed/png/light/panel-to-top.png b/rtdata/images/themed/png/light/panel-to-top.png
new file mode 100644
index 000000000..dafa6b852
Binary files /dev/null and b/rtdata/images/themed/png/light/panel-to-top.png differ
diff --git a/rtdata/images/themed/png/light/paste.png b/rtdata/images/themed/png/light/paste.png
new file mode 100644
index 000000000..ffefcc323
Binary files /dev/null and b/rtdata/images/themed/png/light/paste.png differ
diff --git a/rtdata/images/themed/png/light/perspective-horizontal-left-small.png b/rtdata/images/themed/png/light/perspective-horizontal-left-small.png
new file mode 100644
index 000000000..f2832c607
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-horizontal-left-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-horizontal-left.png b/rtdata/images/themed/png/light/perspective-horizontal-left.png
new file mode 100644
index 000000000..23b24f6aa
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-horizontal-left.png differ
diff --git a/rtdata/images/themed/png/light/perspective-horizontal-right-small.png b/rtdata/images/themed/png/light/perspective-horizontal-right-small.png
new file mode 100644
index 000000000..e555f0c1e
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-horizontal-right-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-horizontal-right.png b/rtdata/images/themed/png/light/perspective-horizontal-right.png
new file mode 100644
index 000000000..7a334ad81
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-horizontal-right.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png
new file mode 100644
index 000000000..12f776add
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-bottom.png b/rtdata/images/themed/png/light/perspective-vertical-bottom.png
new file mode 100644
index 000000000..c6dbfcd51
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-bottom.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-top-small.png b/rtdata/images/themed/png/light/perspective-vertical-top-small.png
new file mode 100644
index 000000000..8202b0e75
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-top-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-top.png b/rtdata/images/themed/png/light/perspective-vertical-top.png
new file mode 100644
index 000000000..05c0a7fe1
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-top.png differ
diff --git a/rtdata/images/themed/png/light/power-inconsistent-small.png b/rtdata/images/themed/png/light/power-inconsistent-small.png
new file mode 100644
index 000000000..2805f8245
Binary files /dev/null and b/rtdata/images/themed/png/light/power-inconsistent-small.png differ
diff --git a/rtdata/images/themed/png/light/power-off-small.png b/rtdata/images/themed/png/light/power-off-small.png
new file mode 100644
index 000000000..6036813a9
Binary files /dev/null and b/rtdata/images/themed/png/light/power-off-small.png differ
diff --git a/rtdata/images/themed/png/light/power-on-small.png b/rtdata/images/themed/png/light/power-on-small.png
new file mode 100644
index 000000000..796aa16e2
Binary files /dev/null and b/rtdata/images/themed/png/light/power-on-small.png differ
diff --git a/rtdata/images/themed/png/light/preferences.png b/rtdata/images/themed/png/light/preferences.png
new file mode 100644
index 000000000..c18a5e2a6
Binary files /dev/null and b/rtdata/images/themed/png/light/preferences.png differ
diff --git a/rtdata/images/themed/png/light/profile-filled.png b/rtdata/images/themed/png/light/profile-filled.png
new file mode 100644
index 000000000..ba549ec63
Binary files /dev/null and b/rtdata/images/themed/png/light/profile-filled.png differ
diff --git a/rtdata/images/themed/png/light/profile-partial.png b/rtdata/images/themed/png/light/profile-partial.png
new file mode 100644
index 000000000..5baed296d
Binary files /dev/null and b/rtdata/images/themed/png/light/profile-partial.png differ
diff --git a/rtdata/images/themed/png/light/redo-all.png b/rtdata/images/themed/png/light/redo-all.png
new file mode 100644
index 000000000..38551bf34
Binary files /dev/null and b/rtdata/images/themed/png/light/redo-all.png differ
diff --git a/rtdata/images/themed/png/light/redo-small.png b/rtdata/images/themed/png/light/redo-small.png
new file mode 100644
index 000000000..6671aa682
Binary files /dev/null and b/rtdata/images/themed/png/light/redo-small.png differ
diff --git a/rtdata/images/themed/png/light/redo.png b/rtdata/images/themed/png/light/redo.png
new file mode 100644
index 000000000..165f4ea29
Binary files /dev/null and b/rtdata/images/themed/png/light/redo.png differ
diff --git a/rtdata/images/themed/png/light/refresh-red-small.png b/rtdata/images/themed/png/light/refresh-red-small.png
new file mode 100644
index 000000000..296035883
Binary files /dev/null and b/rtdata/images/themed/png/light/refresh-red-small.png differ
diff --git a/rtdata/images/themed/png/light/refresh-small.png b/rtdata/images/themed/png/light/refresh-small.png
new file mode 100644
index 000000000..c6c827182
Binary files /dev/null and b/rtdata/images/themed/png/light/refresh-small.png differ
diff --git a/rtdata/images/themed/png/light/refresh.png b/rtdata/images/themed/png/light/refresh.png
new file mode 100644
index 000000000..cc062f1f5
Binary files /dev/null and b/rtdata/images/themed/png/light/refresh.png differ
diff --git a/rtdata/images/themed/png/light/remove-small.png b/rtdata/images/themed/png/light/remove-small.png
new file mode 100644
index 000000000..c9bdc8b83
Binary files /dev/null and b/rtdata/images/themed/png/light/remove-small.png differ
diff --git a/rtdata/images/themed/png/light/remove.png b/rtdata/images/themed/png/light/remove.png
new file mode 100644
index 000000000..5d030627a
Binary files /dev/null and b/rtdata/images/themed/png/light/remove.png differ
diff --git a/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png
new file mode 100644
index 000000000..d8929ac42
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/rotate-aroundnode.png b/rtdata/images/themed/png/light/rotate-aroundnode.png
new file mode 100644
index 000000000..5da406b64
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-aroundnode.png differ
diff --git a/rtdata/images/themed/png/light/rotate-left-90.png b/rtdata/images/themed/png/light/rotate-left-90.png
new file mode 100644
index 000000000..7904c82f5
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-left-90.png differ
diff --git a/rtdata/images/themed/png/light/rotate-left-small.png b/rtdata/images/themed/png/light/rotate-left-small.png
new file mode 100644
index 000000000..f3c94f65a
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-left-small.png differ
diff --git a/rtdata/images/themed/png/light/rotate-left.png b/rtdata/images/themed/png/light/rotate-left.png
new file mode 100644
index 000000000..5e2b0a201
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-left.png differ
diff --git a/rtdata/images/themed/png/light/rotate-right-90.png b/rtdata/images/themed/png/light/rotate-right-90.png
new file mode 100644
index 000000000..52fd331dd
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-right-90.png differ
diff --git a/rtdata/images/themed/png/light/rotate-right-small.png b/rtdata/images/themed/png/light/rotate-right-small.png
new file mode 100644
index 000000000..4fa8f8d19
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-right-small.png differ
diff --git a/rtdata/images/themed/png/light/rotate-right.png b/rtdata/images/themed/png/light/rotate-right.png
new file mode 100644
index 000000000..c819cbe73
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-right.png differ
diff --git a/rtdata/images/themed/png/light/rotate-straighten-small.png b/rtdata/images/themed/png/light/rotate-straighten-small.png
new file mode 100644
index 000000000..67190d31a
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-straighten-small.png differ
diff --git a/rtdata/images/themed/png/light/rotate-straighten.png b/rtdata/images/themed/png/light/rotate-straighten.png
new file mode 100644
index 000000000..a9c2e0805
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-straighten.png differ
diff --git a/rtdata/images/themed/png/light/save-small.png b/rtdata/images/themed/png/light/save-small.png
new file mode 100644
index 000000000..c296fdb72
Binary files /dev/null and b/rtdata/images/themed/png/light/save-small.png differ
diff --git a/rtdata/images/themed/png/light/save.png b/rtdata/images/themed/png/light/save.png
new file mode 100644
index 000000000..f71542230
Binary files /dev/null and b/rtdata/images/themed/png/light/save.png differ
diff --git a/rtdata/images/themed/png/light/saved-no-small.png b/rtdata/images/themed/png/light/saved-no-small.png
new file mode 100644
index 000000000..68021eda4
Binary files /dev/null and b/rtdata/images/themed/png/light/saved-no-small.png differ
diff --git a/rtdata/images/themed/png/light/saved-yes-small.png b/rtdata/images/themed/png/light/saved-yes-small.png
new file mode 100644
index 000000000..4557ef905
Binary files /dev/null and b/rtdata/images/themed/png/light/saved-yes-small.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png
new file mode 100644
index 000000000..ff6adb675
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png
new file mode 100644
index 000000000..5d6e35c3d
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png
new file mode 100644
index 000000000..2a9741c0f
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png
new file mode 100644
index 000000000..e52337d33
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png
new file mode 100644
index 000000000..7e009920f
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png
new file mode 100644
index 000000000..64289008a
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png
new file mode 100644
index 000000000..f55cbb8c3
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png
new file mode 100644
index 000000000..0c8b9522d
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png
new file mode 100644
index 000000000..c6dfe8410
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png
new file mode 100644
index 000000000..b45b608d9
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png
new file mode 100644
index 000000000..99730ee4b
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png
new file mode 100644
index 000000000..e0b91d8b3
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png
new file mode 100644
index 000000000..449946648
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png
new file mode 100644
index 000000000..e59257824
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png
new file mode 100644
index 000000000..b2e5e3611
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png differ
diff --git a/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png
new file mode 100644
index 000000000..7ff59d927
Binary files /dev/null and b/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png differ
diff --git a/rtdata/images/themed/png/light/star-gold-hollow-narrow.png b/rtdata/images/themed/png/light/star-gold-hollow-narrow.png
new file mode 100644
index 000000000..b0ce704d6
Binary files /dev/null and b/rtdata/images/themed/png/light/star-gold-hollow-narrow.png differ
diff --git a/rtdata/images/themed/png/light/star-gold-hollow-small.png b/rtdata/images/themed/png/light/star-gold-hollow-small.png
new file mode 100644
index 000000000..478055c2b
Binary files /dev/null and b/rtdata/images/themed/png/light/star-gold-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/star-gold-narrow.png b/rtdata/images/themed/png/light/star-gold-narrow.png
new file mode 100644
index 000000000..32710fb9d
Binary files /dev/null and b/rtdata/images/themed/png/light/star-gold-narrow.png differ
diff --git a/rtdata/images/themed/png/light/star-gold-small.png b/rtdata/images/themed/png/light/star-gold-small.png
new file mode 100644
index 000000000..da02a823e
Binary files /dev/null and b/rtdata/images/themed/png/light/star-gold-small.png differ
diff --git a/rtdata/images/themed/png/light/star-hollow-narrow.png b/rtdata/images/themed/png/light/star-hollow-narrow.png
new file mode 100644
index 000000000..4a15f0ba1
Binary files /dev/null and b/rtdata/images/themed/png/light/star-hollow-narrow.png differ
diff --git a/rtdata/images/themed/png/light/star-hollow-small.png b/rtdata/images/themed/png/light/star-hollow-small.png
new file mode 100644
index 000000000..8e5335410
Binary files /dev/null and b/rtdata/images/themed/png/light/star-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/star-narrow.png b/rtdata/images/themed/png/light/star-narrow.png
new file mode 100644
index 000000000..78c8eea8a
Binary files /dev/null and b/rtdata/images/themed/png/light/star-narrow.png differ
diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png
new file mode 100644
index 000000000..2bb54647a
Binary files /dev/null and b/rtdata/images/themed/png/light/star-small.png differ
diff --git a/rtdata/images/themed/png/light/template-16.png b/rtdata/images/themed/png/light/template-16.png
new file mode 100644
index 000000000..1c50ead9e
Binary files /dev/null and b/rtdata/images/themed/png/light/template-16.png differ
diff --git a/rtdata/images/themed/png/light/template-24.png b/rtdata/images/themed/png/light/template-24.png
new file mode 100644
index 000000000..7ab9e8c0f
Binary files /dev/null and b/rtdata/images/themed/png/light/template-24.png differ
diff --git a/rtdata/images/themed/png/light/template-narrow.png b/rtdata/images/themed/png/light/template-narrow.png
new file mode 100644
index 000000000..78c374503
Binary files /dev/null and b/rtdata/images/themed/png/light/template-narrow.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-hollow-small.png b/rtdata/images/themed/png/light/tick-green-hollow-small.png
new file mode 100644
index 000000000..176bf5489
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-green-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-hollow.png b/rtdata/images/themed/png/light/tick-green-hollow.png
new file mode 100644
index 000000000..7cac33dc0
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-green-hollow.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-small.png b/rtdata/images/themed/png/light/tick-green-small.png
new file mode 100644
index 000000000..54cf5d024
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-green-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-green.png b/rtdata/images/themed/png/light/tick-green.png
new file mode 100644
index 000000000..2458734b2
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-green.png differ
diff --git a/rtdata/images/themed/png/light/tick-hollow-small.png b/rtdata/images/themed/png/light/tick-hollow-small.png
new file mode 100644
index 000000000..9a0973962
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-small.png b/rtdata/images/themed/png/light/tick-small.png
new file mode 100644
index 000000000..73438bed0
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-small.png differ
diff --git a/rtdata/images/themed/png/light/tick.png b/rtdata/images/themed/png/light/tick.png
new file mode 100644
index 000000000..7bb629789
Binary files /dev/null and b/rtdata/images/themed/png/light/tick.png differ
diff --git a/rtdata/images/themed/png/light/transform.png b/rtdata/images/themed/png/light/transform.png
new file mode 100644
index 000000000..ec1c6642a
Binary files /dev/null and b/rtdata/images/themed/png/light/transform.png differ
diff --git a/rtdata/images/themed/png/light/trash-delete.png b/rtdata/images/themed/png/light/trash-delete.png
new file mode 100644
index 000000000..7d0c422f7
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-delete.png differ
diff --git a/rtdata/images/themed/png/light/trash-empty-show.png b/rtdata/images/themed/png/light/trash-empty-show.png
new file mode 100644
index 000000000..9e4ade318
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-empty-show.png differ
diff --git a/rtdata/images/themed/png/light/trash-empty.png b/rtdata/images/themed/png/light/trash-empty.png
new file mode 100644
index 000000000..7a8345109
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-empty.png differ
diff --git a/rtdata/images/themed/png/light/trash-full-show.png b/rtdata/images/themed/png/light/trash-full-show.png
new file mode 100644
index 000000000..8061c5070
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-full-show.png differ
diff --git a/rtdata/images/themed/png/light/trash-full.png b/rtdata/images/themed/png/light/trash-full.png
new file mode 100644
index 000000000..a43d6f3e5
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-full.png differ
diff --git a/rtdata/images/themed/png/light/trash-hide-deleted.png b/rtdata/images/themed/png/light/trash-hide-deleted.png
new file mode 100644
index 000000000..319a0dd4a
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-hide-deleted.png differ
diff --git a/rtdata/images/themed/png/light/trash-remove-small.png b/rtdata/images/themed/png/light/trash-remove-small.png
new file mode 100644
index 000000000..df70891fb
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-remove-small.png differ
diff --git a/rtdata/images/themed/png/light/trash-remove.png b/rtdata/images/themed/png/light/trash-remove.png
new file mode 100644
index 000000000..8c0c45aad
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-remove.png differ
diff --git a/rtdata/images/themed/png/light/trash-small.png b/rtdata/images/themed/png/light/trash-small.png
new file mode 100644
index 000000000..7e3183942
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-small.png differ
diff --git a/rtdata/images/themed/png/light/undo-all.png b/rtdata/images/themed/png/light/undo-all.png
new file mode 100644
index 000000000..04170e26f
Binary files /dev/null and b/rtdata/images/themed/png/light/undo-all.png differ
diff --git a/rtdata/images/themed/png/light/undo-small.png b/rtdata/images/themed/png/light/undo-small.png
new file mode 100644
index 000000000..6d16726ac
Binary files /dev/null and b/rtdata/images/themed/png/light/undo-small.png differ
diff --git a/rtdata/images/themed/png/light/undo.png b/rtdata/images/themed/png/light/undo.png
new file mode 100644
index 000000000..6451ce0dd
Binary files /dev/null and b/rtdata/images/themed/png/light/undo.png differ
diff --git a/rtdata/images/themed/png/light/warning-highlights.png b/rtdata/images/themed/png/light/warning-highlights.png
new file mode 100644
index 000000000..5426a14a3
Binary files /dev/null and b/rtdata/images/themed/png/light/warning-highlights.png differ
diff --git a/rtdata/images/themed/png/light/warning-shadows.png b/rtdata/images/themed/png/light/warning-shadows.png
new file mode 100644
index 000000000..86b6c06a6
Binary files /dev/null and b/rtdata/images/themed/png/light/warning-shadows.png differ
diff --git a/rtdata/images/themed/png/light/wavelets.png b/rtdata/images/themed/png/light/wavelets.png
new file mode 100644
index 000000000..3907c255e
Binary files /dev/null and b/rtdata/images/themed/png/light/wavelets.png differ
diff --git a/rtdata/images/themed/png/light/wb-auto-small.png b/rtdata/images/themed/png/light/wb-auto-small.png
new file mode 100644
index 000000000..e7995b4ce
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-auto-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-auto.png b/rtdata/images/themed/png/light/wb-auto.png
new file mode 100644
index 000000000..d1b60e8ad
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-auto.png differ
diff --git a/rtdata/images/themed/png/light/wb-camera-small.png b/rtdata/images/themed/png/light/wb-camera-small.png
new file mode 100644
index 000000000..72d03db7b
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-camera-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-camera.png b/rtdata/images/themed/png/light/wb-camera.png
new file mode 100644
index 000000000..8034b85d2
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-camera.png differ
diff --git a/rtdata/images/themed/png/light/wb-cloudy-small.png b/rtdata/images/themed/png/light/wb-cloudy-small.png
new file mode 100644
index 000000000..131b28287
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-cloudy-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-cloudy.png b/rtdata/images/themed/png/light/wb-cloudy.png
new file mode 100644
index 000000000..04e6e3418
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-cloudy.png differ
diff --git a/rtdata/images/themed/png/light/wb-custom-small.png b/rtdata/images/themed/png/light/wb-custom-small.png
new file mode 100644
index 000000000..c0d2ebf09
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-custom-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-custom.png b/rtdata/images/themed/png/light/wb-custom.png
new file mode 100644
index 000000000..fdc7258cd
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-custom.png differ
diff --git a/rtdata/images/themed/png/light/wb-flash-small.png b/rtdata/images/themed/png/light/wb-flash-small.png
new file mode 100644
index 000000000..cf44f0357
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-flash-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-flash.png b/rtdata/images/themed/png/light/wb-flash.png
new file mode 100644
index 000000000..8c602dc88
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-flash.png differ
diff --git a/rtdata/images/themed/png/light/wb-fluorescent-small.png b/rtdata/images/themed/png/light/wb-fluorescent-small.png
new file mode 100644
index 000000000..0362ebf02
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-fluorescent-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-fluorescent.png b/rtdata/images/themed/png/light/wb-fluorescent.png
new file mode 100644
index 000000000..4acc5e767
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-fluorescent.png differ
diff --git a/rtdata/images/themed/png/light/wb-lamp-small.png b/rtdata/images/themed/png/light/wb-lamp-small.png
new file mode 100644
index 000000000..4c8516d30
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-lamp-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-lamp.png b/rtdata/images/themed/png/light/wb-lamp.png
new file mode 100644
index 000000000..57da8265c
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-lamp.png differ
diff --git a/rtdata/images/themed/png/light/wb-led-small.png b/rtdata/images/themed/png/light/wb-led-small.png
new file mode 100644
index 000000000..7b3d8504f
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-led-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-led.png b/rtdata/images/themed/png/light/wb-led.png
new file mode 100644
index 000000000..5c2d363c6
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-led.png differ
diff --git a/rtdata/images/themed/png/light/wb-shade-small.png b/rtdata/images/themed/png/light/wb-shade-small.png
new file mode 100644
index 000000000..397fcfdd4
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-shade-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-shade.png b/rtdata/images/themed/png/light/wb-shade.png
new file mode 100644
index 000000000..7603de77e
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-shade.png differ
diff --git a/rtdata/images/themed/png/light/wb-sun-small.png b/rtdata/images/themed/png/light/wb-sun-small.png
new file mode 100644
index 000000000..70c139ab2
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-sun-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-sun.png b/rtdata/images/themed/png/light/wb-sun.png
new file mode 100644
index 000000000..da7271078
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-sun.png differ
diff --git a/rtdata/images/themed/png/light/wb-tungsten-small.png b/rtdata/images/themed/png/light/wb-tungsten-small.png
new file mode 100644
index 000000000..3dcbf947d
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-tungsten-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-tungsten.png b/rtdata/images/themed/png/light/wb-tungsten.png
new file mode 100644
index 000000000..9c3793852
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-tungsten.png differ
diff --git a/rtdata/images/themed/png/light/wb-water-small.png b/rtdata/images/themed/png/light/wb-water-small.png
new file mode 100644
index 000000000..59e7bb836
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-water-small.png differ
diff --git a/rtdata/images/themed/png/light/wb-water.png b/rtdata/images/themed/png/light/wb-water.png
new file mode 100644
index 000000000..593516563
Binary files /dev/null and b/rtdata/images/themed/png/light/wb-water.png differ
diff --git a/rtdata/images/themed/png/light/window-add.png b/rtdata/images/themed/png/light/window-add.png
new file mode 100644
index 000000000..6ccacd678
Binary files /dev/null and b/rtdata/images/themed/png/light/window-add.png differ
diff --git a/rtdata/images/themed/svg/add-small.svg b/rtdata/images/themed/svg/add-small.svg
new file mode 100644
index 000000000..13abbdc25
--- /dev/null
+++ b/rtdata/images/themed/svg/add-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/add.svg b/rtdata/images/themed/svg/add.svg
new file mode 100644
index 000000000..c45f9f584
--- /dev/null
+++ b/rtdata/images/themed/svg/add.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/aperture.svg b/rtdata/images/themed/svg/aperture.svg
new file mode 100644
index 000000000..5820ee283
--- /dev/null
+++ b/rtdata/images/themed/svg/aperture.svg
@@ -0,0 +1,395 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow-down-small.svg b/rtdata/images/themed/svg/arrow-down-small.svg
new file mode 100644
index 000000000..d17ba4329
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow-down-small.svg
@@ -0,0 +1,234 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow-left-small.svg b/rtdata/images/themed/svg/arrow-left-small.svg
new file mode 100644
index 000000000..54eafbc29
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow-left-small.svg
@@ -0,0 +1,234 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow-right-small.svg b/rtdata/images/themed/svg/arrow-right-small.svg
new file mode 100644
index 000000000..43bfdd4e8
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow-right-small.svg
@@ -0,0 +1,234 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow-up-small.svg b/rtdata/images/themed/svg/arrow-up-small.svg
new file mode 100644
index 000000000..b5609c5d7
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow-up-small.svg
@@ -0,0 +1,234 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow-updown.svg b/rtdata/images/themed/svg/arrow-updown.svg
new file mode 100644
index 000000000..d5b6c22a5
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow-updown.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow2-left.svg b/rtdata/images/themed/svg/arrow2-left.svg
new file mode 100644
index 000000000..f71ee83e3
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow2-left.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/arrow2-right.svg b/rtdata/images/themed/svg/arrow2-right.svg
new file mode 100644
index 000000000..8c3f60554
--- /dev/null
+++ b/rtdata/images/themed/svg/arrow2-right.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/atom.svg b/rtdata/images/themed/svg/atom.svg
new file mode 100644
index 000000000..72fb97532
--- /dev/null
+++ b/rtdata/images/themed/svg/atom.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/bayer.svg b/rtdata/images/themed/svg/bayer.svg
new file mode 100644
index 000000000..1718ce5c4
--- /dev/null
+++ b/rtdata/images/themed/svg/bayer.svg
@@ -0,0 +1,196 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/beforeafter.svg b/rtdata/images/themed/svg/beforeafter.svg
new file mode 100644
index 000000000..8c4eaab48
--- /dev/null
+++ b/rtdata/images/themed/svg/beforeafter.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/cancel-small.svg b/rtdata/images/themed/svg/cancel-small.svg
new file mode 100644
index 000000000..3bbe99bc1
--- /dev/null
+++ b/rtdata/images/themed/svg/cancel-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/cancel.svg b/rtdata/images/themed/svg/cancel.svg
new file mode 100644
index 000000000..c42837e61
--- /dev/null
+++ b/rtdata/images/themed/svg/cancel.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-black-small.svg b/rtdata/images/themed/svg/circle-black-small.svg
new file mode 100644
index 000000000..2b314c556
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-black-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-blue-green-small.svg b/rtdata/images/themed/svg/circle-blue-green-small.svg
new file mode 100644
index 000000000..5068447b3
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-blue-green-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-blue-red-small.svg b/rtdata/images/themed/svg/circle-blue-red-small.svg
new file mode 100644
index 000000000..6445577c1
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-blue-red-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-blue-small.svg b/rtdata/images/themed/svg/circle-blue-small.svg
new file mode 100644
index 000000000..b92577051
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-blue-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-blue-yellow-small.svg b/rtdata/images/themed/svg/circle-blue-yellow-small.svg
new file mode 100644
index 000000000..5f2e7f04d
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-blue-yellow-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-cyan-red-small.svg b/rtdata/images/themed/svg/circle-cyan-red-small.svg
new file mode 100644
index 000000000..6b34c50ec
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-cyan-red-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-cyan-small.svg b/rtdata/images/themed/svg/circle-cyan-small.svg
new file mode 100644
index 000000000..b376821cb
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-cyan-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-darkgray-small.svg b/rtdata/images/themed/svg/circle-darkgray-small.svg
new file mode 100644
index 000000000..8183c820f
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-darkgray-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-blue-small.svg b/rtdata/images/themed/svg/circle-empty-blue-small.svg
new file mode 100644
index 000000000..e9004ae63
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-blue-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-darkgray-small.svg b/rtdata/images/themed/svg/circle-empty-darkgray-small.svg
new file mode 100644
index 000000000..21b4db7ab
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-darkgray-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-gray-small.svg b/rtdata/images/themed/svg/circle-empty-gray-small.svg
new file mode 100644
index 000000000..9bca30ae1
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-gray-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-green-small.svg b/rtdata/images/themed/svg/circle-empty-green-small.svg
new file mode 100644
index 000000000..b99c6d43e
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-green-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-purple-small.svg b/rtdata/images/themed/svg/circle-empty-purple-small.svg
new file mode 100644
index 000000000..751525ff2
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-purple-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-red-small.svg b/rtdata/images/themed/svg/circle-empty-red-small.svg
new file mode 100644
index 000000000..fcb7123cf
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-red-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-empty-yellow-small.svg b/rtdata/images/themed/svg/circle-empty-yellow-small.svg
new file mode 100644
index 000000000..65d9fd4cf
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-empty-yellow-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-gray-blue-small.svg b/rtdata/images/themed/svg/circle-gray-blue-small.svg
new file mode 100644
index 000000000..0804edcd7
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-gray-blue-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-gray-green-small.svg b/rtdata/images/themed/svg/circle-gray-green-small.svg
new file mode 100644
index 000000000..609f6d0e7
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-gray-green-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-gray-red-small.svg b/rtdata/images/themed/svg/circle-gray-red-small.svg
new file mode 100644
index 000000000..6e203cdbb
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-gray-red-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-gray-small.svg b/rtdata/images/themed/svg/circle-gray-small.svg
new file mode 100644
index 000000000..6ed1fd51d
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-gray-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-green-blue-small.svg b/rtdata/images/themed/svg/circle-green-blue-small.svg
new file mode 100644
index 000000000..650f9fc44
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-green-blue-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-green-red-small.svg b/rtdata/images/themed/svg/circle-green-red-small.svg
new file mode 100644
index 000000000..21e153062
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-green-red-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-green-small.svg b/rtdata/images/themed/svg/circle-green-small.svg
new file mode 100644
index 000000000..dc1b0217a
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-green-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-magenta-small.svg b/rtdata/images/themed/svg/circle-magenta-small.svg
new file mode 100644
index 000000000..9f2e485f9
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-magenta-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-orange-small.svg b/rtdata/images/themed/svg/circle-orange-small.svg
new file mode 100644
index 000000000..addf840d1
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-orange-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-purple-small.svg b/rtdata/images/themed/svg/circle-purple-small.svg
new file mode 100644
index 000000000..2c4a3f225
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-purple-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-red-blue-small.svg b/rtdata/images/themed/svg/circle-red-blue-small.svg
new file mode 100644
index 000000000..274cb68fa
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-red-blue-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-red-cyan-small.svg b/rtdata/images/themed/svg/circle-red-cyan-small.svg
new file mode 100644
index 000000000..e2feb97e1
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-red-cyan-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-red-green-small.svg b/rtdata/images/themed/svg/circle-red-green-small.svg
new file mode 100644
index 000000000..96cc892dd
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-red-green-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-red-small.svg b/rtdata/images/themed/svg/circle-red-small.svg
new file mode 100644
index 000000000..a56b0d328
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-red-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-white-small.svg b/rtdata/images/themed/svg/circle-white-small.svg
new file mode 100644
index 000000000..5a485d954
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-white-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-yellow-blue-small.svg b/rtdata/images/themed/svg/circle-yellow-blue-small.svg
new file mode 100644
index 000000000..f6e134941
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-yellow-blue-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-yellow-small.svg b/rtdata/images/themed/svg/circle-yellow-small.svg
new file mode 100644
index 000000000..7d86fdb19
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-yellow-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-circles.svg b/rtdata/images/themed/svg/color-circles.svg
new file mode 100644
index 000000000..f7f6ad657
--- /dev/null
+++ b/rtdata/images/themed/svg/color-circles.svg
@@ -0,0 +1,215 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker-add-hicontrast.svg b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg
new file mode 100644
index 000000000..09870ff48
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker-add.svg b/rtdata/images/themed/svg/color-picker-add.svg
new file mode 100644
index 000000000..b42b8371d
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-add.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker-bars.svg b/rtdata/images/themed/svg/color-picker-bars.svg
new file mode 100644
index 000000000..f6c57ea40
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-bars.svg
@@ -0,0 +1,154 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker-hicontrast.svg b/rtdata/images/themed/svg/color-picker-hicontrast.svg
new file mode 100644
index 000000000..20ece03b7
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-hicontrast.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker-hide.svg b/rtdata/images/themed/svg/color-picker-hide.svg
new file mode 100644
index 000000000..be180885e
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-hide.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/color-picker.svg b/rtdata/images/themed/svg/color-picker.svg
new file mode 100644
index 000000000..d52d96633
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/contrastmask-off.svg b/rtdata/images/themed/svg/contrastmask-off.svg
new file mode 100644
index 000000000..ed76efbbb
--- /dev/null
+++ b/rtdata/images/themed/svg/contrastmask-off.svg
@@ -0,0 +1,155 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/contrastmask-on.svg b/rtdata/images/themed/svg/contrastmask-on.svg
new file mode 100644
index 000000000..9e3504128
--- /dev/null
+++ b/rtdata/images/themed/svg/contrastmask-on.svg
@@ -0,0 +1,155 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/copy.svg b/rtdata/images/themed/svg/copy.svg
new file mode 100644
index 000000000..9471e1ea7
--- /dev/null
+++ b/rtdata/images/themed/svg/copy.svg
@@ -0,0 +1,277 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crop-auto-small.svg b/rtdata/images/themed/svg/crop-auto-small.svg
new file mode 100644
index 000000000..6d8ac3ea7
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-auto-small.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crop-auto.svg b/rtdata/images/themed/svg/crop-auto.svg
new file mode 100644
index 000000000..bc662e9ea
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-auto.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crop-point-hicontrast.svg b/rtdata/images/themed/svg/crop-point-hicontrast.svg
new file mode 100644
index 000000000..4a06bfcba
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-point-hicontrast.svg
@@ -0,0 +1,176 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crop-small.svg b/rtdata/images/themed/svg/crop-small.svg
new file mode 100644
index 000000000..94c0b43df
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-small.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crop.svg b/rtdata/images/themed/svg/crop.svg
new file mode 100644
index 000000000..8fd598f60
--- /dev/null
+++ b/rtdata/images/themed/svg/crop.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crossed-arrows-in.svg b/rtdata/images/themed/svg/crossed-arrows-in.svg
new file mode 100644
index 000000000..8a4c71dc8
--- /dev/null
+++ b/rtdata/images/themed/svg/crossed-arrows-in.svg
@@ -0,0 +1,135 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crossed-arrows-out.svg b/rtdata/images/themed/svg/crossed-arrows-out.svg
new file mode 100644
index 000000000..5eb5ba4b1
--- /dev/null
+++ b/rtdata/images/themed/svg/crossed-arrows-out.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crosshair-adjust.svg b/rtdata/images/themed/svg/crosshair-adjust.svg
new file mode 100644
index 000000000..4cde3415a
--- /dev/null
+++ b/rtdata/images/themed/svg/crosshair-adjust.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crosshair-hicontrast.svg b/rtdata/images/themed/svg/crosshair-hicontrast.svg
new file mode 100644
index 000000000..a4dcc2592
--- /dev/null
+++ b/rtdata/images/themed/svg/crosshair-hicontrast.svg
@@ -0,0 +1,161 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crosshair-node-curve.svg b/rtdata/images/themed/svg/crosshair-node-curve.svg
new file mode 100644
index 000000000..d72c2a929
--- /dev/null
+++ b/rtdata/images/themed/svg/crosshair-node-curve.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/crosshair-small.svg b/rtdata/images/themed/svg/crosshair-small.svg
new file mode 100644
index 000000000..2e5e6596a
--- /dev/null
+++ b/rtdata/images/themed/svg/crosshair-small.svg
@@ -0,0 +1,172 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-controlpoints-small.svg b/rtdata/images/themed/svg/curve-controlpoints-small.svg
new file mode 100644
index 000000000..fc85b8774
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-controlpoints-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-controlpoints.svg b/rtdata/images/themed/svg/curve-controlpoints.svg
new file mode 100644
index 000000000..2d432264c
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-controlpoints.svg
@@ -0,0 +1,192 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-flat-small.svg b/rtdata/images/themed/svg/curve-flat-small.svg
new file mode 100644
index 000000000..59585c64a
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-flat-small.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-flat.svg b/rtdata/images/themed/svg/curve-flat.svg
new file mode 100644
index 000000000..89888b4d1
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-flat.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-linear-small.svg b/rtdata/images/themed/svg/curve-linear-small.svg
new file mode 100644
index 000000000..c2a3f7915
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-linear-small.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-linear.svg b/rtdata/images/themed/svg/curve-linear.svg
new file mode 100644
index 000000000..b016121aa
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-linear.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-nurbs-small.svg b/rtdata/images/themed/svg/curve-nurbs-small.svg
new file mode 100644
index 000000000..1ff3a1a76
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-nurbs-small.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-nurbs.svg b/rtdata/images/themed/svg/curve-nurbs.svg
new file mode 100644
index 000000000..1d7ef10ce
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-nurbs.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-parametric-small.svg b/rtdata/images/themed/svg/curve-parametric-small.svg
new file mode 100644
index 000000000..2334def2d
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-parametric-small.svg
@@ -0,0 +1,137 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-parametric.svg b/rtdata/images/themed/svg/curve-parametric.svg
new file mode 100644
index 000000000..88a1f0389
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-parametric.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-spline-small.svg b/rtdata/images/themed/svg/curve-spline-small.svg
new file mode 100644
index 000000000..990df0c0d
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-spline-small.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/curve-spline.svg b/rtdata/images/themed/svg/curve-spline.svg
new file mode 100644
index 000000000..f0a28a1a9
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-spline.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/detail.svg b/rtdata/images/themed/svg/detail.svg
new file mode 100644
index 000000000..4bdc2fb9b
--- /dev/null
+++ b/rtdata/images/themed/svg/detail.svg
@@ -0,0 +1,206 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/device-floppy.svg b/rtdata/images/themed/svg/device-floppy.svg
new file mode 100644
index 000000000..29b855e4b
--- /dev/null
+++ b/rtdata/images/themed/svg/device-floppy.svg
@@ -0,0 +1,142 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/device-hdd.svg b/rtdata/images/themed/svg/device-hdd.svg
new file mode 100644
index 000000000..b93a1d698
--- /dev/null
+++ b/rtdata/images/themed/svg/device-hdd.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/device-network.svg b/rtdata/images/themed/svg/device-network.svg
new file mode 100644
index 000000000..d17821545
--- /dev/null
+++ b/rtdata/images/themed/svg/device-network.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/device-optical.svg b/rtdata/images/themed/svg/device-optical.svg
new file mode 100644
index 000000000..de73e9422
--- /dev/null
+++ b/rtdata/images/themed/svg/device-optical.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/device-usb.svg b/rtdata/images/themed/svg/device-usb.svg
new file mode 100644
index 000000000..116a6e1f5
--- /dev/null
+++ b/rtdata/images/themed/svg/device-usb.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-auto-small.svg b/rtdata/images/themed/svg/distortion-auto-small.svg
new file mode 100644
index 000000000..6a8ac0a03
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-auto-small.svg
@@ -0,0 +1,141 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-auto.svg b/rtdata/images/themed/svg/distortion-auto.svg
new file mode 100644
index 000000000..8cfadb130
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-auto.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-barrel-small.svg b/rtdata/images/themed/svg/distortion-barrel-small.svg
new file mode 100644
index 000000000..b769bd0aa
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-barrel-small.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-barrel.svg b/rtdata/images/themed/svg/distortion-barrel.svg
new file mode 100644
index 000000000..012651e87
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-barrel.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-pincushion-small.svg b/rtdata/images/themed/svg/distortion-pincushion-small.svg
new file mode 100644
index 000000000..8c26277d2
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-pincushion-small.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/distortion-pincushion.svg b/rtdata/images/themed/svg/distortion-pincushion.svg
new file mode 100644
index 000000000..c893eb99a
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-pincushion.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/edit-point.svg b/rtdata/images/themed/svg/edit-point.svg
new file mode 100644
index 000000000..9f686d6e9
--- /dev/null
+++ b/rtdata/images/themed/svg/edit-point.svg
@@ -0,0 +1,156 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/equilizer-narrow.svg b/rtdata/images/themed/svg/equilizer-narrow.svg
new file mode 100644
index 000000000..52dcaed4b
--- /dev/null
+++ b/rtdata/images/themed/svg/equilizer-narrow.svg
@@ -0,0 +1,358 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/equilizer-wide.svg b/rtdata/images/themed/svg/equilizer-wide.svg
new file mode 100644
index 000000000..594cca2ab
--- /dev/null
+++ b/rtdata/images/themed/svg/equilizer-wide.svg
@@ -0,0 +1,263 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/expander-closed-small.svg b/rtdata/images/themed/svg/expander-closed-small.svg
new file mode 100644
index 000000000..e9cea3b4d
--- /dev/null
+++ b/rtdata/images/themed/svg/expander-closed-small.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/expander-open-small.svg b/rtdata/images/themed/svg/expander-open-small.svg
new file mode 100644
index 000000000..8355bc2f3
--- /dev/null
+++ b/rtdata/images/themed/svg/expander-open-small.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/exposure.svg b/rtdata/images/themed/svg/exposure.svg
new file mode 100644
index 000000000..c0edc9e9b
--- /dev/null
+++ b/rtdata/images/themed/svg/exposure.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filetype-hdr.svg b/rtdata/images/themed/svg/filetype-hdr.svg
new file mode 100644
index 000000000..86729442d
--- /dev/null
+++ b/rtdata/images/themed/svg/filetype-hdr.svg
@@ -0,0 +1,147 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filetype-ps.svg b/rtdata/images/themed/svg/filetype-ps.svg
new file mode 100644
index 000000000..c0dc6069c
--- /dev/null
+++ b/rtdata/images/themed/svg/filetype-ps.svg
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filter-clear.svg b/rtdata/images/themed/svg/filter-clear.svg
new file mode 100644
index 000000000..27af953db
--- /dev/null
+++ b/rtdata/images/themed/svg/filter-clear.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filter-original.svg b/rtdata/images/themed/svg/filter-original.svg
new file mode 100644
index 000000000..c14a57a99
--- /dev/null
+++ b/rtdata/images/themed/svg/filter-original.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filter-original2.svg b/rtdata/images/themed/svg/filter-original2.svg
new file mode 100644
index 000000000..ce761302a
--- /dev/null
+++ b/rtdata/images/themed/svg/filter-original2.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/filter.svg b/rtdata/images/themed/svg/filter.svg
new file mode 100644
index 000000000..684ffc35e
--- /dev/null
+++ b/rtdata/images/themed/svg/filter.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/flip-horizontal.svg b/rtdata/images/themed/svg/flip-horizontal.svg
new file mode 100644
index 000000000..67465657f
--- /dev/null
+++ b/rtdata/images/themed/svg/flip-horizontal.svg
@@ -0,0 +1,147 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/flip-vertical.svg b/rtdata/images/themed/svg/flip-vertical.svg
new file mode 100644
index 000000000..39771286a
--- /dev/null
+++ b/rtdata/images/themed/svg/flip-vertical.svg
@@ -0,0 +1,148 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/focusscreen-off.svg b/rtdata/images/themed/svg/focusscreen-off.svg
new file mode 100644
index 000000000..0197b8b5d
--- /dev/null
+++ b/rtdata/images/themed/svg/focusscreen-off.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/focusscreen-on.svg b/rtdata/images/themed/svg/focusscreen-on.svg
new file mode 100644
index 000000000..b6a6149f7
--- /dev/null
+++ b/rtdata/images/themed/svg/focusscreen-on.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed-home-small.svg b/rtdata/images/themed/svg/folder-closed-home-small.svg
new file mode 100644
index 000000000..e2988a681
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed-home-small.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed-home.svg b/rtdata/images/themed/svg/folder-closed-home.svg
new file mode 100644
index 000000000..d4bf64e15
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed-home.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed-recent-small.svg b/rtdata/images/themed/svg/folder-closed-recent-small.svg
new file mode 100644
index 000000000..e412e386c
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed-recent-small.svg
@@ -0,0 +1,130 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed-recent.svg b/rtdata/images/themed/svg/folder-closed-recent.svg
new file mode 100644
index 000000000..84da8e236
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed-recent.svg
@@ -0,0 +1,150 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed-small.svg b/rtdata/images/themed/svg/folder-closed-small.svg
new file mode 100644
index 000000000..f86f2157f
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed-small.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-closed.svg b/rtdata/images/themed/svg/folder-closed.svg
new file mode 100644
index 000000000..74166166c
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-closed.svg
@@ -0,0 +1,120 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-open-recent-small.svg b/rtdata/images/themed/svg/folder-open-recent-small.svg
new file mode 100644
index 000000000..dc2f2ec3f
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-open-recent-small.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-open-recent.svg b/rtdata/images/themed/svg/folder-open-recent.svg
new file mode 100644
index 000000000..c0baf0ccf
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-open-recent.svg
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-open-small.svg b/rtdata/images/themed/svg/folder-open-small.svg
new file mode 100644
index 000000000..f25394737
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-open-small.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/folder-open.svg b/rtdata/images/themed/svg/folder-open.svg
new file mode 100644
index 000000000..324a4bb9e
--- /dev/null
+++ b/rtdata/images/themed/svg/folder-open.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/fullscreen-enter.svg b/rtdata/images/themed/svg/fullscreen-enter.svg
new file mode 100644
index 000000000..33e8bf568
--- /dev/null
+++ b/rtdata/images/themed/svg/fullscreen-enter.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/fullscreen-leave.svg b/rtdata/images/themed/svg/fullscreen-leave.svg
new file mode 100644
index 000000000..3eee818a9
--- /dev/null
+++ b/rtdata/images/themed/svg/fullscreen-leave.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut-hist.svg b/rtdata/images/themed/svg/gamut-hist.svg
new file mode 100644
index 000000000..289dbf396
--- /dev/null
+++ b/rtdata/images/themed/svg/gamut-hist.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut-plus.svg b/rtdata/images/themed/svg/gamut-plus.svg
new file mode 100644
index 000000000..c27796b70
--- /dev/null
+++ b/rtdata/images/themed/svg/gamut-plus.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut-softproof.svg b/rtdata/images/themed/svg/gamut-softproof.svg
new file mode 100644
index 000000000..ca37ca2a0
--- /dev/null
+++ b/rtdata/images/themed/svg/gamut-softproof.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut-warning.svg b/rtdata/images/themed/svg/gamut-warning.svg
new file mode 100644
index 000000000..83cdb85cb
--- /dev/null
+++ b/rtdata/images/themed/svg/gamut-warning.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut_srgb_prophoto_xy.svg b/rtdata/images/themed/svg/gamut_srgb_prophoto_xy.svg
new file mode 100644
index 000000000..951b6611d
--- /dev/null
+++ b/rtdata/images/themed/svg/gamut_srgb_prophoto_xy.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gears-pause.svg b/rtdata/images/themed/svg/gears-pause.svg
new file mode 100644
index 000000000..b472a82f4
--- /dev/null
+++ b/rtdata/images/themed/svg/gears-pause.svg
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gears-play.svg b/rtdata/images/themed/svg/gears-play.svg
new file mode 100644
index 000000000..83c23557d
--- /dev/null
+++ b/rtdata/images/themed/svg/gears-play.svg
@@ -0,0 +1,160 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gears-small.svg b/rtdata/images/themed/svg/gears-small.svg
new file mode 100644
index 000000000..60cfdc609
--- /dev/null
+++ b/rtdata/images/themed/svg/gears-small.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gears.svg b/rtdata/images/themed/svg/gears.svg
new file mode 100644
index 000000000..3a7785a6f
--- /dev/null
+++ b/rtdata/images/themed/svg/gears.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/goto-end-small.svg b/rtdata/images/themed/svg/goto-end-small.svg
new file mode 100644
index 000000000..26d805c5d
--- /dev/null
+++ b/rtdata/images/themed/svg/goto-end-small.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/goto-start-small.svg b/rtdata/images/themed/svg/goto-start-small.svg
new file mode 100644
index 000000000..35b4e9f8c
--- /dev/null
+++ b/rtdata/images/themed/svg/goto-start-small.svg
@@ -0,0 +1,130 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/hand-closed-hicontrast.svg b/rtdata/images/themed/svg/hand-closed-hicontrast.svg
new file mode 100644
index 000000000..0d6b00f95
--- /dev/null
+++ b/rtdata/images/themed/svg/hand-closed-hicontrast.svg
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/hand-open-hicontrast.svg b/rtdata/images/themed/svg/hand-open-hicontrast.svg
new file mode 100644
index 000000000..310eda2d1
--- /dev/null
+++ b/rtdata/images/themed/svg/hand-open-hicontrast.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/hand-open.svg b/rtdata/images/themed/svg/hand-open.svg
new file mode 100644
index 000000000..a7597b482
--- /dev/null
+++ b/rtdata/images/themed/svg/hand-open.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-bar-off-small.svg b/rtdata/images/themed/svg/histogram-bar-off-small.svg
new file mode 100644
index 000000000..76016bf46
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-bar-off-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-bar-on-small.svg b/rtdata/images/themed/svg/histogram-bar-on-small.svg
new file mode 100644
index 000000000..858569703
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-bar-on-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-bayer-off-small.svg b/rtdata/images/themed/svg/histogram-bayer-off-small.svg
new file mode 100644
index 000000000..5d6c439fb
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-bayer-off-small.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-bayer-on-small.svg b/rtdata/images/themed/svg/histogram-bayer-on-small.svg
new file mode 100644
index 000000000..d9ef178a5
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-bayer-on-small.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-blue-off-small.svg b/rtdata/images/themed/svg/histogram-blue-off-small.svg
new file mode 100644
index 000000000..e78f3c19c
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-blue-off-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-blue-on-small.svg b/rtdata/images/themed/svg/histogram-blue-on-small.svg
new file mode 100644
index 000000000..d0bbe35db
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-blue-on-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-gold-off-small.svg b/rtdata/images/themed/svg/histogram-gold-off-small.svg
new file mode 100644
index 000000000..ed7d82521
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-gold-off-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-gold-on-small.svg b/rtdata/images/themed/svg/histogram-gold-on-small.svg
new file mode 100644
index 000000000..601a15165
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-gold-on-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-green-off-small.svg b/rtdata/images/themed/svg/histogram-green-off-small.svg
new file mode 100644
index 000000000..462b1b45f
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-green-off-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-green-on-small.svg b/rtdata/images/themed/svg/histogram-green-on-small.svg
new file mode 100644
index 000000000..6c06531c6
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-green-on-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-mode-linear-small.svg b/rtdata/images/themed/svg/histogram-mode-linear-small.svg
new file mode 100644
index 000000000..52b914762
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-mode-linear-small.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-mode-logx-small.svg b/rtdata/images/themed/svg/histogram-mode-logx-small.svg
new file mode 100644
index 000000000..0eb016d00
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-mode-logx-small.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-mode-logxy-small.svg b/rtdata/images/themed/svg/histogram-mode-logxy-small.svg
new file mode 100644
index 000000000..e0b69c4e5
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-mode-logxy-small.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-red-off-small.svg b/rtdata/images/themed/svg/histogram-red-off-small.svg
new file mode 100644
index 000000000..ec4200483
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-red-off-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-red-on-small.svg b/rtdata/images/themed/svg/histogram-red-on-small.svg
new file mode 100644
index 000000000..082813853
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-red-on-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-silver-off-small.svg b/rtdata/images/themed/svg/histogram-silver-off-small.svg
new file mode 100644
index 000000000..200bbd0b7
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-silver-off-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/histogram-silver-on-small.svg b/rtdata/images/themed/svg/histogram-silver-on-small.svg
new file mode 100644
index 000000000..414d5f4f0
--- /dev/null
+++ b/rtdata/images/themed/svg/histogram-silver-on-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/info.svg b/rtdata/images/themed/svg/info.svg
new file mode 100644
index 000000000..8805fcad4
--- /dev/null
+++ b/rtdata/images/themed/svg/info.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/intent-absolute.svg b/rtdata/images/themed/svg/intent-absolute.svg
new file mode 100644
index 000000000..055759ad1
--- /dev/null
+++ b/rtdata/images/themed/svg/intent-absolute.svg
@@ -0,0 +1,297 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/intent-perceptual.svg b/rtdata/images/themed/svg/intent-perceptual.svg
new file mode 100644
index 000000000..2e845cd39
--- /dev/null
+++ b/rtdata/images/themed/svg/intent-perceptual.svg
@@ -0,0 +1,303 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/intent-relative.svg b/rtdata/images/themed/svg/intent-relative.svg
new file mode 100644
index 000000000..04e553796
--- /dev/null
+++ b/rtdata/images/themed/svg/intent-relative.svg
@@ -0,0 +1,297 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/intent-saturation.svg b/rtdata/images/themed/svg/intent-saturation.svg
new file mode 100644
index 000000000..569c54962
--- /dev/null
+++ b/rtdata/images/themed/svg/intent-saturation.svg
@@ -0,0 +1,305 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-1to1-small.svg b/rtdata/images/themed/svg/magnifier-1to1-small.svg
new file mode 100644
index 000000000..68aa7d6c2
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-1to1-small.svg
@@ -0,0 +1,148 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-1to1.svg b/rtdata/images/themed/svg/magnifier-1to1.svg
new file mode 100644
index 000000000..5272cf2ed
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-1to1.svg
@@ -0,0 +1,141 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-crop.svg b/rtdata/images/themed/svg/magnifier-crop.svg
new file mode 100644
index 000000000..54d6e3e9e
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-crop.svg
@@ -0,0 +1,140 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-fit.svg b/rtdata/images/themed/svg/magnifier-fit.svg
new file mode 100644
index 000000000..1d531e2d7
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-fit.svg
@@ -0,0 +1,147 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-minus-small.svg b/rtdata/images/themed/svg/magnifier-minus-small.svg
new file mode 100644
index 000000000..08871ed77
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-minus-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-minus.svg b/rtdata/images/themed/svg/magnifier-minus.svg
new file mode 100644
index 000000000..567845d57
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-minus.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-plus-small.svg b/rtdata/images/themed/svg/magnifier-plus-small.svg
new file mode 100644
index 000000000..a93e8cd8e
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-plus-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier-plus.svg b/rtdata/images/themed/svg/magnifier-plus.svg
new file mode 100644
index 000000000..a98c19bad
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier-plus.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/magnifier.svg b/rtdata/images/themed/svg/magnifier.svg
new file mode 100644
index 000000000..3b7ae2fd2
--- /dev/null
+++ b/rtdata/images/themed/svg/magnifier.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/metadata.svg b/rtdata/images/themed/svg/metadata.svg
new file mode 100644
index 000000000..695d2af1a
--- /dev/null
+++ b/rtdata/images/themed/svg/metadata.svg
@@ -0,0 +1,203 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/node-move-nw-se-hicontrast.svg b/rtdata/images/themed/svg/node-move-nw-se-hicontrast.svg
new file mode 100644
index 000000000..375c8ea27
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-nw-se-hicontrast.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/node-move-sw-ne-hicontrast.svg b/rtdata/images/themed/svg/node-move-sw-ne-hicontrast.svg
new file mode 100644
index 000000000..fdda47505
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-sw-ne-hicontrast.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/node-move-x-hicontrast.svg b/rtdata/images/themed/svg/node-move-x-hicontrast.svg
new file mode 100644
index 000000000..a24af10ef
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-x-hicontrast.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/node-move-xy-hicontrast.svg b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg
new file mode 100644
index 000000000..05d291870
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg
@@ -0,0 +1,171 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/node-move-y-hicontrast.svg b/rtdata/images/themed/svg/node-move-y-hicontrast.svg
new file mode 100644
index 000000000..615f3f94a
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-y-hicontrast.svg
@@ -0,0 +1,131 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/one-to-one-small.svg b/rtdata/images/themed/svg/one-to-one-small.svg
new file mode 100644
index 000000000..8b08f99d0
--- /dev/null
+++ b/rtdata/images/themed/svg/one-to-one-small.svg
@@ -0,0 +1,271 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/ornament1.svg b/rtdata/images/themed/svg/ornament1.svg
new file mode 100644
index 000000000..af3d729e5
--- /dev/null
+++ b/rtdata/images/themed/svg/ornament1.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/padlock-locked-small.svg b/rtdata/images/themed/svg/padlock-locked-small.svg
new file mode 100644
index 000000000..27f1bc510
--- /dev/null
+++ b/rtdata/images/themed/svg/padlock-locked-small.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/padlock-unlocked-small.svg b/rtdata/images/themed/svg/padlock-unlocked-small.svg
new file mode 100644
index 000000000..0c282c8cf
--- /dev/null
+++ b/rtdata/images/themed/svg/padlock-unlocked-small.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/palette-brush.svg b/rtdata/images/themed/svg/palette-brush.svg
new file mode 100644
index 000000000..30eaac0d6
--- /dev/null
+++ b/rtdata/images/themed/svg/palette-brush.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/panel-to-bottom.svg b/rtdata/images/themed/svg/panel-to-bottom.svg
new file mode 100644
index 000000000..8e63c0309
--- /dev/null
+++ b/rtdata/images/themed/svg/panel-to-bottom.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/panel-to-left.svg b/rtdata/images/themed/svg/panel-to-left.svg
new file mode 100644
index 000000000..d987f54f7
--- /dev/null
+++ b/rtdata/images/themed/svg/panel-to-left.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/panel-to-right.svg b/rtdata/images/themed/svg/panel-to-right.svg
new file mode 100644
index 000000000..52fc38529
--- /dev/null
+++ b/rtdata/images/themed/svg/panel-to-right.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/panel-to-top.svg b/rtdata/images/themed/svg/panel-to-top.svg
new file mode 100644
index 000000000..5b1cccfe5
--- /dev/null
+++ b/rtdata/images/themed/svg/panel-to-top.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/paste.svg b/rtdata/images/themed/svg/paste.svg
new file mode 100644
index 000000000..83d82617a
--- /dev/null
+++ b/rtdata/images/themed/svg/paste.svg
@@ -0,0 +1,260 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-horizontal-left-small.svg b/rtdata/images/themed/svg/perspective-horizontal-left-small.svg
new file mode 100644
index 000000000..c4797a6a2
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-left-small.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-horizontal-left.svg b/rtdata/images/themed/svg/perspective-horizontal-left.svg
new file mode 100644
index 000000000..18ce37ea3
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-left.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-horizontal-right-small.svg b/rtdata/images/themed/svg/perspective-horizontal-right-small.svg
new file mode 100644
index 000000000..4721117c8
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-right-small.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-horizontal-right.svg b/rtdata/images/themed/svg/perspective-horizontal-right.svg
new file mode 100644
index 000000000..809e94123
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-right.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg b/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg
new file mode 100644
index 000000000..80f023b74
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-vertical-bottom.svg b/rtdata/images/themed/svg/perspective-vertical-bottom.svg
new file mode 100644
index 000000000..4cc5bf0f3
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-bottom.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-vertical-top-small.svg b/rtdata/images/themed/svg/perspective-vertical-top-small.svg
new file mode 100644
index 000000000..1ec0fafa7
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-top-small.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/perspective-vertical-top.svg b/rtdata/images/themed/svg/perspective-vertical-top.svg
new file mode 100644
index 000000000..34f75fe7f
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-top.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/power-inconsistent-small.svg b/rtdata/images/themed/svg/power-inconsistent-small.svg
new file mode 100644
index 000000000..305f504cd
--- /dev/null
+++ b/rtdata/images/themed/svg/power-inconsistent-small.svg
@@ -0,0 +1,120 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/power-off-small.svg b/rtdata/images/themed/svg/power-off-small.svg
new file mode 100644
index 000000000..d04115bb9
--- /dev/null
+++ b/rtdata/images/themed/svg/power-off-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/power-on-small.svg b/rtdata/images/themed/svg/power-on-small.svg
new file mode 100644
index 000000000..caaf7992d
--- /dev/null
+++ b/rtdata/images/themed/svg/power-on-small.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/preferences.svg b/rtdata/images/themed/svg/preferences.svg
new file mode 100644
index 000000000..db6794736
--- /dev/null
+++ b/rtdata/images/themed/svg/preferences.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/profile-filled.svg b/rtdata/images/themed/svg/profile-filled.svg
new file mode 100644
index 000000000..d31352f11
--- /dev/null
+++ b/rtdata/images/themed/svg/profile-filled.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/profile-partial.svg b/rtdata/images/themed/svg/profile-partial.svg
new file mode 100644
index 000000000..90d22c74a
--- /dev/null
+++ b/rtdata/images/themed/svg/profile-partial.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/redo-all.svg b/rtdata/images/themed/svg/redo-all.svg
new file mode 100644
index 000000000..f9dbaad23
--- /dev/null
+++ b/rtdata/images/themed/svg/redo-all.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/redo-small.svg b/rtdata/images/themed/svg/redo-small.svg
new file mode 100644
index 000000000..be05d9592
--- /dev/null
+++ b/rtdata/images/themed/svg/redo-small.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/redo.svg b/rtdata/images/themed/svg/redo.svg
new file mode 100644
index 000000000..14f9f7c00
--- /dev/null
+++ b/rtdata/images/themed/svg/redo.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/refresh-red-small.svg b/rtdata/images/themed/svg/refresh-red-small.svg
new file mode 100644
index 000000000..498faafe8
--- /dev/null
+++ b/rtdata/images/themed/svg/refresh-red-small.svg
@@ -0,0 +1,140 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/refresh-small.svg b/rtdata/images/themed/svg/refresh-small.svg
new file mode 100644
index 000000000..d9ca603ef
--- /dev/null
+++ b/rtdata/images/themed/svg/refresh-small.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/refresh.svg b/rtdata/images/themed/svg/refresh.svg
new file mode 100644
index 000000000..3b0b0cb72
--- /dev/null
+++ b/rtdata/images/themed/svg/refresh.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/remove-small.svg b/rtdata/images/themed/svg/remove-small.svg
new file mode 100644
index 000000000..1bffa469c
--- /dev/null
+++ b/rtdata/images/themed/svg/remove-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/remove.svg b/rtdata/images/themed/svg/remove.svg
new file mode 100644
index 000000000..bccfdb160
--- /dev/null
+++ b/rtdata/images/themed/svg/remove.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg
new file mode 100644
index 000000000..fda645c55
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-aroundnode.svg b/rtdata/images/themed/svg/rotate-aroundnode.svg
new file mode 100644
index 000000000..67ac406fa
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-aroundnode.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-left-90.svg b/rtdata/images/themed/svg/rotate-left-90.svg
new file mode 100644
index 000000000..394c88c29
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-left-90.svg
@@ -0,0 +1,149 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-left-small.svg b/rtdata/images/themed/svg/rotate-left-small.svg
new file mode 100644
index 000000000..d85b5e8ea
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-left-small.svg
@@ -0,0 +1,154 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-left.svg b/rtdata/images/themed/svg/rotate-left.svg
new file mode 100644
index 000000000..c66020379
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-left.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-right-90.svg b/rtdata/images/themed/svg/rotate-right-90.svg
new file mode 100644
index 000000000..eca331bc8
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-right-90.svg
@@ -0,0 +1,150 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-right-small.svg b/rtdata/images/themed/svg/rotate-right-small.svg
new file mode 100644
index 000000000..89e6d4ac2
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-right-small.svg
@@ -0,0 +1,154 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-right.svg b/rtdata/images/themed/svg/rotate-right.svg
new file mode 100644
index 000000000..26a46a3f6
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-right.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-straighten-small.svg b/rtdata/images/themed/svg/rotate-straighten-small.svg
new file mode 100644
index 000000000..00da936f8
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-straighten-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/rotate-straighten.svg b/rtdata/images/themed/svg/rotate-straighten.svg
new file mode 100644
index 000000000..34765aa2b
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-straighten.svg
@@ -0,0 +1,237 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/save-small.svg b/rtdata/images/themed/svg/save-small.svg
new file mode 100644
index 000000000..3398e27c8
--- /dev/null
+++ b/rtdata/images/themed/svg/save-small.svg
@@ -0,0 +1,177 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/save.svg b/rtdata/images/themed/svg/save.svg
new file mode 100644
index 000000000..eae40ed09
--- /dev/null
+++ b/rtdata/images/themed/svg/save.svg
@@ -0,0 +1,456 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/saved-no-small.svg b/rtdata/images/themed/svg/saved-no-small.svg
new file mode 100644
index 000000000..02b245aa1
--- /dev/null
+++ b/rtdata/images/themed/svg/saved-no-small.svg
@@ -0,0 +1,189 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/saved-yes-small.svg b/rtdata/images/themed/svg/saved-yes-small.svg
new file mode 100644
index 000000000..f545e9b18
--- /dev/null
+++ b/rtdata/images/themed/svg/saved-yes-small.svg
@@ -0,0 +1,175 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-black-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-black-off-narrow.svg
new file mode 100644
index 000000000..23d835032
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-black-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-black-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-black-on-narrow.svg
new file mode 100644
index 000000000..431f8bd58
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-black-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg
new file mode 100644
index 000000000..4da563f36
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg
new file mode 100644
index 000000000..6aa7e2cb1
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg
new file mode 100644
index 000000000..3bc716d8e
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg
new file mode 100644
index 000000000..6e3ddb2ed
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-green-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-green-off-narrow.svg
new file mode 100644
index 000000000..814feedf6
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-green-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-green-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-green-on-narrow.svg
new file mode 100644
index 000000000..ed178b3b0
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-green-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg
new file mode 100644
index 000000000..c5758afa0
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg
new file mode 100644
index 000000000..9db291ba3
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-red-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-red-off-narrow.svg
new file mode 100644
index 000000000..b05b91ae5
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-red-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-red-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-red-on-narrow.svg
new file mode 100644
index 000000000..52382d0df
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-red-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg
new file mode 100644
index 000000000..9b3bc4a2a
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg
new file mode 100644
index 000000000..e7b1f00bd
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-white-off-narrow.svg b/rtdata/images/themed/svg/square-toggle-white-off-narrow.svg
new file mode 100644
index 000000000..99e675f83
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-white-off-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/square-toggle-white-on-narrow.svg b/rtdata/images/themed/svg/square-toggle-white-on-narrow.svg
new file mode 100644
index 000000000..97b5e5e41
--- /dev/null
+++ b/rtdata/images/themed/svg/square-toggle-white-on-narrow.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-gold-hollow-narrow.svg b/rtdata/images/themed/svg/star-gold-hollow-narrow.svg
new file mode 100644
index 000000000..82ab83a4a
--- /dev/null
+++ b/rtdata/images/themed/svg/star-gold-hollow-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-gold-hollow-small.svg b/rtdata/images/themed/svg/star-gold-hollow-small.svg
new file mode 100644
index 000000000..ecdcf65f7
--- /dev/null
+++ b/rtdata/images/themed/svg/star-gold-hollow-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-gold-narrow.svg b/rtdata/images/themed/svg/star-gold-narrow.svg
new file mode 100644
index 000000000..ee54c8214
--- /dev/null
+++ b/rtdata/images/themed/svg/star-gold-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-gold-small.svg b/rtdata/images/themed/svg/star-gold-small.svg
new file mode 100644
index 000000000..48694c3f1
--- /dev/null
+++ b/rtdata/images/themed/svg/star-gold-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-hollow-narrow.svg b/rtdata/images/themed/svg/star-hollow-narrow.svg
new file mode 100644
index 000000000..66b1c233c
--- /dev/null
+++ b/rtdata/images/themed/svg/star-hollow-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-hollow-small.svg b/rtdata/images/themed/svg/star-hollow-small.svg
new file mode 100644
index 000000000..6d63a6e8b
--- /dev/null
+++ b/rtdata/images/themed/svg/star-hollow-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-narrow.svg b/rtdata/images/themed/svg/star-narrow.svg
new file mode 100644
index 000000000..90add16d5
--- /dev/null
+++ b/rtdata/images/themed/svg/star-narrow.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/star-small.svg b/rtdata/images/themed/svg/star-small.svg
new file mode 100644
index 000000000..cd7a9b8ef
--- /dev/null
+++ b/rtdata/images/themed/svg/star-small.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/template-16.svg b/rtdata/images/themed/svg/template-16.svg
new file mode 100644
index 000000000..d38151609
--- /dev/null
+++ b/rtdata/images/themed/svg/template-16.svg
@@ -0,0 +1,103 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/template-24.svg b/rtdata/images/themed/svg/template-24.svg
new file mode 100644
index 000000000..88d934fc5
--- /dev/null
+++ b/rtdata/images/themed/svg/template-24.svg
@@ -0,0 +1,102 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/template-narrow.svg b/rtdata/images/themed/svg/template-narrow.svg
new file mode 100644
index 000000000..9a6321317
--- /dev/null
+++ b/rtdata/images/themed/svg/template-narrow.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-green-hollow-small.svg b/rtdata/images/themed/svg/tick-green-hollow-small.svg
new file mode 100644
index 000000000..fcac2954d
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-green-hollow-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-green-hollow.svg b/rtdata/images/themed/svg/tick-green-hollow.svg
new file mode 100644
index 000000000..9b1eca47d
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-green-hollow.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-green-small.svg b/rtdata/images/themed/svg/tick-green-small.svg
new file mode 100644
index 000000000..edf2dd4b4
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-green-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-green.svg b/rtdata/images/themed/svg/tick-green.svg
new file mode 100644
index 000000000..fa250d9fe
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-green.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-hollow-small.svg b/rtdata/images/themed/svg/tick-hollow-small.svg
new file mode 100644
index 000000000..010fba31e
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-hollow-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick-small.svg b/rtdata/images/themed/svg/tick-small.svg
new file mode 100644
index 000000000..943c61d76
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/tick.svg b/rtdata/images/themed/svg/tick.svg
new file mode 100644
index 000000000..8ab7a2e27
--- /dev/null
+++ b/rtdata/images/themed/svg/tick.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/transform.svg b/rtdata/images/themed/svg/transform.svg
new file mode 100644
index 000000000..09b55309d
--- /dev/null
+++ b/rtdata/images/themed/svg/transform.svg
@@ -0,0 +1,133 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-delete.svg b/rtdata/images/themed/svg/trash-delete.svg
new file mode 100644
index 000000000..7593e6001
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-delete.svg
@@ -0,0 +1,368 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-empty-show.svg b/rtdata/images/themed/svg/trash-empty-show.svg
new file mode 100644
index 000000000..366b15bd6
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-empty-show.svg
@@ -0,0 +1,287 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-empty.svg b/rtdata/images/themed/svg/trash-empty.svg
new file mode 100644
index 000000000..47ceae609
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-empty.svg
@@ -0,0 +1,278 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-full-show.svg b/rtdata/images/themed/svg/trash-full-show.svg
new file mode 100644
index 000000000..8ec3f9092
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-full-show.svg
@@ -0,0 +1,291 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-full.svg b/rtdata/images/themed/svg/trash-full.svg
new file mode 100644
index 000000000..eae5920e3
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-full.svg
@@ -0,0 +1,290 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-hide-deleted.svg b/rtdata/images/themed/svg/trash-hide-deleted.svg
new file mode 100644
index 000000000..e70aa21e1
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-hide-deleted.svg
@@ -0,0 +1,293 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-remove-small.svg b/rtdata/images/themed/svg/trash-remove-small.svg
new file mode 100644
index 000000000..a58bafd39
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-remove-small.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-remove.svg b/rtdata/images/themed/svg/trash-remove.svg
new file mode 100644
index 000000000..31ca65a56
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-remove.svg
@@ -0,0 +1,288 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-small.svg b/rtdata/images/themed/svg/trash-small.svg
new file mode 100644
index 000000000..3d2e674c6
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-small.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/undo-all.svg b/rtdata/images/themed/svg/undo-all.svg
new file mode 100644
index 000000000..e648588ef
--- /dev/null
+++ b/rtdata/images/themed/svg/undo-all.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/undo-small.svg b/rtdata/images/themed/svg/undo-small.svg
new file mode 100644
index 000000000..83b4663a0
--- /dev/null
+++ b/rtdata/images/themed/svg/undo-small.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/undo.svg b/rtdata/images/themed/svg/undo.svg
new file mode 100644
index 000000000..bc4282693
--- /dev/null
+++ b/rtdata/images/themed/svg/undo.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/warning-highlights.svg b/rtdata/images/themed/svg/warning-highlights.svg
new file mode 100644
index 000000000..c7aaf80ce
--- /dev/null
+++ b/rtdata/images/themed/svg/warning-highlights.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/warning-shadows.svg b/rtdata/images/themed/svg/warning-shadows.svg
new file mode 100644
index 000000000..f9baa36c1
--- /dev/null
+++ b/rtdata/images/themed/svg/warning-shadows.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wavelets.svg b/rtdata/images/themed/svg/wavelets.svg
new file mode 100644
index 000000000..1d6de039c
--- /dev/null
+++ b/rtdata/images/themed/svg/wavelets.svg
@@ -0,0 +1,157 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-auto-small.svg b/rtdata/images/themed/svg/wb-auto-small.svg
new file mode 100644
index 000000000..23e55f560
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-auto-small.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-auto.svg b/rtdata/images/themed/svg/wb-auto.svg
new file mode 100644
index 000000000..5914ee63e
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-auto.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-camera-small.svg b/rtdata/images/themed/svg/wb-camera-small.svg
new file mode 100644
index 000000000..2521d513e
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-camera-small.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-camera.svg b/rtdata/images/themed/svg/wb-camera.svg
new file mode 100644
index 000000000..f83342b6b
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-camera.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-cloudy-small.svg b/rtdata/images/themed/svg/wb-cloudy-small.svg
new file mode 100644
index 000000000..0197eab4e
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-cloudy-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-cloudy.svg b/rtdata/images/themed/svg/wb-cloudy.svg
new file mode 100644
index 000000000..5762fa37b
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-cloudy.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-custom-small.svg b/rtdata/images/themed/svg/wb-custom-small.svg
new file mode 100644
index 000000000..f176458a8
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-custom-small.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-custom.svg b/rtdata/images/themed/svg/wb-custom.svg
new file mode 100644
index 000000000..f1d2ec8f7
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-custom.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-flash-small.svg b/rtdata/images/themed/svg/wb-flash-small.svg
new file mode 100644
index 000000000..634912538
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-flash-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-flash.svg b/rtdata/images/themed/svg/wb-flash.svg
new file mode 100644
index 000000000..fb4b0ca66
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-flash.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-fluorescent-small.svg b/rtdata/images/themed/svg/wb-fluorescent-small.svg
new file mode 100644
index 000000000..67c86ec71
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-fluorescent-small.svg
@@ -0,0 +1,172 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-fluorescent.svg b/rtdata/images/themed/svg/wb-fluorescent.svg
new file mode 100644
index 000000000..8746978e1
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-fluorescent.svg
@@ -0,0 +1,169 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-lamp-small.svg b/rtdata/images/themed/svg/wb-lamp-small.svg
new file mode 100644
index 000000000..32c172d7f
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-lamp-small.svg
@@ -0,0 +1,172 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-lamp.svg b/rtdata/images/themed/svg/wb-lamp.svg
new file mode 100644
index 000000000..39f2ccb94
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-lamp.svg
@@ -0,0 +1,169 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-led-small.svg b/rtdata/images/themed/svg/wb-led-small.svg
new file mode 100644
index 000000000..7e20c4576
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-led-small.svg
@@ -0,0 +1,156 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-led.svg b/rtdata/images/themed/svg/wb-led.svg
new file mode 100644
index 000000000..952f5f77f
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-led.svg
@@ -0,0 +1,151 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-shade-small.svg b/rtdata/images/themed/svg/wb-shade-small.svg
new file mode 100644
index 000000000..78ed1e6c6
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-shade-small.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-shade.svg b/rtdata/images/themed/svg/wb-shade.svg
new file mode 100644
index 000000000..3ac24bd80
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-shade.svg
@@ -0,0 +1,172 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-sun-small.svg b/rtdata/images/themed/svg/wb-sun-small.svg
new file mode 100644
index 000000000..94abad681
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-sun-small.svg
@@ -0,0 +1,178 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-sun.svg b/rtdata/images/themed/svg/wb-sun.svg
new file mode 100644
index 000000000..b9c71a3dc
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-sun.svg
@@ -0,0 +1,173 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-tungsten-small.svg b/rtdata/images/themed/svg/wb-tungsten-small.svg
new file mode 100644
index 000000000..dc4b62beb
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-tungsten-small.svg
@@ -0,0 +1,163 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-tungsten.svg b/rtdata/images/themed/svg/wb-tungsten.svg
new file mode 100644
index 000000000..0dabc0935
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-tungsten.svg
@@ -0,0 +1,158 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-water-small.svg b/rtdata/images/themed/svg/wb-water-small.svg
new file mode 100644
index 000000000..2cb62298a
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-water-small.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/wb-water.svg b/rtdata/images/themed/svg/wb-water.svg
new file mode 100644
index 000000000..55a98f099
--- /dev/null
+++ b/rtdata/images/themed/svg/wb-water.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/window-add.svg b/rtdata/images/themed/svg/window-add.svg
new file mode 100644
index 000000000..da0651444
--- /dev/null
+++ b/rtdata/images/themed/svg/window-add.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/images/toleftend.png b/rtdata/images/toleftend.png
deleted file mode 100644
index 4dfd61fec..000000000
Binary files a/rtdata/images/toleftend.png and /dev/null differ
diff --git a/rtdata/images/torightend.png b/rtdata/images/torightend.png
deleted file mode 100644
index 2c5204f74..000000000
Binary files a/rtdata/images/torightend.png and /dev/null differ
diff --git a/rtdata/images/transform.png b/rtdata/images/transform.png
deleted file mode 100644
index fc2f66cef..000000000
Binary files a/rtdata/images/transform.png and /dev/null differ
diff --git a/rtdata/images/trash-show-empty.png b/rtdata/images/trash-show-empty.png
deleted file mode 100644
index 08fcdfc93..000000000
Binary files a/rtdata/images/trash-show-empty.png and /dev/null differ
diff --git a/rtdata/images/trash-show-full.png b/rtdata/images/trash-show-full.png
deleted file mode 100644
index c9bd50e51..000000000
Binary files a/rtdata/images/trash-show-full.png and /dev/null differ
diff --git a/rtdata/images/trash.png b/rtdata/images/trash.png
deleted file mode 100644
index 08fcdfc93..000000000
Binary files a/rtdata/images/trash.png and /dev/null differ
diff --git a/rtdata/images/warnhl.png b/rtdata/images/warnhl.png
deleted file mode 100644
index 98dddeb92..000000000
Binary files a/rtdata/images/warnhl.png and /dev/null differ
diff --git a/rtdata/images/warnsh.png b/rtdata/images/warnsh.png
deleted file mode 100644
index ee2c31e08..000000000
Binary files a/rtdata/images/warnsh.png and /dev/null differ
diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 8f928ebc7..a8d381a8e 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -999,7 +999,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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.
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1011,9 +1011,11 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!GENERAL_CLOSE;Close
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_174;CIECAM02
@@ -1319,10 +1321,16 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1334,9 +1342,56 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1366,6 +1421,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1379,6 +1435,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@@ -1406,20 +1463,17 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!PARTIALPASTE_PCVIGNETTE;Vignette filter
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
!PREFERENCES_BEHSETALL;All to 'Set'
@@ -1448,11 +1502,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!PREFERENCES_D55;5500K
!PREFERENCES_D60;6000K
!PREFERENCES_D65;6500K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FLUOF2;Fluorescent F2
!PREFERENCES_FLUOF7;Fluorescent F7
!PREFERENCES_FLUOF11;Fluorescent F11
@@ -1477,23 +1528,18 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1506,34 +1552,22 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
!PROFILEPANEL_MODE_TIP;Processing profile fill mode.\n\nButton pressed: partial profiles will be converted to full profiles; the missing values will be replaced with hard-coded defaults.\n\nButton released: profiles will be applied as they are, altering only those values which they contain.
!PROFILEPANEL_MYPROFILES;My profiles
@@ -1552,6 +1586,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
@@ -1845,6 +1880,12 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LABCURVE_CHROMA_TOOLTIP;To apply B&W toning, set Chromaticity to -100.
!TP_LABCURVE_CURVEEDITOR_CL;CL
!TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Chromaticity according to luminance C=f(L)
@@ -1885,6 +1926,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1894,13 +1937,16 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1949,10 +1995,12 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1968,7 +2016,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2039,6 +2087,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2111,7 +2161,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index b4404728f..78667ee02 100644
--- a/rtdata/languages/Chinese (Simplified)
+++ b/rtdata/languages/Chinese (Simplified)
@@ -488,13 +488,7 @@ PARTIALPASTE_WAVELETGROUP;小波变换等级
PARTIALPASTE_WHITEBALANCE;白平衡
PREFERENCES_ADD;添加
PREFERENCES_APPLNEXTSTARTUP;下次启动生效
-PREFERENCES_AUTLISLOW;低
-PREFERENCES_AUTLISMAX;最大 - 所有块平均值
-PREFERENCES_AUTLISSTD;高
-PREFERENCES_AUTLISVLOW;无
-PREFERENCES_AUTLOW;低
PREFERENCES_AUTOMONPROFILE;使用操作系统主显示器的色彩档案
-PREFERENCES_AUTSTD;标准
PREFERENCES_BATCH_PROCESSING;批处理
PREFERENCES_BEHADDALL;全 '添加'
PREFERENCES_BEHAVIOR;行为
@@ -536,8 +530,6 @@ PREFERENCES_DARKFRAMESHOTS;张
PREFERENCES_DARKFRAMETEMPLATES;模板
PREFERENCES_DATEFORMAT;日期格式
PREFERENCES_DATEFORMATHINT;可以使用下列控制符:\n%y : 年\n%m : 月h\n%d : 日\n\n例如, 中文日期格式:\n%y/%m/%d
-PREFERENCES_DAUB_LABEL;使用 Daubechies D6 小波变换而不是 D4
-PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and 小波变换等级 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_DIRDARKFRAMES;暗场图像路径
PREFERENCES_DIRHOME;用户文件路径
PREFERENCES_DIRLAST;上次访问路径
@@ -545,7 +537,6 @@ PREFERENCES_DIROTHER;其他
PREFERENCES_DIRSELECTDLG;启动时选择图片路径...
PREFERENCES_DIRSOFTWARE;软件安装路径
PREFERENCES_EDITORLAYOUT;编辑器布局
-PREFERENCES_EXPAUT;进阶
PREFERENCES_EXTERNALEDITOR;外部编辑器
PREFERENCES_FBROWSEROPTS;文件浏览选项
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
@@ -591,12 +582,7 @@ PREFERENCES_INTENT_SATURATION;饱和度
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;如果RAW文件没有修改, 显示内嵌JPEG缩略图
PREFERENCES_LANG;语言
PREFERENCES_LANGAUTODETECT;使用系统语言
-PREFERENCES_LEVAUTDN;降噪等级
-PREFERENCES_LEVDN;单元尺寸
-PREFERENCES_LISS;自动多区域平滑
-PREFERENCES_MAX;最大 (Tile)
PREFERENCES_MAXRECENTFOLDERS;最近访问路径历史记录数
-PREFERENCES_MED;中等 (Tile/2)
PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -604,7 +590,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Group "Processing profile operations"
PREFERENCES_MENUGROUPRANK;组 "评价"
PREFERENCES_MENUOPTIONS;子菜单选项
PREFERENCES_METADATA;元数据
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;默认渲染意图
PREFERENCES_MONITOR;显示器
PREFERENCES_MONPROFILE;默认色彩配置文件
@@ -613,7 +598,6 @@ PREFERENCES_MULTITAB;多编辑器标签模式
PREFERENCES_MULTITABDUALMON;多编辑器标签独立模式
PREFERENCES_NAVGUIDEBRUSH;导航器引导颜色
PREFERENCES_NAVIGATIONFRAME;导航器
-PREFERENCES_NOISE;降噪
PREFERENCES_OUTDIR;输出路径
PREFERENCES_OUTDIRFOLDER;保存至文件夹
PREFERENCES_OUTDIRFOLDERHINT;将已寸图片放至所选文件夹
@@ -649,8 +633,6 @@ PREFERENCES_PRTPROFILE;色彩配置文件
PREFERENCES_PSPATH;Adobe Photoshop安装路径
PREFERENCES_REMEMBERZOOMPAN;记忆缩放和位置
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;降噪和小波变换等级可用的最大线程数
-PREFERENCES_RGBDTL_TOOLTIP;"0"表示自动选择最大可用线程数 线程越多处理越快, 同时消耗更多内存
PREFERENCES_SELECTFONT;设置主要字体
PREFERENCES_SELECTFONT_COLPICKER;设置色彩选择器字体
PREFERENCES_SELECTLANG;选择语言
@@ -664,37 +646,26 @@ PREFERENCES_SHOWDATETIME;显示时间日期
PREFERENCES_SHOWEXPOSURECOMPENSATION;附加曝光补偿
PREFERENCES_SHOWFILMSTRIPTOOLBAR;显示图像胶片栏
PREFERENCES_SHTHRESHOLD;阴影过暗阈值
-PREFERENCES_SIMPLAUT;工具模式
PREFERENCES_SINGLETAB;单编辑器栏模式
PREFERENCES_SINGLETABVERTAB;单编辑器栏模式, 标签栏垂直
-PREFERENCES_SMA;小 (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;队列处理完成
PREFERENCES_SND_HELP;输入完整路径来指定声音文件, 或者留空表示无声 \nWindows系统声音可以使用 "SystemDefault", "SystemAsterisk" 等 Linux则可以使用 "complete", "window-attention" 等
PREFERENCES_SND_LNGEDITPROCDONE;编辑器处理完成
PREFERENCES_SND_THRESHOLDSECS;几秒之后
PREFERENCES_STARTUPIMDIR;启动时路径
-PREFERENCES_STDAUT;标准
PREFERENCES_TAB_BROWSER;文件浏览器
PREFERENCES_TAB_COLORMGR;色彩管理
PREFERENCES_TAB_DYNAMICPROFILE;动态预设规则
PREFERENCES_TAB_GENERAL;一般
PREFERENCES_TAB_IMPROC;图片处理
-PREFERENCES_TAB_PERFORMANCE;性能和品质
PREFERENCES_TAB_SOUND;音效
PREFERENCES_THEME;主题
-PREFERENCES_TIMAX;高
-PREFERENCES_TINB;块数量
-PREFERENCES_TISTD;标准
PREFERENCES_TP_LABEL;工具栏
PREFERENCES_TP_USEICONORTEXT;标签使用图标而不是文本
PREFERENCES_TP_VSCROLLBAR;隐藏垂直滚动栏
PREFERENCES_TUNNELMETADATA;无损复制 Exif/IPTC/XMP 到输出文件
PREFERENCES_USEBUNDLEDPROFILES;启用内置预设
PREFERENCES_VIEW;输出设备白平衡 (显示器、电视、投影仪等)
-PREFERENCES_WAVLEV;在质量为"高"时增加小波变换等级
-PREFERENCES_WLONE;一级
-PREFERENCES_WLTWO;二级
-PREFERENCES_WLZER;无
PREFERENCES_WORKFLOW;排版
PROFILEPANEL_LABEL;处理参数配置
PROFILEPANEL_LOADDLGLABEL;加载处理参数为...
@@ -1060,11 +1031,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_86;RGB Curves - Luminosity mode
@@ -1426,10 +1398,16 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1441,8 +1419,55 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1472,6 +1497,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1491,6 +1517,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the Focus Mask.\nShortcut: Shift-f\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\n\nTo improve detection accuracy for noisy images evaluate at smaller zoom, about 10-30%.
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -1498,7 +1525,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PARTIALPASTE_ADVANCEDGROUP;Advanced Settings
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
+!PARTIALPASTE_RAW_BORDER;Raw border
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
!PREFERENCES_BEHSETALLHINT;Set all parameters to the Set mode.\nAdjustments of parameters in the batch tool panel will be absolute, the actual values will be displayed.
@@ -1511,7 +1541,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PREFERENCES_CUSTPROFBUILDHINT;Executable (or script) file called when a new initial processing profile should be generated for an image.\n\nThe path of the communication file (*.ini style, a.k.a. "Keyfile") is added as a command line parameter. It contains various parameters required for the scripts and image Exif to allow a rules-based processing profile generation.\n\nWARNING: You are responsible for using double quotes where necessary if you're using paths containing spaces.
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
@@ -1538,6 +1571,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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.
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
@@ -1795,6 +1829,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!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.
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LABCURVE_CHROMA_TOOLTIP;To apply B&W toning, set Chromaticity to -100.
!TP_LABCURVE_CURVEEDITOR_A_RANGE1;Green Saturated
!TP_LABCURVE_CURVEEDITOR_A_RANGE2;Green Pastel
@@ -1854,6 +1894,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACKS;Black Levels
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
@@ -1867,15 +1909,18 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@@ -1927,10 +1972,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
@@ -1947,7 +1994,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2017,6 +2064,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2106,7 +2155,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index cdb0bc822..6e7698f9a 100644
--- a/rtdata/languages/Chinese (Traditional)
+++ b/rtdata/languages/Chinese (Traditional)
@@ -565,7 +565,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -579,12 +579,13 @@ TP_WBALANCE_TEMPERATURE;色溫
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -981,10 +982,16 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -996,9 +1003,56 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1029,11 +1083,12 @@ TP_WBALANCE_TEMPERATURE;色溫
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1069,6 +1124,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1123,6 +1179,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1130,6 +1187,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1141,17 +1199,12 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1189,13 +1242,10 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1228,12 +1278,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1241,7 +1286,6 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1250,13 +1294,14 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1270,8 +1315,6 @@ TP_WBALANCE_TEMPERATURE;色溫
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1281,36 +1324,26 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1338,6 +1371,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1663,10 +1697,6 @@ TP_WBALANCE_TEMPERATURE;色溫
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1713,6 +1743,12 @@ TP_WBALANCE_TEMPERATURE;色溫
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1800,6 +1836,8 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1815,15 +1853,18 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@@ -1875,10 +1916,12 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1899,7 +1942,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1983,6 +2026,8 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2076,7 +2121,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 4b88d089c..671fde250 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -982,14 +982,8 @@ PARTIALPASTE_VIGNETTING;Korekce vinětace
PARTIALPASTE_WHITEBALANCE;Nastavení bílé
PREFERENCES_ADD;Přidat
PREFERENCES_APPLNEXTSTARTUP;vyžaduje restart aplikace
-PREFERENCES_AUTLISLOW;Nízké
-PREFERENCES_AUTLISMAX;Maximální - průměr všech dlaždic
-PREFERENCES_AUTLISSTD;Vysoké
-PREFERENCES_AUTLISVLOW;Ne
-PREFERENCES_AUTLOW;Nízká
PREFERENCES_AUTOMONPROFILE;Použít barevný profil hlavního monitoru z operačního systému
PREFERENCES_AUTOSAVE_TP_OPEN;Před ukončením automaticky uložit\nstav sbalení/rozbalení nástrojů.
-PREFERENCES_AUTSTD;Běžná
PREFERENCES_BATCH_PROCESSING;Dávkové zpracování
PREFERENCES_BEHADDALL;Vše do 'Přidat'
PREFERENCES_BEHADDALLHINT;Nastaví všechny parametry do módu Přidat.\nZměna parametrů v panelu dávkového zpracování se aplikuje jako rozdíl k uloženým hodnotám.
@@ -1036,8 +1030,6 @@ PREFERENCES_DARKFRAMESHOTS;snímků
PREFERENCES_DARKFRAMETEMPLATES;šablony
PREFERENCES_DATEFORMAT;Formát data
PREFERENCES_DATEFORMATHINT;Lze použít následující formátovací řetězce:\n%y\t- rok (year)\n%m\t- měsíc (month)\n%d\t- den (day)\n\nNapříklad český formát data:\n%d. %m. %y
-PREFERENCES_DAUB_LABEL;Použít D6 Daubechiesové vlnky namísto D4
-PREFERENCES_DAUB_TOOLTIP;Nástroje Redukce šumu a Úrovně vlnky používají Daubechiesové mateřskou vlnku. Pokud místo D4 vyberete D6 zvýší se počet ortogonálních Daubechiesové koeficientů a pravděpodobně zvýší kvalitu úrovní malého měřítka. Není zde rozdíl ve spotřebě paměti nebo délce zpracování.
PREFERENCES_DIRDARKFRAMES;Složka tmavých snímků
PREFERENCES_DIRECTORIES;Složky
PREFERENCES_DIRHOME;Domovská složka
@@ -1047,7 +1039,6 @@ PREFERENCES_DIRSELECTDLG;Zvolte složku s obrázky při spuštění...
PREFERENCES_DIRSOFTWARE;Instalační složka
PREFERENCES_EDITORCMDLINE;Vlastní příkazová řádka
PREFERENCES_EDITORLAYOUT;Rozvržení editoru
-PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;Externí editor
PREFERENCES_FBROWSEROPTS;Volby prohlížeče souborů / náhledů
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Jednořádková lišta nástrojů v prohlížeči souborů\n(vypněte na nízkých rozlišeních)
@@ -1093,12 +1084,7 @@ PREFERENCES_INTENT_SATURATION;Nasycení
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Ukázat vložené JPEG náhledy u needitovaných snímků
PREFERENCES_LANG;Jazyk
PREFERENCES_LANGAUTODETECT;Použít systémový jazyk
-PREFERENCES_LEVAUTDN;Úroveň odšumění
-PREFERENCES_LEVDN;Velikost buňky
-PREFERENCES_LISS;Automatické více zónové vyhlazení
-PREFERENCES_MAX;Velká (dlaždice)
PREFERENCES_MAXRECENTFOLDERS;Maximální počet nedávných složek
-PREFERENCES_MED;Střední (Poloviční dlaždice)
PREFERENCES_MENUGROUPEXTPROGS;Skupina "Otevřít pomocí"
PREFERENCES_MENUGROUPFILEOPERATIONS;Skupina "Souborové operace"
PREFERENCES_MENUGROUPLABEL;Skupina "Barevné štítky"
@@ -1106,7 +1092,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Skupina "Operace s profily zpracování"
PREFERENCES_MENUGROUPRANK;Skupina "Hodnocení"
PREFERENCES_MENUOPTIONS;Volby místní nabídky
PREFERENCES_METADATA;Metadata
-PREFERENCES_MIN;Velmi malá (100x115)
PREFERENCES_MONINTENT;Výchozí reprodukční záměr
PREFERENCES_MONITOR;Monitor
PREFERENCES_MONPROFILE;Výchozí barevný profil
@@ -1115,7 +1100,6 @@ 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
PREFERENCES_NAVIGATIONFRAME;Navigátor
-PREFERENCES_NOISE;Redukce šumu
PREFERENCES_OUTDIR;Výstupní složka
PREFERENCES_OUTDIRFOLDER;Ulož do souboru
PREFERENCES_OUTDIRFOLDERHINT;Uložit obrázky do vybrané složky.
@@ -1151,8 +1135,6 @@ 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".
-PREFERENCES_RGBDTL_LABEL;Maximální počet vláken pro redukci šumu a úrovně vlnky
-PREFERENCES_RGBDTL_TOOLTIP;Pro automatické nastavení maximálního možného počtu vláken ponechte nastaveno na "0". Čím více vláken běží paralelně, tím rychlejší je výpočet. Paměťové nároky najdete na RawPedii.
PREFERENCES_SAVE_TP_OPEN_NOW;Uložit stav sbalení/rozbalení nástrojů hned
PREFERENCES_SELECTFONT;Vyberte hlavní písmo
PREFERENCES_SELECTFONT_COLPICKER;Vybrat písmo pro Průzkumníka barev
@@ -1167,41 +1149,30 @@ PREFERENCES_SHOWDATETIME;Zobrazovat datum a čas
PREFERENCES_SHOWEXPOSURECOMPENSATION;Přidat kompenzaci expozice
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Zobrazit lištu s filmovým pásem
PREFERENCES_SHTHRESHOLD;Práh oříznutých stínů
-PREFERENCES_SIMPLAUT;Režim nástrojů
PREFERENCES_SINGLETAB;Mód jedné karty editoru
PREFERENCES_SINGLETABVERTAB;Mód jedné karty editoru, svislé karty
-PREFERENCES_SMA;Malá (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Zpracování fronty dokončeno
PREFERENCES_SND_HELP;Vložte cestu k souboru pro nastavení zvuku nebo ponechte prázdné (bez zvuku).\nVe Windows zadejte "SystemDefault", "SystemAsterisk" a podobně.\nNa Linuxu použijte "complete", "window-attention" a další.
PREFERENCES_SND_LNGEDITPROCDONE;Zpracování v editoru dokončeno
PREFERENCES_SND_THRESHOLDSECS;Po sekundách
PREFERENCES_STARTUPIMDIR;Složka obrázků při spuštění
-PREFERENCES_STDAUT;Běžný
PREFERENCES_TAB_BROWSER;Prohlížeč souborů
PREFERENCES_TAB_COLORMGR;Správa barev
PREFERENCES_TAB_DYNAMICPROFILE;Pravidla dynamických profilů
PREFERENCES_TAB_GENERAL;Obecné
PREFERENCES_TAB_IMPROC;Zpracování obrázku
-PREFERENCES_TAB_PERFORMANCE;Výkon a kvalita
PREFERENCES_TAB_SOUND;Zvuky
PREFERENCES_THEME;Vzhled
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Vložený JPEG náhled
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Obrázek k zobrazení
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrální vykreslení raw
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Vložený JPEG náhled pokud je v plné velikosti, jinak neutrální raw
-PREFERENCES_TIMAX;Vysoký
-PREFERENCES_TINB;Počet dlaždic
-PREFERENCES_TISTD;Běžný
PREFERENCES_TP_LABEL;Panel nástrojů:
PREFERENCES_TP_USEICONORTEXT;V záhlaví karty zobrazit ikonu namísto textu
PREFERENCES_TP_VSCROLLBAR;Skrýt svislou posuvnou lištu
PREFERENCES_TUNNELMETADATA;Zkopírovat nezměněná Exif/IPTC/XMP metadata do výstupního souboru
PREFERENCES_USEBUNDLEDPROFILES;Použít přiložené profily
PREFERENCES_VIEW;Nastavení vyvážení bílé výstupních zařízení (monitor, TV, projektor, rámeček a jiné)
-PREFERENCES_WAVLEV;Zvýšit úroveň vlnkové transformace v nejvyšší kvalitě
-PREFERENCES_WLONE;Jedna úroveň
-PREFERENCES_WLTWO;Dvě úrovně
-PREFERENCES_WLZER;Ne
PREFERENCES_WORKFLOW;Rozvržení
PROFILEPANEL_COPYPPASTE;Parametry pro kopírování
PROFILEPANEL_GLOBALPROFILES;Přiložené profily
@@ -1870,7 +1841,6 @@ TP_RETINEX_FREEGAMMA;Volná gama
TP_RETINEX_GAIN;Zisk
TP_RETINEX_GAINOFFS;Zisk a posun (jasu)
TP_RETINEX_GAINTRANSMISSION;Přenos zisku
-TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Zesílí nebo zeslabí mapu přenosu pro dosažení jasu.\nÚsečka: přenos -min od 0. průměr. a hodnot (max).\nPořadnice: zisk.
TP_RETINEX_GAIN_TOOLTIP;Působí na obnovený obrázek.\n\nToto je velmi odlišné od ostatních nastavení. Použito pro černé nebo bílé pixely a pro vyvážení histogramu.
TP_RETINEX_GAMMA;Gama
TP_RETINEX_GAMMA_FREE;Volná
@@ -2226,6 +2196,8 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value.
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_235;B&W - CM - Auto
!HISTORY_MSG_237;B&W - CM
!HISTORY_MSG_273;CT - Color Balance SMH
@@ -2234,22 +2206,100 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
+!PARTIALPASTE_RAW_BORDER;Raw border
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
+!PREFERENCES_TAB_PERFORMANCE;Performance
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!TP_BWMIX_MIXC;Channel Mixer
!TP_BWMIX_NEUTRAL;Reset
-!TP_RAW_4PASS;4-Pass
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
+!TP_RAW_RCDVNG4;RCD+VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
+!TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain.
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 48871b32a..9e1d79191 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -557,7 +557,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -573,13 +573,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -976,10 +977,16 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -991,9 +998,56 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1024,11 +1078,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1065,6 +1120,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1120,6 +1176,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1127,6 +1184,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1138,17 +1196,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1186,13 +1239,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1225,12 +1275,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1238,7 +1283,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1247,13 +1291,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1267,8 +1312,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1278,36 +1321,26 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1335,6 +1368,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1660,10 +1694,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1710,6 +1740,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1797,6 +1833,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1812,15 +1850,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1870,10 +1911,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1897,7 +1940,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1981,6 +2024,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2074,7 +2119,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index d696da4dd..d9488295e 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -36,7 +36,7 @@
#35 2017-02-18 AWB bias (TooWaBoo) RT 5.0 r1
#36 2017-02-23 Korrekturen (TooWaBoo) RT 5.0 r1
#37 2017-03-06 Dynamisches Profil (TooWaBoo) RT 5.0 r1
-#38 2017-03-26 Pixel Shift (TooWaBoo) RT 5.0 r1
+#38 2017-03-26 Pixel-Shift (TooWaBoo) RT 5.0 r1
#39 06.04.2017 Fast Export (TooWaBoo) RT 5.0 r1
#40 30.04.2017 Erweiterung/Korrekturen (TooWaBoo) RT 5.0 r1
#41 03.05.2017 Erweiterung/Korrekturen (TooWaBoo) RT 5.0 r1
@@ -58,6 +58,17 @@
#57 17.05.2018 Erweiterung (TooWaBoo) RT 5.4
#58 19.05.2018 Erweiterung (TooWaBoo) RT 5.4
#59 29.05.2018 Erweiterung (TooWaBoo) RT 5.4
+#60 14.06.2018 Erweiterung (TooWaBoo) RT 5.4
+#61 14.06.2018 Korrektur (TooWaBoo) RT 5.4
+#62 22.06.2018 Korrektur (TooWaBoo) RT 5.4
+#63 24.06.2018 DCB/RCD+VNG4 (TooWaBoo) RT 5.4
+#64 24.06.2018 Erweiterung/Korrektur (TooWaBoo) RT 5.4
+#65 25.06.2018 Korrekturen (TooWaBoo) RT 5.4
+#66 04.07.2018 Erweiterung (TooWaBoo) RT 5.4
+#67 05.07.2018 Erweiterung (TooWaBoo) RT 5.4
+#68 05.07.2018 Erweiterung (TooWaBoo) RT 5.4
+#69 25.07.2018 Erweiterung (TooWaBoo) RT 5.4
+#70 25.07.2018 Korrekturen (TooWaBoo) RT 5.4
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@@ -88,11 +99,11 @@ CURVEEDITOR_NURBS;NURBS-Kurve
CURVEEDITOR_PARAMETRIC;Parametrisch
CURVEEDITOR_SAVEDLGLABEL;Kurve speichern...
CURVEEDITOR_SHADOWS;Schatten
-CURVEEDITOR_TOOLTIPCOPY;Kurve in Zwischenablage kopieren
-CURVEEDITOR_TOOLTIPLINEAR;Kurve zurücksetzen
-CURVEEDITOR_TOOLTIPLOAD;Kurve laden
-CURVEEDITOR_TOOLTIPPASTE;Kurve aus Zwischenablage einfügen
-CURVEEDITOR_TOOLTIPSAVE;Kurve speichern
+CURVEEDITOR_TOOLTIPCOPY;Kurve in Zwischenablage kopieren.
+CURVEEDITOR_TOOLTIPLINEAR;Kurve zurücksetzen.
+CURVEEDITOR_TOOLTIPLOAD;Kurve laden.
+CURVEEDITOR_TOOLTIPPASTE;Kurve aus Zwischenablage einfügen.
+CURVEEDITOR_TOOLTIPSAVE;Kurve speichern.
CURVEEDITOR_TYPE;Typ:
DIRBROWSER_FOLDERS;Ordner
DONT_SHOW_AGAIN;Meldung nicht mehr anzeigen.
@@ -106,7 +117,7 @@ DYNPROFILEEDITOR_NEW;Neu
DYNPROFILEEDITOR_NEW_RULE;Profilregel erstellen
DYNPROFILEEDITOR_PROFILE;Profil
EDITWINDOW_TITLE;Bildbearbeitung
-EDIT_OBJECT_TOOLTIP;Schaltet das Einstellungswerkzeug\nim 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
@@ -244,7 +255,7 @@ FILEBROWSER_SHOWCOLORLABEL5HINT;Nur violett markierte Bilder anzeigen\nTaste: d
FILEBROWSER_SHOWEDITEDHINT;Nur bearbeitete Bilder anzeigen\nTaste: 7
FILEBROWSER_SHOWEDITEDNOTHINT;Nur unbearbeitete Bilder anzeigen\nTaste: 6
-FILEBROWSER_SHOWEXIFINFO;Bildinformationen ein-/ausblenden\n\nIm Multi-Reitermodus:\nTaste: i\nIm Ein-Reitermodus:\nTaste: Alt + i
+FILEBROWSER_SHOWEXIFINFO;Bildinformationen ein-/ausblenden.\n\nIm Multi-Reitermodus:\nTaste: i\nIm Ein-Reitermodus:\nTaste: Alt + i
FILEBROWSER_SHOWNOTTRASHHINT;Nur nicht gelöschte Bilder anzeigen
FILEBROWSER_SHOWORIGINALHINT;Zeige nur das Originalbild.\n\nWenn mehrere Bilder mit dem gleichen Dateinamen und unterschiedlichen Dateitypen existieren, ist das Originalbild das Bild, welches in der Liste "Dateitypen anzeigen" unter Einstellungen > Dateiverwaltung als erstes gefunden wird.
FILEBROWSER_SHOWRANK1HINT;Nur mit 1 Stern bewertete Bilder anzeigen\nTaste: 1
@@ -281,7 +292,7 @@ GENERAL_DISABLED;Deaktiviert
GENERAL_ENABLE;Aktivieren
GENERAL_ENABLED;Aktiviert
GENERAL_FILE;Datei:
-GENERAL_LANDSCAPE;Quer
+GENERAL_LANDSCAPE;Landschaft
GENERAL_NA;n/a
GENERAL_NO;Nein
GENERAL_NONE;Keine
@@ -290,17 +301,19 @@ GENERAL_OPEN;Öffnen
GENERAL_PORTRAIT;Portrait
GENERAL_RESET;Zurücksetzen
GENERAL_SAVE;Speichern
+GENERAL_SAVE_AS;Speichern
GENERAL_SLIDER;Regler
GENERAL_UNCHANGED;(Unverändert)
GENERAL_WARNING;Warnung
GIMP_PLUGIN_INFO;Willkommen zum RawTherapee GIMP-Plugin!\nNach den Änderungen bitte das RawTherapee-Fenster schließen.\nDas Bild wird dann automatisch in GIMP importiert.
-HISTOGRAM_TOOLTIP_B;Blau-Histogramm ein-/ausblenden
-HISTOGRAM_TOOLTIP_BAR;RGB-Anzeigeleiste ein-/ausblenden\n\nZum Fixieren/Lösen der Anzeige muss mit der\nrechten Maustaste ins Bildfenster geklickt werden.
-HISTOGRAM_TOOLTIP_CHRO;Chromatizität-Histogramm ein/ausblenden
-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_B;Blau-Histogramm ein-/ausblenden.
+HISTOGRAM_TOOLTIP_BAR;RGB-Anzeigeleiste ein-/ausblenden.
+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_MODE;Schaltet zwischen linearer, logarithmischer-linearer und\nlogarithmischer-logarithmischer Skalierung um.
+HISTOGRAM_TOOLTIP_R;Rot-Histogramm ein-/ausblenden.
HISTOGRAM_TOOLTIP_RAW;Zwischen normalen Histogrammen und\nRAW-Histogrammen umschalten.
HISTORY_CHANGED;Geändert
HISTORY_CUSTOMCURVE;Benutzerdefiniert
@@ -601,7 +614,7 @@ HISTORY_MSG_293;(Filmsimulation)
HISTORY_MSG_294;(Filmsimulation)\nIntensität
HISTORY_MSG_295;(Filmsimulation) - Film
HISTORY_MSG_296;(Rauschreduzierung)\nLuminanzkurve
-HISTORY_MSG_297;(Rauschreduzierung)\nQualität
+HISTORY_MSG_297;(Rauschreduzierung)\nModus
HISTORY_MSG_298;(Vorverarbeitung)\nDead-Pixel-Filter
HISTORY_MSG_299;(Rauschreduzierung)\nChrominanzkurve
HISTORY_MSG_300;-
@@ -731,7 +744,7 @@ HISTORY_MSG_423;(Retinex) - Einstellungen\nGammasteigung
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
+HISTORY_MSG_427;(Farbmanagement)\nAusgabeprofil\nRendering-Intent
HISTORY_MSG_428;Monitor-Rendering-Intent
HISTORY_MSG_429;(Retinex) - Einstellungen\nDynamikkompression\nIterationen
HISTORY_MSG_430;(Retinex) - Einstellungen\nDynamikkompression\nTransmission Gradient
@@ -750,20 +763,20 @@ HISTORY_MSG_442;(Retinex) - Einstellungen\nTransmission - Skalierung
HISTORY_MSG_443;(Farbmanagement)\nAusgabeprofil\nSchwarzpunkt-Kompensation
HISTORY_MSG_444;(Weißabgleich)\nAWB-Temperatur-Korrektur
HISTORY_MSG_445;(Sensor-Matrix)\nFarbinterpolation\nUnterbild
-HISTORY_MSG_449;(Sensor-Matrix)\nFarbinterpolation\nISO-Anpassung
-HISTORY_MSG_452;(Sensor-Matrix)\nFarbinterpolation\nBewegungsmaske\nanzeigen
-HISTORY_MSG_453;(Sensor-Matrix)\nFarbinterpolation\nNur Maske anzeigen
-HISTORY_MSG_457;(Sensor-Matrix)\nFarbinterpolation\nBewegung im Rot/Blau-\nKanal erkennen
-HISTORY_MSG_462;(Sensor-Matrix)\nFarbinterpolation\nBewegung im Grün-\nKanal erkennen
-HISTORY_MSG_464;(Sensor-Matrix)\nFarbinterpolation\nUnschärfebewegungsmaske
-HISTORY_MSG_465;(Sensor-Matrix)\nFarbinterpolation\nUnschärferadius
-HISTORY_MSG_468;(Sensor-Matrix)\nFarbinterpolation\nLücken in der Bewegungs-\nmaske erkennen
-HISTORY_MSG_469;(Sensor-Matrix)\nFarbinterpolation\nMedian
-HISTORY_MSG_471;(Sensor-Matrix)\nFarbinterpolation\nBewegungskorrektur
-HISTORY_MSG_472;(Sensor-Matrix)\nFarbinterpolation\nWeicher Übergang
-HISTORY_MSG_473;(Sensor-Matrix)\nFarbinterpolation\nLMMSE für Bewegungs-\nteile verwenden
-HISTORY_MSG_474;(Sensor-Matrix)\nFarbinterpolation\nFrame-Helligkeit angleichen
-HISTORY_MSG_475;(Sensor-Matrix)\nFarbinterpolation)\nAusgleich pro Kanal
+HISTORY_MSG_449;(Sensor-Matrix)\nFarbinterpolation - PS\nISO-Anpassung
+HISTORY_MSG_452;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungsmaske\nanzeigen
+HISTORY_MSG_453;(Sensor-Matrix)\nFarbinterpolation - PS\nNur Maske anzeigen
+HISTORY_MSG_457;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegung im Rot/Blau-\nKanal erkennen
+HISTORY_MSG_462;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegung im Grün-\nKanal erkennen
+HISTORY_MSG_464;(Sensor-Matrix)\nFarbinterpolation - PS\nUnschärfebewegungsmaske
+HISTORY_MSG_465;(Sensor-Matrix)\nFarbinterpolation - PS\nUnschärferadius
+HISTORY_MSG_468;(Sensor-Matrix)\nFarbinterpolation - PS\nLücken in der Bewegungs-\nmaske erkennen
+HISTORY_MSG_469;(Sensor-Matrix)\nFarbinterpolation - PS\nMedian
+HISTORY_MSG_471;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungskorrektur
+HISTORY_MSG_472;(Sensor-Matrix)\nFarbinterpolation - PS\nWeicher Übergang
+HISTORY_MSG_473;(Sensor-Matrix)\nFarbinterpolation - PS\nLMMSE für Bewegungs-\nteile verwenden
+HISTORY_MSG_474;(Sensor-Matrix)\nFarbinterpolation - PS\nFrame-Helligkeit angleichen
+HISTORY_MSG_475;(Sensor-Matrix)\nFarbinterpolation - PS\nAusgleich pro Kanal
HISTORY_MSG_476;(CIECAM02)\nBetrachtungsbed.\nFarbtemperatur
HISTORY_MSG_477;(CIECAM02)\nBetrachtungsbed.\nTönung
HISTORY_MSG_478;(CIECAM02)\nBetrachtungsbed.\nYb% (Ø Luminanz)
@@ -784,7 +797,14 @@ HISTORY_MSG_492;(RGB-Kurven)
HISTORY_MSG_493;(L*a*b*)
HISTORY_MSG_CLAMPOOG;(Belichtung) - Farben\nauf Farbraum beschränken
HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b* - Farbkorrektur
+HISTORY_MSG_DUALDEMOSAIC_CONTRAST;(Sensor-Matrix)\nFarbinterpolation\nKontrastschwelle
HISTORY_MSG_HISTMATCHING;(Belichtung)\nAuto-Tonwertkurve
+HISTORY_MSG_ICM_OUTPUT_PRIMARIES;(Farbmanagement)\nAusgabeprofil\nVorlagen
+HISTORY_MSG_ICM_OUTPUT_TEMP;(Farbmanagement)\nAusgabeprofil\nIccV4-Illuminant D
+HISTORY_MSG_ICM_OUTPUT_TYPE;(Farbmanagement)\nAusgabeprofil\nTyp
+HISTORY_MSG_ICM_WORKING_GAMMA;(Farbmanagement)\nArbeitsfarbraum\nGamma
+HISTORY_MSG_ICM_WORKING_SLOPE;(Farbmanagement)\nArbeitsfarbraum\nSteigung
+HISTORY_MSG_ICM_WORKING_TRC_METHOD;(Farbmanagement)\nArbeitsfarbraum\nFarbtonkennlinie
HISTORY_MSG_LOCALCONTRAST_AMOUNT;(Lokaler Kontrast)\nIntensität
HISTORY_MSG_LOCALCONTRAST_DARKNESS;(Lokaler Kontrast)\nDunkle Bereiche
HISTORY_MSG_LOCALCONTRAST_ENABLED;(Lokaler Kontrast)
@@ -792,15 +812,61 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;(Lokaler Kontrast)\nHelle Bereiche
HISTORY_MSG_LOCALCONTRAST_RADIUS;(Lokaler Kontrast)\nRadius
HISTORY_MSG_METADATA_MODE;(Metadaten)\nKopiermodus
HISTORY_MSG_MICROCONTRAST_CONTRAST;(Mikrokontrast)\nKontrastschwelle
+HISTORY_MSG_PIXELSHIFT_DEMOSAIC;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungsmethode
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nRichtung
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter
HISTORY_MSG_PRSHARPEN_CONTRAST;(Skalieren) - Schärfen\nKontrastschwelle
+HISTORY_MSG_RAW_BORDER;(Sensor-Matrix)\nFarbinterpolation\nBildrand
+HISTORY_MSG_RESIZE_ALLOWUPSCALING;(Skalieren)\nHochskalieren zulassen
HISTORY_MSG_SHARPENING_CONTRAST;(Schärfung)\nKontrastschwelle
+HISTORY_MSG_SOFTLIGHT_ENABLED;(Weiches Licht)
+HISTORY_MSG_SOFTLIGHT_STRENGTH;(Weiches Licht)\nIntensität
HISTORY_MSG_TM_FATTAL_ANCHOR;(Dynamikkompression)\nHelligkeitsverschiebung
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s
HISTORY_SNAPSHOT;Schnappschuss
HISTORY_SNAPSHOTS;Schnappschüsse
+ICCPROFCREATOR_COPYRIGHT;Copyright:
+ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Auf den vorgegebenen Copyright-Text zurücksetzen.
+ICCPROFCREATOR_CUSTOM;Benutzerdefiniert
+ICCPROFCREATOR_DESCRIPTION;Beschreibung:
+ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Füge Gamma- und Steigungswerte der Beschreibung hinzu
+ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Wenn leer, wird die Standardbeschreibung verwendet.
+ICCPROFCREATOR_GAMMA;Gamma
+ICCPROFCREATOR_ICCVERSION;ICC-Version:
+ICCPROFCREATOR_ILL;Illuminant:
+ICCPROFCREATOR_ILL_41;D41
+ICCPROFCREATOR_ILL_50;D50
+ICCPROFCREATOR_ILL_55;D55
+ICCPROFCREATOR_ILL_60;D60
+ICCPROFCREATOR_ILL_65;D65
+ICCPROFCREATOR_ILL_80;D80
+ICCPROFCREATOR_ILL_DEF;Vorgabe
+ICCPROFCREATOR_ILL_INC;StdA 2856K
+ICCPROFCREATOR_ILL_TOOLTIP;Illuminant kann nur bei ICC-v4-Profilen\nverwendet werden.
+ICCPROFCREATOR_PRIMARIES;Vorlage:
+ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+ICCPROFCREATOR_PRIM_BEST;BestRGB
+ICCPROFCREATOR_PRIM_BETA;BetaRGB
+ICCPROFCREATOR_PRIM_BLUX;Blau X
+ICCPROFCREATOR_PRIM_BLUY;Blau Y
+ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+ICCPROFCREATOR_PRIM_GREX;Grün X
+ICCPROFCREATOR_PRIM_GREY;Grün Y
+ICCPROFCREATOR_PRIM_PROPH;Prophoto
+ICCPROFCREATOR_PRIM_REC2020;Rec2020
+ICCPROFCREATOR_PRIM_REDX;Rot X
+ICCPROFCREATOR_PRIM_REDY;Rot Y
+ICCPROFCREATOR_PRIM_SRGB;sRGB
+ICCPROFCREATOR_PRIM_TOOLTIP;Benutzerdefinierte Vorlagen können nur\nbei ICC-v4-Profilen verwendet werden.
+ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+ICCPROFCREATOR_PROF_V2;ICC v2
+ICCPROFCREATOR_PROF_V4;ICC v4
+ICCPROFCREATOR_SAVEDIALOG_TITLE;ICC-Profile speichern unter ...
+ICCPROFCREATOR_SLOPE;Steigung
+ICCPROFCREATOR_TRC_PRESET;Farbtonkennlinie:
IPTCPANEL_CATEGORY;Kategorie
IPTCPANEL_CATEGORYHINT;Beschreibt das Thema des Bildes nach\nMeinung des Anbieters.
IPTCPANEL_CITY;Stadt
@@ -848,16 +914,17 @@ LENSPROFILE_CORRECTION_LCPFILE;LCP-Datei
LENSPROFILE_CORRECTION_MANUAL;Benutzerdefiniert (Lensfun)
LENSPROFILE_LENS_WARNING;Warnung: Der Cropfaktor des Profils entspricht nicht dem des Objektivs.\nDies kann zu einem fehlerhaften Ergebnis führen.
MAIN_BUTTON_FULLSCREEN;Vollbild\nTaste: F11
+MAIN_BUTTON_ICCPROFCREATOR;ICC-Profil erstellen
MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F4\n\nNavigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F4
MAIN_BUTTON_NAVPREV_TOOLTIP;Navigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F3\n\nNavigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F3
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: x\n\nWie oben, jedoch ohne Löschung aktiver Filter. Das\nMiniaturbild des geöffneten Bildes wird nicht angezeigt,\nwenn es herausgefiltert wurde.\nTaste: y
MAIN_BUTTON_PREFERENCES;Einstellungen
-MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Bild zur Warteschlange hinzufügen\nTaste: Strg + b
-MAIN_BUTTON_SAVE_TOOLTIP;Bild speichern\nTaste: Strg + s
+MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Bild zur Warteschlange hinzufügen.\nTaste: Strg + b
+MAIN_BUTTON_SAVE_TOOLTIP;Bild speichern.\nTaste: Strg + s\nProfil (.pp3) speichern.\nTaste: Strg + Umschalt + s
MAIN_BUTTON_SENDTOEDITOR;Bild im externen Editor öffnen
-MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Bild im externen Editor öffnen\nTaste: Strg + e
-MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Alle seitlichen Bedienfelder ein-/ausblenden\nTaste: m
-MAIN_BUTTON_UNFULLSCREEN;Vollbild beenden\nTaste: F11
+MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Bild im externen Editor öffnen.\nTaste: Strg + e
+MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Alle seitlichen Bedienfelder ein-/ausblenden.\nTaste: m
+MAIN_BUTTON_UNFULLSCREEN;Vollbild beenden.\nTaste: F11
MAIN_FRAME_BATCHQUEUE;Warteschlange
MAIN_FRAME_BATCHQUEUE_TOOLTIP;Warteschlange\nTaste: Strg + F3
MAIN_FRAME_EDITOR;Editor
@@ -904,25 +971,26 @@ MAIN_TAB_TRANSFORM;Transformieren
MAIN_TAB_TRANSFORM_TOOLTIP;Taste: Alt + t
MAIN_TAB_WAVELET;Wavelet
MAIN_TAB_WAVELET_TOOLTIP;Taste: Alt + w
-MAIN_TOOLTIP_BACKCOLOR0;Hintergrundfarbe der Vorschau basierend auf dem: Oberflächendesign\nTaste: 9
+MAIN_TOOLTIP_BACKCOLOR0;Hintergrundfarbe der Vorschau basierend auf dem Oberflächendesign.\nTaste: 9
MAIN_TOOLTIP_BACKCOLOR1;Hintergrundfarbe der Vorschau: Schwarz\nTaste: 9
MAIN_TOOLTIP_BACKCOLOR2;Hintergrundfarbe der Vorschau: Weiß\nTaste: 9
MAIN_TOOLTIP_BACKCOLOR3;Hintergrundfarbe der Vorschau: Mittleres Grau\nTaste: 9
MAIN_TOOLTIP_BEFOREAFTERLOCK;Vorher-Ansicht: Sperren / Entsperren\n\nGesperrt: Friert die Vorher-Ansicht ein, so\ndass sich die Gesamtwirkung mehrerer\nBearbeitungsschritte beurteilen lässt.\n\nEntsperrt: Die Vorher-Ansicht hinkt dem\naktuellen Bild immer einen Bearbeitungs-\nschritt hinterher.
-MAIN_TOOLTIP_HIDEHP;Linkes Bedienfeld ein-/ausblenden\nTaste: l
-MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten\nTaste: <
-MAIN_TOOLTIP_INDCLIPPEDS;Anzeige zu dunkler Bereiche ein-/ausschalten\nTaste: >
+MAIN_TOOLTIP_HIDEHP;Linkes Bedienfeld ein-/ausblenden.\nTaste: l
+MAIN_TOOLTIP_INDCLIPPEDH;Anzeige zu heller Bereiche ein-/ausschalten.\nTaste: <
+MAIN_TOOLTIP_INDCLIPPEDS;Anzeige zu dunkler Bereiche ein-/ausschalten.\nTaste: >
MAIN_TOOLTIP_PREVIEWB;Vorschau Blau-Kanal\nTaste: b
MAIN_TOOLTIP_PREVIEWFOCUSMASK;Vorschau Fokusmaske\nTaste: Umschalt + f\n\nPräziser bei Bildern mit geringer Tiefenschärfe,\nniedrigem Rauschen und bei hoher Vergrößerung.
MAIN_TOOLTIP_PREVIEWG;Vorschau Grün-Kanal\nTaste: g
MAIN_TOOLTIP_PREVIEWL;Vorschau Helligkeit\nTaste: v\n\n0.299·R + 0.587·G + 0.114·B
MAIN_TOOLTIP_PREVIEWR;Vorschau Rot-Kanal\nTaste: r
-MAIN_TOOLTIP_QINFO;Bildinformationen ein-/ausblenden\nTaste: i
-MAIN_TOOLTIP_SHOWHIDELP1;Linkes Bedienfeld ein-/ausblenden\nTaste: l
-MAIN_TOOLTIP_SHOWHIDERP1;Rechtes Bedienfeld ein-/ausblenden\nTaste: Alt + l
-MAIN_TOOLTIP_SHOWHIDETP1;Oberes Bedienfeld ein-/ausblenden\nTaste: Umschalt + l
+MAIN_TOOLTIP_PREVIEWSHARPMASK;Schärfungs-Kontroll-Maske ein-/ausschalten.\n\nFunktioniert nur bei aktivierter Schärfung\nund Zoom >= 100%.
+MAIN_TOOLTIP_QINFO;Bildinformationen ein-/ausblenden.\nTaste: i
+MAIN_TOOLTIP_SHOWHIDELP1;Linkes Bedienfeld ein-/ausblenden.\nTaste: l
+MAIN_TOOLTIP_SHOWHIDERP1;Rechtes Bedienfeld ein-/ausblenden.\nTaste: Alt + l
+MAIN_TOOLTIP_SHOWHIDETP1;Oberes Bedienfeld ein-/ausblenden.\nTaste: Umschalt + l
MAIN_TOOLTIP_THRESHOLD;Schwelle
-MAIN_TOOLTIP_TOGGLE;Vorher/Nachher-Ansicht ein-/ausschalten\nTaste: Umschalt + b
+MAIN_TOOLTIP_TOGGLE;Vorher/Nachher-Ansicht ein-/ausschalten.\nTaste: Umschalt + b
MONITOR_PROFILE_SYSTEM;Systemvorgabe
NAVIGATOR_B;B:
NAVIGATOR_G;G:
@@ -960,7 +1028,7 @@ PARTIALPASTE_DIRPYRDENOISE;Rauschreduzierung
PARTIALPASTE_DIRPYREQUALIZER;Detailebenenkontrast
PARTIALPASTE_DISTORTION;Verzeichnungskorrektur
PARTIALPASTE_EPD;Tonwertkorrektur
-PARTIALPASTE_EQUALIZER;Anzahl der Ebenen
+PARTIALPASTE_EQUALIZER;Wavelet
PARTIALPASTE_EVERYTHING;Alle Parameter aktivieren / deaktivieren
PARTIALPASTE_EXIFCHANGES;Änderungen an Exif-Daten
PARTIALPASTE_EXPOSURE;Belichtung
@@ -987,6 +1055,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Vorverarbeitung: Dead-Pixel-Filter
PARTIALPASTE_PREPROCESS_GREENEQUIL;Vorverarbeitung: Grün-Ausgleich
PARTIALPASTE_PREPROCESS_HOTPIXFILT;Vorverarbeitung: Hot-Pixel-Filter
PARTIALPASTE_PREPROCESS_LINEDENOISE;Vorverarbeitung: Zeilenrauschfilter
+PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;Vorverarbeitung: PDAF-Zeilenfilter
PARTIALPASTE_PRSHARPENING;Schärfung nach Größenänderung
PARTIALPASTE_RAWCACORR_AUTO;Chromatische Aberration: Automatische Korrektur
PARTIALPASTE_RAWCACORR_CAREDBLUE;Chromatische Aberration: Rot & Blau
@@ -994,13 +1063,14 @@ PARTIALPASTE_RAWEXPOS_BLACK;Weißpunkt: Schwarzpegel
PARTIALPASTE_RAWEXPOS_LINEAR;Weißpunkt: Korrekturfaktor
PARTIALPASTE_RAWEXPOS_PRESER;Weißpunkt: Lichter schützen (EV)
PARTIALPASTE_RAWGROUP;RAW
+PARTIALPASTE_RAW_BORDER;Farbinterpolation: Bildrand
PARTIALPASTE_RAW_DCBENHANCE;Farbinterpolation: DCB-Verbesserung
PARTIALPASTE_RAW_DCBITERATIONS;Farbinterpolation: Anzahl der DCB-Iterationen
PARTIALPASTE_RAW_DMETHOD;Farbinterpolation: Methode
PARTIALPASTE_RAW_FALSECOLOR;Farbinterpolation: Falschfarbenreduzierung
PARTIALPASTE_RAW_IMAGENUM;Farbinterpolation: Unterbild
PARTIALPASTE_RAW_LMMSEITERATIONS;Farbinterpolation: LMMSE-Verbesserungsstufen
-PARTIALPASTE_RAW_PIXELSHIFT;Farbinterpolation: Pixel Shift
+PARTIALPASTE_RAW_PIXELSHIFT;Farbinterpolation: Pixel-Shift
PARTIALPASTE_RESIZE;Skalieren
PARTIALPASTE_RETINEX;Retinex (Bildschleier entfernen)
PARTIALPASTE_RGBCURVES;RGB-Kurven
@@ -1009,6 +1079,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Schatten/Lichter
PARTIALPASTE_SHARPENEDGE;Kantenschärfung
PARTIALPASTE_SHARPENING;Schärfung
PARTIALPASTE_SHARPENMICRO;Mikrokontrast
+PARTIALPASTE_SOFTLIGHT;Weiches Licht
PARTIALPASTE_TM_FATTAL;Dynamikkompression
PARTIALPASTE_VIBRANCE;Dynamik
PARTIALPASTE_VIGNETTING;Vignettierungskorrektur
@@ -1016,14 +1087,8 @@ PARTIALPASTE_WAVELETGROUP;Wavelet
PARTIALPASTE_WHITEBALANCE;Weißabgleich
PREFERENCES_ADD;HINZU
PREFERENCES_APPLNEXTSTARTUP;erfordert Neustart
-PREFERENCES_AUTLISLOW;Niedrig
-PREFERENCES_AUTLISMAX;Max.-Durchschnitt aller Kacheln
-PREFERENCES_AUTLISSTD;Hoch
-PREFERENCES_AUTLISVLOW;Keine
-PREFERENCES_AUTLOW;Niedrig
-PREFERENCES_AUTOMONPROFILE;Automatisch das für den aktuellen Monitor festgelegte Profil verwenden.
+PREFERENCES_AUTOMONPROFILE;Automatisch das für den aktuellen Monitor festgelegte Profil verwenden
PREFERENCES_AUTOSAVE_TP_OPEN;Werkzeugstatus vor dem Beenden automatisch speichern
-PREFERENCES_AUTSTD;Standard
PREFERENCES_BATCH_PROCESSING;Stapelverarbeitung
PREFERENCES_BEHADDALL;Alle hinzufügen
PREFERENCES_BEHADDALLHINT;Setzt alle Parameter auf Hinzufügen.\nAnpassungen der Parameter in der Hintergrundstapelverarbeitung werden als Deltas zu den gespeicherten Werten interpretiert.
@@ -1074,8 +1139,6 @@ PREFERENCES_DARKFRAMESHOTS;Aufnahmen
PREFERENCES_DARKFRAMETEMPLATES;Vorlagen
PREFERENCES_DATEFORMAT;Format
PREFERENCES_DATEFORMATHINT;Die folgenden Variablen können verwendet werden:\n%y : Jahr\n%m : Monat\n%d : Tag\n\nBeispiele:\n%d.%m.%y (übliche deutsche Datumsschreibweise)\n%y-%m-%d (Datumsformat nach ISO 8601 und EN 28601)
-PREFERENCES_DAUB_LABEL;Benutze Daubechies D6-Wavelets anstatt D4
-PREFERENCES_DAUB_TOOLTIP;Rauschreduzierung und Waveletebenen verwenden ein Debauchies Mutter-Wavelet. Wenn Sie D6 statt D4 wählen, erhöhen Sie die Anzahl der orthogonalen Daubechies-Koeffizienten, was die Qualität bei niedrigen Ebenen verbessern kann. Es gibt keinen Unterschied zwischen D4 und D6 im Speicherverbrauch oder in der Verarbeitungszeit.
PREFERENCES_DIRDARKFRAMES;Dunkelbild-Verzeichnis
PREFERENCES_DIRECTORIES;Verzeichnisse
PREFERENCES_DIRHOME;Benutzer-Verzeichnis
@@ -1085,7 +1148,6 @@ PREFERENCES_DIRSELECTDLG;Wähle das Bild-Verzeichnis beim Programmstart...
PREFERENCES_DIRSOFTWARE;Installationsverzeichnis
PREFERENCES_EDITORCMDLINE;Benutzerdefinierte Befehlszeile
PREFERENCES_EDITORLAYOUT;Editor-Layout
-PREFERENCES_EXPAUT;Experte
PREFERENCES_EXTERNALEDITOR;Externer Editor
PREFERENCES_FBROWSEROPTS;Bildinformationen und Miniaturbilder
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Einzeilige Toolbar\n(Bei geringer Bildschirmauflösung deaktivieren)
@@ -1116,7 +1178,7 @@ 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\nHaupthistogramms, andernfalls das des gammakorrigierten\nAusgangsprofil, verwendet.
+PREFERENCES_HISTOGRAM_TOOLTIP;Wenn aktiviert wird das Arbeitsprofil für die Darstellung\ndes Haupthistogramms verwendet, andernfalls das des\ngammakorrigierten Ausgangsprofil.
PREFERENCES_HLTHRESHOLD;Lichter - Schwelle
PREFERENCES_ICCDIR;ICC-Profile-Verzeichnis
PREFERENCES_IMG_RELOAD_NEEDED;Änderungen werden nur auf neu geöffnete Bilder angewendet
@@ -1131,12 +1193,7 @@ PREFERENCES_INTENT_SATURATION;Sättigung
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Zeige das eingebettete JPEG als Miniaturbild, wenn die RAW-Datei noch nicht editiert wurde
PREFERENCES_LANG;Sprache
PREFERENCES_LANGAUTODETECT;Systemsprache verwenden
-PREFERENCES_LEVAUTDN;Rauschreduzierungsstufe
-PREFERENCES_LEVDN;Zellengröße
-PREFERENCES_LISS;Automatische Glättung bei Mehrfachzonen
-PREFERENCES_MAX;Maxi (Kachel)
PREFERENCES_MAXRECENTFOLDERS;Maximale Anzahl der letzten Dateien
-PREFERENCES_MED;Medium (Kachel/2)
PREFERENCES_MENUGROUPEXTPROGS;Untermenü "Öffnen mit"
PREFERENCES_MENUGROUPFILEOPERATIONS;Untermenü Dateioperationen
PREFERENCES_MENUGROUPLABEL;Untermenü Farbmarkierung
@@ -1144,7 +1201,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Untermenü Profiloperationen
PREFERENCES_MENUGROUPRANK;Untermenü Bewertung
PREFERENCES_MENUOPTIONS;Menüoptionen
PREFERENCES_METADATA;Metadaten
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;Standard-Rendering-Intent
PREFERENCES_MONITOR;Monitor
PREFERENCES_MONPROFILE;Standardfarbprofil
@@ -1153,9 +1209,8 @@ PREFERENCES_MULTITAB;Multi-Reitermodus
PREFERENCES_MULTITABDUALMON;Multi-Reitermodus (auf zweitem Monitor, wenn verfügbar)
PREFERENCES_NAVGUIDEBRUSH;Farbe der Navigationshilfe
PREFERENCES_NAVIGATIONFRAME;Navigation
-PREFERENCES_NOISE;Rauschreduzierung
PREFERENCES_OUTDIR;Ausgabeverzeichnis
-PREFERENCES_OUTDIRFOLDER;In dieses Verzeichnis speichern
+PREFERENCES_OUTDIRFOLDER;In dieses 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%f, %d1, %d2, ..., %p1, %p2, ..., %r, %s1, %s2, ...\n\nDiese Variablen beinhalten bestimmte Teile des Verzeichnispfades, in welchem sich das Bild befindet, oder Attribute des Bildes.\n\nWenn zum Beispiel /home/tom/photos/2010-10-31/dsc0042.nef geöffnet wurde, dann haben die Variablen den folgenden Inhalt:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31\n%p2 = /home/tom/photos\n%p3 = /home/tom\n%p4 = /home\n\nWenn Sie die Ausgabedatei in dasselbe Verzeichnis wie das Originalbild speichern wollen, dann wählen Sie:\n%p1/%f\n\nWenn Sie die Ausgabedatei in ein Unterverzeichnis mit dem Namen "converted" schreiben wollen, dann wählen Sie:\n%p1/converted/%f\n\nWenn Sie die Ausgabedatei im Verzeichnispfad "/home/tom/photos/converted" speichern wollen, dort jedoch in einem mit dem Namen des Ursprungsverzeichnisses betitelten Unterverzeichnis, dann wählen Sie:\n%p2/converted/%d1/%f\n\nDie Variable %r enthält die Bewertung des Bildes.
@@ -1177,10 +1232,10 @@ PREFERENCES_PRINTER;Drucker (Soft-Proofing)
PREFERENCES_PROFILEHANDLING;Behandlung der Bearbeitungsprofile
PREFERENCES_PROFILELOADPR;Priorität der Profile beim Laden
PREFERENCES_PROFILEPRCACHE;Bearbeitungsprofil im Festplatten-Cache
-PREFERENCES_PROFILEPRFILE;Bearbeitungsprofil, welches geladener Datei beiliegt (Sidecar)
-PREFERENCES_PROFILESAVEBOTH;Verarbeitungsparameter im Festplatten-Cache und zusammen mit der Datei speichern
+PREFERENCES_PROFILEPRFILE;Bearbeitungsprofil welches dem geladenen Bild beiliegt (Sidecar)
+PREFERENCES_PROFILESAVEBOTH;Verarbeitungsparameter im Festplatten-Cache und zusammen mit dem Bild speichern
PREFERENCES_PROFILESAVECACHE;Verarbeitungsparameter im Festplatten-Cache speichern
-PREFERENCES_PROFILESAVEINPUT;Verarbeitungsparameter zusammen mit Datei speichern (Sidecar)
+PREFERENCES_PROFILESAVEINPUT;Verarbeitungsparameter zusammen mit dem Bild speichern (Sidecar)
PREFERENCES_PROFILESAVELOCATION;Speicherort der Profile
PREFERENCES_PROFILE_NONE;Kein Farbprofil
PREFERENCES_PROPERTY;Eigenschaft
@@ -1189,8 +1244,6 @@ 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\ndes vorangegangenen Bildes.\n\nFunktioniert nur unter folgenden Bedingungen:\nEin-Reitermodus aktiv\n“Demosaikmethode für 100%-Ansicht“ muss auf “Wie im Bild-\nverarbeitungsprofil vorgegeben“ eingestellt sein.
-PREFERENCES_RGBDTL_LABEL;Maximale Anzahl Threads für Rauschreduzierung
-PREFERENCES_RGBDTL_TOOLTIP;Die Rauschreduzierung benötigt mindestens 128MB RAM für ein 10 Megapixel-Bild oder 512MB für ein 40 Megapixel-Bild, und zusätzlich 128MB RAM pro Thread. Je mehr Threads parallel ablaufen, desto schneller ist die Berechnung. Bei Einstellung "0" werden so viele Threads wie möglich benutzt.
PREFERENCES_SAVE_TP_OPEN_NOW;Werkzeugstatus jetzt speichern
PREFERENCES_SELECTFONT;Schriftart
PREFERENCES_SELECTFONT_COLPICKER;Schriftart für die Farbwähler
@@ -1205,41 +1258,30 @@ PREFERENCES_SHOWDATETIME;Datum und Uhrzeit anzeigen
PREFERENCES_SHOWEXPOSURECOMPENSATION;Belichtungskorrektur anfügen
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Toolbar oberhalb des Filmstreifens anzeigen
PREFERENCES_SHTHRESHOLD;Schatten - Schwelle
-PREFERENCES_SIMPLAUT;Werkzeugmodus
PREFERENCES_SINGLETAB;Ein-Reitermodus
PREFERENCES_SINGLETABVERTAB;Ein-Reitermodus (vertikale Reiter)
-PREFERENCES_SMA;Klein (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Warteschlange abgearbeitet
PREFERENCES_SND_HELP;Geben Sie einen Pfad zu einer Sounddatei oder einen Systemklang ein.\n\nBeispiel Systemklänge:\nWindows: SystemDefault, SystemAsterisk ...\nLinux: complete, window-attention ...\n
PREFERENCES_SND_LNGEDITPROCDONE;Bearbeitung abgeschlossen
PREFERENCES_SND_THRESHOLDSECS;Verzögerung in Sekunden
PREFERENCES_STARTUPIMDIR;Bildverzeichnis beim Programmstart
-PREFERENCES_STDAUT;Standard
PREFERENCES_TAB_BROWSER;Dateiverwaltung
PREFERENCES_TAB_COLORMGR;Farbmanagement
PREFERENCES_TAB_DYNAMICPROFILE;Dynamisches Profil
PREFERENCES_TAB_GENERAL;Allgemein
PREFERENCES_TAB_IMPROC;Bildbearbeitung
-PREFERENCES_TAB_PERFORMANCE;Performance & Qualität
PREFERENCES_TAB_SOUND;Klänge
PREFERENCES_THEME;Oberflächendesign
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Eingebundenes JPEG
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Bildanzeige
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrales RAW-Bild
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Eingebundenes JPEG wenn in Originalgröße, sonst neutrales RAW-Bild
-PREFERENCES_TIMAX;Hoch
-PREFERENCES_TINB;Anzahl Kacheln
-PREFERENCES_TISTD;Standard
PREFERENCES_TP_LABEL;Werkzeugbereich:
PREFERENCES_TP_USEICONORTEXT;Symbole statt Text in Karteireitern
PREFERENCES_TP_VSCROLLBAR;Keine vertikale Scrollbar
PREFERENCES_TUNNELMETADATA;Exif/XMP unverändert in die Ausgabedatei übernehmen.
PREFERENCES_USEBUNDLEDPROFILES;Standardprofile verwenden
PREFERENCES_VIEW;Weißabgleich-Einstellung des Ausgabegerätes (Monitor, TV, Projektor, usw.)
-PREFERENCES_WAVLEV;Die Qualität von Waveletebenen erhöhen
-PREFERENCES_WLONE;Eine Ebene
-PREFERENCES_WLTWO;Zwei Ebenen
-PREFERENCES_WLZER;Nein
PREFERENCES_WORKFLOW;Layout
PROFILEPANEL_COPYPPASTE;Zu kopierende Parameter
PROFILEPANEL_GLOBALPROFILES;Standardprofile
@@ -1256,10 +1298,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 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.
+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...
@@ -1278,7 +1320,7 @@ QINFO_FRAMECOUNT;%2 Frames
QINFO_HDR;HDR / %2 Frame(s)
QINFO_ISO;ISO
QINFO_NOEXIF;Keine Exif-Daten vorhanden.
-QINFO_PIXELSHIFT;Pixel Shift / %2 Frame(s)
+QINFO_PIXELSHIFT;Pixel-Shift / %2 Frame(s)
SAMPLEFORMAT_0;Unbekanntes Datenformat
SAMPLEFORMAT_1;8 Bit ohne Vorzeichen
SAMPLEFORMAT_2;16 Bit ohne Vorzeichen
@@ -1314,18 +1356,18 @@ THRESHOLDSELECTOR_HINT;Umschalt-Taste halten, um individuelle\nKontrollpu
THRESHOLDSELECTOR_T;Oben
THRESHOLDSELECTOR_TL;Oben-Links
THRESHOLDSELECTOR_TR;Oben-Rechts
-TOOLBAR_TOOLTIP_COLORPICKER;Farbwähler\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 auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
-TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: c\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
+TOOLBAR_TOOLTIP_COLORPICKER;Farbwähler\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 auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
+TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen.\nTaste: c\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
TOOLBAR_TOOLTIP_HAND;Hand-Werkzeug\nTaste: h
TOOLBAR_TOOLTIP_STRAIGHTEN;Ausrichten / Drehen\nTaste: s\n\nRichtet das Bild entlang einer Leitlinie aus.
-TOOLBAR_TOOLTIP_WB;Weißabgleich manuell setzen\nTaste: w
+TOOLBAR_TOOLTIP_WB;Weißabgleich manuell setzen.\nTaste: w
TP_BWMIX_ALGO;OYCPM-Algorithmus
TP_BWMIX_ALGO_LI;Linear
TP_BWMIX_ALGO_SP;Spezialeffekte
-TP_BWMIX_ALGO_TOOLTIP;Linear liefert ein lineares Ergebnis\nSpezialeffekte liefert einen speziellen Effekt durch Mischen von Kanälen.
+TP_BWMIX_ALGO_TOOLTIP;Linear liefert ein lineares Ergebnis.\nSpezialeffekte liefert einen speziellen Effekt durch Mischen von Kanälen.
TP_BWMIX_AUTOCH;Auto
TP_BWMIX_CC_ENABLED;Komplemantärfarbe anpassen
-TP_BWMIX_CC_TOOLTIP;Aktiviert die automatische Anpassung der\nKomplementä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
@@ -1389,36 +1431,36 @@ TP_CHMIXER_GREEN;Grün-Kanal
TP_CHMIXER_LABEL;RGB-Kanalmixer
TP_CHMIXER_RED;Rot-Kanal
TP_CHROMATABERR_LABEL;Chromatische Aberration
-TP_COARSETRAF_TOOLTIP_HFLIP;Horizontal spiegeln
-TP_COARSETRAF_TOOLTIP_ROTLEFT;Nach links drehen\nTaste: [
-TP_COARSETRAF_TOOLTIP_ROTRIGHT;Nach rechts drehen\nTaste: ]
-TP_COARSETRAF_TOOLTIP_VFLIP;Vertikal spiegeln
+TP_COARSETRAF_TOOLTIP_HFLIP;Horizontal spiegeln.
+TP_COARSETRAF_TOOLTIP_ROTLEFT;Nach links drehen.\nTaste: [
+TP_COARSETRAF_TOOLTIP_ROTRIGHT;Nach rechts drehen.\nTaste: ]
+TP_COARSETRAF_TOOLTIP_VFLIP;Vertikal spiegeln.
TP_COLORAPP_ADAPTSCENE;Luminanz (cd/m²)
-TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute Luminanz der Szenenleuchstärket\n(normalerweise 2000cd/m²)
+TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute Luminanz der Szenenleuchstärket\n(normalerweise 2000cd/m²).
TP_COLORAPP_ADAPTVIEWING;Luminanz (cd/m²)
-TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolute Luminanz der Betrachtungsumgebung\n(normalerweise 16cd/m²)
+TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolute Luminanz der Betrachtungsumgebung\n(normalerweise 16cd/m²).
TP_COLORAPP_ADAP_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), werden die optimalen\nWerte aus den Exif-Daten automatisch berechnet.
TP_COLORAPP_ALGO;Algorithmus
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\nund allen Parametern
+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_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\nvon 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\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_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\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_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
@@ -1428,18 +1470,18 @@ TP_COLORAPP_CURVEEDITOR3_TOOLTIP;Korrigiert Buntheit, Sättigung oder Farbigkeit
TP_COLORAPP_DATACIE;CIECAM02-Ausgabe-Histogramm in\nKurven anzeigen
TP_COLORAPP_DATACIE_TOOLTIP;Wenn aktiviert, zeigen die Histogramme\nder CIECAM02-Kurven die angenäherten\nWerte/Bereiche für J oder Q und C, S oder M\nNACH den CIECAM02-Anpassungen an. Das\nbetrifft nicht das Haupt-Histogramm.\n\nWenn deaktiviert, zeigen die Histogramme\nder CIECAM02-Kurven die L*a*b*-Werte\nVOR den CIECAM02-Anpassungen an.
TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Wenn aktiviert (empfohlen), wird ein optimaler\nWert berechnet, der von CAT02 und CIECAM02\nverwendet wird.\nUm den Wert manuell zu setzen, muss die Option\ndeaktiviert sein (Werte über 64 sind empfohlen).
-TP_COLORAPP_DEGREE_TOOLTIP;Umfang der “CIE Chromatic Adaptation Transform 2002“
+TP_COLORAPP_DEGREE_TOOLTIP;Umfang der “CIE Chromatic Adaptation Transform 2002“.
TP_COLORAPP_FREE;Farbtemperatur + Tönung + CAT02 + [Ausgabe]
TP_COLORAPP_GAMUT;Gamutkontrolle (L*a*b*)
TP_COLORAPP_GAMUT_TOOLTIP;Gamutkontrolle im L*a*b*-Modus erlauben.
TP_COLORAPP_HUE;Farbton (H)
-TP_COLORAPP_HUE_TOOLTIP;Farbton (H) - Winkel zwischen 0° und 360°
+TP_COLORAPP_HUE_TOOLTIP;Farbton (H) - Winkel zwischen 0° und 360°.
TP_COLORAPP_LABEL;CIE Color Appearance Model 2002
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\nvon 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;Weißabgleich [RT] + [Ausgabe]:\nRT's Weißabgleich wird für die Szene verwendet,\nCIECAM02 auf D50 gesetzt und der Weißabgleich\ndes Ausgabegerätes kann unter:\nEinstellungen > Farb-Management\neingestellt werden.\n\nWeißabgleich [RT+CAT02] + [Ausgabe]:\nRT's Weißabgleich wird für CAT02 verwendet und\nder Weißabgleich des Ausgabegerätes kann unter\nEinstellungen > Farb-Management\neingestellt werden.
TP_COLORAPP_NEUTRAL;Zurücksetzen
@@ -1478,7 +1520,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
@@ -1508,7 +1550,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\nKurven 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
@@ -1524,7 +1566,7 @@ TP_CROP_GUIDETYPE;Hilfslinien:
TP_CROP_H;Höhe
TP_CROP_LABEL;Ausschnitt
TP_CROP_PPI;PPI=
-TP_CROP_SELECTCROP;Ausschnitt wählen
+TP_CROP_SELECTCROP;Ausschnitt wählen.
TP_CROP_W;Breite
TP_CROP_X;x
TP_CROP_Y;y
@@ -1568,10 +1610,10 @@ TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_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_MAIN_GAMMA;Gamma
TP_DIRPYRDENOISE_MAIN_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_MAIN_MODE;Qualität
-TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Hoch
-TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Standard
-TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;Einstellung der Qualität der Rauschreduzierung.\nDie Einstellung “Hoch“ verbessert die Rausch-\nreduzierung auf Kosten der Verarbeitungszeit.
+TP_DIRPYRDENOISE_MAIN_MODE;Modus
+TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Aggressiv
+TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Konservativ
+TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;"Konservativ" bewahrt Tieffrequenz-Chroma-Muster,\nwährend "Aggressiv" sie entfernt.
TP_DIRPYRDENOISE_MEDIAN_METHOD;Methode
TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;Nur Farbe
TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;L*a*b*
@@ -1636,8 +1678,8 @@ TP_EXPOSURE_HISTMATCHING_TOOLTIP;Passt Regler und Kurven (mit Ausnahme der Belic
TP_EXPOSURE_LABEL;Belichtung
TP_EXPOSURE_SATURATION;Sättigung
TP_EXPOSURE_TCMODE_FILMLIKE;Filmähnlich
-TP_EXPOSURE_TCMODE_LABEL1;Tonwertkurve 1 Modus
-TP_EXPOSURE_TCMODE_LABEL2;Tonwertkurve 2 Modus
+TP_EXPOSURE_TCMODE_LABEL1;Tonwertkurve 1: Modus
+TP_EXPOSURE_TCMODE_LABEL2;Tonwertkurve 2: Modus
TP_EXPOSURE_TCMODE_LUMINANCE;Luminanz
TP_EXPOSURE_TCMODE_PERCEPTUAL;Wahrnehmungsabhängig
TP_EXPOSURE_TCMODE_SATANDVALBLENDING;Sättigung und Überlagerung
@@ -1670,12 +1712,12 @@ TP_GRADIENT_CENTER_X_TOOLTIP;Ankerpunkt der Rotationsachse X:\n-100 = linker Bil
TP_GRADIENT_CENTER_Y;Rotationsachse Y
TP_GRADIENT_CENTER_Y_TOOLTIP;Ankerpunkt der Rotationsachse Y:\n-100 = oberer Bildrand\n0 = Bildmitte\n+100 = unterer Bildrand
TP_GRADIENT_DEGREE;Rotationswinkel
-TP_GRADIENT_DEGREE_TOOLTIP;Rotationswinkel in Grad
+TP_GRADIENT_DEGREE_TOOLTIP;Rotationswinkel in Grad.
TP_GRADIENT_FEATHER;Bereich
-TP_GRADIENT_FEATHER_TOOLTIP;Bereich des Verlaufs in Prozent der Bilddiagonalen
+TP_GRADIENT_FEATHER_TOOLTIP;Bereich des Verlaufs in Prozent der Bilddiagonalen.
TP_GRADIENT_LABEL;Grauverlaufsfilter
TP_GRADIENT_STRENGTH;Intensität
-TP_GRADIENT_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen
+TP_GRADIENT_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen.
TP_HLREC_BLEND;Überlagerung
TP_HLREC_CIELAB;CIELab-Überlagerung
TP_HLREC_COLOR;Farbübertragung
@@ -1702,20 +1744,20 @@ TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpoliert
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\nDCP/ICC-Eingangsfarbprofil, welches präziser als\neine einfache Matrix ist
+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_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\neingebettet 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_INPUTNONE_TOOLTIP;Kein Eingangsfarbprofil verwenden.
TP_ICM_INPUTPROFILE;Eingangsfarbprofil
TP_ICM_LABEL;Farbmanagement
TP_ICM_NOICM;Kein ICM: sRGB-Ausgabe
TP_ICM_OUTPUTPROFILE;Ausgabeprofil
-TP_ICM_PROFILEINTENT;Rendering Intent
+TP_ICM_PROFILEINTENT;Rendering-Intent
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.
@@ -1723,6 +1765,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Speichert das lineare TIFF-Bild bevor das\nEingangs
TP_ICM_TONECURVE;Tonwertkurve
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_ICM_WORKING_TRC;Farbtonkennlinie:
+TP_ICM_WORKING_TRC_CUSTOM;Benutzerdefiniert
+TP_ICM_WORKING_TRC_GAMMA;Gamma
+TP_ICM_WORKING_TRC_NONE;Keine
+TP_ICM_WORKING_TRC_SLOPE;Steigung
+TP_ICM_WORKING_TRC_TOOLTIP;Nur für die mitgelieferten\nProfile möglich.
TP_IMPULSEDENOISE_LABEL;Impulsrauschreduzierung
TP_IMPULSEDENOISE_THRESH;Schwelle
TP_LABCURVE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
@@ -1779,24 +1827,24 @@ TP_METADATA_MODE;Kopiermodus
TP_METADATA_STRIP;Keine
TP_METADATA_TUNNEL;Unveränderte Daten
TP_NEUTRAL;Zurücksetzen
-TP_NEUTRAL_TIP;Belichtungseinstellungen auf\nneutrale 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
TP_PCVIGNETTE_ROUNDNESS;Form
TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Form:\n0 = Rechteck\n50 = Ellipse\n100 = Kreis
TP_PCVIGNETTE_STRENGTH;Intensität
-TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen (bezogen auf die Bildecken)
+TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen (bezogen auf die Bildecken).
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\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_DEADPIXFILT_TOOLTIP;Entfernt tote Pixel.
TP_PREPROCESS_GREENEQUIL;Grün-Ausgleich
TP_PREPROCESS_HOTPIXFILT;Hot-Pixel-Filter
-TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Entfernt Hot-Pixel
+TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Entfernt Hot-Pixel.
TP_PREPROCESS_LABEL;Vorverarbeitung
TP_PREPROCESS_LINEDENOISE;Zeilenrauschfilter
TP_PREPROCESS_LINEDENOISE_DIRECTION;Richtung
@@ -1825,17 +1873,23 @@ TP_RAWEXPOS_LINEAR;Korrekturfaktor
TP_RAWEXPOS_PRESER;Weißpunkt: Lichter schützen
TP_RAWEXPOS_RGB;Rot, Grün, Blau
TP_RAWEXPOS_TWOGREEN;Grün-Werte automatisch angleichen
-TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-TP_RAW_3PASSBEST;3-Pass (Beste)
+TP_RAW_1PASSMEDIUM;1-Pass (Markesteijn)
+TP_RAW_2PASS;1-Pass + schnell
+TP_RAW_3PASSBEST;3-Pass (Markesteijn)
+TP_RAW_4PASS;3-Pass + schnell
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
+TP_RAW_AMAZEVNG4;AMaZE + VNG4
+TP_RAW_BORDER;Bildrand
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB-Verbesserung
TP_RAW_DCBITERATIONS;Anzahl der DCB-Iterationen
+TP_RAW_DCBVNG4;DCB + VNG4
TP_RAW_DMETHOD;Methode
TP_RAW_DMETHOD_PROGRESSBAR;%1 verarbeitet
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaikoptimierung
-TP_RAW_DMETHOD_TOOLTIP;IGV und LMMSE sind speziel für High-ISO-Aufnahmen um die\nRauschreduzierung zu unterstützen ohne zu Maze-Mustern,\nPosterisierung oder einem ausgewaschenen Look zu führen.\n\nPixel Shift ist für “Pentax Pixel Shift“-Dateien. Für "Nicht-Pixel-\nShift"-Dateien wird automatisch AMaZE verwendet.
+TP_RAW_DMETHOD_TOOLTIP;IGV und LMMSE sind speziel für High-ISO-Aufnahmen um die\nRauschreduzierung zu unterstützen ohne zu Maze-Mustern,\nPosterisierung oder einem ausgewaschenen Look zu führen.\n\nPixel-Shift ist für “Pentax Pixel-Shift“-Dateien. Für "Nicht-Pixel-\nShift"-Dateien wird automatisch AMaZE verwendet.
+TP_RAW_DUALDEMOSAICCONTRAST;Kontrastschwelle
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;Falschfarbenreduzierung
TP_RAW_FAST;Schnell
@@ -1844,16 +1898,17 @@ TP_RAW_HD_TOOLTIP;Je niedriger der Wert, umso empfindlicher reagiert\ndie “Hot
TP_RAW_HPHD;HPHD
TP_RAW_IGV;IGV
TP_RAW_IMAGENUM;Unterbild
-TP_RAW_IMAGENUM_TOOLTIP;Einige RAW-Formate enthalten mehrere Unterbilder (Pentax Pixel Shift,\nPentax 3-in-1 HDR, Canon Dual Pixel).\n\n> Auswahl des zu verwendenden Unterbildes (nicht bei Pixel Shift).\n\n> Legt das Unterbild für die Bewegungsbereiche bei Pixel Shift fest.
+TP_RAW_IMAGENUM_TOOLTIP;Einige RAW-Formate enthalten mehrere Unterbilder (Pentax Pixel-Shift,\nPentax 3-in-1 HDR, Canon Dual Pixel).\n\n> Auswahl des zu verwendenden Unterbildes (nicht bei Pixel-Shift).\n\n> Legt das Unterbild für die Bewegungsbereiche bei Pixel-Shift fest.
TP_RAW_LABEL;Farbinterpolation
TP_RAW_LMMSE;LMMSE
TP_RAW_LMMSEITERATIONS;LMMSE-Verbesserungsstufen
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_MONO;Mono
TP_RAW_NONE;Keine
-TP_RAW_PIXELSHIFT;Pixel Shift
+TP_RAW_PIXELSHIFT;Pixel-Shift
TP_RAW_PIXELSHIFTADAPTIVE;Adaptive Erkennung
TP_RAW_PIXELSHIFTBLUR;Unschärfebewegungsmaske
+TP_RAW_PIXELSHIFTDMETHOD;Bewegungsmethode
TP_RAW_PIXELSHIFTEPERISO;Empfindlichkeit
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;Der Standardwert 0 wird für die Basis-ISO empfohlen.\nHöhere Werte erhöhen die Empfindlichkeit der Bewegungserkennung.\nVerändern Sie den Wert in kleinen Schritten und beobachten Sie die\nBewegungsmaske. Erhöhen Sie die Empfindlichkeit für unterbelichtete\noder High-ISO-Bilder.
TP_RAW_PIXELSHIFTEQUALBRIGHT;Frame-Helligkeit angleichen
@@ -1863,7 +1918,7 @@ TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Gleicht die Helligkeit der Frames an den ak
TP_RAW_PIXELSHIFTEXP0;Experimentell
TP_RAW_PIXELSHIFTGREEN;Bewegung im Grün-Kanal erkennen
TP_RAW_PIXELSHIFTHOLEFILL;Lücken in der Bewegungsmaske erkennen
-TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Lücken in der Bewegungsmaske erkennen
+TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Lücken in der Bewegungsmaske erkennen.
TP_RAW_PIXELSHIFTLMMSE;LMMSE für Bewegungsbereiche verwenden
TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;LMMSE anstatt AMaZE für bewegte Bildbereiche verwenden.\nSinnvoll bei High-ISO-Aufnahmen.
TP_RAW_PIXELSHIFTMASKTHRESHOLD;3x3 new threshold
@@ -1900,10 +1955,12 @@ TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
TP_RAW_RCD;RCD
+TP_RAW_RCDVNG4;RCD + VNG4
TP_RAW_SENSOR_BAYER_LABEL;Sensor mit Bayer-Matrix
-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_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.\n\n"+ schnell" erzeugt weniger Artefakte in kontrast-\narmen Bereichen.
TP_RAW_SENSOR_XTRANS_LABEL;Sensor mit X-Trans-Matrix
TP_RAW_VNG4;VNG4
+TP_RESIZE_ALLOW_UPSCALING;Hochskalieren zulassen
TP_RESIZE_APPLIESTO;Anwenden auf:
TP_RESIZE_CROPPEDAREA;Ausschnitt
TP_RESIZE_FITBOX;Begrenzungsrahmen
@@ -1969,7 +2026,7 @@ TP_RETINEX_MEDIAN;Medianfilter
TP_RETINEX_METHOD;Methode
TP_RETINEX_METHOD_TOOLTIP;Schatten wirkt sich auf dunkle Bereiche aus.\n\nSchatten / Lichter wirkt sich auf dunkle und helle Bereiche aus.\n\nLichter wirkt sich auf helle Bereiche aus.\n\nSpitzlichter 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_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\nauf ihre Standardwerte zurück.
@@ -2007,7 +2064,7 @@ TP_RGBCURVES_LUMAMODE_TOOLTIP;Der Helligkeitsmodus ändert die Helligkeit
TP_RGBCURVES_RED;R
TP_ROTATE_DEGREE;Winkel
TP_ROTATE_LABEL;Drehen
-TP_ROTATE_SELECTLINE;Leitlinie wählen
+TP_ROTATE_SELECTLINE;Leitlinie wählen.
TP_SAVEDIALOG_OK_TIP;Taste: Strg + Enter
TP_SHADOWSHLIGHTS_HIGHLIGHTS;Lichter
TP_SHADOWSHLIGHTS_HLTONALW;Tonwertbreite Lichter
@@ -2042,6 +2099,8 @@ TP_SHARPENMICRO_CONTRAST;Kontrastschwelle
TP_SHARPENMICRO_LABEL;Mikrokontrast
TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
+TP_SOFTLIGHT_LABEL;Weiches Licht
+TP_SOFTLIGHT_STRENGTH;Intensität
TP_TM_FATTAL_AMOUNT;Intensität
TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung
TP_TM_FATTAL_LABEL;Dynamikkompression
@@ -2053,7 +2112,7 @@ TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Rot / Violett
TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE2;Rot
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
@@ -2103,7 +2162,7 @@ TP_WAVELET_CHCU;Kurve
TP_WAVELET_CHR;Farb-Kontrast-Verknüpfung
TP_WAVELET_CHRO;Ebenengrenze Gesättigte/Pastellfarben
TP_WAVELET_CHRO_TOOLTIP;Waveletebene (n) die, die Grenze zwischen gesättigten und Pastellfarben bestimmt.\n1-n: Gesättigte Farben\nn-9: Pastellfarben\n\nIst der Wert größer als die vorgegebene Anzahl an Waveletebenen werden diese ignoriert.
-TP_WAVELET_CHR_TOOLTIP;Farbton als Funktion des Kontrasts und der Farb-Kontrast-Verknüpfung
+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
@@ -2116,15 +2175,15 @@ TP_WAVELET_CONTR;Gamut
TP_WAVELET_CONTRA;Kontrast
TP_WAVELET_CONTRAST_MINUS;Kontrast -
TP_WAVELET_CONTRAST_PLUS;Kontrast +
-TP_WAVELET_CONTRA_TOOLTIP;Ändert den Kontrast des Restbildes
+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)\n50%: Durchschnittlicher lokaler Kontrast (Werte zwischen 100 - 300)\n66%: Standardabweichung des Lokalen Kontrasts (Werte zwischen 300 - 800)\n100%: 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\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\nam Ende der Waveletverarbeitung an.\n
+TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Wendet eine Kontrasthelligkeitskurve\nam Ende der Waveletverarbeitung an.
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
@@ -2199,7 +2258,7 @@ TP_WAVELET_NPTYPE_TOOLTIP;Dieser Algorithmus verwendet ein Pixel und acht\nseine
TP_WAVELET_OPACITY;Deckkraft Blau / Gelb
TP_WAVELET_OPACITYW;Kontrastausgleichskurve
TP_WAVELET_OPACITYWL;Lokale Kontrastkurve
-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_OPACITYWL_TOOLTIP;Wendet eine lokale Kontrastkurve am\nEnde der Wavelet-Verarbeitung an.\n\nLinks stellt den niedrigsten, rechts den\nhöchsten Kontrast dar.
TP_WAVELET_PASTEL;Pastellfarben
TP_WAVELET_PROC;Verarbeitung
TP_WAVELET_RE1;Schärfung verstärken
@@ -2293,9 +2352,11 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
-!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
-!TP_RAW_4PASS;4-Pass
-!TP_RAW_AMAZEVNG4;AMaZE+VNG4
-!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
-!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
+!PREFERENCES_TAB_PERFORMANCE;Performance
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 9ba753ef5..9fdef1914 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -2,7 +2,7 @@ EXPORT_BYPASS_RAW_CCSTEPS;Bypass [raw] False Colour Suppression
FILEBROWSER_COLORLABEL_TOOLTIP;Colour label.\n\nUse dropdown menu or shortcuts:\nShift-Ctrl-0 No Colour\nShift-Ctrl-1 Red\nShift-Ctrl-2 Yellow\nShift-Ctrl-3 Green\nShift-Ctrl-4 Blue\nShift-Ctrl-5 Purple
FILEBROWSER_POPUPCOLORLABEL;Colour label
FILEBROWSER_SHOWUNCOLORHINT;Show images without a colour label.\nShortcut: Alt-0
-FILECHOOSER_FILTER_COLPROF;Colour profiles
+FILECHOOSER_FILTER_COLPROF;Colour profiles (*.icc)
HISTORY_MSG_46;Colour denoising
HISTORY_MSG_69;Working colour space
HISTORY_MSG_70;Output colour space
@@ -24,8 +24,9 @@ HISTORY_MSG_322;W - Gamut - Avoid colour shift
HISTORY_MSG_385;W - Residual - Colour Balance
HISTORY_MSG_392;W - Residual - Colour Balance
HISTORY_MSG_419;Retinex - Colour space
-HISTORY_MSG_CLAMPOOG;Out-of-gamut colour clipping
+HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colours
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Colour correction
+HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid colour shift
MAIN_TAB_COLOR;Colour
MAIN_TOOLTIP_BACKCOLOR0;Background colour of the preview: Theme-based\nShortcut: 9
MAIN_TOOLTIP_BACKCOLOR1;Background colour of the preview: Black\nShortcut: 9
@@ -99,6 +100,7 @@ TP_LABCURVE_AVOIDCOLORSHIFT;Avoid colour shift
TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colours into gamut of the working colour space and apply Munsell correction.
TP_PCVIGNETTE_FEATHER_TOOLTIP;Feathering:\n0 = corners only,\n50 = halfway to centre,\n100 = to centre.
TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controls defringe strength by colour.\nHigher = more,\nLower = less.
+TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid colour shift
TP_RAW_FALSECOLOR;False colour suppression steps
TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Equalize the brightness of the frames to the brightness of the selected frame.\nIf there are overexposed areas in the frames select the brightest frame to avoid magenta colour cast in overexposed areas or enable motion correction.
TP_RGBCURVES_LUMAMODE_TOOLTIP;Luminosity mode allows to vary the contribution of R, G and B channels to the luminosity of the image, without altering image colour.
@@ -343,16 +345,17 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!GENERAL_PORTRAIT;Portrait
!GENERAL_RESET;Reset
!GENERAL_SAVE;Save
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
!HISTOGRAM_TOOLTIP_B;Show/Hide blue histogram.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
!HISTOGRAM_TOOLTIP_G;Show/Hide green histogram.
!HISTOGRAM_TOOLTIP_L;Show/Hide CIELab luminance histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_R;Show/Hide red histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_CHANGED;Changed
@@ -815,7 +818,13 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -827,12 +836,58 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!HISTORY_SNAPSHOT;Snapshot
!HISTORY_SNAPSHOTS;Snapshots
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!IPTCPANEL_CATEGORY;Category
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITY;City
@@ -880,12 +935,13 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PREFERENCES;Preferences
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
@@ -942,6 +998,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: i
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
@@ -1009,6 +1066,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1016,6 +1074,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1030,19 +1089,14 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PARTIALPASTE_VIGNETTING;Vignetting correction
!PARTIALPASTE_WHITEBALANCE;White balance
!PREFERENCES_ADD;Add
!PREFERENCES_APPLNEXTSTARTUP;restart required
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1087,8 +1141,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_DARKFRAMETEMPLATES;templates
!PREFERENCES_DATEFORMAT;Date format
!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y - year\n%m - month\n%d - day\n\nFor example, the ISO 8601 standard dictates the date format as follows:\n%y-%m-%d
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_DIRHOME;Home directory
@@ -1098,7 +1150,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_DIRSOFTWARE;Installation directory
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_EXTERNALEDITOR;External Editor
!PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
@@ -1141,26 +1192,19 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPPROFILEOPERATIONS;Group "Processing profile operations"
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!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
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OUTDIR;Output Directory
!PREFERENCES_OUTDIRFOLDER;Save to folder
!PREFERENCES_OUTDIRFOLDERHINT;Save images to the selected folder.
@@ -1176,6 +1220,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list.
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1195,8 +1241,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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".
-!PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTLANG;Select language
@@ -1210,40 +1254,30 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
!PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
!PREFERENCES_STARTUPIMDIR;Image Directory at Startup
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_BROWSER;File Browser
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_GENERAL;General
!PREFERENCES_TAB_IMPROC;Image Processing
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1293,6 +1327,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
!SAVEDLG_FILEFORMAT;File format
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_JPEGQUAL;JPEG quality
!SAVEDLG_PUTTOQUEUE;Put into processing queue
@@ -1623,10 +1658,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_FLATFIELD_BT_VERTICAL;Vertical
!TP_FLATFIELD_CLIPCONTROL;Clip control
!TP_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER_X_TOOLTIP;Shift gradient to the left (negative values) or right (positive values).
!TP_GRADIENT_CENTER_Y_TOOLTIP;Shift gradient up (negative values) or down (positive values).
@@ -1677,6 +1708,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
!TP_ICM_WORKINGPROFILE;Working Profile
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_BRIGHTNESS;Lightness
@@ -1760,6 +1797,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1775,15 +1813,18 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@@ -1833,10 +1874,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1866,7 +1909,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1974,6 +2017,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2062,7 +2107,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
@@ -2195,7 +2240,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
-!TP_WBALANCE_SPOTWB;Spot WB
+!TP_WBALANCE_SPOTWB;Use the pipette to pick the white balance from a neutral patch in the preview.
!TP_WBALANCE_TEMPBIAS;AWB temperature bias
!TP_WBALANCE_TEMPBIAS_TOOLTIP;Allows to alter the computation of the "auto white balance"\nby biasing it towards warmer or cooler temperatures. The bias\nis expressed as a percentage of the computed temperature,\nso that the result is given by "computedTemp + computedTemp * bias".
!TP_WBALANCE_TEMPERATURE;Temperature
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 88254c317..944457486 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -206,7 +206,7 @@
!FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n+ - Multiple Editor Tabs Mode,\nAlt-+ - Single Editor Tab Mode.
!FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n- - Multiple Editor Tabs Mode,\nAlt-- - Single Editor Tab Mode.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -234,16 +234,17 @@
!GENERAL_PORTRAIT;Portrait
!GENERAL_RESET;Reset
!GENERAL_SAVE;Save
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
!HISTOGRAM_TOOLTIP_B;Show/Hide blue histogram.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
!HISTOGRAM_TOOLTIP_G;Show/Hide green histogram.
!HISTOGRAM_TOOLTIP_L;Show/Hide CIELab luminance histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_R;Show/Hide red histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_CHANGED;Changed
@@ -726,10 +727,16 @@
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -741,12 +748,59 @@
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!HISTORY_SNAPSHOT;Snapshot
!HISTORY_SNAPSHOTS;Snapshots
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!IPTCPANEL_CATEGORY;Category
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITY;City
@@ -794,12 +848,13 @@
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PREFERENCES;Preferences
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
@@ -861,6 +916,7 @@
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: i
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
@@ -931,6 +987,7 @@
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -938,6 +995,7 @@
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -953,20 +1011,15 @@
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PARTIALPASTE_VIGNETTING;Vignetting correction
!PARTIALPASTE_WHITEBALANCE;White balance
!PREFERENCES_ADD;Add
!PREFERENCES_APPLNEXTSTARTUP;restart required
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1013,8 +1066,6 @@
!PREFERENCES_DARKFRAMETEMPLATES;templates
!PREFERENCES_DATEFORMAT;Date format
!PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y - year\n%m - month\n%d - day\n\nFor example, the ISO 8601 standard dictates the date format as follows:\n%y-%m-%d
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_DIRHOME;Home directory
@@ -1024,7 +1075,6 @@
!PREFERENCES_DIRSOFTWARE;Installation directory
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_EXTERNALEDITOR;External Editor
!PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
@@ -1070,12 +1120,7 @@
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1083,7 +1128,6 @@
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1092,7 +1136,6 @@
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OUTDIR;Output Directory
!PREFERENCES_OUTDIRFOLDER;Save to folder
!PREFERENCES_OUTDIRFOLDERHINT;Save images to the selected folder.
@@ -1108,6 +1151,8 @@
!PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list.
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1128,8 +1173,6 @@
!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".
-!PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1144,41 +1187,31 @@
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
!PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
!PREFERENCES_STARTUPIMDIR;Image Directory at Startup
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_BROWSER;File Browser
!PREFERENCES_TAB_COLORMGR;Color Management
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_GENERAL;General
!PREFERENCES_TAB_IMPROC;Image Processing
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1228,6 +1261,7 @@
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
!SAVEDLG_FILEFORMAT;File format
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_JPEGQUAL;JPEG quality
!SAVEDLG_PUTTOQUEUE;Put into processing queue
@@ -1596,10 +1630,6 @@
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1660,6 +1690,12 @@
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
!TP_ICM_WORKINGPROFILE;Working Profile
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1747,6 +1783,8 @@
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1762,15 +1800,18 @@
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@@ -1822,10 +1863,12 @@
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1855,7 +1898,7 @@
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1964,6 +2007,8 @@
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2060,7 +2105,7 @@
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
@@ -2195,7 +2240,7 @@
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
-!TP_WBALANCE_SPOTWB;Spot WB
+!TP_WBALANCE_SPOTWB;Use the pipette to pick the white balance from a neutral patch in the preview.
!TP_WBALANCE_TEMPBIAS;AWB temperature bias
!TP_WBALANCE_TEMPBIAS_TOOLTIP;Allows to alter the computation of the "auto white balance"\nby biasing it towards warmer or cooler temperatures. The bias\nis expressed as a percentage of the computed temperature,\nso that the result is given by "computedTemp + computedTemp * bias".
!TP_WBALANCE_TEMPERATURE;Temperature
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 5f4866261..8560fd93c 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -821,8 +821,6 @@ PREFERENCES_PROFILESAVECACHE;Guardar perfiles de procesamiento en memoria interm
PREFERENCES_PROFILESAVEINPUT;Guardar perfiles de procesamiento junto con imagen de entrada
PREFERENCES_PROPERTY;Propiedad
PREFERENCES_PSPATH;Carpeta de instalación de Adobe Photoshop
-PREFERENCES_RGBDTL_LABEL;Número máximo de hilos para reducción de ruido
-PREFERENCES_RGBDTL_TOOLTIP;La Reducción de Ruido requiere como base 128MB de RAM para una imagen de 10MPix o 512MB para una imagen de 40MPix; más 128MB RAM por hilo de proceso.\nMientras más hilos corren en paralelo, más rápido es el procesamiento. Coloque “0” para que automáticamente se use tantos hilos como sea posible según la capacidad de su equipo.
PREFERENCES_SELECTFONT;Seleccionar fuente
PREFERENCES_SELECTLANG;Seleccionar idioma
PREFERENCES_SELECTTHEME;Seleccionar tema
@@ -842,7 +840,6 @@ PREFERENCES_TAB_BROWSER;Explorador de archivos
PREFERENCES_TAB_COLORMGR;Gestión del color
PREFERENCES_TAB_GENERAL;General
PREFERENCES_TAB_IMPROC;Procesamiento de imágenes
-PREFERENCES_TAB_PERFORMANCE;Rendimiento
PREFERENCES_TAB_SOUND;Sonidos
PREFERENCES_TP_LABEL;Panel de herramientas:
PREFERENCES_TP_USEICONORTEXT;Usar iconos de pestaña en lugar de texto
@@ -1507,7 +1504,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1517,8 +1514,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
@@ -1706,10 +1705,16 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1721,8 +1726,55 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1752,11 +1804,13 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@@ -1775,19 +1829,16 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PARTIALPASTE_GRADIENT;Graduated filter
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CMMBPC;Black point compensation
@@ -1803,11 +1854,8 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1819,22 +1867,17 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1853,23 +1896,14 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1882,6 +1916,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
@@ -1956,6 +1991,12 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LABCURVE_CURVEEDITOR_CC;CC
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
@@ -1976,14 +2017,19 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -2027,7 +2073,9 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -2043,7 +2091,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2110,6 +2158,8 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2182,7 +2232,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index 59a73eee7..e3559ff98 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -558,7 +558,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -574,13 +574,14 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -977,10 +978,16 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -992,9 +999,56 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1025,11 +1079,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1066,6 +1121,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1121,6 +1177,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1128,6 +1185,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1139,17 +1197,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1187,13 +1240,10 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1226,12 +1276,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1239,7 +1284,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1248,13 +1292,14 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1268,8 +1313,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1279,36 +1322,26 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1336,6 +1369,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1661,10 +1695,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1711,6 +1741,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1798,6 +1834,8 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1813,15 +1851,18 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1871,10 +1912,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1898,7 +1941,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1982,6 +2025,8 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2075,7 +2120,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 8ab919cc2..a20f9251d 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -201,7 +201,7 @@ FILEBROWSER_UNRANK_TOOLTIP;Effacer le rang\nRaccourci: Shift-0
FILEBROWSER_ZOOMINHINT;Augmenter la taille des vignettes.\nRaccourci: +\n\nRaccourcis dans le mode Éditeur Unique: Alt-+
FILEBROWSER_ZOOMOUTHINT;Diminuer la taille des vignettes.\nRaccourci: -\n\nRaccourcis dans le mode Éditeur Unique: Alt--
FILECHOOSER_FILTER_ANY;Tous les fichiers
-FILECHOOSER_FILTER_COLPROF;Profils couleur
+FILECHOOSER_FILTER_COLPROF;Profils couleur (*.icc)
FILECHOOSER_FILTER_CURVE;Fichiers de courbe
FILECHOOSER_FILTER_LCP;Profils de correction d'objectif
FILECHOOSER_FILTER_PP;Fichiers de traitement
@@ -228,6 +228,7 @@ GENERAL_OK;OK
GENERAL_OPEN;Ouvrir
GENERAL_PORTRAIT;Portrait
GENERAL_SAVE;Enregistrer
+GENERAL_SAVE_AS;Enregistrer sous...
GENERAL_SLIDER;Curseur
GENERAL_UNCHANGED;(Inchangé)
GENERAL_WARNING;Attention
@@ -725,6 +726,46 @@ HISTORY_NEWSNAPSHOT;Ajouter
HISTORY_NEWSNAPSHOT_TOOLTIP;Raccourci: Alt-s
HISTORY_SNAPSHOT;Capture
HISTORY_SNAPSHOTS;Captures
+ICCPROFCREATOR_ADD_PARAM_IN_DESC;Ajoute le paramètre Gamma et Pente (Slope) à la fin de la description
+ICCPROFCREATOR_COPYRIGHT;Copyright:
+ICCPROFCREATOR_CUSTOM;Personnalisé
+ICCPROFCREATOR_DESCRIPTION;Description:
+ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Laisser vide pour que mettre la description par défaut
+ICCPROFCREATOR_GAMMA;Gamma
+ICCPROFCREATOR_ICCVERSION;Version du profil généré:
+ICCPROFCREATOR_ILL;Illuminant:
+ICCPROFCREATOR_ILL_41;D41
+ICCPROFCREATOR_ILL_50;D50
+ICCPROFCREATOR_ILL_55;D55
+ICCPROFCREATOR_ILL_60;D60
+ICCPROFCREATOR_ILL_65;D65
+ICCPROFCREATOR_ILL_80;D80
+ICCPROFCREATOR_ILL_DEF;Valeur par défaut
+ICCPROFCREATOR_ILL_INC;StdA 2856K
+ICCPROFCREATOR_ILL_TOOLTIP;Vous ne pouvez régler l'Illuminant que pour les profils ICC v4
+ICCPROFCREATOR_PRIMARIES;Primaires:
+ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+ICCPROFCREATOR_PRIM_BEST;BestRGB
+ICCPROFCREATOR_PRIM_BETA;BetaRGB
+ICCPROFCREATOR_PRIM_BLUX;Bleu X
+ICCPROFCREATOR_PRIM_BLUY;Bleu Y
+ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+ICCPROFCREATOR_PRIM_GREX;Vert X
+ICCPROFCREATOR_PRIM_GREY;Vert Y
+ICCPROFCREATOR_PRIM_PROPH;Prophoto
+ICCPROFCREATOR_PRIM_REC2020;Rec2020
+ICCPROFCREATOR_PRIM_REDX;Rouge X
+ICCPROFCREATOR_PRIM_REDY;Rouge Y
+ICCPROFCREATOR_PRIM_SRGB;sRGB
+ICCPROFCREATOR_PRIM_TOOLTIP;Vous ne pouvez régler des Primaires personnalisées que pour les profils ICC v4
+ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+ICCPROFCREATOR_PROF_V2;ICC v2
+ICCPROFCREATOR_PROF_V4;ICC v4
+ICCPROFCREATOR_SAVEDIALOG_TITLE;Enregistrer le profil ICC sous...
+ICCPROFCREATOR_SLOPE;Pente
+ICCPROFCREATOR_TRC_PRESET;Courbe de réponse tonale:
IPTCPANEL_CATEGORY;Catégorie
IPTCPANEL_CATEGORYHINT;Identifie le sujet de l'image selon l'opinion du fournisseur.
IPTCPANEL_CITY;Ville
@@ -772,6 +813,7 @@ LENSPROFILE_CORRECTION_LCPFILE;Fichier LCP
LENSPROFILE_CORRECTION_MANUAL;Paramètres de correction manuel
LENSPROFILE_LENS_WARNING;Attention: la taille du capteur utilisé pour le profilage de l'objectif est plus grand que celui de l'appareil sélectionné, le résultat peut être faux.
MAIN_BUTTON_FULLSCREEN;Plein écran
+MAIN_BUTTON_ICCPROFCREATOR;Créateur de Profil ICC
MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigue à l'image Suivante relativement à l'image ouverte dans l'Éditeur\nRaccourci: Shift-F4\n\nPour naviguer à l'image Suivante relativement à la vignette sélectionnée dans le Navigateur de fichiers\nRaccourci: F4
MAIN_BUTTON_NAVPREV_TOOLTIP;Navigue à l'image Précédente relativement à l'image ouverte dans l'Éditeur\nRaccourci: Shift-F3\n\nPour naviguer à l'image Précédente relativement à la vignette sélectionnée dans le Navigateur de fichiers\nRaccourci: F3
MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronise le Navigateur de fichiers avec l'Éditeur pour révéler la vignette de l'image actuellement ouverte, et efface les filtres dans le Navigateur de fichiers\nRaccourci: x\n\nComme ci-dessus, mais sans effacer les filtres dans le Navigateur de fichiers\nRaccourci: y\n(Notez que la vignette ne sera pas visible si elle a été filtrée).
@@ -860,7 +902,7 @@ NAVIGATOR_S;S:
NAVIGATOR_V;V:
NAVIGATOR_XY_FULL;Largeur = %1, Hauteur = %2
NAVIGATOR_XY_NA;x = n/d, y = n/d
-OPTIONS_BUNDLED_MISSING;Le profile fourni "%1" n'a pas été trouvé!\n\nVotre installation peut être endomagé.\n\nLes valeurs internes par défaut seront utilisées à la place.
+OPTIONS_BUNDLED_MISSING;Le profil fourni "%1" n'a pas été trouvé!\n\nVotre installation peut être endomagé.\n\nLes valeurs internes par défaut seront utilisées à la place.
OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les images standards n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place.
OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les images Raw n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place.
PARTIALPASTE_ADVANCEDGROUP;Réglages Avancés
@@ -939,14 +981,8 @@ PARTIALPASTE_WAVELETGROUP;Niveaux d'ondelette
PARTIALPASTE_WHITEBALANCE;Balance des blancs
PREFERENCES_ADD;Ajoute
PREFERENCES_APPLNEXTSTARTUP;appliqué au prochain lancement
-PREFERENCES_AUTLISLOW;Bas
-PREFERENCES_AUTLISMAX;Max - Moyenne de toutes les tuiles
-PREFERENCES_AUTLISSTD;Haut
-PREFERENCES_AUTLISVLOW;Aucun
-PREFERENCES_AUTLOW;Bas
PREFERENCES_AUTOMONPROFILE;Utiliser automatiquement le profil de l'écran principal
PREFERENCES_AUTOSAVE_TP_OPEN;Sauver automatiquement l'état ouvert/fermé\n des outils avant de fermer
-PREFERENCES_AUTSTD;Standard
PREFERENCES_BATCH_PROCESSING;Traitement par lot
PREFERENCES_BEHADDALL;Tout à 'Ajoute'
PREFERENCES_BEHADDALLHINT;Règle tous les paramètres sur le mode Ajoute.\nLa modification des paramètres dans le panneau d'édition en par lot sera des deltas par-rapport aux valeurs existantes
@@ -997,8 +1033,6 @@ PREFERENCES_DARKFRAMESHOTS;image(s)
PREFERENCES_DARKFRAMETEMPLATES;modèle(s)
PREFERENCES_DATEFORMAT;Format
PREFERENCES_DATEFORMATHINT;Vous pouvez utiliser les paramètres de chaînes formatées suivants:\n%y : année\n%m : mois\n%d : jour\n\nPar exemple, le format de date française est:\n%d/%m/%y
-PREFERENCES_DAUB_LABEL;Utiliser les ondelettes de Daubechies D6 au lieu de D4
-PREFERENCES_DAUB_TOOLTIP;Les outils de Réduction de Bruit et de Niveaux d'Ondelettes utilisent une ondelette de Debauchie mère. Si vous choisissez D6 au lieu de D4 vous augmentez le nombre de coéf. orthogonaux de Daubechies et augmentez probablement la qualité des niveaux de taille moyenne. Il n'y a pas de différence de consommation mémoire ou de temps de traitement entre les deux.
PREFERENCES_DIRDARKFRAMES;Dossier des images de Trame Noire
PREFERENCES_DIRECTORIES;Dossiers
PREFERENCES_DIRHOME;Racine de mes documents personnels
@@ -1008,7 +1042,6 @@ PREFERENCES_DIRSELECTDLG;Choix du dossier Image au lancement...
PREFERENCES_DIRSOFTWARE;Dossier d'installation
PREFERENCES_EDITORCMDLINE;Ligne de commande personnelle
PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur
-PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;Éditeur externe
PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre de menu de l'explorateur de fichiers uni-ligne\n(à désactiver pour les écrans de faible résolution)
@@ -1054,12 +1087,7 @@ PREFERENCES_INTENT_SATURATION;Saturation
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Afficher vignette incluse dans fichier RAW si non édité
PREFERENCES_LANG;Langage
PREFERENCES_LANGAUTODETECT;Utiliser les paramètres linguistiques de l'OS
-PREFERENCES_LEVAUTDN;Niveau de débruitage
-PREFERENCES_LEVDN;Taille de la cellule
-PREFERENCES_LISS;Adoucissement auto multi-zone
-PREFERENCES_MAX;Maxi (Tuile)
PREFERENCES_MAXRECENTFOLDERS;Nombre maximum de dossiers récents
-PREFERENCES_MED;Moyen (Tuile/2)
PREFERENCES_MENUGROUPEXTPROGS;Groupe "Ouvrir avec"
PREFERENCES_MENUGROUPFILEOPERATIONS;Opérations sur les fichiers
PREFERENCES_MENUGROUPLABEL;Label
@@ -1067,7 +1095,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Opérations sur les profils
PREFERENCES_MENUGROUPRANK;Classement
PREFERENCES_MENUOPTIONS;Options du menu
PREFERENCES_METADATA;Metadonnées
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;Intention de rendu par défaut
PREFERENCES_MONITOR;Moniteur
PREFERENCES_MONPROFILE;Profil couleur par défaut
@@ -1076,7 +1103,6 @@ PREFERENCES_MULTITAB;Éditeurs multiple
PREFERENCES_MULTITABDUALMON;Éditeurs multiple, si possible sur un second moniteur
PREFERENCES_NAVGUIDEBRUSH;Couleur du cadre dans le Navigateur
PREFERENCES_NAVIGATIONFRAME;Navigation
-PREFERENCES_NOISE;Réduction de Bruit
PREFERENCES_OUTDIR;Dossier de sortie
PREFERENCES_OUTDIRFOLDER;Dossier de sauvegarde
PREFERENCES_OUTDIRFOLDERHINT;Place les images traitées dans le dossier selectionné
@@ -1112,8 +1138,6 @@ 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".
-PREFERENCES_RGBDTL_LABEL;Nombre maximum d'unités de calcul pour la Réduction du bruit
-PREFERENCES_RGBDTL_TOOLTIP;La réduction du bruit nécessite un minimum d'à peu près 128Mo de RAM pour une image de 10MPix ou 512Mo pour une image de 40MPix, ainsi que 128Mo de RAM supplémentaire par unité de calcul. Plus il y aura d'unités de calcul travaillant en parallèle, plus ce sera rapide. Laissez la valeur à "0" pour utiliser automatiquement autant d'unités de calcul que possible.
PREFERENCES_SAVE_TP_OPEN_NOW;Sauver l'état ouvert/fermé maintenant
PREFERENCES_SELECTFONT;Police principale
PREFERENCES_SELECTFONT_COLPICKER;Police des pipette à couleur
@@ -1128,37 +1152,26 @@ PREFERENCES_SHOWDATETIME;Voir la date et l'heure
PREFERENCES_SHOWEXPOSURECOMPENSATION;Ajoute la compensation d'exposition
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Montrer la barre d'outil de la pellicule d'image ("filmstrip")
PREFERENCES_SHTHRESHOLD;Seuil pour le dépassement de domaine inférieur
-PREFERENCES_SIMPLAUT;Mode de l'outil
PREFERENCES_SINGLETAB;Éditeur unique
PREFERENCES_SINGLETABVERTAB;Éditeur unique, onglets verticaux
-PREFERENCES_SMA;Petit (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;File de traitement terminée
PREFERENCES_SND_HELP;Saisissez un chemin de fichier ou rien du tout (pour ne pas avoir de son). Pour Windows,\nsaisissez "SystemDefault", "SystemAsterisk" etc. pour utiliser les sons systèmes.
PREFERENCES_SND_LNGEDITPROCDONE;Traitement de la zone de prévisualisation terminé
PREFERENCES_SND_THRESHOLDSECS;après (s)
PREFERENCES_STARTUPIMDIR;Répertoire Image au démarrage
-PREFERENCES_STDAUT;Standard
PREFERENCES_TAB_BROWSER;Navigateur de fichiers
PREFERENCES_TAB_COLORMGR;Gestion des couleurs
PREFERENCES_TAB_DYNAMICPROFILE;Règles de Profil Dynamique
PREFERENCES_TAB_GENERAL;Général
PREFERENCES_TAB_IMPROC;Traitement de l'image
-PREFERENCES_TAB_PERFORMANCE;Performance
PREFERENCES_TAB_SOUND;Sons
PREFERENCES_THEME;Thème
-PREFERENCES_TIMAX;Haut
-PREFERENCES_TINB;Nombre de tuiles
-PREFERENCES_TISTD;Standard
PREFERENCES_TP_LABEL;Panneau des outils:
PREFERENCES_TP_USEICONORTEXT;Utiliser des icônes au lieu de textes
PREFERENCES_TP_VSCROLLBAR;Cacher la barre de défilement verticale
PREFERENCES_TUNNELMETADATA;Copier les données Exif/IPTC/XMP tel quel dans le fichier de sortie
PREFERENCES_USEBUNDLEDPROFILES;Utiliser les profils fournis
PREFERENCES_VIEW;Point blanc du périphérique sortie (moniteur, TV, projecteur,...)
-PREFERENCES_WAVLEV;Augmenter le nombre de niveau d'ondelette en qualité "haute"
-PREFERENCES_WLONE;Un niveau
-PREFERENCES_WLTWO;Deux niveaux
-PREFERENCES_WLZER;Non
PREFERENCES_WORKFLOW;Habitudes de travail
PROFILEPANEL_COPYPPASTE;Paramètres à copier
PROFILEPANEL_GLOBALPROFILES;Profils fournis
@@ -1208,6 +1221,7 @@ SAMPLEFORMAT_32;24 bits à virgule flottante
SAMPLEFORMAT_64;32 bits à virgule flottante
SAVEDLG_AUTOSUFFIX;Ajouter automatiquement un suffixe si le fichier existe déjà
SAVEDLG_FILEFORMAT;Format de fichier
+SAVEDLG_FILEFORMAT_FLOAT; virgule flottante
SAVEDLG_FORCEFORMATOPTS;Forcer les options d'enregistrement
SAVEDLG_JPEGQUAL;Qualité JPEG
SAVEDLG_PNGCOMPR;Compression PNG
@@ -1576,10 +1590,10 @@ TP_FLATFIELD_BT_VERTICAL;Vertical
TP_FLATFIELD_CLIPCONTROL;Control de l'écrêtage
TP_FLATFIELD_CLIPCONTROL_TOOLTIP;"Contrôle de l'écrêtage" évite les hautes lumière brûlées dûs à l'application du champ uniforme. S'il y a déjà des hautes lumières brûlées avant l'application du champ uniforme, "Contrôle de l'écrêtage" peut conduire à une dérive couleur.
TP_FLATFIELD_LABEL;Champ Uniforme
-TP_GAMMA_CURV;Gamma
-TP_GAMMA_FREE;Manuel
-TP_GAMMA_OUTPUT;Gamma de sortie
-TP_GAMMA_SLOP;Pente (linéaire)
+TP_GAMMA_CURV;Gamma:
+TP_GAMMA_CUSTOM;Manuel
+TP_GAMMA_OUTPUT_TRC_PRESET;Courbe de réponse tonale (TRC):
+TP_GAMMA_SLOP;Pente (linéaire):
TP_GENERAL_11SCALE_TOOLTIP;Les effets de cet outil ne sont visible ou fiable qu'avec un aperçu à l'échelle 1:1.
TP_GRADIENT_CENTER;Centre
TP_GRADIENT_CENTER_X;Centre X
@@ -1640,6 +1654,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Sauvegarde une image TIFF linéaire avant que le pr
TP_ICM_TONECURVE;Utiliser la courbe tonale du profil DCP
TP_ICM_TONECURVE_TOOLTIP;Utilise la courbe tonale DCP incluse. Ce paramètre ne sera actif que si le profil DCP contient une courbe tonale
TP_ICM_WORKINGPROFILE;Profil de Travail
+TP_ICM_WORKING_TRC;Courbe de réponse tonale:
+TP_ICM_WORKING_TRC_CUSTOM;Personnalisé
+TP_ICM_WORKING_TRC_GAMMA;Gamma
+TP_ICM_WORKING_TRC_NONE;Aucune
+TP_ICM_WORKING_TRC_SLOPE;Pente
+TP_ICM_WORKING_TRC_TOOLTIP;Seulement pour les profils internes
TP_IMPULSEDENOISE_LABEL;Réduction du bruit d'impulsion
TP_IMPULSEDENOISE_THRESH;Seuil
TP_LABCURVE_AVOIDCOLORSHIFT;Éviter les dérives de teinte
@@ -2197,6 +2217,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value.
!EXIFFILTER_IMAGETYPE;Image type
!GENERAL_RESET;Reset
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_235;B&W - CM - Auto
!HISTORY_MSG_237;B&W - CM
!HISTORY_MSG_273;CT - Color Balance SMH
@@ -2204,16 +2225,37 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
+!PARTIALPASTE_RAW_BORDER;Raw border
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
@@ -2228,15 +2270,24 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
-!TP_RAW_4PASS;4-Pass
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
!TP_RAW_PIXELSHIFTEPERISO;Sensitivity
!TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nHigher values increase sensitivity of motion detection.\nChange in small steps and watch the motion mask while changing.\nIncrease sensitivity for underexposed or high ISO images.
!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
+!TP_RAW_RCDVNG4;RCD+VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 8d9cd5815..9c7c024f9 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -557,7 +557,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -573,13 +573,14 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -976,10 +977,16 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -991,9 +998,56 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1024,11 +1078,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1065,6 +1120,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1120,6 +1176,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1127,6 +1184,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1138,17 +1196,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1186,13 +1239,10 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1225,12 +1275,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1238,7 +1283,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1247,13 +1291,14 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1267,8 +1312,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1278,36 +1321,26 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1335,6 +1368,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1660,10 +1694,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1710,6 +1740,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1797,6 +1833,8 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1812,15 +1850,18 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1870,10 +1911,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1897,7 +1940,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1981,6 +2024,8 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2074,7 +2119,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 223d2e45c..85bc43c05 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -558,7 +558,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -574,13 +574,14 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -977,10 +978,16 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -992,9 +999,56 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1025,11 +1079,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1066,6 +1121,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1121,6 +1177,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1128,6 +1185,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1139,17 +1197,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1187,13 +1240,10 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1226,12 +1276,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1239,7 +1284,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1248,13 +1292,14 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1268,8 +1313,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1279,36 +1322,26 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1336,6 +1369,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1661,10 +1695,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1711,6 +1741,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1798,6 +1834,8 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1813,15 +1851,18 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1871,10 +1912,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1898,7 +1941,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1982,6 +2025,8 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2075,7 +2120,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 9a7db12e9..9ee5e607a 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -726,8 +726,6 @@ PREFERENCES_PROFILESAVECACHE;Salva il profilo di sviluppo nella memoria
PREFERENCES_PROFILESAVEINPUT;Salva il profilo di sviluppo a fianco del file originario
PREFERENCES_PROPERTY;Proprietà
PREFERENCES_PSPATH;Cartella d'installazione di Adobe Photoshop
-PREFERENCES_RGBDTL_LABEL;Numero massimo di thread per la Riduzione Rumore
-PREFERENCES_RGBDTL_TOOLTIP;La Riduzione Rumore richiede un minimo di circa 128MB di RAM per un'immagine di 10MPixel o 512MB per una di 40MPixel più 128MB di RAM per ogni thread. Più thread vengono eseguiti in parallelo, più rapida sarà l'elaborazione. Lascia l'impostazione a "0" per usare automaticamente quanti più thread possibili.
PREFERENCES_SELECTFONT;Seleziona il carattere
PREFERENCES_SELECTLANG;Seleziona la lingua
PREFERENCES_SELECTTHEME;Seleziona il tema
@@ -747,7 +745,6 @@ PREFERENCES_TAB_BROWSER;Navigatore
PREFERENCES_TAB_COLORMGR;Gestione Colore
PREFERENCES_TAB_GENERAL;Generale
PREFERENCES_TAB_IMPROC;Elaborazione immagine
-PREFERENCES_TAB_PERFORMANCE;Prestazioni
PREFERENCES_TAB_SOUND;Suoni
PREFERENCES_TP_LABEL;Pannello Strumenti:
PREFERENCES_TP_USEICONORTEXT;Utilizza le icone delle schede anziché il testo
@@ -1342,7 +1339,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1352,8 +1349,10 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
@@ -1581,10 +1580,16 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1596,8 +1601,55 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1627,12 +1679,14 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -1646,19 +1700,16 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CLUTSDIR;HaldCLUT directory
@@ -1675,11 +1726,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1691,22 +1739,17 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1725,23 +1768,14 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1754,6 +1788,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
@@ -1883,6 +1918,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -1906,6 +1947,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1915,13 +1958,16 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -1965,10 +2011,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1984,7 +2032,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2051,6 +2099,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2123,7 +2173,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 540b59521..038548deb 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -264,6 +264,7 @@ GENERAL_OPEN;開く
GENERAL_PORTRAIT;縦
GENERAL_RESET;リセット
GENERAL_SAVE;保存
+GENERAL_SAVE_AS;...で保存
GENERAL_SLIDER;スライダー
GENERAL_UNCHANGED;(変更なし)
GENERAL_WARNING;警告
@@ -274,6 +275,7 @@ HISTOGRAM_TOOLTIP_CHRO;色度・ヒストグラム 表示/非表示
HISTOGRAM_TOOLTIP_FULL;完全/縮尺調整の表示切り替え
HISTOGRAM_TOOLTIP_G;グリーン・ヒストグラム 表示/非表示
HISTOGRAM_TOOLTIP_L;CIEL*a*b* 輝度・ヒストグラム 表示/非表示
+HISTOGRAM_TOOLTIP_MODE;ヒストグラムの尺度を線形、対数-線形、対数-対数でトグルします
HISTOGRAM_TOOLTIP_R;レッド・ヒストグラム 表示/非表示
HISTOGRAM_TOOLTIP_RAW;rawヒストグラム 表示/非表示
HISTORY_CHANGED;変更されました
@@ -348,9 +350,9 @@ HISTORY_MSG_65;色収差補正
HISTORY_MSG_66;ハイライト復元
HISTORY_MSG_67;ハイライト復元 量
HISTORY_MSG_68;ハイライト復元 方式
-HISTORY_MSG_69;作業カラースペース
-HISTORY_MSG_70;出力カラースペース
-HISTORY_MSG_71;入力カラースペース
+HISTORY_MSG_69;作業色空間
+HISTORY_MSG_70;出力色空間
+HISTORY_MSG_71;入力色空間
HISTORY_MSG_72;周辺光量補正
HISTORY_MSG_73;チャンネルミキサー
HISTORY_MSG_74;リサイズ スケール
@@ -758,7 +760,14 @@ HISTORY_MSG_492;RGBカーブ
HISTORY_MSG_493;L*a*b*調整
HISTORY_MSG_CLAMPOOG;色域外の色を切り取る
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - カラー補正
+HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - コントラストのしきい値
HISTORY_MSG_HISTMATCHING;トーンカーブの自動調節
+HISTORY_MSG_ICM_OUTPUT_PRIMARIES;出力 - プライマリ
+HISTORY_MSG_ICM_OUTPUT_TEMP;出力 - ICC-v4 光源 D
+HISTORY_MSG_ICM_OUTPUT_TYPE;出力 - タイプ
+HISTORY_MSG_ICM_WORKING_GAMMA;作業色空間 - ガンマ
+HISTORY_MSG_ICM_WORKING_SLOPE;作業色空間 - 勾配
+HISTORY_MSG_ICM_WORKING_TRC_METHOD;作業色空間 - TRCの方式
HISTORY_MSG_LOCALCONTRAST_AMOUNT;ローカルコントラスト - 量
HISTORY_MSG_LOCALCONTRAST_DARKNESS;ローカルコントラスト - 暗い部分
HISTORY_MSG_LOCALCONTRAST_ENABLED;ローカルコントラスト
@@ -766,15 +775,63 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;ローカルコントラスト - 明るい
HISTORY_MSG_LOCALCONTRAST_RADIUS;ローカルコントラスト - 半径
HISTORY_MSG_METADATA_MODE;メタデータ コピーモード
HISTORY_MSG_MICROCONTRAST_CONTRAST;マイクロコントラスト - コントラストのしきい値
+HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - 振れに対するデモザイクの方式
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;ラインノイズフィルタの方向
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAFラインフィルタ
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - コントラストのしきい値
+HISTORY_MSG_RAWCACORR_AUTOIT;Rawの色順応補正 - 繰り返し
+HISTORY_MSG_RAWCACORR_COLOURSHIFT;Rawの色順応補正 - 色ずれを回避
+HISTORY_MSG_RAW_BORDER;Rawの境界
+HISTORY_MSG_RESIZE_ALLOWUPSCALING;リサイズ - アップスケーリングを可能にする
HISTORY_MSG_SHARPENING_CONTRAST;シャープ化 - コントラストのしきい値
+HISTORY_MSG_SOFTLIGHT_ENABLED;ソフトライト
+HISTORY_MSG_SOFTLIGHT_STRENGTH;ソフトライト - 強さ
HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - アンカー
HISTORY_NEWSNAPSHOT;追加
HISTORY_NEWSNAPSHOT_TOOLTIP;ショートカット: Alt-s
HISTORY_SNAPSHOT;スナップショット
HISTORY_SNAPSHOTS;スナップショット
+ICCPROFCREATOR_COPYRIGHT;著作権:
+ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;デフォルトの著作権にリセットする、”RawTherapee CC0”を承諾する
+ICCPROFCREATOR_CUSTOM;カスタム
+ICCPROFCREATOR_DESCRIPTION;記述:
+ICCPROFCREATOR_DESCRIPTION_ADDPARAM;ガンマと勾配の値を記述に加える
+ICCPROFCREATOR_DESCRIPTION_TOOLTIP;デフォルトの記述をセットするために空にしておく
+ICCPROFCREATOR_GAMMA;ガンマ
+ICCPROFCREATOR_ICCVERSION;ICCのバージョン:
+ICCPROFCREATOR_ILL;光源:
+ICCPROFCREATOR_ILL_41;D41
+ICCPROFCREATOR_ILL_50;D50
+ICCPROFCREATOR_ILL_55;D55
+ICCPROFCREATOR_ILL_60;D60
+ICCPROFCREATOR_ILL_65;D65
+ICCPROFCREATOR_ILL_80;D80
+ICCPROFCREATOR_ILL_DEF;デフォルト
+ICCPROFCREATOR_ILL_INC;StdA 2856K
+ICCPROFCREATOR_ILL_TOOLTIP;ICC v4プロファイルに関する光源だけを設定することができます
+ICCPROFCREATOR_PRIMARIES;プライマリ:
+ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+ICCPROFCREATOR_PRIM_BEST;BestRGB
+ICCPROFCREATOR_PRIM_BETA;BetaRGB
+ICCPROFCREATOR_PRIM_BLUX;ブルー X
+ICCPROFCREATOR_PRIM_BLUY;ブルー Y
+ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+ICCPROFCREATOR_PRIM_GREX;グリーン X
+ICCPROFCREATOR_PRIM_GREY;グリーン Y
+ICCPROFCREATOR_PRIM_PROPH;Prophoto
+ICCPROFCREATOR_PRIM_REC2020;Rec2020
+ICCPROFCREATOR_PRIM_REDX;レッド X
+ICCPROFCREATOR_PRIM_REDY;レッド Y
+ICCPROFCREATOR_PRIM_SRGB;sRGB
+ICCPROFCREATOR_PRIM_TOOLTIP;ICC v4プロファイルに関するカスタムプライマリーを設定することが出来ます
+ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+ICCPROFCREATOR_PROF_V2;ICC v2
+ICCPROFCREATOR_PROF_V4;ICC v4
+ICCPROFCREATOR_SAVEDIALOG_TITLE;...でICCプロファイルを保存
+ICCPROFCREATOR_SLOPE;勾配
+ICCPROFCREATOR_TRC_PRESET;トーン再現カーブ:
IPTCPANEL_CATEGORY;カテゴリ
IPTCPANEL_CATEGORYHINT;画像の意図
IPTCPANEL_CITY;都市
@@ -822,6 +879,7 @@ LENSPROFILE_CORRECTION_LCPFILE;LCPファイル
LENSPROFILE_CORRECTION_MANUAL;手動でパラメータを補正する
LENSPROFILE_LENS_WARNING;注意:レンズプロファイルに関する切り抜きの因数がカメラの因数より大きいと、誤った結果になるかもしれません
MAIN_BUTTON_FULLSCREEN;フルスクリーン
+MAIN_BUTTON_ICCPROFCREATOR;ICCプロファイルクリエーター
MAIN_BUTTON_NAVNEXT_TOOLTIP;エディタで開いている画像に対応する次の画像に移動します\nショートカット: Shift-F4\n\nファイルブラウザで選択したサムネイルに対応する次の画像に移動するには\nショートカット: F4
MAIN_BUTTON_NAVPREV_TOOLTIP;エディタで開いている画像に対応する前の画像に移動します\nショートカット: Shift-F3\n\nファイルブラウザで選択したサムネイルに対応する前の画像に移動するには\nショートカット: F3
MAIN_BUTTON_NAVSYNC_TOOLTIP;現在開いている画像のサムネイルを明示しエディタとファイルブラウザを同期させ、ファイルブラウザでのフィルタをクリアします \nショートカット: x\n\n上記と同じですが、ファイルブラウザでのフィルタをクリアしません\nショートカット: y\n(除外する場合、開いているファイルのサムネイルが表示されませんので注意してください).
@@ -862,9 +920,9 @@ MAIN_TAB_COLOR;カラー
MAIN_TAB_COLOR_TOOLTIP;ショートカット: Alt-c
MAIN_TAB_DETAIL;ディテール
MAIN_TAB_DETAIL_TOOLTIP;ショートカット: Alt-d
-MAIN_TAB_DEVELOP;現像
+MAIN_TAB_DEVELOP;一括編集
MAIN_TAB_EXIF;Exif
-MAIN_TAB_EXPORT; 書き出し
+MAIN_TAB_EXPORT;高速書き出し
MAIN_TAB_EXPOSURE;露光
MAIN_TAB_EXPOSURE_TOOLTIP;ショートカット: Alt-e
MAIN_TAB_FILTER;絞り込み
@@ -876,8 +934,6 @@ MAIN_TAB_RAW;raw
MAIN_TAB_RAW_TOOLTIP;ショートカット: Alt-r
MAIN_TAB_TRANSFORM;変形
MAIN_TAB_TRANSFORM_TOOLTIP;ショートカット: Alt-t
-MAIN_TAB_WAVELET;ウェーブレット
-MAIN_TAB_WAVELET_TOOLTIP;ショートカット: Alt-w
MAIN_TOOLTIP_BACKCOLOR0;プレビューの背景色を指定します: テーマに基づく\nショートカット: 9
MAIN_TOOLTIP_BACKCOLOR1;プレビューの背景色を指定します: 黒\nショートカットt: 9
MAIN_TOOLTIP_BACKCOLOR2;プレビューの背景色を指定します: 白\nショートカット: 9
@@ -891,6 +947,7 @@ MAIN_TOOLTIP_PREVIEWFOCUSMASK;フォーカス・マスク表示\nショ
MAIN_TOOLTIP_PREVIEWG;グリーン チャンネル表示\nショートカット: g
MAIN_TOOLTIP_PREVIEWL;輝度表示\nショートカット: v\n\n0.299*R + 0.587*G + 0.114*B
MAIN_TOOLTIP_PREVIEWR;レッド チャンネル表示\nショートカット: r
+MAIN_TOOLTIP_PREVIEWSHARPMASK;プレビューで見るシャープ化機能のコントラストマスク\nショートカット: なし\n\nこの機能が使えるのはシャープ化機能が有効で、画像が100%以上に拡大されている場合だけ
MAIN_TOOLTIP_QINFO;画像の情報\nショートカット: i
MAIN_TOOLTIP_SHOWHIDELP1;表示/非表示 左パネル\nショートカット: l
MAIN_TOOLTIP_SHOWHIDERP1;表示/非表示 右パネル\nショートカット: Alt-l
@@ -909,7 +966,7 @@ NAVIGATOR_R;R:
NAVIGATOR_S;S:
NAVIGATOR_V;V:
NAVIGATOR_XY_FULL;幅 = %1, 高さ = %2
-NAVIGATOR_XY_NA;x = n/a, y = n/a
+NAVIGATOR_XY_NA;x: --, y: --
OPTIONS_BUNDLED_MISSING;付属のプロファイル "%1"が見つかりません\n\nインストールされたプロファイルが損傷しているかもしれません\n\nその場合はデフォルトの値が使われます
OPTIONS_DEFIMG_MISSING;rawではない画像のデフォルプロファイルが見つからないか、設定されていません\n\nプロファイル・ディレクトリを確認してください、存在しないか破損しているかもしれません\n\nデフォルト設定値が使用されます
OPTIONS_DEFRAW_MISSING;raw画像のデフォル・プロファイルが見つからないか、設定されていません\n\nプロファイル・ディレクトリを確認してください、存在しないか破損しているかもしれません\n\nデフォルト設定値が使用されます
@@ -934,7 +991,7 @@ PARTIALPASTE_DIRPYRDENOISE;ノイズ低減
PARTIALPASTE_DIRPYREQUALIZER;ディテール・レベルのコントラスト
PARTIALPASTE_DISTORTION;歪曲補正
PARTIALPASTE_EPD;トーンマッピング
-PARTIALPASTE_EQUALIZER;ウェーブレットイコライザ
+PARTIALPASTE_EQUALIZER;ウェーブレット
PARTIALPASTE_EVERYTHING;すべて
PARTIALPASTE_EXIFCHANGES;exifデータを変える
PARTIALPASTE_EXPOSURE;露光量
@@ -961,6 +1018,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;デッドピクセルフィルターを適
PARTIALPASTE_PREPROCESS_GREENEQUIL;グリーン 平衡化
PARTIALPASTE_PREPROCESS_HOTPIXFILT;ホットピクセルフィルターを適用
PARTIALPASTE_PREPROCESS_LINEDENOISE;ラインノイズ フィルタ
+PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF ラインフィルタ
PARTIALPASTE_PRSHARPENING;リサイズ後のシャープ化
PARTIALPASTE_RAWCACORR_AUTO;自動色収差補正
PARTIALPASTE_RAWCACORR_CAREDBLUE;色収差 レッドとブルー
@@ -968,6 +1026,7 @@ PARTIALPASTE_RAWEXPOS_BLACK;黒レベル
PARTIALPASTE_RAWEXPOS_LINEAR;raw ホワイトポイント リニア補正係数
PARTIALPASTE_RAWEXPOS_PRESER;raw ホワイトポイント ハイライトを保持したまま補正 (EV)
PARTIALPASTE_RAWGROUP;raw 設定
+PARTIALPASTE_RAW_BORDER;Rawの境界
PARTIALPASTE_RAW_DCBENHANCE;DCB 拡張処理適用
PARTIALPASTE_RAW_DCBITERATIONS;DCB反復の数
PARTIALPASTE_RAW_DMETHOD;デモザイクの方法
@@ -983,21 +1042,15 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;シャドウ/ハイライト
PARTIALPASTE_SHARPENEDGE;エッジ
PARTIALPASTE_SHARPENING;シャープ化 (USM/RL)
PARTIALPASTE_SHARPENMICRO;マイクロコントラスト
+PARTIALPASTE_SOFTLIGHT;ソフトな明るさ
PARTIALPASTE_TM_FATTAL;ダイナミックレンジ圧縮
PARTIALPASTE_VIBRANCE;自然な彩度
PARTIALPASTE_VIGNETTING;周辺光量補正
-PARTIALPASTE_WAVELETGROUP;ウェーブレット処理
PARTIALPASTE_WHITEBALANCE;ホワイトバランス
PREFERENCES_ADD;追加
PREFERENCES_APPLNEXTSTARTUP;要再起動
-PREFERENCES_AUTLISLOW;低
-PREFERENCES_AUTLISMAX;最大 - 全タイルの平均
-PREFERENCES_AUTLISSTD;高
-PREFERENCES_AUTLISVLOW;なし
-PREFERENCES_AUTLOW;低
PREFERENCES_AUTOMONPROFILE;OSのメインモニター・プロファイルを使用
PREFERENCES_AUTOSAVE_TP_OPEN;プログラム終了の前に、機能パネルの開閉状態を自動的に保存する
-PREFERENCES_AUTSTD;標準
PREFERENCES_BATCH_PROCESSING;バッチ処理
PREFERENCES_BEHADDALL;すべて '追加'
PREFERENCES_BEHADDALLHINT;すべてのパラメータを 追加モードにします\nバッチツールパネルで設定される調整値が、各画像の既定値に加算されます
@@ -1011,10 +1064,6 @@ PREFERENCES_CACHECLEARTHUMBS;サムネイルのクリア
PREFERENCES_CACHEMAXENTRIES;キャッシュエントリーの最大数
PREFERENCES_CACHEOPTS;cache オプション
PREFERENCES_CACHETHUMBHEIGHT;サムネイル縦の最大値
-PREFERENCES_CIEART;CIECAM02 最適化
-PREFERENCES_CIEART_FRAME;CIECAM02-特定の設定
-PREFERENCES_CIEART_LABEL;倍精度の代わりに単精度浮動小数点を使用
-PREFERENCES_CIEART_TOOLTIP;有効にした場合、 CIECAM02は倍精度浮動小数点形式の代わりに単精度で実行されます。これは品質を少し犠牲にし、速度を少し増加させます
PREFERENCES_CLIPPINGIND;クリッピング領域の表示
PREFERENCES_CLUTSCACHE;HaldCLUT cache
PREFERENCES_CLUTSCACHE_LABEL;cacheに置けるHaldCLUTの最大数
@@ -1048,8 +1097,6 @@ PREFERENCES_DARKFRAMESHOTS;ショット
PREFERENCES_DARKFRAMETEMPLATES;テンプレート
PREFERENCES_DATEFORMAT;日付の形式
PREFERENCES_DATEFORMATHINT;次の書式を使用することができます:\n%y : 年\n%m : 月\n%d : 日\n\n例として, ハンガリアン記法の日付:\n%y/%m/%d
-PREFERENCES_DAUB_LABEL;ドビッシー関数のタイプ D4の代わりにD6を使う
-PREFERENCES_DAUB_TOOLTIP;ノイズ低減とウェーブレットのレベルツールはマザーウェーブレットにドビッシーを使っています。このタイプでD4の代わりにD6を選択すると、直交系であるドビッシーの係数が増えるので、恐らくスケールの小さいレベルは質が向上するでしょう。タイプを変えても処理時間やメモリー使用量に影響はありません。
PREFERENCES_DIRDARKFRAMES;ダークフレーム・ディレクトリ
PREFERENCES_DIRECTORIES;ディレクトリ
PREFERENCES_DIRHOME;ホーム・ディレクトリ
@@ -1059,7 +1106,6 @@ PREFERENCES_DIRSELECTDLG;起動時の画像ディレクトリ選択...
PREFERENCES_DIRSOFTWARE;インストール・ディレクトリ
PREFERENCES_EDITORCMDLINE;カスタムコマンドライン
PREFERENCES_EDITORLAYOUT;編集 レイアウト
-PREFERENCES_EXPAUT;高度
PREFERENCES_EXTERNALEDITOR;外部エディタ
PREFERENCES_FBROWSEROPTS;ファイルブラウザ/サムネイルのオプション
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;ファイルブラウザでの一行のツールバー (低解像度表示用に選択解除)
@@ -1105,12 +1151,7 @@ PREFERENCES_INTENT_SATURATION;彩度
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;rawファイルが未編集の場合 JPEGのサムネイルを表示
PREFERENCES_LANG;言語
PREFERENCES_LANGAUTODETECT;OSの言語設定を使用
-PREFERENCES_LEVAUTDN;ノイズ低減のレベル
-PREFERENCES_LEVDN;セルのサイズ
-PREFERENCES_LISS;自動(多分割スムージング)
-PREFERENCES_MAX;最大(タイル)
PREFERENCES_MAXRECENTFOLDERS;直近のフォルダーの最大数
-PREFERENCES_MED;中 (タイルの半分)
PREFERENCES_MENUGROUPEXTPROGS;"..で開く"のグループ
PREFERENCES_MENUGROUPFILEOPERATIONS;"ファイル操作"のグループ
PREFERENCES_MENUGROUPLABEL;"カラーラベル"のグループ
@@ -1118,7 +1159,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;"処理プロファイル操作"のグル
PREFERENCES_MENUGROUPRANK;"ランキング"のグループ
PREFERENCES_MENUOPTIONS;メニューオプションの状況
PREFERENCES_METADATA;メタデータ
-PREFERENCES_MIN;最小 (100x115)
PREFERENCES_MONINTENT;デフォルトのモニターインテント
PREFERENCES_MONITOR;モニター
PREFERENCES_MONPROFILE;デフォルトのモニタープロファイル
@@ -1127,7 +1167,6 @@ PREFERENCES_MULTITAB;マルチ編集タブモード
PREFERENCES_MULTITABDUALMON;独自のウィンドウモードによるマルチ編集タブ
PREFERENCES_NAVGUIDEBRUSH;ナビゲーターのガイドカラー
PREFERENCES_NAVIGATIONFRAME;ナビゲーション
-PREFERENCES_NOISE;ノイズ低減
PREFERENCES_OUTDIR;出力ディレクトリ
PREFERENCES_OUTDIRFOLDER;フォルダに保存
PREFERENCES_OUTDIRFOLDERHINT;選択したフォルダに画像を保存します
@@ -1143,6 +1182,8 @@ PREFERENCES_PARSEDEXTADDHINT;拡張子を記入し このボタンでリスト
PREFERENCES_PARSEDEXTDELHINT;選択した拡張子をリストから削除します
PREFERENCES_PARSEDEXTDOWNHINT;選択した拡張子をリストの下に移動
PREFERENCES_PARSEDEXTUPHINT;選択した拡張子をリストの上に移動
+PREFERENCES_PERFORMANCE_THREADS;スレッド
+PREFERENCES_PERFORMANCE_THREADS_LABEL;ノイズ低減とウェーブレットレベルに関するスレッドの最大数(0 = 自動)
PREFERENCES_PREVDEMO;プレビューのデモザイク方式
PREFERENCES_PREVDEMO_FAST;Fast
PREFERENCES_PREVDEMO_LABEL;プレビューのズームレベルが100%以下の場合に使うデモザイクアルゴリズム:
@@ -1163,8 +1204,6 @@ PREFERENCES_PRTPROFILE;カラープロファイル
PREFERENCES_PSPATH;Adobe Photoshop のインストール・ディレクトリ
PREFERENCES_REMEMBERZOOMPAN;ズームレベルとパン速度を記憶する
PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;現在の画像のズームレベルとパン速度を記憶し、新しく開く画像に適用\n\nこのオプションが使えるのは、編集画面のモードが“シングル編集”で、“プレビューのズームレベルが100%以下の場合に使うデモザイク”が“pp3に従う”と設定されている場合だけです。
-PREFERENCES_RGBDTL_LABEL;ノイズ低減とウェーブレットのための最大スレッド数
-PREFERENCES_RGBDTL_TOOLTIP;ノイズ低減は、10メガピクセル画像では128MB程度、40メガピクセル画像では512MBを必要とします、そして更にスレッドごとに128MBが必要です。複数のスレッドを同時に実行すると演算が速くなります。自動的にできる限り多くのスレッドを使用するには"0"の設定のままにします
PREFERENCES_SAVE_TP_OPEN_NOW;機能パネルの今の開閉状態を保存する
PREFERENCES_SELECTFONT;フォント選択
PREFERENCES_SELECTFONT_COLPICKER;カラーピッカーのフォントを選択
@@ -1179,41 +1218,31 @@ PREFERENCES_SHOWDATETIME;日付表示
PREFERENCES_SHOWEXPOSURECOMPENSATION;露光補正追加
PREFERENCES_SHOWFILMSTRIPTOOLBAR;画像スライドのツールバーを表示する
PREFERENCES_SHTHRESHOLD;シャドウ・クリッピング領域のしきい値
-PREFERENCES_SIMPLAUT;ツールのモード
PREFERENCES_SINGLETAB;シングルタブモードモード
PREFERENCES_SINGLETABVERTAB;シングル編集タブモード, 垂直タブ
-PREFERENCES_SMA;小 (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;キュー処理 終了
PREFERENCES_SND_HELP;ファイルパスを入力 または空欄(無音).\nWindowsはシステムサウンドの "SystemDefault", "SystemAsterisk"など..\nLinuxはシステムサウンドの "complete", "window-attention"などを使用します
PREFERENCES_SND_LNGEDITPROCDONE;編集処理 終了
PREFERENCES_SND_THRESHOLDSECS;秒後
PREFERENCES_STARTUPIMDIR;起動時の画像・ディレクトリ
-PREFERENCES_STDAUT;標準
PREFERENCES_TAB_BROWSER;ファイルブラウザ
PREFERENCES_TAB_COLORMGR;カラーマネジメント
PREFERENCES_TAB_DYNAMICPROFILE;ダイナミックプロファイルの規定
PREFERENCES_TAB_GENERAL;一般
PREFERENCES_TAB_IMPROC;画像処理
-PREFERENCES_TAB_PERFORMANCE;パフォーマンスとクォリティ
+PREFERENCES_TAB_PERFORMANCE;パフォーマンス
PREFERENCES_TAB_SOUND;サウンド
PREFERENCES_THEME;テーマ
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;埋め込まれているJPEGのプレビュー
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;表示する画像
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;ニュートラルなrawレンダリング
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;埋め込まれているJPEGがフルサイズの場合、指定がなければニュートラルなrawレンダリングで表示
-PREFERENCES_TIMAX;多数
-PREFERENCES_TINB;タイル数
-PREFERENCES_TISTD;標準
PREFERENCES_TP_LABEL;ツール パネル:
PREFERENCES_TP_USEICONORTEXT;テキストの代わりにタブアイコンを使用
PREFERENCES_TP_VSCROLLBAR;ツールパネルの垂直スクロールバーを隠す
PREFERENCES_TUNNELMETADATA;Exif/IPTC/XMPを変更を加えずに出力ファイルにコピー
PREFERENCES_USEBUNDLEDPROFILES;付属のプロファイルを使用
PREFERENCES_VIEW;出力デバイスのホワイトバランス設定 (モニター, TV, プロジェクター,観視...)
-PREFERENCES_WAVLEV;’高い’質の場合、ウェーブレット変換のレベルを上げる
-PREFERENCES_WLONE;レベル1
-PREFERENCES_WLTWO;レベル2
-PREFERENCES_WLZER;上げない
PREFERENCES_WORKFLOW;レイアウト
PROFILEPANEL_COPYPPASTE;コピーするパラメータ
PROFILEPANEL_GLOBALPROFILES;付属のプロファイル
@@ -1263,18 +1292,18 @@ SAMPLEFORMAT_32;24ビット浮動小数点
SAMPLEFORMAT_64;32ビット浮動小数点
SAVEDLG_AUTOSUFFIX;ファイルが存在する場合、自動的に末尾に文字を加える
SAVEDLG_FILEFORMAT;ファイル形式
+SAVEDLG_FILEFORMAT_FLOAT;浮動小数点
SAVEDLG_FORCEFORMATOPTS;強制保存オプション
SAVEDLG_JPEGQUAL;JPEG 品質
-SAVEDLG_PNGCOMPR;PNG 圧縮
SAVEDLG_PUTTOQUEUE;キュー処理に追加
SAVEDLG_PUTTOQUEUEHEAD;キュー処理の最初に追加
SAVEDLG_PUTTOQUEUETAIL;キュー処理の最後に追加
SAVEDLG_SAVEIMMEDIATELY;すぐに保存
SAVEDLG_SAVESPP;設定値も保存する
SAVEDLG_SUBSAMP;サブ・サンプリング
-SAVEDLG_SUBSAMP_1;高圧縮
+SAVEDLG_SUBSAMP_1;最適な圧縮
SAVEDLG_SUBSAMP_2;バランス
-SAVEDLG_SUBSAMP_3;高画質
+SAVEDLG_SUBSAMP_3;最適な画質
SAVEDLG_SUBSAMP_TOOLTIP;最適な圧縮率:\nJ:a:b 4:2:0\nh/v 2/2\n色度は水平方向・垂直方向で半分になります\n\nバランスを重視した圧縮率:\nJ:a:b 4:2:2\nh/v 2/1\n色度は水平方向で半分になります\n\n質を重視した圧縮率:\nJ:a:b 4:4:4\nh/v 1/1\n色度のサブサンプリングはありません.
SAVEDLG_TIFFUNCOMPRESSED;非圧縮 TIFF
SAVEDLG_WARNFILENAME;ファイルに名前が付けられます
@@ -1507,12 +1536,6 @@ TP_DARKFRAME_LABEL;ダークフレーム
TP_DEFRINGE_LABEL;フリンジ低減
TP_DEFRINGE_RADIUS;半径
TP_DEFRINGE_THRESHOLD;しきい値
-TP_DIRPYRDENOISE_3X3;3×3
-TP_DIRPYRDENOISE_3X3_SOFT;3×3 ソフト
-TP_DIRPYRDENOISE_5X5;5×5
-TP_DIRPYRDENOISE_5X5_SOFT;5×5 ソフト
-TP_DIRPYRDENOISE_7X7;7×7
-TP_DIRPYRDENOISE_9X9;9×9
TP_DIRPYRDENOISE_CHROMINANCE_AMZ;自動(多分割方式)
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;自動(分割方式)
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;色ノイズ低減の効果を確認して下さい\n注意:設定値の計算はあくまで平均的なもので、かなり主観的でです
@@ -1543,7 +1566,6 @@ TP_DIRPYRDENOISE_LUMINANCE_FRAME;輝度ノイズ
TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING;輝度
TP_DIRPYRDENOISE_MAIN_COLORSPACE;色空間
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;L*a*b*
-TP_DIRPYRDENOISE_MAIN_COLORSPACE_LABEL;ノイズ低減
TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;raw画像は、RGBまたはL*a*b*方式のいずれかを使用することができます。\n\nraw以外の画像は、選択にかかわらずL*a*b*方式が採用されます
TP_DIRPYRDENOISE_MAIN_GAMMA;ガンマ
@@ -1639,10 +1661,6 @@ TP_FLATFIELD_BT_VERTICAL;垂直
TP_FLATFIELD_CLIPCONTROL;クリップコントロール
TP_FLATFIELD_CLIPCONTROL_TOOLTIP;クリップコントロールは、フラットフィールドを使った時に白飛びが発生するのを避けるために使います。適用する元画像に既に白飛びがある場合は、クリップコントロールの適用で色被りが起こる可能性があります。
TP_FLATFIELD_LABEL;フラットフィールド
-TP_GAMMA_CURV;ガンマ
-TP_GAMMA_FREE;フリーなガンマ
-TP_GAMMA_OUTPUT;出力 ガンマ
-TP_GAMMA_SLOP;勾配(リニア)
TP_GENERAL_11SCALE_TOOLTIP;この機能の効果や、そのサブコンポーネントの確認には、プレビューで1:1以上のスケールが必要です。
TP_GRADIENT_CENTER;中央位置
TP_GRADIENT_CENTER_X;中央 X軸
@@ -1663,7 +1681,7 @@ TP_HLREC_ENA_TOOLTIP;自動露光でも動作可
TP_HLREC_LABEL;ハイライト復元
TP_HLREC_LUMINANCE;輝度復元
TP_HLREC_METHOD;方式:
-TP_HSVEQUALIZER_CHANNEL;HSV チャンネル
+TP_HSVEQUALIZER_CHANNEL;チャンネル
TP_HSVEQUALIZER_HUE;H
TP_HSVEQUALIZER_LABEL;HSV イコライザ
TP_HSVEQUALIZER_SAT;S
@@ -1703,6 +1721,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;入力プロファイルが適用される前のリ
TP_ICM_TONECURVE;DCPトーンカーブ使用
TP_ICM_TONECURVE_TOOLTIP;DCPのプロファイルに含まれているトーンカーブを使用することができます
TP_ICM_WORKINGPROFILE;作業プロファイル
+TP_ICM_WORKING_TRC;トーン再現カーブ:
+TP_ICM_WORKING_TRC_CUSTOM;カスタム
+TP_ICM_WORKING_TRC_GAMMA;ガンマ
+TP_ICM_WORKING_TRC_NONE;なし
+TP_ICM_WORKING_TRC_SLOPE;勾配
+TP_ICM_WORKING_TRC_TOOLTIP;組み込まれたプロファイルだけ
TP_IMPULSEDENOISE_LABEL;インパルスノイズ低減
TP_IMPULSEDENOISE_THRESH;しきい値
TP_LABCURVE_AVOIDCOLORSHIFT;色ずれを回避
@@ -1790,6 +1814,8 @@ TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Sonyのミラーレスカメラの一部
TP_PRSHARPENING_LABEL;リサイズ後のシャープ化
TP_PRSHARPENING_TOOLTIP;リサイズ後の画像をシャープ化します。但し、リサイズの方式がランチョスの場合に限ります。プレビュー画面でこの機能の効果を見ることは出来ません。使用法に関してはRawPediaを参照して下さい。
TP_RAWCACORR_AUTO;自動補正
+TP_RAWCACORR_AUTOIT;繰り返し
+TP_RAWCACORR_AVOIDCOLORSHIFT;色ずれを回避
TP_RAWCACORR_CABLUE;ブルー
TP_RAWCACORR_CARED;レッド
TP_RAWCACORR_CASTR;強さ
@@ -1805,17 +1831,23 @@ TP_RAWEXPOS_LINEAR;ホワイトポイント補正
TP_RAWEXPOS_PRESER;ハイライトを保持
TP_RAWEXPOS_RGB;レッド、グリーン、ブルー
TP_RAWEXPOS_TWOGREEN;2つのグリーンを連動
-TP_RAW_1PASSMEDIUM;1-パス (ミディアム)
-TP_RAW_3PASSBEST;3-Pass (最良)
+TP_RAW_1PASSMEDIUM;1-パス (Markesteijn)
+TP_RAW_2PASS;1-パス+fast
+TP_RAW_3PASSBEST;3-Pass (Markesteijn)
+TP_RAW_4PASS;3-パス+fast
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
+TP_RAW_AMAZEVNG4;AMaZE+VNG4
+TP_RAW_BORDER;境界
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB 拡張処理
TP_RAW_DCBITERATIONS;DCB 反復の数
+TP_RAW_DCBVNG4;DCB+VNG4
TP_RAW_DMETHOD;方式
TP_RAW_DMETHOD_PROGRESSBAR;%1 デモザイク中...
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;デモザイク・リファイン中...
TP_RAW_DMETHOD_TOOLTIP;注: IGVとLMMSEは高ISO画像に適しています
+TP_RAW_DUALDEMOSAICCONTRAST;コントラストのしきい値
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;偽色抑制処理の回数
TP_RAW_FAST;Fast
@@ -1833,6 +1865,7 @@ TP_RAW_MONO;Mono
TP_RAW_NONE;なし (センサーのパターンを表示)
TP_RAW_PIXELSHIFT;ピクセルシフト
TP_RAW_PIXELSHIFTBLUR;振れマスクのぼかし
+TP_RAW_PIXELSHIFTDMETHOD;振れに対するデモザイクの方式
TP_RAW_PIXELSHIFTEPERISO;ISOの適合
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;通常のISOに関してはデフォルトの0で十分だと思われます。\n高いISOの場合は、振れの検知を良くするために設定値を上げます。\n少しづつ増加させ、振れのマスクの変化を見ます。
TP_RAW_PIXELSHIFTEQUALBRIGHT;構成画像の明るさを均等にする
@@ -1861,10 +1894,12 @@ TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;デフォルトで設定している値1.0で基
TP_RAW_PIXELSHIFTSMOOTH;境界部分を滑らかにする
TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;これは振れのある領域と振れがない領域の境を滑らかに補正するものです。\n0に設定すると機能の働きはありません。\n1に設定すると、選択された構成画像にAMaZEかLMMSEが使われた結果が得られます("LMMSEを使う"というオプション次第)、或いは"メディアンを使う"が選択されていれば全ての構成画像にメディアンが使われます。
TP_RAW_RCD;RCD
+TP_RAW_RCDVNG4;RCD+VNG4
TP_RAW_SENSOR_BAYER_LABEL;ベイヤー配列を使ったセンサー
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-passが最適です(低ISO画像には奨められます)\n高ISO画像の場合、1-passと3-passの違いは殆どありません、処理速度は前者の方が速いです。
TP_RAW_SENSOR_XTRANS_LABEL;X-Transマトリクスを使ったセンサー
TP_RAW_VNG4;VNG4
+TP_RESIZE_ALLOW_UPSCALING;アップスケーリングを可能にする
TP_RESIZE_APPLIESTO;適用領域:
TP_RESIZE_CROPPEDAREA;切り抜き画像
TP_RESIZE_FITBOX;バウンディング・ボックス
@@ -2003,6 +2038,8 @@ TP_SHARPENMICRO_CONTRAST;コントラストのしきい値
TP_SHARPENMICRO_LABEL;マイクロコントラスト
TP_SHARPENMICRO_MATRIX;3×3マトリクスの代わりに 5×5
TP_SHARPENMICRO_UNIFORMITY;均等
+TP_SOFTLIGHT_LABEL;ソフトライト
+TP_SOFTLIGHT_STRENGTH;強さ
TP_TM_FATTAL_AMOUNT;量
TP_TM_FATTAL_ANCHOR;アンカー
TP_TM_FATTAL_LABEL;ダイナミックレンジ圧縮
@@ -2250,13 +2287,3 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ
ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: +
ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
-!TP_RAW_4PASS;4-Pass
-!TP_RAW_AMAZEVNG4;AMaZE+VNG4
-!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
-!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index d951d2461..212330c9c 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -558,7 +558,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -574,13 +574,14 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -977,10 +978,16 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -992,9 +999,56 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1025,11 +1079,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1066,6 +1121,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1121,6 +1177,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1128,6 +1185,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1139,17 +1197,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1187,13 +1240,10 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1226,12 +1276,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1239,7 +1284,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1248,13 +1292,14 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1268,8 +1313,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1279,36 +1322,26 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1336,6 +1369,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1661,10 +1695,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1711,6 +1741,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1798,6 +1834,8 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1813,15 +1851,18 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1871,10 +1912,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1898,7 +1941,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1982,6 +2025,8 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2075,7 +2120,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 70489ded5..00dc4d800 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -922,7 +922,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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.
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -934,11 +934,12 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!GENERAL_CLOSE;Close
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
@@ -1250,10 +1251,16 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1265,9 +1272,56 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1297,6 +1351,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1313,6 +1368,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!MAIN_TOOLTIP_BACKCOLOR1;Background color of the preview: Black\nShortcut: 9
!MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: White\nShortcut: 9
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@@ -1342,20 +1398,17 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!PARTIALPASTE_PCVIGNETTE;Vignette filter
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
!PREFERENCES_BEHSETALL;All to 'Set'
@@ -1384,11 +1437,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!PREFERENCES_D55;5500K
!PREFERENCES_D60;6000K
!PREFERENCES_D65;6500K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FLUOF2;Fluorescent F2
!PREFERENCES_FLUOF7;Fluorescent F7
!PREFERENCES_FLUOF11;Fluorescent F11
@@ -1413,24 +1463,19 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1443,34 +1488,22 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
!PROFILEPANEL_MODE_TIP;Processing profile fill mode.\n\nButton pressed: partial profiles will be converted to full profiles; the missing values will be replaced with hard-coded defaults.\n\nButton released: profiles will be applied as they are, altering only those values which they contain.
!PROFILEPANEL_MYPROFILES;My profiles
@@ -1490,6 +1523,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1809,6 +1843,12 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
!TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction.
!TP_LABCURVE_CHROMATICITY;Chromaticity
@@ -1878,6 +1918,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1887,13 +1929,16 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1942,10 +1987,12 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1961,7 +2008,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2032,6 +2079,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2114,7 +2163,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index aa96073a4..d002263bc 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -906,13 +906,7 @@ PARTIALPASTE_WAVELETGROUP;Wavelet verwerking
PARTIALPASTE_WHITEBALANCE;Witbalans
PREFERENCES_ADD;Toevoegen
PREFERENCES_APPLNEXTSTARTUP;herstart vereist
-PREFERENCES_AUTLISLOW;Laag
-PREFERENCES_AUTLISMAX;Max - Gemiddelde van alle tegels
-PREFERENCES_AUTLISSTD;Hoog
-PREFERENCES_AUTLISVLOW;Geen
-PREFERENCES_AUTLOW;Laag
PREFERENCES_AUTOMONPROFILE;Gebruik automatisch het standaard monitorprofiel \nvan het besturingsysteem
-PREFERENCES_AUTSTD;Standaard
PREFERENCES_BATCH_PROCESSING;Batch-verwerking
PREFERENCES_BEHADDALL;Alles op 'Toevoegen'
PREFERENCES_BEHADDALLHINT;Zet alle parameters in de Toevoegen mode.\nWijzigingen van parameters in de batch tool zijn deltas op de opgeslagen waarden.
@@ -956,8 +950,6 @@ PREFERENCES_DARKFRAMESHOTS;foto's
PREFERENCES_DARKFRAMETEMPLATES;sjablonen
PREFERENCES_DATEFORMAT;Datumformaat
PREFERENCES_DATEFORMATHINT;U kunt de volgende formaten gebruiken:\n%y : jaar\n%m : maand\n%d : dag\n\nHet Nederlandse datumformaat is bijvoorbeeld:\n%d/%m/%y
-PREFERENCES_DAUB_LABEL;Gebruik Daubechies D6 wavelets in plaats van D4
-PREFERENCES_DAUB_TOOLTIP;De Ruisonderdrukking en Wavelet niveaus gebruiken de Debauchies moeder wavelet. Als je D6 gebruikt in plaats van D4 vergroot het aantal orthogonale Daubechies coëfficiënten en dit verbeterd waarschijnlijk de kwaliteit van de lage niveaus.
PREFERENCES_DIRDARKFRAMES;Map met donkerframes
PREFERENCES_DIRHOME;Standaardmap
PREFERENCES_DIRLAST;Laatst bezochte map
@@ -965,7 +957,6 @@ PREFERENCES_DIROTHER;Anders
PREFERENCES_DIRSELECTDLG;Selecteer standaardmap bij opstarten...
PREFERENCES_DIRSOFTWARE;Installatiemap
PREFERENCES_EDITORLAYOUT;Bewerkingsvenster
-PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;Externe editor
PREFERENCES_FBROWSEROPTS;Opties bestandsnavigator
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Enkele rij navigator werkbalk (de-activeer voor lage resolutie)
@@ -1009,12 +1000,7 @@ PREFERENCES_INTENT_RELATIVE;Relatieve colorimetrie
PREFERENCES_INTENT_SATURATION;Verzadiging
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Toon interne JPEG-miniatuur indien onbewerkt
PREFERENCES_LANGAUTODETECT;Gebruik taalinstellingen pc
-PREFERENCES_LEVAUTDN;Ruisonderdrukking niveau
-PREFERENCES_LEVDN;Cell grootte
-PREFERENCES_LISS;Auto multi-zone verzachten
-PREFERENCES_MAX;Maxi (Tegel)
PREFERENCES_MAXRECENTFOLDERS;Maximum aantal recente mappen
-PREFERENCES_MED;Gemiddeld (Tegel/2)
PREFERENCES_MENUGROUPEXTPROGS;Groepeer open met
PREFERENCES_MENUGROUPFILEOPERATIONS;Groepeer bestandsbewerkingen
PREFERENCES_MENUGROUPLABEL;Groepeer labelen
@@ -1022,7 +1008,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Groepeer profielbewerkingen
PREFERENCES_MENUGROUPRANK;Groepeer markering
PREFERENCES_MENUOPTIONS;Menu-opties
PREFERENCES_METADATA;Metadata
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;Standaard monitor weergave
PREFERENCES_MONITOR;Monitor
PREFERENCES_MONPROFILE;Standaard kleurprofiel
@@ -1031,7 +1016,6 @@ PREFERENCES_MULTITAB;Multi-tab: elke foto opent in nieuw tabvenster
PREFERENCES_MULTITABDUALMON;Multi-tab, indien beschikbaar op tweede monitor
PREFERENCES_NAVGUIDEBRUSH;Navigator randkleur
PREFERENCES_NAVIGATIONFRAME;Navigatie
-PREFERENCES_NOISE;Ruisonderdrukking
PREFERENCES_OUTDIR;Uitvoermap
PREFERENCES_OUTDIRFOLDER;Sla op in map
PREFERENCES_OUTDIRFOLDERHINT;Sla foto's op in andere map
@@ -1065,8 +1049,6 @@ PREFERENCES_PRTPROFILE;Kleurprofiel
PREFERENCES_PSPATH;Installatiemap Adobe Photoshop
PREFERENCES_REMEMBERZOOMPAN;Onthoud zoom % en pan startpunt
PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Onthoud het zoom % en pan startpunt van de huidige afbeelding als er een nieuwe afbeelding wordt geopend.\n\nDeze optie werkt alleen in "Single Editor Tab Mode" en wanneer "Demozaïekmethode van het voorbeeld <100% zoom" hetzelfde is als "Gelijk aan PP3".
-PREFERENCES_RGBDTL_LABEL;Maximum aantal 'threads' voor Ruisonderdrukking en Wavelet (gedeeld door 2)
-PREFERENCES_RGBDTL_TOOLTIP;Ruisonderdrukking en Wavelet gebruiken ongeveer 128MB RAM voor een 10MPix afbeelding, of 512MB voor een 40MPix afbeelding en additioneel 128MB RAM per thread. Hoe meer threads parallel worden gebruikt, hoe sneller de bewerking. Laat de instelling op "0" staan om automatisch het maximale aantal threads te gebruiken dat mogelijk is.
PREFERENCES_SELECTFONT;Kies lettertype
PREFERENCES_SELECTFONT_COLPICKER;Font van de Kleurkiezer
PREFERENCES_SELECTLANG;Selecteer taal
@@ -1080,36 +1062,25 @@ PREFERENCES_SHOWDATETIME;Toon datum en tijd
PREFERENCES_SHOWEXPOSURECOMPENSATION;Toon belichtingscompensatie
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Toon filmstrip werkbalk
PREFERENCES_SHTHRESHOLD;Grenswaarde onderbelichting
-PREFERENCES_SIMPLAUT;Gereedschap
PREFERENCES_SINGLETAB;Enkel-tab: foto's openen in zelfde tabvenster
PREFERENCES_SINGLETABVERTAB;Enkel-tab ('filmstrip') modus met verticale tabs
-PREFERENCES_SMA;Klein (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Verwerkingsrij klaar
PREFERENCES_SND_HELP;Typ bestandsnaam (of niets: geen geluid).\nWindows: gebruik 'SystemDefault', 'SystemAsterisk', etc. voor systeemgeluiden.\nLinux: gebruik "complete", "window-attention" etc. voor systeemgeluiden
PREFERENCES_SND_LNGEDITPROCDONE;Bewerking klaar
PREFERENCES_SND_THRESHOLDSECS;na seconden
PREFERENCES_STARTUPIMDIR;Standaardmap bij opstarten
-PREFERENCES_STDAUT;Standaard
PREFERENCES_TAB_BROWSER;Bestandsnavigator
PREFERENCES_TAB_COLORMGR;Kleurbeheer
PREFERENCES_TAB_DYNAMICPROFILE;Dynamisch Profielregel
PREFERENCES_TAB_GENERAL;Algemeen
PREFERENCES_TAB_IMPROC;Beeldverwerking
-PREFERENCES_TAB_PERFORMANCE;Prestaties en Kwaliteit
PREFERENCES_TAB_SOUND;Geluiden
-PREFERENCES_TIMAX;Hoog
-PREFERENCES_TINB;Aantal tegles
-PREFERENCES_TISTD;Standaard
PREFERENCES_TP_LABEL;Gereedschapspaneel:
PREFERENCES_TP_USEICONORTEXT;Gebruik iconen ipv. tekst voor de tabbladen
PREFERENCES_TP_VSCROLLBAR;Verberg de schuifbalk van het gereedschapspaneel
PREFERENCES_TUNNELMETADATA;Kopieer Exif/IPTC/XMP-data onveranderd naar uitvoerbestand
PREFERENCES_USEBUNDLEDPROFILES;Gebruik gebundelde profielen
PREFERENCES_VIEW;Witbalans instelling van het uitvoerapparaat (monitor, TV, projector...)
-PREFERENCES_WAVLEV;Vergroot wavelet ninveau voor kwaliteit 'hoog'
-PREFERENCES_WLONE;Eén niveau
-PREFERENCES_WLTWO;Twee niveaus
-PREFERENCES_WLZER;Nee
PREFERENCES_WORKFLOW;Layout
PROFILEPANEL_COPYPPASTE;Te kopiëren parameters
PROFILEPANEL_GLOBALPROFILES;Gebundelde profielen
@@ -2111,8 +2082,10 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!EXIFFILTER_IMAGETYPE;Image type
!EXIFPANEL_SHOWALL;Show all
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
!HISTORY_MSG_235;B&W - CM - Auto
@@ -2141,10 +2114,16 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -2156,23 +2135,75 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
!PARTIALPASTE_ADVANCEDGROUP;Advanced Settings
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
+!PARTIALPASTE_RAW_BORDER;Raw border
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_CROP;Crop editing
!PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop area
@@ -2185,9 +2216,12 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
!PREFERENCES_LANG;Language
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PROFILESAVEBOTH;Save processing profile both to the cache and next to the input file
!PREFERENCES_PROFILESAVELOCATION;Processing profile saving location
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
@@ -2204,6 +2238,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
!TP_BWMIX_MIXC;Channel Mixer
@@ -2222,6 +2257,12 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors
!TP_EXPOSURE_HISTMATCHING;Auto-Matched Tone Curve
!TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -2238,8 +2279,13 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
-!TP_RAW_4PASS;4-Pass
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
@@ -2249,11 +2295,15 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels.
!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain.
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index b433dc902..f61fa7a88 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -557,7 +557,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -573,13 +573,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -976,10 +977,16 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -991,9 +998,56 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1024,11 +1078,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1065,6 +1120,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1120,6 +1176,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1127,6 +1184,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1138,17 +1196,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1186,13 +1239,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1225,12 +1275,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1238,7 +1283,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1247,13 +1291,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1267,8 +1312,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1278,36 +1321,26 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1335,6 +1368,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1660,10 +1694,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1710,6 +1740,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1797,6 +1833,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1812,15 +1850,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1870,10 +1911,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1897,7 +1940,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1981,6 +2024,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2074,7 +2119,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index b9b336f3f..3558870b8 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -776,8 +776,6 @@ PREFERENCES_PROFILESAVECACHE;Zapisz parametry przetwarzania w pamięci podręczn
PREFERENCES_PROFILESAVEINPUT;Zapisz parametry przetwarzania obok pliku wejściowego
PREFERENCES_PROPERTY;Własność
PREFERENCES_PSPATH;Katalog w którym zainstalowany jest Adobe Photoshop
-PREFERENCES_RGBDTL_LABEL;Maksymalna ilość wątków redukcji szumów
-PREFERENCES_RGBDTL_TOOLTIP;Redukcja szumów potrzebuje około 128MB RAMu dla zdjęcia 10Mpix oraz 512MB dla zdjęcia 40Mpix, i dodatkowo 128MB dla każdego wątku. Im większa liczba równoległych wątków, tym krótszy czas egzekucji. Zostawienie ustawienia na "0" automatycznie użyje tyle wątków, ile możliwe.
PREFERENCES_SELECTFONT;Wybierz czcionkę
PREFERENCES_SELECTLANG;Wybierz język
PREFERENCES_SELECTTHEME;Wybierz temat
@@ -797,7 +795,6 @@ PREFERENCES_TAB_BROWSER;Przeglądarka plików
PREFERENCES_TAB_COLORMGR;Zarządzanie kolorami
PREFERENCES_TAB_GENERAL;Ogólne
PREFERENCES_TAB_IMPROC;Przetwarzanie obrazu
-PREFERENCES_TAB_PERFORMANCE;Wydajność
PREFERENCES_TAB_SOUND;Dźwięki
PREFERENCES_TP_LABEL;Panel narzędzi:
PREFERENCES_TP_USEICONORTEXT;Uzyj ikon w zakładkach zamiast tekstowych etykiet
@@ -1464,7 +1461,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1474,8 +1471,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
@@ -1663,10 +1662,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1678,8 +1683,55 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1709,12 +1761,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -1723,19 +1777,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PARTIALPASTE_EQUALIZER;Wavelet levels
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CMMBPC;Black point compensation
@@ -1751,11 +1802,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1767,22 +1815,17 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1801,23 +1844,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1830,6 +1864,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
@@ -1904,6 +1939,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -1923,14 +1964,19 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -1974,7 +2020,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1990,7 +2038,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2057,6 +2105,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2129,7 +2179,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 19ca6a4dd..27740a48c 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -776,8 +776,6 @@ PREFERENCES_PROFILESAVECACHE;Zapisz parametry przetwarzania w pamieci podrecznej
PREFERENCES_PROFILESAVEINPUT;Zapisz parametry przetwarzania obok pliku wejsciowego
PREFERENCES_PROPERTY;Wlasnosc
PREFERENCES_PSPATH;Katalog w ktorym zainstalowany jest Adobe Photoshop
-PREFERENCES_RGBDTL_LABEL;Maksymalna ilosc watkow redukcji szumow
-PREFERENCES_RGBDTL_TOOLTIP;Redukcja szumow potrzebuje okolo 128MB RAMu dla zdjecia 10Mpix oraz 512MB dla zdjecia 40Mpix, i dodatkowo 128MB dla kazdego watku. Im wieksza liczba rownoleglych watkow, tym krotszy czas egzekucji. Zostawienie ustawienia na "0" automatycznie uzyje tyle watkow, ile mozliwe.
PREFERENCES_SELECTFONT;Wybierz czcionke
PREFERENCES_SELECTLANG;Wybierz jezyk
PREFERENCES_SELECTTHEME;Wybierz temat
@@ -797,7 +795,6 @@ PREFERENCES_TAB_BROWSER;Przegladarka plikow
PREFERENCES_TAB_COLORMGR;Zarzadzanie kolorami
PREFERENCES_TAB_GENERAL;Ogolne
PREFERENCES_TAB_IMPROC;Przetwarzanie obrazu
-PREFERENCES_TAB_PERFORMANCE;Wydajnosc
PREFERENCES_TAB_SOUND;Dzwieki
PREFERENCES_TP_LABEL;Panel narzedzi:
PREFERENCES_TP_USEICONORTEXT;Uzyj ikon w zakladkach zamiast tekstowych etykiet
@@ -1464,7 +1461,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1474,8 +1471,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_166;Exposure - Reset
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
@@ -1663,10 +1662,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1678,8 +1683,55 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1709,12 +1761,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -1723,19 +1777,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PARTIALPASTE_EQUALIZER;Wavelet levels
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CMMBPC;Black point compensation
@@ -1751,11 +1802,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1767,22 +1815,17 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1801,23 +1844,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1830,6 +1864,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
@@ -1904,6 +1939,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -1923,14 +1964,19 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -1974,7 +2020,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1990,7 +2038,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2057,6 +2105,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2129,7 +2179,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 961b18455..ba33f8228 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -1,11 +1,11 @@
-#01 2018-05-17 Digitalpix58
+#01 2018-07-25 Digitalpix58
ABOUT_TAB_BUILD;Versão
ABOUT_TAB_CREDITS;Créditos
ABOUT_TAB_LICENSE;Licença
ABOUT_TAB_RELEASENOTES;Nota de Lançamento
ABOUT_TAB_SPLASH;Splash
-ADJUSTER_RESET_TO_DEFAULT;Restaurar ao padrão
+ADJUSTER_RESET_TO_DEFAULT;Clique - restaurar para o valor padrão.\nCtrl+clique - restaurar para o valor inicial.
BATCHQUEUE_AUTOSTART;Início automático
BATCHQUEUE_AUTOSTARTHINT;Começa a processar automaticamente um novo trabalho.
BATCHQUEUE_DESTFILENAME;Caminho e nome do arquivo
@@ -17,10 +17,10 @@ CURVEEDITOR_AXIS_OUT;O:
CURVEEDITOR_AXIS_RIGHT_TAN;RT:
CURVEEDITOR_CURVE;Curva
CURVEEDITOR_CURVES;Curvas
-CURVEEDITOR_CUSTOM;Personalizados
+CURVEEDITOR_CUSTOM;Personalizado
CURVEEDITOR_DARKS;Escuros
CURVEEDITOR_EDITPOINT_HINT;Ativar edição dos valores de entrada/saída do nó.\n\nClique com o btão direito do mouse num nó para selecioná-lo.\nClique com o botão direito do mouse no espaço vazio para desmarcar o nó.
-CURVEEDITOR_HIGHLIGHTS;Destaques
+CURVEEDITOR_HIGHLIGHTS;Realces
CURVEEDITOR_LIGHTS;Luzes
CURVEEDITOR_LINEAR;Linear
CURVEEDITOR_LOADDLGLABEL;Carregar curva...
@@ -45,7 +45,7 @@ DYNPROFILEEDITOR_MOVE_DOWN;Mover para Baixo
DYNPROFILEEDITOR_MOVE_UP;Mover para Cima
DYNPROFILEEDITOR_NEW;Novo
DYNPROFILEEDITOR_NEW_RULE;Nva Regra de Perfil Dinâmico
-DYNPROFILEEDITOR_PROFILE;Processando Perfil
+DYNPROFILEEDITOR_PROFILE;Perfil de Processamento
EDITWINDOW_TITLE;Edição de Imagem
EDIT_OBJECT_TOOLTIP;Exibe um widget na janela de visualização que permite ajustar essa ferramenta.
EDIT_PIPETTE_TOOLTIP;Para adicionar um ponto de ajuste à curva, segure a tecla Ctrl enquanto clica com o botão esquerdo no ponto desejado na visualização da imagem.\nPara ajustar o ponto, Mantenha pressionada a tecla Ctrl enquanto clica com o botão esquerdo na área correspondente na visualização, então solte Ctrl (amenos que deseje um fino controle) e enquanto ainda mantém pressionado o botão esquerdo do mouse, mova o mouse para cima ou para baixo para mover esse ponto para cima ou para baixo na curva.
@@ -89,7 +89,7 @@ EXPORT_BYPASS_RAW_FF;Ignorar [raw] Flat-Field
EXPORT_BYPASS_RAW_GREENTHRESH;Ignorar [raw] Equilíbrio Verde
EXPORT_BYPASS_RAW_LINENOISE;Ignorar [raw] Filtro de Ruído de Linha
EXPORT_BYPASS_RAW_LMMSE_ITERATIONS;Ignorar [raw] LMMSE Etapas de Aprimoramento
-EXPORT_BYPASS_SHARPENEDGE;Ignorar Afiação de Borda
+EXPORT_BYPASS_SHARPENEDGE;Ignorar Nitidez de Borda
EXPORT_BYPASS_SHARPENING;Ignorar Nitidez
EXPORT_BYPASS_SHARPENMICRO;Ignorar Microcontraste
EXPORT_BYPASS_SH_HQ;Ignorar Sombras/Realces da Máscara de Nitidez
@@ -150,7 +150,7 @@ FILEBROWSER_POPUPOPEN;Abrir
FILEBROWSER_POPUPOPENINEDITOR;Abrir no Editor
FILEBROWSER_POPUPPROCESS;Coloque na fila
FILEBROWSER_POPUPPROCESSFAST;Coloque na fila (Exportação rápida)
-FILEBROWSER_POPUPPROFILEOPERATIONS;Processando operações de perfil
+FILEBROWSER_POPUPPROFILEOPERATIONS;Operações de perfil de processamento
FILEBROWSER_POPUPRANK;Classificar
FILEBROWSER_POPUPRANK0;Desclassificar
FILEBROWSER_POPUPRANK1;Rank 1 *
@@ -206,7 +206,7 @@ FILECHOOSER_FILTER_ANY;Todos os arquivos
FILECHOOSER_FILTER_COLPROF;Perfis de Cores
FILECHOOSER_FILTER_CURVE;Arquivos de curvas
FILECHOOSER_FILTER_LCP;Perfis de correção de lentes
-FILECHOOSER_FILTER_PP;Processando perfis
+FILECHOOSER_FILTER_PP;Perfis de processamento
FILECHOOSER_FILTER_SAME;Mesmo formato da foto atual
FILECHOOSER_FILTER_TIFF;Arquivos TIFF
GENERAL_ABOUT;Sobre
@@ -229,7 +229,9 @@ GENERAL_NONE;None
GENERAL_OK;OK
GENERAL_OPEN;Abrir
GENERAL_PORTRAIT;Retrato
+GENERAL_RESET;Restaurar
GENERAL_SAVE;Salvar
+GENERAL_SAVE_AS;Salvar como...
GENERAL_SLIDER;Barra de volume
GENERAL_UNCHANGED;(Inalterado)
GENERAL_WARNING;Atenção
@@ -250,7 +252,7 @@ HISTORY_MSG_1;Foto Carregada
HISTORY_MSG_2;PP3 Perfil carregado
HISTORY_MSG_3;PP3 Perfil alterado
HISTORY_MSG_4;Histórico de navegação
-HISTORY_MSG_5;Exposição - Luminosidade
+HISTORY_MSG_5;Exposição - Claridade
HISTORY_MSG_6;Exposição - Contraste
HISTORY_MSG_7;Exposição - Preto
HISTORY_MSG_8;Exposição - Compensação
@@ -259,7 +261,7 @@ HISTORY_MSG_10;Exposição - Compressão de sombra
HISTORY_MSG_11;Exposição - Curva de tom 1
HISTORY_MSG_12;Exposição - Níveis automáticos
HISTORY_MSG_13;Exposição - Clip
-HISTORY_MSG_14;L*a*b* - Luminosidade
+HISTORY_MSG_14;L*a*b* - Claridade
HISTORY_MSG_15;L*a*b* - Contraste
HISTORY_MSG_16;-
HISTORY_MSG_17;-
@@ -268,8 +270,8 @@ HISTORY_MSG_19;L*a*b* - L* curva
HISTORY_MSG_20;Nitidez
HISTORY_MSG_21;USM - Raio
HISTORY_MSG_22;USM - Montante
-HISTORY_MSG_23;USM - Limiar
-HISTORY_MSG_24;USM - Nitidez nas bordas
+HISTORY_MSG_23;USM - Limite
+HISTORY_MSG_24;USM - Nitidez somente nas bordas
HISTORY_MSG_25;USM - Raio de detecção de borda
HISTORY_MSG_26;USM - Tolerância de borda
HISTORY_MSG_27;USM - Controle de halo
@@ -298,7 +300,7 @@ HISTORY_MSG_49;DCP illuminante
HISTORY_MSG_50;Sombras/Realces
HISTORY_MSG_51;S/H - Realces
HISTORY_MSG_52;S/H - Sombras
-HISTORY_MSG_53;S/H - Largura tonal do realces
+HISTORY_MSG_53;S/H - Largura tonal dos realces
HISTORY_MSG_54;S/H - Largura tonal das sombras
HISTORY_MSG_55;S/H - Contraste local
HISTORY_MSG_56;S/H - Raio
@@ -333,7 +335,7 @@ HISTORY_MSG_84;Correção de perspectiva
HISTORY_MSG_85;Correção de Lente - Arquivo LCP
HISTORY_MSG_86;RGB Curvas - Modo de lLuminosidade
HISTORY_MSG_87;Redução de Ruído por Impulso
-HISTORY_MSG_88;Limiar de Impulso NR
+HISTORY_MSG_88;Limite de Impulso NR
HISTORY_MSG_89;Redução de Ruído
HISTORY_MSG_90;NR - Luminância
HISTORY_MSG_91;NR - Crominância mestre
@@ -352,8 +354,8 @@ HISTORY_MSG_103;HSV - Valor
HISTORY_MSG_104;HSV Equalizador
HISTORY_MSG_105;Defringe
HISTORY_MSG_106;Defringe - Raio
-HISTORY_MSG_107;Defringe - Limiar
-HISTORY_MSG_108;Exposição - Limiar HLC
+HISTORY_MSG_107;Defringe - Limite
+HISTORY_MSG_108;Exposição - Limite HLC
HISTORY_MSG_109;Redimensionar - Caixa delimitadora
HISTORY_MSG_110;Redimensionar - Aplica-se a
HISTORY_MSG_111;L*a*b* - Evite mudança de cor
@@ -402,8 +404,8 @@ HISTORY_MSG_153;Vibração - Tons saturados
HISTORY_MSG_154;Vibração - Protege os tons da película
HISTORY_MSG_155;Vibração - Evita mudança de cor
HISTORY_MSG_156;Vibração - Link pastel/saturado
-HISTORY_MSG_157;Vibração - Limiar P/S
-HISTORY_MSG_158;TM - Robustez
+HISTORY_MSG_157;Vibração - Limite P/S
+HISTORY_MSG_158;TM - Intensidade
HISTORY_MSG_159;TM - Borda parando
HISTORY_MSG_160;TM - Escala
HISTORY_MSG_161;TM - Reponderar iteração
@@ -425,7 +427,7 @@ HISTORY_MSG_176;CAM02 - Visualizando surround
HISTORY_MSG_177;CAM02 - Luminosidade de cena
HISTORY_MSG_178;CAM02 - Visualizando luminosidade
HISTORY_MSG_179;CAM02 - Modelo de ponto branco
-HISTORY_MSG_180;CAM02 - Luminosidade (J)
+HISTORY_MSG_180;CAM02 - Claridade (J)
HISTORY_MSG_181;CAM02 - Croma (C)
HISTORY_MSG_182;CAM02 - Automático CAT02
HISTORY_MSG_183;CAM02 - Contraste (J)
@@ -456,7 +458,7 @@ HISTORY_MSG_207;Defringe - Curva de matiz
HISTORY_MSG_208;Equalizador WB - B/R
HISTORY_MSG_210;GF - Ângulo
HISTORY_MSG_211;Filtro Graduado
-HISTORY_MSG_212;VF - Robustez
+HISTORY_MSG_212;VF - Intensidade
HISTORY_MSG_213;Filtro de Vinheta
HISTORY_MSG_214;Preto-e-Branco
HISTORY_MSG_215;P&B - CM - Vermelho
@@ -482,18 +484,18 @@ HISTORY_MSG_234;P&B - Tipo de curva 'posterior'
HISTORY_MSG_235;P&B - Misturador de canal automático
HISTORY_MSG_236;--sem uso--
HISTORY_MSG_237;P&B - Misturador
-HISTORY_MSG_238;GF - Pena
-HISTORY_MSG_239;GF - Robustez
+HISTORY_MSG_238;GF - Difusão
+HISTORY_MSG_239;GF - Intensidade
HISTORY_MSG_240;GF - Centro
-HISTORY_MSG_241;VF - Pena
+HISTORY_MSG_241;VF - Difusão
HISTORY_MSG_242;VF - Arredondamento
HISTORY_MSG_243;VC - Raio
-HISTORY_MSG_244;VC - Robustez
+HISTORY_MSG_244;VC - Intensidade
HISTORY_MSG_245;VC - Centro
HISTORY_MSG_246;L*a*b* - Curva CL
HISTORY_MSG_247;L*a*b* - Curva LH
HISTORY_MSG_248;L*a*b* - Curva HH
-HISTORY_MSG_249;CbDL - Limiar
+HISTORY_MSG_249;CbDL - Limite
HISTORY_MSG_250;NR - Aprimorada
HISTORY_MSG_251;P&B - Algorítimo
HISTORY_MSG_252;CbDL - Película tar/prot
@@ -525,9 +527,9 @@ HISTORY_MSG_277;--sem uso--
HISTORY_MSG_278;CT - Preserve luminância
HISTORY_MSG_279;CT - Sombras
HISTORY_MSG_280;CT - Realces
-HISTORY_MSG_281;CT - Sat. robustez
-HISTORY_MSG_282;CT - Sat. limiar
-HISTORY_MSG_283;CT - Robustez
+HISTORY_MSG_281;CT - Sat. intensidade
+HISTORY_MSG_282;CT - Sat. limite
+HISTORY_MSG_283;CT - Intensidade
HISTORY_MSG_284;CT - Proteção automática sat.
HISTORY_MSG_285;NR - Mediano - Método
HISTORY_MSG_286;NR - Mediano - Tipo
@@ -538,7 +540,7 @@ HISTORY_MSG_290;Nível de Preto - Vermelho
HISTORY_MSG_291;Nível de Preto - Verde
HISTORY_MSG_292;Nível de Preto - Azul
HISTORY_MSG_293;Simulação de Filme
-HISTORY_MSG_294;Simulação de Filme - Robustez
+HISTORY_MSG_294;Simulação de Filme - Intensidade
HISTORY_MSG_295;Simulação de Filme - Filme
HISTORY_MSG_296;NR - Curva de luminância
HISTORY_MSG_297;NR - Modo
@@ -556,7 +558,7 @@ HISTORY_MSG_308;W - Direção do processo
HISTORY_MSG_309;W - ES - Detalhe
HISTORY_MSG_310;W - Residual - Céu tar/prot
HISTORY_MSG_311;W - Níveis de Wavelet
-HISTORY_MSG_312;W - Residual - Limiar de sombras
+HISTORY_MSG_312;W - Residual - Limite de sombras
HISTORY_MSG_313;W - Croma - Sat/past
HISTORY_MSG_314;W - Gamut - Reduzir artefatos
HISTORY_MSG_315;W - Residual - Contraste
@@ -572,7 +574,7 @@ HISTORY_MSG_324;W - Croma - Pastel
HISTORY_MSG_325;W - Croma - Saturado
HISTORY_MSG_326;W - Croma - Método
HISTORY_MSG_327;W - Contraste - Aplicar para
-HISTORY_MSG_328;W - Croma - Robustez do link
+HISTORY_MSG_328;W - Croma - Intensidade do link
HISTORY_MSG_329;W - Tonificação - Opacidade RG
HISTORY_MSG_330;W - Tonificação - Opacidade BY
HISTORY_MSG_331;W - Níveis de contraste - Extra
@@ -580,11 +582,11 @@ HISTORY_MSG_332;W - Método de ladrilhos
HISTORY_MSG_333;W - Residual - Sombras
HISTORY_MSG_334;W - Residual - Croma
HISTORY_MSG_335;W - Residual - Realces
-HISTORY_MSG_336;W - Residual - Limiar de realces
+HISTORY_MSG_336;W - Residual - Limite de realces
HISTORY_MSG_337;W - Residual - Tonalidade do céu
HISTORY_MSG_338;W - ES - Raio
-HISTORY_MSG_339;W - ES - Robustez
-HISTORY_MSG_340;W - Robustez
+HISTORY_MSG_339;W - ES - Intensidade
+HISTORY_MSG_340;W - Intensidade
HISTORY_MSG_341;W - Performance de borda
HISTORY_MSG_342;W - ES - Primeiro nível
HISTORY_MSG_343;W - Níveis cromáticos
@@ -599,15 +601,15 @@ HISTORY_MSG_351;W - Residual - Curva HH
HISTORY_MSG_352;W - Fundo
HISTORY_MSG_353;W - ES - Sensibilidade Gradiente
HISTORY_MSG_354;W - ES - Aprimorada
-HISTORY_MSG_355;W - ES - Limiar baixo
-HISTORY_MSG_356;W - ES - Limiar alto
+HISTORY_MSG_355;W - ES - Limite baixo
+HISTORY_MSG_356;W - ES - Limite alto
HISTORY_MSG_357;W - Remoção de ruído - Link com ES
HISTORY_MSG_358;W - Gamut - CH
-HISTORY_MSG_359;Hot/Dead - Limiar
+HISTORY_MSG_359;Hot/Dead - Limite
HISTORY_MSG_360;TM - Gamma
HISTORY_MSG_361;W - Final - Balanço cromático
HISTORY_MSG_362;W - Residual - Método de compressão
-HISTORY_MSG_363;W - Residual - Robustez da compressão
+HISTORY_MSG_363;W - Residual - Intensidade da compressão
HISTORY_MSG_364;W - Final - Balanço de Contraste
HISTORY_MSG_365;W - Final - Balanço Delta
HISTORY_MSG_366;W - Residual - Gamma de compressão
@@ -618,7 +620,7 @@ HISTORY_MSG_370;W - Final - Curva de contraste local
HISTORY_MSG_371;Pós Redimensionamento de Nitidez
HISTORY_MSG_372;PRS USM - Raio
HISTORY_MSG_373;PRS USM - Montante
-HISTORY_MSG_374;PRS USM - Limiar
+HISTORY_MSG_374;PRS USM - Limite
HISTORY_MSG_375;PRS USM - Nitidez apenas nas bordas
HISTORY_MSG_376;PRS USM - Raio de detecção de borda
HISTORY_MSG_377;PRS USM - Tolerância de borda
@@ -654,28 +656,28 @@ HISTORY_MSG_406;W - ES - Pixels vizinhos
HISTORY_MSG_407;Retinex - Método
HISTORY_MSG_408;Retinex - Raio
HISTORY_MSG_409;Retinex - Contraste
-HISTORY_MSG_410;Retinex - Offset
-HISTORY_MSG_411;Retinex - Robustez
+HISTORY_MSG_410;Retinex - Compensação
+HISTORY_MSG_411;Retinex - Intensidade
HISTORY_MSG_412;Retinex - Gradiente de Gaussian
HISTORY_MSG_413;Retinex - Contraste
HISTORY_MSG_414;Retinex - Histograma - Laboratório
-HISTORY_MSG_415;Retinex - Transmição
+HISTORY_MSG_415;Retinex - Transmissão
HISTORY_MSG_416;Retinex
HISTORY_MSG_417;Retinex - Mediana de transmissão
-HISTORY_MSG_418;Retinex - Limiar
+HISTORY_MSG_418;Retinex - Limite
HISTORY_MSG_419;Retinex - Espaço colorido
HISTORY_MSG_420;Retinex - Histograma - HSL
HISTORY_MSG_421;Retinex - Gamma
HISTORY_MSG_422;Retinex - Gamma
-HISTORY_MSG_423;Retinex - Inclinação gamma
-HISTORY_MSG_424;Retinex - Limiar HL
+HISTORY_MSG_423;Retinex - Declive gamma
+HISTORY_MSG_424;Retinex - Limite HL
HISTORY_MSG_425;Retinex - Base de registro
HISTORY_MSG_426;Retinex - Equalizador de matiz
HISTORY_MSG_427;Intenção de renderização de saída
HISTORY_MSG_428;Intenção de renderização do monitor
HISTORY_MSG_429;Retinex - Iterações
HISTORY_MSG_430;Retinex - Gradiente de transmissão
-HISTORY_MSG_431;Retinex - Gradiente de robustez
+HISTORY_MSG_431;Retinex - Gradiente de intensidade
HISTORY_MSG_432;Retinex - M - Realces
HISTORY_MSG_433;Retinex - M - Realces TW
HISTORY_MSG_434;Retinex - M - Sombras
@@ -695,9 +697,9 @@ HISTORY_MSG_452;PS - Mostrar movimento
HISTORY_MSG_453;PS - Mostrar apenas a máscara
HISTORY_MSG_457;PS - Verificar vermelho/azul
HISTORY_MSG_462;PS - Verificar verde
-HISTORY_MSG_464;PS - Máscara de movimento borrar
-HISTORY_MSG_465;PS - Raio borrar
-HISTORY_MSG_468;PS - Preencher furos
+HISTORY_MSG_464;PS - Máscara de movimento de desfoque
+HISTORY_MSG_465;PS - Raio de desfoque
+HISTORY_MSG_468;PS - Preencher buracos
HISTORY_MSG_469;PS - Mediano
HISTORY_MSG_471;PS - Correção de movimento
HISTORY_MSG_472;PS - Transições suaves
@@ -716,24 +718,84 @@ HISTORY_MSG_484;CAM02 - Cena automática Yb
HISTORY_MSG_485;Correção de Lente
HISTORY_MSG_486;Correção de Lente - Câmera
HISTORY_MSG_487;Correção de Lente - Lente
+HISTORY_MSG_488;Compressão de Amplitude Dinâmica(DRC)
+HISTORY_MSG_489;DRC - Limite
+HISTORY_MSG_490;DRC - Montante
HISTORY_MSG_491;Balanço de Branco
HISTORY_MSG_492;Curvas RGB
HISTORY_MSG_493;L*a*b* Ajustes
HISTORY_MSG_CLAMPOOG;Recorte de cor fora do gamut
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Correção de cor
+HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Limite de contraste
HISTORY_MSG_HISTMATCHING;Curva de Tom Auto-compatível
+HISTORY_MSG_ICM_OUTPUT_PRIMARIESPrimárias do perfil de saída
+HISTORY_MSG_ICM_OUTPUT_TEMP;Saída IccV4 D iluminante
+HISTORY_MSG_ICM_OUTPUT_TYPE;Tipo de perfil de saída
+HISTORY_MSG_ICM_WORKING_GAMMA;Gamma de trabalho
+HISTORY_MSG_ICM_WORKING_SLOPE;Declive de trabalho
+HISTORY_MSG_ICM_WORKING_TRC_METHOD;Método de trabalho TRC
HISTORY_MSG_LOCALCONTRAST_AMOUNT;Contraste Local - Montante
HISTORY_MSG_LOCALCONTRAST_DARKNESS;Contraste Local - Escuridão
HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste Local
-HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste Local - Luminosidade
+HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste Local - Claridade
HISTORY_MSG_LOCALCONTRAST_RADIUS;Contraste Local - Raio
HISTORY_MSG_METADATA_MODE;Modo de cópia de metadados
+HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontraste - Limite de contraste
+HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Método Demosaico para Movimento
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Direção do filtro de ruído de linha
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;Filtros de linha PDAF
+HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Limite de contraste
+HISTORY_MSG_RAW_BORDER;Borda raw
+HISTORY_MSG_RESIZE_ALLOWUPSCALING;Redimensionar - Permitir escalonamento
+HISTORY_MSG_SHARPENING_CONTRAST;Nitidez - Limite de contraste
+HISTORY_MSG_SOFTLIGHT_ENABLED;Luz suave
+HISTORY_MSG_SOFTLIGHT_STRENGTH;Luz suave - Intensidade
+HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Âncora
HISTORY_NEWSNAPSHOT;Adicionar
HISTORY_NEWSNAPSHOT_TOOLTIP;Atalho: Alt-s
HISTORY_SNAPSHOT;Instantâneo
HISTORY_SNAPSHOTS;Instantâneos
+ICCPROFCREATOR_ADD_PARAM_IN_DESC;Anexar os valores Gamma e Declive para a descrição
+ICCPROFCREATOR_COPYRIGHT;Direito Autoral:
+ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Restaurar para o direito autoral padrão, concedido a "RawTherapee, CC0"
+ICCPROFCREATOR_CUSTOM;Personalizado
+ICCPROFCREATOR_DESCRIPTION;Descrição:
+ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Deixe em branco para configurar a descrição padrão
+ICCPROFCREATOR_GAMMA;Gamma
+ICCPROFCREATOR_ICCVERSION;Versão do perfil gerado:
+ICCPROFCREATOR_ILL;Iluminante:
+ICCPROFCREATOR_ILL_41;D41
+ICCPROFCREATOR_ILL_50;D50
+ICCPROFCREATOR_ILL_55;D55
+ICCPROFCREATOR_ILL_60;D60
+ICCPROFCREATOR_ILL_65;D65
+ICCPROFCREATOR_ILL_80;D80
+ICCPROFCREATOR_ILL_DEF;Padrão
+ICCPROFCREATOR_ILL_INC;StdA 2856K
+ICCPROFCREATOR_ILL_TOOLTIP;Só podes configurar o iluminante com perfis ICC v4
+ICCPROFCREATOR_PRIMARIES;Primárias:
+ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+ICCPROFCREATOR_PRIM_BEST;RGB superior
+ICCPROFCREATOR_PRIM_BETA;BetaRGB
+ICCPROFCREATOR_PRIM_BLUX;Azul X
+ICCPROFCREATOR_PRIM_BLUY;Azul Y
+ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+ICCPROFCREATOR_PRIM_GREX;Verde X
+ICCPROFCREATOR_PRIM_GREY;Verde Y
+ICCPROFCREATOR_PRIM_PROPH;Prophoto
+ICCPROFCREATOR_PRIM_REC2020;Rec2020
+ICCPROFCREATOR_PRIM_REDX;Vermelho X
+ICCPROFCREATOR_PRIM_REDY;Vermelho Y
+ICCPROFCREATOR_PRIM_SRGB;sRGB
+ICCPROFCREATOR_PRIM_TOOLTIP;Só podes configurar Primárias Personalizadas com perfis ICC v4
+ICCPROFCREATOR_PRIM_WIDEG;Gamut ampla
+ICCPROFCREATOR_PROF_V2;ICC v2
+ICCPROFCREATOR_PROF_V4;ICC v4
+ICCPROFCREATOR_SAVEDIALOG_TITLE;Salvar o perfil ICC como...
+ICCPROFCREATOR_SLOPE;Declive
+ICCPROFCREATOR_TRC_PRESET;Curva de resposta do tom:
IPTCPANEL_CATEGORY;Categoria
IPTCPANEL_CATEGORYHINT;Identifica o assunto da imagem na opinião do provedor.
IPTCPANEL_CITY;Cidade
@@ -781,6 +843,7 @@ LENSPROFILE_CORRECTION_LCPFILE;Arquivo LCP
LENSPROFILE_CORRECTION_MANUAL;Parâmetros de correção manual
LENSPROFILE_LENS_WARNING;Aviso: o fator de corte usado para o perfil da lente é maior que o fator de corte da câmera, os resultados podem estar errados.
MAIN_BUTTON_FULLSCREEN;Tela cheia
+MAIN_BUTTON_ICCPROFCREATOR;Criador de Perfil ICC
MAIN_BUTTON_NAVNEXT_TOOLTIP;Navegue até a próxima imagem relativa à imagem aberta no Editor.\nAtalho: Shift-F4\n\nPara navegar até a próxima imagem relativa à miniatura selecionada no Navegador de Arquivos ou no Diapositivo:\nAtalho: F4
MAIN_BUTTON_NAVPREV_TOOLTIP;Navegue até a imagem anterior relativa à imagem aberta no Editor.\nAtalho: Shift-F3\n\nPara navegar até a imagem anterior relativa à miniatura selecionada no Navegador de Arquivos ou no Diapositivo:\nAtalho: F3
MAIN_BUTTON_NAVSYNC_TOOLTIP;Sincronize o Navegador de Arquivos ou o Diapositivo com o Editor para revelar a miniatura da imagem aberta no momento e limpe os filtros ativos.\nAtalho: x\n\nComo acima, mas sem limpar os filtros ativos:\nAtalho: y\n(Observe que a miniatura da imagem aberta não será mostrada se estiver filtrada).
@@ -848,11 +911,12 @@ MAIN_TOOLTIP_PREVIEWFOCUSMASK;Pré-visualize a Máscara de Foco.\nAtalho:
MAIN_TOOLTIP_PREVIEWG;Pré-visualize o Canal verde.\nAtalho: g
MAIN_TOOLTIP_PREVIEWL;Pré-visualize a Luminosidade.\nAtalho: v\n\n0.299*R + 0.587*G + 0.114*B
MAIN_TOOLTIP_PREVIEWR;Pré-visualize o Canal vermelho.\nAtalho: r
+MAIN_TOOLTIP_PREVIEWSHARPMASK;Pré-visualize a Máscara de Contraste de Nitidez.\nAtalho: Nenhum\n\nSó funciona quando a nitidez e o zoom estão ativados >= 100%.
MAIN_TOOLTIP_QINFO;Informação rápida na imagem.\nAtalho: i
MAIN_TOOLTIP_SHOWHIDELP1;Mostrar/Ocultar o painel esquerdo.\nShortcut: l
MAIN_TOOLTIP_SHOWHIDERP1;Mostrar/Ocultar o painel direito.\nAtalho: Alt-l
MAIN_TOOLTIP_SHOWHIDETP1;Mostrar/Ocultar o painel superior.\nAtalho: Shift-l
-MAIN_TOOLTIP_THRESHOLD;Limiar
+MAIN_TOOLTIP_THRESHOLD;Limite
MAIN_TOOLTIP_TOGGLE;Alternar o Antes/Depois visualização.\nAtalho: Shift-b
MONITOR_PROFILE_SYSTEM;Sistema padrão
NAVIGATOR_B;B:
@@ -884,9 +948,9 @@ PARTIALPASTE_COMPOSITIONGROUP;Configurações de composição
PARTIALPASTE_CROP;Cortar
PARTIALPASTE_DARKFRAMEAUTOSELECT;Auto-seleção de quadro escuro
PARTIALPASTE_DARKFRAMEFILE;Arquivo de quadro escuro
-PARTIALPASTE_DEFRINGE;Defeito
+PARTIALPASTE_DEFRINGE;Defringe
PARTIALPASTE_DETAILGROUP;Configurações de detalhes
-PARTIALPASTE_DIALOGLABEL;Perfil de processamento de colagem parcial
+PARTIALPASTE_DIALOGLABEL;Perfil de processamento colar parcial
PARTIALPASTE_DIRPYRDENOISE;Redução de ruído
PARTIALPASTE_DIRPYREQUALIZER;Contraste pelos níveis de detalhe
PARTIALPASTE_DISTORTION;Correção de distorção
@@ -896,7 +960,7 @@ PARTIALPASTE_EVERYTHING;Tudo
PARTIALPASTE_EXIFCHANGES;Exif
PARTIALPASTE_EXPOSURE;Exposição
PARTIALPASTE_FILMSIMULATION;Simulação de filme
-PARTIALPASTE_FLATFIELDAUTOSELECT;Auto-seleção de campo plano
+PARTIALPASTE_FLATFIELDAUTOSELECT;Seleção automática de campo plano
PARTIALPASTE_FLATFIELDBLURRADIUS;Raio de desfoque de campo plano
PARTIALPASTE_FLATFIELDBLURTYPE;Tipo de desfoque de campo plano
PARTIALPASTE_FLATFIELDCLIPCONTROL;Controle de clipe de campo plano
@@ -918,6 +982,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Filtro de pixels mortos
PARTIALPASTE_PREPROCESS_GREENEQUIL;Equilíbrio verde
PARTIALPASTE_PREPROCESS_HOTPIXFILT;Filtro de pixel quente
PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtro de ruído de linha
+PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;Filtro de linhas PDAF
PARTIALPASTE_PRSHARPENING;Nitidez pós-redimensionamento
PARTIALPASTE_RAWCACORR_AUTO;Auto correção CA
PARTIALPASTE_RAWCACORR_CAREDBLUE;vermelho & azul CA
@@ -925,6 +990,7 @@ PARTIALPASTE_RAWEXPOS_BLACK;Níveis de preto
PARTIALPASTE_RAWEXPOS_LINEAR;Correção de ponto branco
PARTIALPASTE_RAWEXPOS_PRESER;preservação do realce
PARTIALPASTE_RAWGROUP;Configurações Raw
+PARTIALPASTE_RAW_BORDER;Borda raw
PARTIALPASTE_RAW_DCBENHANCE;Aprimoramento DCB
PARTIALPASTE_RAW_DCBITERATIONS;Iterações DCB
PARTIALPASTE_RAW_DMETHOD;Método demosaico
@@ -937,22 +1003,18 @@ PARTIALPASTE_RETINEX;Retinex
PARTIALPASTE_RGBCURVES;Curvas RGB
PARTIALPASTE_ROTATION;Rotação
PARTIALPASTE_SHADOWSHIGHLIGHTS;Sombras/realces
-PARTIALPASTE_SHARPENEDGE;Arestas
+PARTIALPASTE_SHARPENEDGE;Bordas
PARTIALPASTE_SHARPENING;Nitidez (USM/RL)
PARTIALPASTE_SHARPENMICRO;Microcontraste
+PARTIALPASTE_SOFTLIGHT;Luz suave
+PARTIALPASTE_TM_FATTAL;Compressão de Amplitude Dinâmica(DRC)
PARTIALPASTE_VIBRANCE;Vibração
PARTIALPASTE_VIGNETTING;Correção de vinheta
PARTIALPASTE_WHITEBALANCE;Balanço de branco
PREFERENCES_ADD;Adicionar
PREFERENCES_APPLNEXTSTARTUP;é necessário reiniciar
-PREFERENCES_AUTLISLOW;Baixo
-PREFERENCES_AUTLISMAX;Max - Média de todos os mosaicos
-PREFERENCES_AUTLISSTD;Alto
-PREFERENCES_AUTLISVLOW;Nenhum
-PREFERENCES_AUTLOW;Baixo
PREFERENCES_AUTOMONPROFILE;Usar o perfil de cores do monitor principal do sistema operacional
PREFERENCES_AUTOSAVE_TP_OPEN;Salvar automaticamente ferramentas recolhidas/expandidas\nestado antes de sair
-PREFERENCES_AUTSTD;Padrão
PREFERENCES_BATCH_PROCESSING;Processamento em Lote
PREFERENCES_BEHADDALL;Tudo para 'Adicionar'
PREFERENCES_BEHADDALLHINT;Definir todos os parâmetros para o Adicionar modo.\nAjustes de parâmetros no painel de ferramentas de lote serão deltas para os valores armazenados.
@@ -982,7 +1044,7 @@ PREFERENCES_CURVEBBOXPOS_ABOVE;Acima
PREFERENCES_CURVEBBOXPOS_BELOW;Abaixo
PREFERENCES_CURVEBBOXPOS_LEFT;Esquerda
PREFERENCES_CURVEBBOXPOS_RIGHT;Direita
-PREFERENCES_CUSTPROFBUILD;Construtor de Perfis de Processamento Customizado
+PREFERENCES_CUSTPROFBUILD;Construtor de Perfis de Processamento Personalizado
PREFERENCES_CUSTPROFBUILDHINT;Arquivo executável (ou script) chamado quando um novo perfil de processamento inicial deve ser gerado para uma imagem.\n\nO caminho do arquivo de comunicação (*.ini estilo, a.k.a. "Arquivo chave") é adicionado como um parâmetro de linha de comando. Ele contém vários parâmetros necessários para os scripts e a imagem Exif para permitir uma geração de perfil de processamento baseada em regras.\n\nATENÇÃO: Precisas usar aspas duplas quando estiver usando caminhos que contenham espaços.
PREFERENCES_CUSTPROFBUILDKEYFORMAT;Formato de chaves
PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Nome
@@ -999,8 +1061,6 @@ PREFERENCES_DARKFRAMESHOTS;tiros
PREFERENCES_DARKFRAMETEMPLATES;modelos
PREFERENCES_DATEFORMAT;Formato de data
PREFERENCES_DATEFORMATHINT;Podes usar as seguintes sequências de formatação:\n%y - ano\n%m - mês\n%d - dia\n\nPor exemplo, o padrão ISO 8601 dita o formato de data da seguinte forma:\n%y-%m-%d
-PREFERENCES_DAUB_LABEL;Use as wavelets Daubechies D6 em vez de D4
-PREFERENCES_DAUB_TOOLTIP;As ferramentas Redução de Ruído e Níveis de Wavelet usam uma wavelet mãe Daubechies. A escolha de D6 em vez de D4, aumentará o número de coeficientes ortogonais Daubechies e a provável melhora da qualidade dos níveis de pequena escala, sem aumento de memória ou tempo de processamento entre os dois.
PREFERENCES_DIRDARKFRAMES;Diretório de quadros escuros
PREFERENCES_DIRECTORIES;Diretórios
PREFERENCES_DIRHOME;Diretório inicial
@@ -1010,7 +1070,6 @@ PREFERENCES_DIRSELECTDLG;Selecione Diretório de Imagens na Inicialização...
PREFERENCES_DIRSOFTWARE;Diretório de instalação
PREFERENCES_EDITORCMDLINE;Linha de comando personalizada
PREFERENCES_EDITORLAYOUT;Layout do Editor
-PREFERENCES_EXPAUT;Especialista
PREFERENCES_EXTERNALEDITOR;Editor Externo
PREFERENCES_FBROWSEROPTS;Navegador de Arquivos / Opções de Miniaturas
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barra de ferramentas do navegador de arquivos de linha única\n(desmarque para exibição de baixa resolução)
@@ -1041,7 +1100,7 @@ PREFERENCES_GREYSC18;Yb=18 CIE L#50
PREFERENCES_GREYSCA;Automático
PREFERENCES_HISTOGRAMPOSITIONLEFT;Histograma no painel esquerdo
PREFERENCES_HISTOGRAMWORKING;Use o perfil de trabalho para o histograma principal e o Navegador
-PREFERENCES_HISTOGRAM_TOOLTIP;Se ativado, o perfil de trabalho é usado para renderizar o histograma principal e o painel Navegador, caso contrário, o perfil de saída corrigido por gama é usado.
+PREFERENCES_HISTOGRAM_TOOLTIP;Se ativado, o perfil de trabalho é usado para renderizar o histograma principal e o painel Navegador, caso contrário, o perfil de saída corrigido por gamma é usado.
PREFERENCES_HLTHRESHOLD;Limite para realces recortados
PREFERENCES_ICCDIR;Diretório contendo perfis de cores
PREFERENCES_IMG_RELOAD_NEEDED;Essas alterações requerem que a imagem seja recarregada (ou que uma nova imagem seja aberta) para terem efeito.
@@ -1056,20 +1115,14 @@ PREFERENCES_INTENT_SATURATION;Saturação
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Mostrar miniatura JPEG incorporada se raw não estiver editada
PREFERENCES_LANG;Linguagem
PREFERENCES_LANGAUTODETECT;Use a linguagem do sistema
-PREFERENCES_LEVAUTDN;Nível de remoção de ruídos
-PREFERENCES_LEVDN;Tamanho da célula
-PREFERENCES_LISS;Auto-suavização multizona
-PREFERENCES_MAX;Maxi (Mosaico)
PREFERENCES_MAXRECENTFOLDERS;Número máximo de pastas recentes
-PREFERENCES_MED;Médio (Mosaico/2)
PREFERENCES_MENUGROUPEXTPROGS;Grupo "Abrir com"
PREFERENCES_MENUGROUPFILEOPERATIONS;Grupo "operações de Arquivo"
PREFERENCES_MENUGROUPLABEL;Grupo "Etiqueta de cor"
-PREFERENCES_MENUGROUPPROFILEOPERATIONS;Grupo "Processando operações de perfil"
+PREFERENCES_MENUGROUPPROFILEOPERATIONS;Grupo "Operações de perfil de processamento"
PREFERENCES_MENUGROUPRANK;Grupo "Rank"
PREFERENCES_MENUOPTIONS;Opções do Menu de Contexto
PREFERENCES_METADATA;Metadados
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;Intenção de renderização padrão
PREFERENCES_MONITOR;Monitor
PREFERENCES_MONPROFILE;Perfil de cor padrão
@@ -1078,7 +1131,6 @@ PREFERENCES_MULTITAB;Modo de Mútiplas Abas do Editor
PREFERENCES_MULTITABDUALMON;Múltiplas Abas do Editor no Modo de Janela Própria
PREFERENCES_NAVGUIDEBRUSH;Cor do guia do navegador
PREFERENCES_NAVIGATIONFRAME;Navegação
-PREFERENCES_NOISE;Redução de Ruído
PREFERENCES_OUTDIR;Diretório de Saída
PREFERENCES_OUTDIRFOLDER;Salvar na pasta
PREFERENCES_OUTDIRFOLDERHINT;Salvar imagens na pasta selecionada.
@@ -1099,14 +1151,14 @@ PREFERENCES_PREVDEMO_FAST;Rápido
PREFERENCES_PREVDEMO_LABEL;Método Demosaicing usado para a visualização em <100% zoom:
PREFERENCES_PREVDEMO_SIDECAR;Como no PP3
PREFERENCES_PRINTER;Impressora (Soft-Proofing)
-PREFERENCES_PROFILEHANDLING;Processamento de Tratamento de Perfil
-PREFERENCES_PROFILELOADPR;Processando prioridade de carregamento do perfil
+PREFERENCES_PROFILEHANDLING;Manuseio de Perfil de Processamento
+PREFERENCES_PROFILELOADPR;Prioridade de carregamento do perfil de processamento
PREFERENCES_PROFILEPRCACHE;Perfil no cache
PREFERENCES_PROFILEPRFILE;Perfil próximo ao arquivo de entrada
-PREFERENCES_PROFILESAVEBOTH;Salve o perfil de processamento no cache e próximo ao arquivo de entrada
+PREFERENCES_PROFILESAVEBOTH;Salvar o perfil de processamento no cache e próximo ao arquivo de entrada
PREFERENCES_PROFILESAVECACHE;Salvar o perfil de processamento no cache
PREFERENCES_PROFILESAVEINPUT;Salvar o perfil de processamento próximo ao arquivo de entrada
-PREFERENCES_PROFILESAVELOCATION;Processando o local de salvamento do perfil
+PREFERENCES_PROFILESAVELOCATION;Local de salvamento do perfil de processamento
PREFERENCES_PROFILE_NONE;Nenhum
PREFERENCES_PROPERTY;Propriedade
PREFERENCES_PRTINTENT;Intenção de renderização
@@ -1114,8 +1166,6 @@ PREFERENCES_PRTPROFILE;Perfil de cor
PREFERENCES_PSPATH;Diretório de instalação do Adobe Photoshop
PREFERENCES_REMEMBERZOOMPAN;Lembre-se de zoom % e compensar pan
PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Lembre-se do zoom % e de compensar o pan da imagem atual ao abrir uma nova imagem.\n\nEsta opção só funciona em "Modo da Aba do Editor Único" e quando "o método Demosaicing utilizado para a pré-visualização em <100% zoom" está definido como "Como no PP3".
-PREFERENCES_RGBDTL_LABEL;Número máximo de threads para Redução de Ruído e Níveis de Wavelet
-PREFERENCES_RGBDTL_TOOLTIP;Deixe a configuração em "0" para usar automaticamente o maior número de threads possível. Quanto mais threads rodarem em paralelo, mais rápido será o cálculo. Consulte o RawPedia para requisitos de memória.
PREFERENCES_SAVE_TP_OPEN_NOW;Salvar ferramentas no estado recolhidas/expandididas agora
PREFERENCES_SELECTFONT;Selecione a fonte principal
PREFERENCES_SELECTFONT_COLPICKER;Selecione a fonte do Seletor de Cor
@@ -1129,49 +1179,38 @@ PREFERENCES_SHOWBASICEXIF;Mostrar informações Exif básicas
PREFERENCES_SHOWDATETIME;Mostrar data e hora
PREFERENCES_SHOWEXPOSURECOMPENSATION;Acrescentar compensação de exposição
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Mostrar barra de ferramentas de diapositivos
-PREFERENCES_SHTHRESHOLD;Limiar para sombras recortadas
-PREFERENCES_SIMPLAUT;Modo de ferramenta
+PREFERENCES_SHTHRESHOLD;Limite para sombras recortadas
PREFERENCES_SINGLETAB;Modo de Aba de Editor Único
PREFERENCES_SINGLETABVERTAB;Editor de Aba Única, Abas verticais
-PREFERENCES_SMA;Pequeno (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Processamento de fila concluído
PREFERENCES_SND_HELP;Digite um endereço de arquivo completo para definir um som ou deixe em branco para não ter som.\nPara sons do sistema no Windows, use "SystemDefault", "SystemAsterisk" etc., e no Linux use "complete", "window-attention" etc.
PREFERENCES_SND_LNGEDITPROCDONE;Processamento de Editor concluído
PREFERENCES_SND_THRESHOLDSECS;Depois de segundos
PREFERENCES_STARTUPIMDIR;Diretório de imagens na inicialização
-PREFERENCES_STDAUT;Padrão
PREFERENCES_TAB_BROWSER;Navegador de Arquivo
PREFERENCES_TAB_COLORMGR;Gerenciamento de Cor
PREFERENCES_TAB_DYNAMICPROFILE;Regras de Perfil Dinâmico
PREFERENCES_TAB_GENERAL;Geral
PREFERENCES_TAB_IMPROC;Processamento de Imagem
-PREFERENCES_TAB_PERFORMANCE;Performance & Qualidade
PREFERENCES_TAB_SOUND;Sons
PREFERENCES_THEME;Tema
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Visualização JPEG incorporada
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Imagem para mostrar
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Renderização raw neutra
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;JPEG incorporado se tamanho completo, raw neutro caso contrário
-PREFERENCES_TIMAX;Alto
-PREFERENCES_TINB;Número de mosaicos
-PREFERENCES_TISTD;Padrão
PREFERENCES_TP_LABEL;Painel de ferramentas:
PREFERENCES_TP_USEICONORTEXT;Use ícones de guias em vez de texto
PREFERENCES_TP_VSCROLLBAR;Ocultar barra de rolagem vertical
PREFERENCES_TUNNELMETADATA;Copiar Exif/IPTC/XMP inalterado para o arquivo de saída
PREFERENCES_USEBUNDLEDPROFILES;Use perfis agrupados
PREFERENCES_VIEW;Balanço de branco do dispositivo de saída (monitor, TV, projetor, visualização, etc.)
-PREFERENCES_WAVLEV;Aumentar o nível de wavelet em qualidade 'alta'
-PREFERENCES_WLONE;Um nível
-PREFERENCES_WLTWO;Dois níveis
-PREFERENCES_WLZER;Não
PREFERENCES_WORKFLOW;Layout
PROFILEPANEL_COPYPPASTE;Parâmetros para copiar
PROFILEPANEL_GLOBALPROFILES;Perfis agrupados
-PROFILEPANEL_LABEL;Processando Perfis
+PROFILEPANEL_LABEL;Perfis de Processamento
PROFILEPANEL_LOADDLGLABEL;Carregar Parâmetros de Processamento...
PROFILEPANEL_LOADPPASTE;Parâmetros para carregar
-PROFILEPANEL_MODE_TIP;Processando o modo de preencher o perfil.\n\nBotão pressionado: perfis parciais serão convertidos em perfis completos; os valores ausentes serão substituídos por padrões codificados.\n\nBotão liberado: os perfis serão aplicados como estão, alterando apenas os valores que eles contêm.
+PROFILEPANEL_MODE_TIP;Modo de preenchimento do perfil de procesamento.\n\nBotão pressionado: perfis parciais serão convertidos em perfis completos; os valores ausentes serão substituídos por padrões codificados.\n\nBotão liberado: os perfis serão aplicados como estão, alterando apenas os valores que eles contêm.
PROFILEPANEL_MYPROFILES;Meus perfis
PROFILEPANEL_PASTEPPASTE;Parâmetros para colar
PROFILEPANEL_PCUSTOM;Personalizado
@@ -1192,7 +1231,7 @@ PROGRESSBAR_LOADPNG;Carregando arquivo PNG...
PROGRESSBAR_LOADTIFF;Carregando arquivo TIFF...
PROGRESSBAR_NOIMAGES;Nenhuma imagem encontrada
PROGRESSBAR_PROCESSING;Processando imagem...
-PROGRESSBAR_PROCESSING_PROFILESAVED;Processando perfil salvo
+PROGRESSBAR_PROCESSING_PROFILESAVED;Perfil de processamento salvo
PROGRESSBAR_READY;Pronto
PROGRESSBAR_SAVEJPEG;Salvando arquivo JPEG...
PROGRESSBAR_SAVEPNG;Salvando arquivo PNG...
@@ -1228,7 +1267,7 @@ SAVEDLG_SUBSAMP_3;Qualidade superior
SAVEDLG_SUBSAMP_TOOLTIP;Compressão superior:\nJ:a:b 4:2:0\nh/v 2/2\nCroma reduzido pela metade na horizontal e na vertical.\n\nBalanceado:\nJ:a:b 4:2:2\nh/v 2/1\nCroma reduzido pela metade na horizontal.\n\nQualidade superior:\nJ:a:b 4:4:4\nh/v 1/1\nSem subamostragem de croma.
SAVEDLG_TIFFUNCOMPRESSED;TIFF não comprimido
SAVEDLG_WARNFILENAME;Arquivo será nomeado
-SHCSELECTOR_TOOLTIP;Clique com o botão direito do mouse para redefinir a posição desses 3 controles deslizantes.
+SHCSELECTOR_TOOLTIP;Clique com o botão direito do mouse para restaurar a posição desses 3 controles deslizantes.
SOFTPROOF_GAMUTCHECK_TOOLTIP;Realce pixels com cores fora do gamut em relação a:\n- o perfil da impressora, se um estiver definido e soft-proofing estiver ativado,\n- o perfil de saída, se um perfil de impressora não estiver definido e soft-proofing estiver ativado,\n- o perfil do monitor, se o soft-proofing estiver desativado.
SOFTPROOF_TOOLTIP;Soft-proofing simula a aparência da imagem:\n- quando impresso, se um perfil de impressora estiver definido em Preferências > Gerenciamento de Cor,\n- quando visualizado num monitor que usa o perfil de saída atual, se um perfil de impressora não estiver definido.
THRESHOLDSELECTOR_B;Inferior
@@ -1266,10 +1305,10 @@ TP_BWMIX_FILTER_NONE;Nenhum
TP_BWMIX_FILTER_PURPLE;Roxa
TP_BWMIX_FILTER_RED;Vermelho
TP_BWMIX_FILTER_REDYELLOW;Vermelho-Amarelo
-TP_BWMIX_FILTER_TOOLTIP;O filtro de cores simula fotos tiradas com um filtro colorido colocado na frente da lente. Filtros coloridos reduzem a transmissão de faixas de cores específicas e, portanto, afetam sua luminosidade. Por exemplo, um filtro vermelho escurece o céu azul.
+TP_BWMIX_FILTER_TOOLTIP;O filtro de cores simula fotos tiradas com um filtro colorido colocado na frente da lente. Filtros coloridos reduzem a transmissão de faixas de cores específicas e, portanto, afetam sua claridade. Por exemplo, um filtro vermelho escurece o céu azul.
TP_BWMIX_FILTER_YELLOW;Amarelo
-TP_BWMIX_GAMMA;Correção de Gama
-TP_BWMIX_GAM_TOOLTIP;Corrigir gama para cada canal RGB.
+TP_BWMIX_GAMMA;Correção de Gamma
+TP_BWMIX_GAM_TOOLTIP;Corrigir gamma para cada canal RGB.
TP_BWMIX_LABEL;Preto e Branco
TP_BWMIX_MET;Método
TP_BWMIX_MET_CHANMIX;Misturador de Canais
@@ -1277,7 +1316,7 @@ TP_BWMIX_MET_DESAT;Dessaturação
TP_BWMIX_MET_LUMEQUAL;Equalizador de Luminância
TP_BWMIX_MIXC;Misturador
TP_BWMIX_NEUTRAL;Restabelecer misturador
-TP_BWMIX_NEUTRAL_TIP;Restabelecer todos os valores (Filtro de Cores, Misturador de Canais) para o padrão.
+TP_BWMIX_NEUTRAL_TIP;Restaurar todos os valores (Filtro de Cores, Misturador de Canais) para o padrão.
TP_BWMIX_RGBLABEL;R: %1%% G: %2%% B: %3%% Total: %4%%
TP_BWMIX_RGBLABEL_HINT;Fatores finais do RGB que cuidam de todas as opções do misturador.\n"Total" exibe a soma dos valores RGB:\n- sempre 100% no modo relativo\n- mais alto (mais claro) ou mais baixo (mais escuro) que 100% no modo absoluto.
TP_BWMIX_RGB_TOOLTIP;Misture os canais RGB. Use predefinições para orientação.\nPreste atenção aos valores negativos que podem causar artefatos ou comportamento errático.
@@ -1326,8 +1365,8 @@ TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Luminância absoluta do ambiente de visualizaç
TP_COLORAPP_ADAP_AUTO_TOOLTIP;Se a caixa de seleção estiver marcada (recommendado) RawTherapee calcula um valor ótimo a partir dos dados Exif.\nPara definir o valor manualmente, desmarque a caixa de seleção primeiro.
TP_COLORAPP_ALGO;Algorimo
TP_COLORAPP_ALGO_ALL;Tudo
-TP_COLORAPP_ALGO_JC;Luminosidade + Croma (JC)
-TP_COLORAPP_ALGO_JS;Luminosidade + Saturação (JS)
+TP_COLORAPP_ALGO_JC;Claridade + Croma (JC)
+TP_COLORAPP_ALGO_JS;Claridade + Saturação (JS)
TP_COLORAPP_ALGO_QM;Brilho + Colorido (QM)
TP_COLORAPP_ALGO_TOOLTIP;Permite escolher entre subconjuntos de parâmetros ou todos os parâmetros.
TP_COLORAPP_BADPIXSL;Filtro de pixel quente/ruim
@@ -1364,12 +1403,12 @@ TP_COLORAPP_LABEL;Modelo de Aparência de Cor CIE 2002
TP_COLORAPP_LABEL_CAM02;Ajustes de Imagem
TP_COLORAPP_LABEL_SCENE;Condições de Cena
TP_COLORAPP_LABEL_VIEWING;Condições de Visualização
-TP_COLORAPP_LIGHT;Luminosidade (J)
-TP_COLORAPP_LIGHT_TOOLTIP;Luminosidade no CIECAM02 difere de L*a*b* e da luminosidade em RGB.
+TP_COLORAPP_LIGHT;Claridade (J)
+TP_COLORAPP_LIGHT_TOOLTIP;Claridade no CIECAM02 difere de L*a*b* e da claridade em RGB.
TP_COLORAPP_MODEL;Modelo de Ponto Branco
TP_COLORAPP_MODEL_TOOLTIP;Modelo de Ponto Branco.\n\nWB [RT] + [saída]: O balanço de branco do RT é usado para a cena, CIECAM02 está definido para D50, e o balanço de branco do dispositivo de saída é definido em Condições de Visualização.\n\nWB [RT+CAT02] + [saída]: As configurações de balanço de branco do RT são usadas pelo CAT02 e o balanço de branco do dispositivo de saída é definido em Condições de Visualização.\n\nTemp+verde livre + CAT02 + [saída]: temp e verde são selecionados pelo usuário, o balanço de branco do dispositivo de saída é definido em Condições de Visualização.
-TP_COLORAPP_NEUTRAL;Restabelecer
-TP_COLORAPP_NEUTRAL_TIP;Restabelecer todas as caixas de seleção e curvas dos controles deslizantes para seus valores padrão
+TP_COLORAPP_NEUTRAL;Restaurar
+TP_COLORAPP_NEUTRAL_TIP;Restaurar todas as caixas de seleção e curvas dos controles deslizantes para seus valores padrão
TP_COLORAPP_RSTPRO;Proteção vermelho e de tons de pele
TP_COLORAPP_RSTPRO_TOOLTIP;Vermelho & proteção de tons de pele afeta os controles deslizantes e as curvas.
TP_COLORAPP_SHARPCIE;--sem uso--
@@ -1388,7 +1427,7 @@ TP_COLORAPP_TCMODE_COLORF;Colorido
TP_COLORAPP_TCMODE_LABEL1;Modo de curva 1
TP_COLORAPP_TCMODE_LABEL2;Modo de curva 2
TP_COLORAPP_TCMODE_LABEL3;Modo de croma da curva
-TP_COLORAPP_TCMODE_LIGHTNESS;Luminosidade
+TP_COLORAPP_TCMODE_LIGHTNESS;Claridade
TP_COLORAPP_TCMODE_SATUR;Saturação
TP_COLORAPP_TEMP_TOOLTIP;Para selecionar um iluminante, defina sempre Matiz=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
TP_COLORAPP_TONECIE;Mapeamento de tom usando CIECAM02
@@ -1417,20 +1456,20 @@ TP_COLORTONING_LUMAMODE_TOOLTIP;Se ativado, quando você mudar de cor (vermelho,
TP_COLORTONING_METHOD;Método
TP_COLORTONING_METHOD_TOOLTIP;"L*a*b* mistura", "Controles deslizantes RGB" e "Curvas RGB" usar mistura de cores interpoladas.\n"Balanço de Cor (Sombras/Meio-tons/Realces)" e "Saturação 2 cores" use cores diretas.\n\nA ferramenta Preto-e-Branco pode ser ativada ao usar qualquer método, que permita a tonificação de cores.
TP_COLORTONING_MIDTONES;Meio-tons
-TP_COLORTONING_NEUTRAL;Restabelecer controles deslizantes
-TP_COLORTONING_NEUTRAL_TIP;Restabelecer todos os valores (Sombras, Meio-tons, Realces) para o padrão.
+TP_COLORTONING_NEUTRAL;Restaurar controles deslizantes
+TP_COLORTONING_NEUTRAL_TIP;Restaurar todos os valores (Sombras, Meio-tons, Realces) para o padrão.
TP_COLORTONING_OPACITY;Opacidade
TP_COLORTONING_RGBCURVES;RGB - Curvas
TP_COLORTONING_RGBSLIDERS;RGB - Controles deslizantes
TP_COLORTONING_SA;Proteção da Saturação
-TP_COLORTONING_SATURATEDOPACITY;Robustez
+TP_COLORTONING_SATURATEDOPACITY;Intensidade
TP_COLORTONING_SATURATIONTHRESHOLD;Limite
TP_COLORTONING_SHADOWS;Sombras
TP_COLORTONING_SPLITCO;Sombras/Meio-tons/Realces
TP_COLORTONING_SPLITCOCO;Balanço de Cor Sombras/Meio-tons/Realces
TP_COLORTONING_SPLITLR;Saturação 2 cores
-TP_COLORTONING_STR;Robustez
-TP_COLORTONING_STRENGTH;Robustez
+TP_COLORTONING_STR;Intensidade
+TP_COLORTONING_STRENGTH;Intensidade
TP_COLORTONING_TWO2;Croma especial '2 cores'
TP_COLORTONING_TWOALL;Croma especial
TP_COLORTONING_TWOBY;Especial a* e b*
@@ -1456,7 +1495,7 @@ TP_CROP_X;X
TP_CROP_Y;Y
TP_DARKFRAME_AUTOSELECT;Auto-seleção
TP_DARKFRAME_LABEL;Quadro Escuro
-TP_DEFRINGE_LABEL;Defeito
+TP_DEFRINGE_LABEL;Defringe
TP_DEFRINGE_RADIUS;Raio
TP_DEFRINGE_THRESHOLD;Limite
TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zonas
@@ -1491,8 +1530,8 @@ TP_DIRPYRDENOISE_MAIN_COLORSPACE;Espaço de cor
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;L*a*b*
TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;Para imagens raw, os métodos RGB ou L*a*b* podem ser usados.\n\nPara imagens não-raw, o método L*a*b* será usado, independentemente da seleção.
-TP_DIRPYRDENOISE_MAIN_GAMMA;Gama
-TP_DIRPYRDENOISE_MAIN_GAMMA_TOOLTIP;Gama varia a robustez da redução de ruído em toda a gama de tons. Valores menores atuam sobre sombras, enquanto valores maiores tem efeito sobre tons mais claros.
+TP_DIRPYRDENOISE_MAIN_GAMMA;Gamma
+TP_DIRPYRDENOISE_MAIN_GAMMA_TOOLTIP;Gamma varia a intensidade da redução de ruído em toda a gama de tons. Valores menores atuam sobre sombras, enquanto valores maiores tem efeito sobre tons mais claros.
TP_DIRPYRDENOISE_MAIN_MODE;Modo
TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Aggressivo
TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Conservador
@@ -1535,16 +1574,16 @@ TP_DISTORTION_AMOUNT;Montante
TP_DISTORTION_AUTO_TIP;Corrige automaticamente a distorção da lente em arquivos RAW, combinando-a com a imagem JPEG incorporada, caso exista, e tenha sua distorção de lente corrigida automaticamente pela câmera.
TP_DISTORTION_LABEL;Correção de Distorção
TP_EPD_EDGESTOPPING;Borda parando
-TP_EPD_GAMMA;Gama
+TP_EPD_GAMMA;Gamma
TP_EPD_LABEL;Mapeamento de Tom
TP_EPD_REWEIGHTINGITERATES;Reponderando iterações
TP_EPD_SCALE;Escala
-TP_EPD_STRENGTH;Robustez
+TP_EPD_STRENGTH;Intensidade
TP_EPD_TOOLTIP;O mapeamento de tom é possível no modo L*a*b* (padão) e no modo CIECAM02.\n\nQuando no modo L*a*b*, o mapeamento de tom também pode ser usado na imagem residual da ferramenta de Níveis de Wavelet.\n\nPara ativar o modo de mapeamento de tom CIECAM02, habilite as seguintes configurações:\n1. CIECAM02\n2. Algorítimo = "Brilho + Colorido (QM)"\n3. "Mapeamento de tom usando o brilho do CIECAM02 (Q)"
TP_EXPOSURE_AUTOLEVELS;Níveis Automáticos
TP_EXPOSURE_AUTOLEVELS_TIP;Alterna a execução dos Níveis Automáticos para definir automaticamente os valores do controle deslizante de Exposição baseado numa análise de imagem.\nHabilita a Reconstrução de Realce se necessário.
TP_EXPOSURE_BLACKLEVEL;Preto
-TP_EXPOSURE_BRIGHTNESS;Luminosidade
+TP_EXPOSURE_BRIGHTNESS;Claridade
TP_EXPOSURE_CLAMPOOG;Recortar cores fora da gama
TP_EXPOSURE_CLIP;Recortar %
TP_EXPOSURE_CLIP_TIP;A fração de pixels a ser recortada na operação Níveis Automáticos.
@@ -1572,7 +1611,7 @@ TP_EXPOS_BLACKPOINT_LABEL;Pontos Pretos Raw
TP_EXPOS_WHITEPOINT_LABEL;Pontos Brancos Raw
TP_FILMSIMULATION_LABEL;Simulação de Filme
TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee está configurado para procurar por imagens Hald CLUT, que são usadas para a ferramenta Simulação de Filme, numa pasta que está demorando para carregar.\nVá para Preferências > Processamento de Imagem > Simulação de Filme\npara ver qual pasta está sendo usada. Deves apontar RawTherapee para uma pasta que contenha apenas imagens Hald CLUT e nada mais, ou para uma pasta vazia, se não quiseres usar a ferramenta Simulação de Filme.\n\nLeia o artigo sobre Simulação de Filme na RawPedia para mais informações.\n\nDesejas cancelar a verificação agora?
-TP_FILMSIMULATION_STRENGTH;Robustez
+TP_FILMSIMULATION_STRENGTH;Intensidade
TP_FILMSIMULATION_ZEROCLUTSFOUND;Definir diretório HaldCLUT em Preferências
TP_FLATFIELD_AUTOSELECT;Seleção automática
TP_FLATFIELD_BLURRADIUS;Raio de desfoque
@@ -1584,9 +1623,9 @@ TP_FLATFIELD_BT_VERTICAL;Vertical
TP_FLATFIELD_CLIPCONTROL;Controle de recorte
TP_FLATFIELD_CLIPCONTROL_TOOLTIP;O controle de recorte evita realces recortados provocados pela aplicação do campo plano. Se já houver realces recortados antes da aplicação do campo plano, o controle de recorte pode levar à conversão de cores.
TP_FLATFIELD_LABEL;Campo Plano
-TP_GAMMA_CURV;Gama
-TP_GAMMA_FREE;Gama livre
-TP_GAMMA_OUTPUT;Gama de saída
+TP_GAMMA_CURV;Gamma
+TP_GAMMA_FREE;Gamma livre
+TP_GAMMA_OUTPUT;Gamma de saída
TP_GAMMA_SLOP;Declive (linear)
TP_GENERAL_11SCALE_TOOLTIP;Os efeitos dessa ferramenta só são visíveis ou são precisos numa escala prévia de 1:1.
TP_GRADIENT_CENTER;Centro
@@ -1596,11 +1635,11 @@ TP_GRADIENT_CENTER_Y;Centro Y
TP_GRADIENT_CENTER_Y_TOOLTIP;Deslocar gradiente para cima (valores negativos) ou para baixo (valores positivos).
TP_GRADIENT_DEGREE;ângulo
TP_GRADIENT_DEGREE_TOOLTIP;Ângulo de rotação em graus.
-TP_GRADIENT_FEATHER;Pena
+TP_GRADIENT_FEATHER;Difusão
TP_GRADIENT_FEATHER_TOOLTIP;Largura do gradiente em porcentagem da diagonal da imagem.
TP_GRADIENT_LABEL;Filtro Graduado
-TP_GRADIENT_STRENGTH;Robustez
-TP_GRADIENT_STRENGTH_TOOLTIP;Robustez do filtro nas paradas.
+TP_GRADIENT_STRENGTH;Intensidade
+TP_GRADIENT_STRENGTH_TOOLTIP;Intensidade do filtro nas paradas.
TP_HLREC_BLEND;Mistura
TP_HLREC_CIELAB;Misturando CIELab
TP_HLREC_COLOR;Propagação de Cor
@@ -1614,7 +1653,7 @@ TP_HSVEQUALIZER_LABEL;Equalizador HSV
TP_HSVEQUALIZER_SAT;S
TP_HSVEQUALIZER_VAL;V
TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Exposição de linha de base
-TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Empregue o deslocamento de exposição da linha de base do DCP incorporado. A configuração só estará disponível se o DCP estiver selecionado como um.
+TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Empregue a compensação de exposição da linha de base do DCP incorporado. A configuração só estará disponível se o DCP estiver selecionado como um.
TP_ICM_APPLYHUESATMAP;Tabela básica
TP_ICM_APPLYHUESATMAP_TOOLTIP;Empregue a tabela básica DCP incorporada (MatizSatMap). A configuração só estará disponível se o DCP estiver selecionado como um.
TP_ICM_APPLYLOOKTABLE;Tabela de aparência
@@ -1624,593 +1663,606 @@ TP_ICM_BLENDCMSMATRIX_TOOLTIP;Ativar para recuperar realces recortados ao usar p
TP_ICM_BPC;Compensação de Ponto Preto
TP_ICM_DCPILLUMINANT;Iluminante
TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado
+TP_ICM_DCPILLUMINANT_TOOLTIP;Selecione qual iluminante DCP incorporado deve ser usado. O padrão é "interpolado", que é uma mistura entre os dois baseado no balanço de branco. A configuração só estará disponível se um DCP de iluminação dupla com suporte de interpolação estiver selecionado.
+TP_ICM_INPUTCAMERA;Câmera padrão
+TP_ICM_INPUTCAMERAICC;Perfil de câmera auto-combinado
+TP_ICM_INPUTCAMERAICC_TOOLTIP;Use os perfis de cores de entrada DCP ou ICC específicos da câmera do RawTherapee. Esses perfis são mais precisos que os matriciais mais simples. Eles não estão disponíveis para todas as câmeras. Esses perfis são armazenados nas pastas /iccperfis/entrada e /dcpperfis e são recuperados automaticamente com base no nome do arquivo correspondente ao nome do modelo da câmera.
+TP_ICM_INPUTCAMERA_TOOLTIP;Use uma matriz de cores simples do dcraw, uma versão aprimorada do RawTherapee (a que estiver disponível baseada no modelo da câmera) ou uma incorporada no DNG.
+TP_ICM_INPUTCUSTOM;Personalizado
+TP_ICM_INPUTCUSTOM_TOOLTIP;Selecione seu próprio arquivo de perfil de cores DCP/ICC para a câmera.
+TP_ICM_INPUTDLGLABEL;Selecione o Perfil de entrada DCP/ICC...
+TP_ICM_INPUTEMBEDDED;Use incorporado, se possível
+TP_ICM_INPUTEMBEDDED_TOOLTIP;Use o perfil de cores incorporado em arquivos não-raw.
+TP_ICM_INPUTNONE;Sem perfil
+TP_ICM_INPUTNONE_TOOLTIP;Não use nenhum perfil de cor de entrada.\nUse somente em casos especiais.
+TP_ICM_INPUTPROFILE;Perfil de Entrada
+TP_ICM_LABEL;Gerenciamento de Cor
+TP_ICM_NOICM;No ICM: Saída sRGB
+TP_ICM_OUTPUTPROFILE;Perfil de Saída
+TP_ICM_PROFILEINTENT;Intenção de Renderização
+TP_ICM_SAVEREFERENCE;Salvar Imagem de Referência
+TP_ICM_SAVEREFERENCE_APPLYWB;Aplicar balanço de branco
+TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Geralmente, aplique o balanço de branco ao salvar imagens para criar perfis ICC e não aplique o balanço de branco para criar perfis DCP.
+TP_ICM_SAVEREFERENCE_TOOLTIP;Salve a imagem TIFF linear antes que o perfil de entrada seja aplicado. O resultado pode ser usado para fins de calibração e geração de um perfil de câmera.
+TP_ICM_TONECURVE;Curva de tom
+TP_ICM_TONECURVE_TOOLTIP;Empregue a curva de tom DCP incorporada. A configuração só estará disponível se o DCP selecionado tiver uma curva de tom.
+TP_ICM_WORKINGPROFILE;Perfil de Trabalho
+TP_ICM_WORKING_TRC;Curva de resposta do tom:
+TP_ICM_WORKING_TRC_CUSTOM;Personalizado
+TP_ICM_WORKING_TRC_GAMMA;Gamma
+TP_ICM_WORKING_TRC_NONE;Nenhum
+TP_ICM_WORKING_TRC_SLOPE;Declive
+TP_ICM_WORKING_TRC_TOOLTIP;Apenas para perfis internos
+TP_IMPULSEDENOISE_LABEL;Redução de Ruído por Impulso
+TP_IMPULSEDENOISE_THRESH;Limite
+TP_LABCURVE_AVOIDCOLORSHIFT;Evite mudança de cor
+TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Ajuste as cores no gamut do espaço de cores de trabalho e aplique a correção Munsell.
+TP_LABCURVE_BRIGHTNESS;Claridade
+TP_LABCURVE_CHROMATICITY;Cromaticidade
+TP_LABCURVE_CHROMA_TOOLTIP;Para aplicar tonificação B&W, configure Cromaticidade para -100.
+TP_LABCURVE_CONTRAST;Contraste
+TP_LABCURVE_CURVEEDITOR;Curva de Luminância
+TP_LABCURVE_CURVEEDITOR_A_RANGE1;Verde Saturado
+TP_LABCURVE_CURVEEDITOR_A_RANGE2;Verde Pastel
+TP_LABCURVE_CURVEEDITOR_A_RANGE3;Vermelho Pastel
+TP_LABCURVE_CURVEEDITOR_A_RANGE4;Vermelho Saturado
+TP_LABCURVE_CURVEEDITOR_B_RANGE1;Azul Saturado
+TP_LABCURVE_CURVEEDITOR_B_RANGE2;Azul Pastel
+TP_LABCURVE_CURVEEDITOR_B_RANGE3;Amarelo Pastel
+TP_LABCURVE_CURVEEDITOR_B_RANGE4;Amarelo Saturado
+TP_LABCURVE_CURVEEDITOR_CC;CC
+TP_LABCURVE_CURVEEDITOR_CC_RANGE1;Neutro
+TP_LABCURVE_CURVEEDITOR_CC_RANGE2;Fosco
+TP_LABCURVE_CURVEEDITOR_CC_RANGE3;Pastel
+TP_LABCURVE_CURVEEDITOR_CC_RANGE4;Saturado
+TP_LABCURVE_CURVEEDITOR_CC_TOOLTIP;Cromaticidade de acordo com a cromaticidade C=f(C)
+TP_LABCURVE_CURVEEDITOR_CH;CH
+TP_LABCURVE_CURVEEDITOR_CH_TOOLTIP;Cromaticidade de acordo com a matiz C=f(H)
+TP_LABCURVE_CURVEEDITOR_CL;CL
+TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Cromaticidade de acordo com a luminância C=f(L)
+TP_LABCURVE_CURVEEDITOR_HH;HH
+TP_LABCURVE_CURVEEDITOR_HH_TOOLTIP;Matiza de acordo com a matiz H=f(H)
+TP_LABCURVE_CURVEEDITOR_LC;LC
+TP_LABCURVE_CURVEEDITOR_LC_TOOLTIP;Luminância de acordo com a cromaticidade L=f(C)
+TP_LABCURVE_CURVEEDITOR_LH;LH
+TP_LABCURVE_CURVEEDITOR_LH_TOOLTIP;Luminância de acrodo com a matiz L=f(H)
+TP_LABCURVE_CURVEEDITOR_LL_TOOLTIP;Luminância de acorodo com a luminância L=f(L)
+TP_LABCURVE_LABEL;L*a*b* Ajustes
+TP_LABCURVE_LCREDSK;Restringir o LC aos tons vermelho e cor de pele
+TP_LABCURVE_LCREDSK_TIP;Se ativada, a curva LC afeta somente tons vermelhos e cor de pele.\nSe desativado, aplica-se a todos os tons.
+TP_LABCURVE_RSTPROTECTION;Proteção para tons verrmelho e cor de pele
+TP_LABCURVE_RSTPRO_TOOLTIP;Funciona no controle deslizante de cromaticidade e na curva CC.
+TP_LENSGEOM_AUTOCROP;Corte automático
+TP_LENSGEOM_FILL;Preenchimento automático
+TP_LENSGEOM_LABEL;Lente / Geometria
+TP_LENSPROFILE_LABEL;Correção de lente perfilada
+TP_LENSPROFILE_USECA;Correção da aberração cromática
+TP_LENSPROFILE_USEDIST;Correção de distorção
+TP_LENSPROFILE_USEVIGN;Correção de vinheta
+TP_LOCALCONTRAST_AMOUNT;Montante
+TP_LOCALCONTRAST_DARKNESS;Nível de escuridão
+TP_LOCALCONTRAST_LABEL;Contraste Local
+TP_LOCALCONTRAST_LIGHTNESS;Nível de claridade
+TP_LOCALCONTRAST_RADIUS;Raio
+TP_METADATA_EDIT;Aplicar modificações
+TP_METADATA_MODE;Modo de cópia de metadados
+TP_METADATA_STRIP;Remover todos os metadados
+TP_METADATA_TUNNEL;Copiar inalterado
+TP_NEUTRAL;Restaurar
+TP_NEUTRAL_TIP;Restaurar os controles deslizantes de exposição para valores neutros.\nAplica-se aos mesmos controles aplicados aos Níveis Automáticos, independentemente da utilização dos Níveis Automáticos.
+TP_PCVIGNETTE_FEATHER;Difusão
+TP_PCVIGNETTE_FEATHER_TOOLTIP;Difundindo:\n0 = apenas cantos,\n50 = a meio caminho do centro,\n100 = para centrar.
+TP_PCVIGNETTE_LABEL;Filtro de Vinheta
+TP_PCVIGNETTE_ROUNDNESS;Arredondamento
+TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Arredondamento:\n0 = retângulo,\n50 = elipse ajustada,\n100 = círculo.
+TP_PCVIGNETTE_STRENGTH;Intensidade
+TP_PCVIGNETTE_STRENGTH_TOOLTIP;Intensidade do filtro nas paradas (alcançada nos cantos).
+TP_PERSPECTIVE_HORIZONTAL;Horizontal
+TP_PERSPECTIVE_LABEL;Perspectiva
+TP_PERSPECTIVE_VERTICAL;Vertical
+TP_PFCURVE_CURVEEDITOR_CH;Matiz
+TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controla a Intensidade defringe por cor.\nHigher = more,\nInferior = menos.
+TP_PREPROCESS_DEADPIXFILT;Filtro de pixels mortos
+TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tenta suprimir os pixels mortos.
+TP_PREPROCESS_GREENEQUIL;Equilíbrio verde
+TP_PREPROCESS_HOTPIXFILT;Filtro de pixel quente
+TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tenta suprimir os pixels quentes.
+TP_PREPROCESS_LABEL;Pré-processando
+TP_PREPROCESS_LINEDENOISE;Filtro de ruído de linha
+TP_PREPROCESS_LINEDENOISE_DIRECTION;Direção
+TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Ambos
+TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
+TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal apenas em linhas PDAF
+TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
+TP_PREPROCESS_NO_FOUND;Nenhum encontrado
+TP_PREPROCESS_PDAFLINESFILTER;Filtro de linhas PDAF
+TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tenta suprimir o ruído de faixas causado por pixels PDAF no sensor, ocorrendo com algumas câmeras mirrorless da Sony em algumas cenas em contraluz com "flare" visível.
+TP_PRSHARPENING_LABEL;Pós-Redimensionamento de Nitidez
+TP_PRSHARPENING_TOOLTIP;Focaliza a imagem após o redimensionamento. Funciona somente quando o método de redimensionamento "Lanczos" é usado. É impossível visualizar os efeitos dessa ferramenta. Veja RawPedia para instruções de uso.
+TP_RAWCACORR_AUTO;Auto correção
+TP_RAWCACORR_CABLUE;Azul
+TP_RAWCACORR_CARED;Vermelho
+TP_RAWCACORR_CASTR;Intensidade
+TP_RAWEXPOS_BLACKS;Níveis de Preto
+TP_RAWEXPOS_BLACK_0;Verde 1 (guia)
+TP_RAWEXPOS_BLACK_1;Vermelho
+TP_RAWEXPOS_BLACK_2;Azul
+TP_RAWEXPOS_BLACK_3;Verde 2
+TP_RAWEXPOS_BLACK_BLUE;Azul
+TP_RAWEXPOS_BLACK_GREEN;Verde
+TP_RAWEXPOS_BLACK_RED;Vermelho
+TP_RAWEXPOS_LINEAR;Correção de ponto branco
+TP_RAWEXPOS_PRESER;Preservação do realce
+TP_RAWEXPOS_RGB;Vermelho, Verde, Azul
+TP_RAWEXPOS_TWOGREEN;Ligações verdes
+TP_RAW_1PASSMEDIUM;1-Passar (Medio)
+TP_RAW_2PASS;1-passar+rápido
+TP_RAW_3PASSBEST;3-Passar (Superior)
+TP_RAW_4PASS;4-Passar
+TP_RAW_AHD;AHD
+TP_RAW_AMAZE;AMaZE
+TP_RAW_AMAZEVNG4;AMaZE+VNG4
+TP_RAW_BORDER;Borda
+TP_RAW_DCB;DCB
+TP_RAW_DCBENHANCE;Aprimoramento DCB
+TP_RAW_DCBITERATIONS;Número de iterações DCB
+TP_RAW_DCBVNG4;DCB+VNG4
+TP_RAW_DMETHOD;Método
+TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
+TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Refinamento Demosaicing...
+TP_RAW_DMETHOD_TOOLTIP;Nota: IGV e LMMSE são dedicados a imagens de ISO alto para auxiliar na redução de ruído sem levar a padrões de confusão, posterização ou aparência desbotada.\nPixel Shift é para arquivos Pentax/Sony Pixel Shift. Ele retorna ao AMaZE para arquivos não Pixel Shift.
+TP_RAW_DUALDEMOSAICCONTRAST;Limite de contraste
+TP_RAW_EAHD;EAHD
+TP_RAW_FALSECOLOR;Etapas de supressão de cores falsas
+TP_RAW_FAST;Rápido
+TP_RAW_HD;Limite
+TP_RAW_HD_TOOLTIP;Valores mais baixos tornam a detecção de pixels quentes/mortos mais agressiva, mas os falsos positivos podem levar a artefatos. Se perceberes algum artefato aparecendo ao habilitar os Filtros de Pixels Quentes/Morto, aumente gradualmente o valor limite até eles desaparecerem.
+TP_RAW_HPHD;HPHD
+TP_RAW_IGV;IGV
+TP_RAW_IMAGENUM;Sub-imagem
+TP_RAW_IMAGENUM_TOOLTIP;Alguns arquivos raw consistem em várias sub-imagens (Pentax/Sony Pixel Shift, Pentax 3-em-1 HDR, Canon Dual Pixel).\n\nUsando qualquer método demosaicing diferente de Pixel Shift, isto seleciona qual sub-imagem é usada.\n\nUsando o método demosaicing do Pixel Shift num Pixel Shift raw, todas as sub-imagens são usadas e isso seleciona qual sub-imagem deve ser usada para as partes móveis.
+TP_RAW_LABEL;Demosaicing
+TP_RAW_LMMSE;LMMSE
+TP_RAW_LMMSEITERATIONS;Etapas de aprimoramento LMMSE
+TP_RAW_LMMSE_TOOLTIP;Adiciona gamma (etapa 1), mediana (etapas 2-4) e refinamento (etapas 5-6) para reduzir artefatos e melhorar a relação sinal-ruído.
+TP_RAW_MONO;Mono
+TP_RAW_NONE;Nenhum (Mostra o padrão do sensor)
+TP_RAW_PIXELSHIFT;Pixel Shift
+TP_RAW_PIXELSHIFTBLUR;Máscara de movimento de desfoque
+TP_RAW_PIXELSHIFTDMETHOD;Método Demosaico para movimento
+TP_RAW_PIXELSHIFTEPERISO;Sensibilidade
+TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;O valor padrão de 0 deve funcionar bem para a base ISO.\nValores mais altos aumentam a sensibilidade da detecção de movimento.\nAltere em pequenas etapas e observe a máscara de movimento enquanto muda.\nAumentar a sensibilidade para imagens subexpostas ou de ISO alto.
+TP_RAW_PIXELSHIFTEQUALBRIGHT;Equaliza o brilho dos quadros
+TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Equaliza por canal
+TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Ativado: Equaliza os canais RGB individualmente.\nDesativado: usa o mesmo fator de equalização para todos os canais.
+TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Equaliza o brilho dos quadros para o brilho do quadro selecionado.\nSe houver áreas superexpostas nos quadros, selecione o quadro mais claro para evitar que a cor magenta seja exposta em áreas superexpostas ou ative a correção de movimento.
+TP_RAW_PIXELSHIFTGREEN;Verifica o canal verde para movimento
+TP_RAW_PIXELSHIFTHOLEFILL;Preenche buracos na máscara de movimento
+TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Preenche buracos na máscara de movimento
+TP_RAW_PIXELSHIFTLMMSE;Usa LMMSE para partes móveis
+TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Usa LMMSE em vez de AMaZE para áreas de movimento.\nÚtil para imagens com ISO alto.
+TP_RAW_PIXELSHIFTMEDIAN;Usa mediana para partes móveis
+TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP;Use a mediana de todos os quadros em vez do quadro selecionado para regiões com movimento.\nRemove objetos que estão em lugares diferentes em todos os quadros.\nDá efeito de movimento em objetos em movimento lento (sobreposição).
+TP_RAW_PIXELSHIFTMM_AUTO;Automático
+TP_RAW_PIXELSHIFTMM_CUSTOM;Personalizado
+TP_RAW_PIXELSHIFTMM_OFF;Desligado
+TP_RAW_PIXELSHIFTMOTIONMETHOD;Correção de Movimento
+TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 não há detecção de movimento.\n1 - 99 o movimento será detectado de acordo com este valor. Aumentar o valor para aumentar a taxa de detecção.\n100 o quadro demosaico AMaZE será usado.
+TP_RAW_PIXELSHIFTNONGREENCROSS;Checa os canais vermelho/azul para movimento
+TP_RAW_PIXELSHIFTSHOWMOTION;Mostra máscara de movimento
+TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Mostra somente máscara de movimento
+TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Mostra a máscara de movimento sem a imagem.
+TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Sobrepõe a imagem com uma máscara verde mostrando as regiões com movimento.
+TP_RAW_PIXELSHIFTSIGMA;Raio de desfoque
+TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;TO raio padrão de 1.0 geralmente se encaixa bem para a base ISO.\nAumente o valor para fotos de ISO alto, 5.0 é um bom ponto de partida.\nObserve a máscara de movimento enquanto altera o valor.
+TP_RAW_PIXELSHIFTSMOOTH;Transições suaves
+TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Transições suaves entre áreas com movimento e áreas sem.\nDefina 0 para desabilitar a transição suave.\nDefina 1 para obter o resultado AMaZE/LMMSE do quadro selecionado (dependendo se "Usar LMMSE" estiver selecionado) ou a mediana de todos os quatro quadros se "Usar mediana" estiver selecionado.
+TP_RAW_RCD;RCD
+TP_RAW_RCDVNG4;RCD+VNG4
+TP_RAW_SENSOR_BAYER_LABEL;Sensor com Matriz Bayer
+TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-passe dá os melhores resultados (recomendado para imagens com ISO baixo).\n1-passe é quase indistinguível do 3-passe para imagens com ISO alto e é mais rápido.
+TP_RAW_SENSOR_XTRANS_LABEL;Sensor com Matriz X-Trans
+TP_RAW_VNG4;VNG4
+TP_RESIZE_ALLOW_UPSCALING;Permitir Escalonamento
+TP_RESIZE_APPLIESTO;Aplica-se a:
+TP_RESIZE_CROPPEDAREA;Área Recortada
+TP_RESIZE_FITBOX;Caixa Delimitadora
+TP_RESIZE_FULLIMAGE;Imagem Cheia
+TP_RESIZE_H;Altura:
+TP_RESIZE_HEIGHT;Altura
+TP_RESIZE_LABEL;Redimensionar
+TP_RESIZE_LANCZOS;Lanczos
+TP_RESIZE_METHOD;Método:
+TP_RESIZE_NEAREST;Mais próximo
+TP_RESIZE_SCALE;Escala
+TP_RESIZE_SPECIFY;Especificar:
+TP_RESIZE_W;Largura:
+TP_RESIZE_WIDTH;Largura
+TP_RETINEX_CONTEDIT_HSL;Equalizador de histograma HSL
+TP_RETINEX_CONTEDIT_LAB;Equalizador de histograma L*a*b*
+TP_RETINEX_CONTEDIT_LH;Equalizador de matiz
+TP_RETINEX_CONTEDIT_MAP;Equalizador de máscara
+TP_RETINEX_CURVEEDITOR_CD;L=f(L)
+TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminância de acordo com a luminância L=f(L)\nCorrija dados raw para reduzir halos e artefatos.
+TP_RETINEX_CURVEEDITOR_LH;Intensidade=f(M)
+TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Intensidade de acordo com a Intensidade da matiz=f(M)\nEsta curva também atua no croma ao usar o método retinex "Realce".
+TP_RETINEX_CURVEEDITOR_MAP;L=f(L)
+TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;Esta curva pode ser aplicada sozinha ou com uma máscara Gaussiana ou uma máscara wavelet.\nCuidado com os artefatos!
+TP_RETINEX_EQUAL;Equalizador
+TP_RETINEX_FREEGAMMA;Gamma livre
+TP_RETINEX_GAIN;Ganho
+TP_RETINEX_GAINOFFS;Ganho e Compensação (brilho)
+TP_RETINEX_GAINTRANSMISSION;Transmissão de ganho
+TP_RETINEX_GAIN_TOOLTIP;Atua na imagem restaurada.\n\nIsso é muito diferente das outras configurações. Usado para pixels pretos ou brancos e para ajudar a equilibrar o histograma.
+TP_RETINEX_GAMMA;Gamma
+TP_RETINEX_GAMMA_FREE;Livre
+TP_RETINEX_GAMMA_HIGH;Alto
+TP_RETINEX_GAMMA_LOW;Baixo
+TP_RETINEX_GAMMA_MID;Médio
+TP_RETINEX_GAMMA_NONE;Nenhum
+TP_RETINEX_GAMMA_TOOLTIP;Restaura tons aplicando gamma antes e depois do Retinex. Diferente das curvas Retinex ou outras curvas (Lab, Exposição, etc.).
+TP_RETINEX_GRAD;Gradiente de transmissão
+TP_RETINEX_GRADS;Gradiente de intensidade
+TP_RETINEX_GRADS_TOOLTIP;Se o controle deslizante for 0, todas as iterações serão idênticas.\nSe > 0 a Intensidade é reduzida quando as iterações aumentam e, inversamente.
+TP_RETINEX_GRAD_TOOLTIP;Se o controle deslizante for 0, todas as iterações serão idênticas.\nSe > 0 Variância e Limite são reduzidos quando as iterações aumentam e, inversamente.
+TP_RETINEX_HIGH;Alto
+TP_RETINEX_HIGHLIG;Realce
+TP_RETINEX_HIGHLIGHT;Limite de realce
+TP_RETINEX_HIGHLIGHT_TOOLTIP;Aumenta a ação do algoritmo alto.\nPode exigir que reajustes "pixels vizinhos" e aumente a "Correção de ponto branco" na guia Raw -> ferramenta de Pontos Brancos Raw.
+TP_RETINEX_HSLSPACE_LIN;HSL-Linear
+TP_RETINEX_HSLSPACE_LOG;HSL-Logarítmica
+TP_RETINEX_ITER;Iterações (Mapeamento de tom)
+TP_RETINEX_ITERF;Mapeamento de tom
+TP_RETINEX_ITER_TOOLTIP;Simula um operador de mapeamento de tom.\nValores altos aumentam o tempo de processamento.
+TP_RETINEX_LABEL;Retinex
+TP_RETINEX_LABEL_MASK;Máscara
+TP_RETINEX_LABSPACE;L*a*b*
+TP_RETINEX_LOW;Baixo
+TP_RETINEX_MAP;Método de máscara
+TP_RETINEX_MAP_GAUS;Máscara gaussiana
+TP_RETINEX_MAP_MAPP;Máscara de nitidez (wavelet parcial)
+TP_RETINEX_MAP_MAPT;Máscara de nitidez (wavelet total)
+TP_RETINEX_MAP_METHOD_TOOLTIP;Usa a máscara gerada pela função Gaussiana acima (Raio, Método) para reduzir halos e artefatos.\n\nApenas curva: aplique uma curva de contraste diagonal na máscara.\nCuidado com os artefatos!\n\nMáscara gaussiana: gera e usa um desfoque gaussiano da máscara original.\nRápido.\n\nMáscara de nitidez: gera e usa uma wavelet na máscara original.\nLento.
+TP_RETINEX_MAP_NONE;Nenhum
+TP_RETINEX_MEDIAN;Filtro mediano de transmissão
+TP_RETINEX_METHOD;Método
+TP_RETINEX_METHOD_TOOLTIP;Baixo = Reforça a luz baixa.\nUniforme = Equaliza a ação.\nAlto = Reforça a luz alta.\nRealces = Remove magenta nos realces.
+TP_RETINEX_MLABEL;Restaurado sem névoa Min=%1 Max=%2
+TP_RETINEX_MLABEL_TOOLTIP;Deve estar perto min=0 max=32768\nImagem restaurada sem mistura.
+TP_RETINEX_NEIGHBOR;Raio
+TP_RETINEX_NEUTRAL;Restaurar
+TP_RETINEX_NEUTRAL_TIP;Restaura todos os controles deslizantes e curvas para seus valores padrão.
+TP_RETINEX_OFFSET;Compensação (brilho)
+TP_RETINEX_SCALES;Gradiente gaussiano
+TP_RETINEX_SCALES_TOOLTIP;Se o controle deslizante for 0, todas as iterações serão idênticas.\nSe > 0 Escala e raio são reduzidos quando as iterações aumentam e inversamente.
+TP_RETINEX_SETTINGS;Configurações
+TP_RETINEX_SKAL;Escala
+TP_RETINEX_SLOPE;Declive gamma livre
+TP_RETINEX_STRENGTH;Intensidade
+TP_RETINEX_THRESHOLD;Limite
+TP_RETINEX_THRESHOLD_TOOLTIP;Limites de entrada/saída.\nEntrada = fonte de imagem,\nSaída = imagem gaussiana.
+TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Média=%3 Sigma=%4
+TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2
+TP_RETINEX_TLABEL_TOOLTIP;Resultado do mapa de transmissão.\nMin e Max são usados pela Variância.\nMédia e Sigma.\nTm=Min TM=Max do mapa de transmissão.
+TP_RETINEX_TRANF;Transmissão
+TP_RETINEX_TRANSMISSION;Mapa de transmissão
+TP_RETINEX_TRANSMISSION_TOOLTIP;Transmissão de acordo com transmissão.\nAbscissa: transmissão de valores negativos (min), média e valores positivos (max).\nOrdenado: amplificação ou redução.
+TP_RETINEX_UNIFORM;Uniforme
+TP_RETINEX_VARIANCE;Contraste
+TP_RETINEX_VARIANCE_TOOLTIP;Baixa variância aumenta o contraste e a saturação local, mas pode levar a artefatos.
+TP_RETINEX_VIEW;Processo
+TP_RETINEX_VIEW_MASK;Máscara
+TP_RETINEX_VIEW_METHOD_TOOLTIP;Padrão - Exibição normal.\nMáscara - Exibe a máscara.\nMáscara de nitidez - Exibe a imagem com uma máscara de nitidez de raio alto.\nTransmissão - Auto/Fixo - Exibe o mapa de transmissão do arquivo, antes de qualquer ação de contraste e brilho.\n\nAtenção: a máscara não corresponde à realidade, mas é amplificada para torná-la mais visível.
+TP_RETINEX_VIEW_NONE;Padrão
+TP_RETINEX_VIEW_TRAN;Transmissão - Auto
+TP_RETINEX_VIEW_TRAN2;Transmissão - Fixo
+TP_RETINEX_VIEW_UNSHARP;Máscara de nitidez
+TP_RGBCURVES_BLUE;B
+TP_RGBCURVES_CHANNEL;Canal
+TP_RGBCURVES_GREEN;G
+TP_RGBCURVES_LABEL;Curvas RGB
+TP_RGBCURVES_LUMAMODE;Modo de luminosidade
+TP_RGBCURVES_LUMAMODE_TOOLTIP;Modo de luminosidade permite variar a contribuição dos canais R, G e B para a luminosidade da imagem, sem alterar a cor da imagem.
+TP_RGBCURVES_RED;R
+TP_ROTATE_DEGREE;Grau
+TP_ROTATE_LABEL;Girar
+TP_ROTATE_SELECTLINE;Selecione Linha Reta
+TP_SAVEDIALOG_OK_TIP;Atalho: Ctrl-Enter
+TP_SHADOWSHLIGHTS_HIGHLIGHTS;Realces
+TP_SHADOWSHLIGHTS_HLTONALW;Largura tonal dos realces
+TP_SHADOWSHLIGHTS_LABEL;Sombras/Realces
+TP_SHADOWSHLIGHTS_LOCALCONTR;Contraste local
+TP_SHADOWSHLIGHTS_RADIUS;Raio
+TP_SHADOWSHLIGHTS_SHADOWS;Sombras
+TP_SHADOWSHLIGHTS_SHARPMASK;Máscara de nitidez
+TP_SHADOWSHLIGHTS_SHTONALW;Largura tonal das sombras
+TP_SHARPENEDGE_AMOUNT;Quantidade
+TP_SHARPENEDGE_LABEL;Bordas
+TP_SHARPENEDGE_PASSES;Iterações
+TP_SHARPENEDGE_THREE;Somente luminância
+TP_SHARPENING_AMOUNT;Montante
+TP_SHARPENING_CONTRAST;Limite de contraste
+TP_SHARPENING_EDRADIUS;Raio
+TP_SHARPENING_EDTOLERANCE;Tolerância de borda
+TP_SHARPENING_HALOCONTROL;Controle de halo
+TP_SHARPENING_HCAMOUNT;Montante
+TP_SHARPENING_LABEL;Nitidez
+TP_SHARPENING_METHOD;Método
+TP_SHARPENING_ONLYEDGES;Nitidez apenas nas bordas
+TP_SHARPENING_RADIUS;Raio
+TP_SHARPENING_RLD;Deconvolução RL
+TP_SHARPENING_RLD_AMOUNT;Montante
+TP_SHARPENING_RLD_DAMPING;Amortecimento
+TP_SHARPENING_RLD_ITERATIONS;Iterações
+TP_SHARPENING_THRESHOLD;Limite
+TP_SHARPENING_USM;Máscara de Nitidez
+TP_SHARPENMICRO_AMOUNT;Quantidade
+TP_SHARPENMICRO_CONTRAST;Limite de contraste
+TP_SHARPENMICRO_LABEL;Microcontraste
+TP_SHARPENMICRO_MATRIX;3×3 matriz em vez de 5×5
+TP_SHARPENMICRO_UNIFORMITY;Uniformidade
+TP_SOFTLIGHT_LABEL;Luz Suave
+TP_SOFTLIGHT_STRENGTH;Intensidade
+TP_TM_FATTAL_AMOUNT;Montante
+TP_TM_FATTAL_ANCHOR;Âncora
+TP_TM_FATTAL_LABEL;Compressão de Amplitude Dinâmica(DRC)
+TP_TM_FATTAL_THRESHOLD;Limite
+TP_VIBRANCE_AVOIDCOLORSHIFT;Evite mudança de cor
+TP_VIBRANCE_CURVEEDITOR_SKINTONES;MM
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tons cor de pele
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Vermelho/Roxo
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE2;Vermelho
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE3;Vermelho/Amarelo
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE4;Amarelo
+TP_VIBRANCE_CURVEEDITOR_SKINTONES_TOOLTIP;Matiz de acordo com matiz M=f(M)
+TP_VIBRANCE_LABEL;Vibração
+TP_VIBRANCE_PASTELS;Tons Pastéis
+TP_VIBRANCE_PASTSATTOG;Ligue tons pastéis e saturados
+TP_VIBRANCE_PROTECTSKINS;Protege os tons cor de pele
+TP_VIBRANCE_PSTHRESHOLD;Limite de tons pastel/saturado
+TP_VIBRANCE_PSTHRESHOLD_SATTHRESH;Limite de saturação
+TP_VIBRANCE_PSTHRESHOLD_TOOLTIP;O eixo vertical representa tons pastel na base e tons saturados no topo.\nO eixo horizontal representa a faixa de saturação.
+TP_VIBRANCE_PSTHRESHOLD_WEIGTHING;Ponderação da transição pastel/saturada
+TP_VIBRANCE_SATURATED;Tons Saturados
+TP_VIGNETTING_AMOUNT;Montante
+TP_VIGNETTING_CENTER;Centro
+TP_VIGNETTING_CENTER_X;Centro X
+TP_VIGNETTING_CENTER_Y;Centro Y
+TP_VIGNETTING_LABEL;Correção de Vinheta
+TP_VIGNETTING_RADIUS;Raio
+TP_VIGNETTING_STRENGTH;Intensidade
+TP_WAVELET_1;Nível 1
+TP_WAVELET_2;Nível 2
+TP_WAVELET_3;Nível 3
+TP_WAVELET_4;Nível 4
+TP_WAVELET_5;Nível 5
+TP_WAVELET_6;Nível 6
+TP_WAVELET_7;Nível 7
+TP_WAVELET_8;Nível 8
+TP_WAVELET_9;Nível 9
+TP_WAVELET_APPLYTO;Aplicar a
+TP_WAVELET_AVOID;Evite mudança de cor
+TP_WAVELET_B0;Preto
+TP_WAVELET_B1;Cinza
+TP_WAVELET_B2;Residual
+TP_WAVELET_BACKGROUND;Fundo
+TP_WAVELET_BACUR;Curva
+TP_WAVELET_BALANCE;Balanço de contraste d/v-h
+TP_WAVELET_BALANCE_TOOLTIP;Altera o equilíbrio entre as direções wavelet: vertical-horizontal e diagonal.\nSe o contraste, croma ou mapeamento de tom residual são ativados, o efeito devido ao equilíbrio é amplificado.
+TP_WAVELET_BALCHRO;Balanço cromático
+TP_WAVELET_BALCHRO_TOOLTIP;Se ativada, a curva ou o controle deslizante 'Balanço de contraste' também modifica o balanço cromático.
+TP_WAVELET_BANONE;Nenhum
+TP_WAVELET_BASLI;Controle deslizante
+TP_WAVELET_BATYPE;Método de balanço de contraste
+TP_WAVELET_CBENAB;Tonificação e Balanço de Cores
+TP_WAVELET_CB_TOOLTIP;Para valores fortes, tonalização de cores do produto, combinando ou não com níveis de decomposição 'tonificação'\nPara valores baixos, podes alterar o balanço de branco do plano de fundo (céu, ...) sem alterar o plano frontal, geralmente mais contrastado
+TP_WAVELET_CCURVE;Contraste local
+TP_WAVELET_CH1;Toda a gama de croma
+TP_WAVELET_CH2;Saturado/pastel
+TP_WAVELET_CH3;Ligue os níveis de contraste
+TP_WAVELET_CHCU;Curva
+TP_WAVELET_CHR;Intensidade de ligação do contraste cromático
+TP_WAVELET_CHRO;Limite saturado/pastel
+TP_WAVELET_CHRO_TOOLTIP;Define o nível de wavelet que será o limite entre as cores saturadas e pastel.\n1-x: saturada\nx-9: pastel\n\nSe o valor exceder o montante de níveis de wavelet que estiveres usando, ele será ignorado.
+TP_WAVELET_CHR_TOOLTIP;Ajusta o croma como uma função dos "níveis de contraste" e "intensidade de ligação do contraste cromático"
+TP_WAVELET_CHSL;Controles deslizantes
+TP_WAVELET_CHTYPE;Método de crominância
+TP_WAVELET_COLORT;Opacidade Vermelho-Verde
+TP_WAVELET_COMPCONT;Contraste
+TP_WAVELET_COMPGAMMA;Compressão gamma
+TP_WAVELET_COMPGAMMA_TOOLTIP;Ajustar o gamma da imagem residual permite equilibrar os dados e o histograma.
+TP_WAVELET_COMPTM;Mapeamento de tom
+TP_WAVELET_CONTEDIT;Curva de contraste 'depois'
+TP_WAVELET_CONTR;Gamut
+TP_WAVELET_CONTRA;Contraste
+TP_WAVELET_CONTRAST_MINUS;Contraste -
+TP_WAVELET_CONTRAST_PLUS;Contraste +
+TP_WAVELET_CONTRA_TOOLTIP;Altera o contraste da imagem residual.
+TP_WAVELET_CTYPE;Controle de crominância
+TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifica o contraste local como uma função do contraste local original (abscissa).\nValores baixos de abscissa representam pequeno contraste local (valores reais de 10..20).\n50% abscissa representa contraste local médio (valores reais de 100..300).\n66% abscissa representa desvio padrão do contraste local (valores reais de 300..800).\n100% abscissa representa contraste local máximo (valores reais de 3000..8000).
+TP_WAVELET_CURVEEDITOR_CH;Níveis de contraste=f(Matiz)
+TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifica cada nível de contraste como uma função da matiz.\nTome cuidado para não sobrescrever as alterações feitas com os controles de matiz da sub-ferramenta Gamut.\nA curva só terá efeito quando os controles deslizantes do nível de contraste da wavelet forem diferentes de zero.
+TP_WAVELET_CURVEEDITOR_CL;L
+TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Aplica uma curva de luminância de contraste final no fim do tratamento wavelet.
+TP_WAVELET_CURVEEDITOR_HH;MM
+TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifica a matiz da imagem residual como uma função de matiz.
+TP_WAVELET_DALL;Todas as direções
+TP_WAVELET_DAUB;Performance de borda
+TP_WAVELET_DAUB2;D2 - baixo
+TP_WAVELET_DAUB4;D4 - padrão
+TP_WAVELET_DAUB6;D6 - padrão plus
+TP_WAVELET_DAUB10;D10 - médio
+TP_WAVELET_DAUB14;D14 - alto
+TP_WAVELET_DAUB_TOOLTIP;Altera coeficientes Daubechies:\nD4 = Padrão,\nD14 = Frequentemente melhor desempenho, 10% mais tempo-intensivo.\n\nAfeta a detecção de bordas, bem como a qualidade geral dos primeiros níveis. No entanto, a qualidade não está estritamente relacionada a esse coeficiente e pode variar com imagens e usos.
+TP_WAVELET_DONE;Vertical
+TP_WAVELET_DTHR;Diagonal
+TP_WAVELET_DTWO;Horizontal
+TP_WAVELET_EDCU;Curva
+TP_WAVELET_EDGCONT;Contraste local
+TP_WAVELET_EDGCONT_TOOLTIP;Ajustar os pontos para a esquerda diminui o contraste, e para a direita aumenta.\nInferior esquerdo, Superior esquerdo, Superior direito, Inferior direito representam respectivamente contraste local para valores baixos, médio, médio + stdev, máximos
+TP_WAVELET_EDGE;Nitidez de borda
+TP_WAVELET_EDGEAMPLI;Amplificação de base
+TP_WAVELET_EDGEDETECT;Sensibilidade ao gradiente
+TP_WAVELET_EDGEDETECTTHR;Limite baixo (ruído)
+TP_WAVELET_EDGEDETECTTHR2;Limite alto (detecção)
+TP_WAVELET_EDGEDETECTTHR_TOOLTIP;Esse ajustador permite que segmentes a detecção de bordas, por exemplo, para evitar a aplicação de nitidez de borda a detalhes finos, como ruído no céu.
+TP_WAVELET_EDGEDETECT_TOOLTIP;Mover o controle deslizante para a direita aumenta a sensibilidade da borda. Isso afeta o contraste local, as configurações de borda e o ruído.
+TP_WAVELET_EDGESENSI;Sensibilidade de borda
+TP_WAVELET_EDGREINF_TOOLTIP;Reforce ou reduza a ação do primeiro nível, faça o oposto ao segundo nível e deixe o restante inalterado.
+TP_WAVELET_EDGTHRESH;Detalhe
+TP_WAVELET_EDGTHRESH_TOOLTIP;Altere a repartição entre os primeiros níveis e os outros. Quanto maior o limite, mais a ação é centrada nos primeiros níveis. Cuidado com valores negativos, eles aumentam a ação de níveis altos e podem introduzir artefatos.
+TP_WAVELET_EDRAD;Raio
+TP_WAVELET_EDRAD_TOOLTIP;Este ajuste de raio é muito diferente daqueles em outras ferramentas de nitidez. Seu valor é comparado a cada nível através de uma função complexa. Nesse sentido, um valor de zero ainda tem efeito.
+TP_WAVELET_EDSL;Controles Deslizantes do Limite
+TP_WAVELET_EDTYPE;Método de contraste local
+TP_WAVELET_EDVAL;Intensidade
+TP_WAVELET_FINAL;Retoque Final
+TP_WAVELET_FINEST;Melhor
+TP_WAVELET_HIGHLIGHT;Faixa de luminância do realce
+TP_WAVELET_HS1;Toda faixa de luminância
+TP_WAVELET_HS2;Sombras/Relces
+TP_WAVELET_HUESKIN;Matiz da pele
+TP_WAVELET_HUESKIN_TOOLTIP;Os pontos inferiores definem o início da zona de transição, e os pontos superiores o final, onde o efeito está no seu máximo.\n\nSe precisares mover a área significativamente, ou se houver artefatos, então o balanço de branco está incorreto.
+TP_WAVELET_HUESKY;Matiz do céu
+TP_WAVELET_HUESKY_TOOLTIP;Os pontos inferiores definem o início da zona de transição, e os pontos superiores o final, onde o efeito está no seu máximo.\n\nSe precisares mover a área significativamente, ou se houver artefatos, então o balanço de branco está incorreto.
+TP_WAVELET_ITER;Níveis de balanço delta
+TP_WAVELET_ITER_TOOLTIP;Esquerda: aumenta os níveis baixos e reduz os níveis altos,\nDireita: reduz os níveis baixos e aumenta os níveis altos.
+TP_WAVELET_LABEL;Níveis Wavelet
+TP_WAVELET_LARGEST;Grosseiro
+TP_WAVELET_LEVCH;Croma
+TP_WAVELET_LEVDIR_ALL;Todos os níveis em todas as direções
+TP_WAVELET_LEVDIR_INF;Abaixo ou igual ao nível
+TP_WAVELET_LEVDIR_ONE;Um nível
+TP_WAVELET_LEVDIR_SUP;Acima do nível
+TP_WAVELET_LEVELS;Níveis Wavelet
+TP_WAVELET_LEVELS_TOOLTIP;Escolha o número de níveis de detalhes para os quais a imagem será decomposta. Mais níveis requerem mais RAM e requerem um longo tempo de processamento.
+TP_WAVELET_LEVF;Contraste
+TP_WAVELET_LEVLABEL;Visualizar níveis máximos possíveis = %1
+TP_WAVELET_LEVONE;Nível 2
+TP_WAVELET_LEVTHRE;Nível 4
+TP_WAVELET_LEVTWO;Nível 3
+TP_WAVELET_LEVZERO;Nível 1
+TP_WAVELET_LINKEDG;Ligar com a Intensidade da Nitidez de Borda
+TP_WAVELET_LIPST;Algoritmo aprimorado
+TP_WAVELET_LOWLIGHT;Faixa de luminância da sombra
+TP_WAVELET_MEDGREINF;Primeiro nível
+TP_WAVELET_MEDI;Reduzir artefatos no céu azul
+TP_WAVELET_MEDILEV;Detecção de borda
+TP_WAVELET_MEDILEV_TOOLTIP;Quando habilitas a detecção de borda, é recomendado:\n- desativar níveis baixos de contraste para evitar artefatos,\n- usar valores altos de sensibilidade ao gradiente.\n\nPodes modular a intensidade com 'refinar' de Remoção de Ruído e Refinar.
+TP_WAVELET_NEUTRAL;Neutro
+TP_WAVELET_NOIS;Remoção de Ruído
+TP_WAVELET_NOISE;Remoção de Ruído e Refinar
+TP_WAVELET_NPHIGH;Alto
+TP_WAVELET_NPLOW;Baixo
+TP_WAVELET_NPNONE;Nenhum
+TP_WAVELET_NPTYPE;Pixels vizinhos
+TP_WAVELET_NPTYPE_TOOLTIP;Este algoritmo usa a proximidade de um pixel e oito de seus vizinhos. Se diferença for menor, bordas serão reforçadas.
+TP_WAVELET_OPACITY;Opacidade Azul-Amarela
+TP_WAVELET_OPACITYW;Curva do balanço de contraste d/v-h
+TP_WAVELET_OPACITYWL;Contraste local final
+TP_WAVELET_OPACITYWL_TOOLTIP;Modifica o contraste local final no fim do tratamento wavelet.\n\nÀ Esquerda representa o menor contraste local, progredindo para o maior contraste local à direita.
+TP_WAVELET_PASTEL;Croma pastel
+TP_WAVELET_PROC;Processo
+TP_WAVELET_RE1;Reforçado
+TP_WAVELET_RE2;Inalterado
+TP_WAVELET_RE3;Reduzido
+TP_WAVELET_RESCHRO;Croma
+TP_WAVELET_RESCON;Sombras
+TP_WAVELET_RESCONH;Realces
+TP_WAVELET_RESID;Imagem Residual
+TP_WAVELET_SAT;Croma saturado
+TP_WAVELET_SETTINGS;Configurações Wavelet
+TP_WAVELET_SKIN;Segmentação/proteção cor da pele
+TP_WAVELET_SKIN_TOOLTIP;Em -100 tons de pele são direcionados.\nEm 0 todos os tons são tratados igualmente.\nEm +100 tons de pele são protegidos enquanto todos os outros tons são afetados.
+TP_WAVELET_SKY;Segmentação/proteção cor do céu
+TP_WAVELET_SKY_TOOLTIP;Em -100 tons de pele são direcionados.\nEm 0 todos os tons são tratados igualmente.\nEm +100 tons de pele são protegidos enquanto todos os outros tons são afetados.
+TP_WAVELET_STREN;Intensidade
+TP_WAVELET_STRENGTH;Intensidade
+TP_WAVELET_SUPE;Extra
+TP_WAVELET_THR;Limite de sombras
+TP_WAVELET_THRESHOLD;Níveis de realces
+TP_WAVELET_THRESHOLD2;Níveis de sombras
+TP_WAVELET_THRESHOLD2_TOOLTIP;Apenas níveis entre 9 e menos 9 terão valores afetados pela faixa de luminância da sombra. Outros níveis serão totalmente tratados. O nível mais alto possível é limitado pelo valor do nível de realce (menos 9 valor do nível de realce).
+TP_WAVELET_THRESHOLD_TOOLTIP;Apenas níveis além do valor escolhido serão afetados pela faixa de luminância do realce. Outros níveis serão totalmente tratados. O valor escolhido aqui limita o maior valor possível dos níveis de sombra.
+TP_WAVELET_THRH;Limite de realces
+TP_WAVELET_TILESBIG;Mosaicos grandes
+TP_WAVELET_TILESFULL;Imagem cheia
+TP_WAVELET_TILESIZE;Método de mosaicos
+TP_WAVELET_TILESLIT;Mosaicos pequenos
+TP_WAVELET_TILES_TOOLTIP;O processamento da imagem cheia leva a uma melhor qualidade e é a opção recomendada, enquanto o uso de mosaicos é uma solução de retorno para usuários com pouca RAM. Consulte o RawPedia para requisitos de memória.
+TP_WAVELET_TMSTRENGTH;Intensidade de compressão
+TP_WAVELET_TMSTRENGTH_TOOLTIP;Controla a intensidade do mapeamento de tom ou a compressaõ de contraste da imagem residua. Quando o valor for diferente de 0, os controles deslizantes Intensidade e Gamma da ferramenta Mapeamento de Tom na guia Exposição ficarão esmaecidos.
+TP_WAVELET_TMTYPE;Método de compressão
+TP_WAVELET_TON;Tonificação
+TP_WBALANCE_AUTO;Automático
+TP_WBALANCE_CAMERA;Câmera
+TP_WBALANCE_CLOUDY;Nublado
+TP_WBALANCE_CUSTOM;Personalizado
+TP_WBALANCE_DAYLIGHT;Luz do dia (sol)
+TP_WBALANCE_EQBLUERED;Equalizador Azul/Vermelho
+TP_WBALANCE_EQBLUERED_TOOLTIP;Permite desviar do comportamento normal do "balanço de branco", modulando o balanço azul/vermelho.\nIsso pode ser útil ao fotografar condições:\na) estão longe do iluminante padrão (por exemplo, embaixo d'água),\nb) estão longe das condições em que as calibrações foram realizadas,\nc) onde as matrizes ou perfis ICC são inadequados.
+TP_WBALANCE_FLASH55;Leica
+TP_WBALANCE_FLASH60;Padrão, Canon, Pentax, Olympus
+TP_WBALANCE_FLASH65;Nikon, Panasonic, Sony, Minolta
+TP_WBALANCE_FLASH_HEADER;Flash
+TP_WBALANCE_FLUO1;F1 - Luz do Dia
+TP_WBALANCE_FLUO2;F2 - Branco Frio
+TP_WBALANCE_FLUO3;F3 - Branco
+TP_WBALANCE_FLUO4;F4 - Branco Quente
+TP_WBALANCE_FLUO5;F5 - Luz do Dia
+TP_WBALANCE_FLUO6;F6 - Branco Suave
+TP_WBALANCE_FLUO7;F7 - Simulador de Luz do Dia D65
+TP_WBALANCE_FLUO8;F8 - Modelo D50 / Sylvania F40
+TP_WBALANCE_FLUO9;F9 - Branco Frio de luxo
+TP_WBALANCE_FLUO10;F10 - Philips TL85
+TP_WBALANCE_FLUO11;F11 - Philips TL84
+TP_WBALANCE_FLUO12;F12 - Philips TL83
+TP_WBALANCE_FLUO_HEADER;Fluorescente
+TP_WBALANCE_GREEN;Tinto
+TP_WBALANCE_GTI;GTI
+TP_WBALANCE_HMI;HMI
+TP_WBALANCE_JUDGEIII;Juiz III
+TP_WBALANCE_LABEL;Balanço de Branco
+TP_WBALANCE_LAMP_HEADER;Lâmpada
+TP_WBALANCE_LED_CRS;CRS SP12 WWMR16
+TP_WBALANCE_LED_HEADER;LED
+TP_WBALANCE_LED_LSI;LSI Lumelex 2040
+TP_WBALANCE_METHOD;Método
+TP_WBALANCE_SHADE;Penumbra
+TP_WBALANCE_SIZE;Tamanho:
+TP_WBALANCE_SOLUX35;Solux 3500K
+TP_WBALANCE_SOLUX41;Solux 4100K
+TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
+TP_WBALANCE_SOLUX47_NG;Solux 4700K (Galeria Nat.)
+TP_WBALANCE_SPOTWB;Use the pipette to pick the white balance from a neutral patch in the preview.
+TP_WBALANCE_TEMPBIAS;Viés de temperatura AWB
+TP_WBALANCE_TEMPBIAS_TOOLTIP;Permite alterar o cálculo do "balanço de branco automático"\ninclinando-o para temperaturas mais quentes ou mais frias. O viés\né expresso como uma porcentagem da temperatura calculada,\npara que o resultado seja dado por "Temperatura calculada + Temperatura calculada * viés".
+TP_WBALANCE_TEMPERATURE;Temperatura
+TP_WBALANCE_TUNGSTEN;Tungstênio
+TP_WBALANCE_WATER1;Embaixo da Água 1
+TP_WBALANCE_WATER2;Embaixo da Água 2
+TP_WBALANCE_WATER_HEADER;Embaixo da Água
+ZOOMPANEL_100;(100%)
+ZOOMPANEL_NEWCROPWINDOW;Janela de detalhe aberta (nova)
+ZOOMPANEL_ZOOM100;Zoom para 100%\nAtalho: z
+ZOOMPANEL_ZOOMFITCROPSCREEN;Ajustar o corte à tela\nAtalho: f
+ZOOMPANEL_ZOOMFITSCREEN;Ajustar toda a imagem à tela\nAtalho: Alt-f
+ZOOMPANEL_ZOOMIN;Mais Zoom\nAtalho: +
+ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: -
!!!!!!!!!!!!!!!!!!!!!!!!!
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
-!GENERAL_RESET;Reset
-!HISTORY_MSG_488;Dynamic Range Compression
-!HISTORY_MSG_489;DRC - Threshold
-!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
-!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
-!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
-!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
-!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!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 available if a dual-illuminant DCP with interpolation support is selected.
-!TP_ICM_INPUTCAMERA;Camera standard
-!TP_ICM_INPUTCAMERAICC;Auto-matched camera profile
-!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_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_INPUTCUSTOM;Custom
-!TP_ICM_INPUTCUSTOM_TOOLTIP;Select your own DCP/ICC color profile file for the camera.
-!TP_ICM_INPUTDLGLABEL;Select Input DCP/ICC Profile...
-!TP_ICM_INPUTEMBEDDED;Use embedded, if possible
-!TP_ICM_INPUTEMBEDDED_TOOLTIP;Use color profile embedded in non-raw files.
-!TP_ICM_INPUTNONE;No profile
-!TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
-!TP_ICM_INPUTPROFILE;Input Profile
-!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
-!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.
-!TP_ICM_TONECURVE;Tone curve
-!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
-!TP_ICM_WORKINGPROFILE;Working Profile
-!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
-!TP_IMPULSEDENOISE_THRESH;Threshold
-!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
-!TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction.
-!TP_LABCURVE_BRIGHTNESS;Lightness
-!TP_LABCURVE_CHROMATICITY;Chromaticity
-!TP_LABCURVE_CHROMA_TOOLTIP;To apply B&W toning, set Chromaticity to -100.
-!TP_LABCURVE_CONTRAST;Contrast
-!TP_LABCURVE_CURVEEDITOR;Luminance Curve
-!TP_LABCURVE_CURVEEDITOR_A_RANGE1;Green Saturated
-!TP_LABCURVE_CURVEEDITOR_A_RANGE2;Green Pastel
-!TP_LABCURVE_CURVEEDITOR_A_RANGE3;Red Pastel
-!TP_LABCURVE_CURVEEDITOR_A_RANGE4;Red Saturated
-!TP_LABCURVE_CURVEEDITOR_B_RANGE1;Blue Saturated
-!TP_LABCURVE_CURVEEDITOR_B_RANGE2;Blue Pastel
-!TP_LABCURVE_CURVEEDITOR_B_RANGE3;Yellow Pastel
-!TP_LABCURVE_CURVEEDITOR_B_RANGE4;Yellow Saturated
-!TP_LABCURVE_CURVEEDITOR_CC;CC
-!TP_LABCURVE_CURVEEDITOR_CC_RANGE1;Neutral
-!TP_LABCURVE_CURVEEDITOR_CC_RANGE2;Dull
-!TP_LABCURVE_CURVEEDITOR_CC_RANGE3;Pastel
-!TP_LABCURVE_CURVEEDITOR_CC_RANGE4;Saturated
-!TP_LABCURVE_CURVEEDITOR_CC_TOOLTIP;Chromaticity according to chromaticity C=f(C)
-!TP_LABCURVE_CURVEEDITOR_CH;CH
-!TP_LABCURVE_CURVEEDITOR_CH_TOOLTIP;Chromaticity according to hue C=f(H)
-!TP_LABCURVE_CURVEEDITOR_CL;CL
-!TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Chromaticity according to luminance C=f(L)
-!TP_LABCURVE_CURVEEDITOR_HH;HH
-!TP_LABCURVE_CURVEEDITOR_HH_TOOLTIP;Hue according to hue H=f(H)
-!TP_LABCURVE_CURVEEDITOR_LC;LC
-!TP_LABCURVE_CURVEEDITOR_LC_TOOLTIP;Luminance according to chromaticity L=f(C)
-!TP_LABCURVE_CURVEEDITOR_LH;LH
-!TP_LABCURVE_CURVEEDITOR_LH_TOOLTIP;Luminance according to hue L=f(H)
-!TP_LABCURVE_CURVEEDITOR_LL_TOOLTIP;Luminance according to luminance L=f(L)
-!TP_LABCURVE_LABEL;L*a*b* Adjustments
-!TP_LABCURVE_LCREDSK;Restrict LC to red and skin-tones
-!TP_LABCURVE_LCREDSK_TIP;If enabled, the LC Curve affects only red and skin-tones.\nIf disabled, it applies to all tones.
-!TP_LABCURVE_RSTPROTECTION;Red and skin-tones protection
-!TP_LABCURVE_RSTPRO_TOOLTIP;Works on the Chromaticity slider and the CC curve.
-!TP_LENSGEOM_AUTOCROP;Auto-Crop
-!TP_LENSGEOM_FILL;Auto-fill
-!TP_LENSGEOM_LABEL;Lens / Geometry
-!TP_LENSPROFILE_LABEL;Profiled Lens Correction
-!TP_LENSPROFILE_USECA;Chromatic aberration correction
-!TP_LENSPROFILE_USEDIST;Distortion correction
-!TP_LENSPROFILE_USEVIGN;Vignetting correction
-!TP_LOCALCONTRAST_AMOUNT;Amount
-!TP_LOCALCONTRAST_DARKNESS;Darkness level
-!TP_LOCALCONTRAST_LABEL;Local Contrast
-!TP_LOCALCONTRAST_LIGHTNESS;Lightness level
-!TP_LOCALCONTRAST_RADIUS;Radius
-!TP_METADATA_EDIT;Apply modifications
-!TP_METADATA_MODE;Metadata copy mode
-!TP_METADATA_STRIP;Strip all metadata
-!TP_METADATA_TUNNEL;Copy unchanged
-!TP_NEUTRAL;Reset
-!TP_NEUTRAL_TIP;Resets exposure sliders to neutral values.\nApplies to the same controls that Auto Levels applies to, regardless of whether you used Auto Levels or not.
-!TP_PCVIGNETTE_FEATHER;Feather
-!TP_PCVIGNETTE_FEATHER_TOOLTIP;Feathering:\n0 = corners only,\n50 = halfway to center,\n100 = to center.
-!TP_PCVIGNETTE_LABEL;Vignette Filter
-!TP_PCVIGNETTE_ROUNDNESS;Roundness
-!TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Roundness:\n0 = rectangle,\n50 = fitted ellipse,\n100 = circle.
-!TP_PCVIGNETTE_STRENGTH;Strength
-!TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filter strength in stops (reached in corners).
-!TP_PERSPECTIVE_HORIZONTAL;Horizontal
-!TP_PERSPECTIVE_LABEL;Perspective
-!TP_PERSPECTIVE_VERTICAL;Vertical
-!TP_PFCURVE_CURVEEDITOR_CH;Hue
-!TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Controls defringe strength by color.\nHigher = more,\nLower = less.
-!TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
-!TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tries to suppress dead pixels.
-!TP_PREPROCESS_GREENEQUIL;Green equilibration
-!TP_PREPROCESS_HOTPIXFILT;Hot pixel filter
-!TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels.
-!TP_PREPROCESS_LABEL;Preprocessing
-!TP_PREPROCESS_LINEDENOISE;Line noise filter
-!TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows
-!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
-!TP_PREPROCESS_NO_FOUND;None found
-!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
-!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
-!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
-!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
-!TP_RAWCACORR_AUTO;Auto-correction
-!TP_RAWCACORR_CABLUE;Blue
-!TP_RAWCACORR_CARED;Red
-!TP_RAWCACORR_CASTR;Strength
-!TP_RAWEXPOS_BLACKS;Black Levels
-!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
-!TP_RAWEXPOS_BLACK_1;Red
-!TP_RAWEXPOS_BLACK_2;Blue
-!TP_RAWEXPOS_BLACK_3;Green 2
-!TP_RAWEXPOS_BLACK_BLUE;Blue
-!TP_RAWEXPOS_BLACK_GREEN;Green
-!TP_RAWEXPOS_BLACK_RED;Red
-!TP_RAWEXPOS_LINEAR;White-point correction
-!TP_RAWEXPOS_PRESER;Highlight preservation
-!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
-!TP_RAW_AHD;AHD
-!TP_RAW_AMAZE;AMaZE
-!TP_RAW_AMAZEVNG4;AMaZE+VNG4
-!TP_RAW_DCB;DCB
-!TP_RAW_DCBENHANCE;DCB enhancement
-!TP_RAW_DCBITERATIONS;Number of DCB iterations
-!TP_RAW_DMETHOD;Method
-!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
-!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
-!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
-!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
-!TP_RAW_EAHD;EAHD
-!TP_RAW_FALSECOLOR;False color suppression steps
-!TP_RAW_FAST;Fast
-!TP_RAW_HD;Threshold
-!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_HPHD;HPHD
-!TP_RAW_IGV;IGV
-!TP_RAW_IMAGENUM;Sub-image
-!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
-!TP_RAW_LABEL;Demosaicing
-!TP_RAW_LMMSE;LMMSE
-!TP_RAW_LMMSEITERATIONS;LMMSE enhancement steps
-!TP_RAW_LMMSE_TOOLTIP;Adds gamma (step 1), median (steps 2-4) and refinement (steps 5-6) to reduce artifacts and improve the signal-to-noise ratio.
-!TP_RAW_MONO;Mono
-!TP_RAW_NONE;None (Shows sensor pattern)
-!TP_RAW_PIXELSHIFT;Pixel Shift
-!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
-!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
-!TP_RAW_PIXELSHIFTEPERISO;Sensitivity
-!TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nHigher values increase sensitivity of motion detection.\nChange in small steps and watch the motion mask while changing.\nIncrease sensitivity for underexposed or high ISO images.
-!TP_RAW_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
-!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Equalize per channel
-!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels.
-!TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Equalize the brightness of the frames to the brightness of the selected frame.\nIf there are overexposed areas in the frames select the brightest frame to avoid magenta color cast in overexposed areas or enable motion correction.
-!TP_RAW_PIXELSHIFTGREEN;Check green channel for motion
-!TP_RAW_PIXELSHIFTHOLEFILL;Fill holes in motion mask
-!TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Fill holes in motion mask
-!TP_RAW_PIXELSHIFTLMMSE;Use LMMSE for moving parts
-!TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use LMMSE instead of AMaZE for areas of motion.\nUseful for high ISO images.
-!TP_RAW_PIXELSHIFTMEDIAN;Use median for moving parts
-!TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP;Use median of all frames instead of selected frame for regions with motion.\nRemoves objects which are at different places in all frames.\nGives motion effect on slow moving (overlapping) objects.
-!TP_RAW_PIXELSHIFTMM_AUTO;Automatic
-!TP_RAW_PIXELSHIFTMM_CUSTOM;Custom
-!TP_RAW_PIXELSHIFTMM_OFF;Off
-!TP_RAW_PIXELSHIFTMOTIONMETHOD;Motion Correction
-!TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 means no motion detection.\n1 - 99 means motion will be detected according to this value. Increase value to increase detection rate.\n100 means the AMaZE-demosaiced frame will be used.
-!TP_RAW_PIXELSHIFTNONGREENCROSS;Check red/blue channels for motion
-!TP_RAW_PIXELSHIFTSHOWMOTION;Show motion mask
-!TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Show only motion mask
-!TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Shows the motion mask without the image.
-!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
-!TP_RAW_PIXELSHIFTSIGMA;Blur radius
-!TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for base ISO.\nIncrease the value for high ISO shots, 5.0 is a good starting point.\nWatch the motion mask while changing the value.
-!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
-!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
-!TP_RAW_RCD;RCD
-!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_RAW_VNG4;VNG4
-!TP_RESIZE_APPLIESTO;Applies to:
-!TP_RESIZE_CROPPEDAREA;Cropped Area
-!TP_RESIZE_FITBOX;Bounding Box
-!TP_RESIZE_FULLIMAGE;Full Image
-!TP_RESIZE_H;Height:
-!TP_RESIZE_HEIGHT;Height
-!TP_RESIZE_LABEL;Resize
-!TP_RESIZE_LANCZOS;Lanczos
-!TP_RESIZE_METHOD;Method:
-!TP_RESIZE_NEAREST;Nearest
-!TP_RESIZE_SCALE;Scale
-!TP_RESIZE_SPECIFY;Specify:
-!TP_RESIZE_W;Width:
-!TP_RESIZE_WIDTH;Width
-!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
-!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
-!TP_RETINEX_CONTEDIT_LH;Hue equalizer
-!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_RGBCURVES_BLUE;B
-!TP_RGBCURVES_CHANNEL;Channel
-!TP_RGBCURVES_GREEN;G
-!TP_RGBCURVES_LABEL;RGB Curves
-!TP_RGBCURVES_LUMAMODE;Luminosity mode
-!TP_RGBCURVES_LUMAMODE_TOOLTIP;Luminosity mode allows to vary the contribution of R, G and B channels to the luminosity of the image, without altering image color.
-!TP_RGBCURVES_RED;R
-!TP_ROTATE_DEGREE;Degree
-!TP_ROTATE_LABEL;Rotate
-!TP_ROTATE_SELECTLINE;Select Straight Line
-!TP_SAVEDIALOG_OK_TIP;Shortcut: Ctrl-Enter
-!TP_SHADOWSHLIGHTS_HIGHLIGHTS;Highlights
-!TP_SHADOWSHLIGHTS_HLTONALW;Highlights tonal width
-!TP_SHADOWSHLIGHTS_LABEL;Shadows/Highlights
-!TP_SHADOWSHLIGHTS_LOCALCONTR;Local contrast
-!TP_SHADOWSHLIGHTS_RADIUS;Radius
-!TP_SHADOWSHLIGHTS_SHADOWS;Shadows
-!TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
-!TP_SHADOWSHLIGHTS_SHTONALW;Shadows tonal width
-!TP_SHARPENEDGE_AMOUNT;Quantity
-!TP_SHARPENEDGE_LABEL;Edges
-!TP_SHARPENEDGE_PASSES;Iterations
-!TP_SHARPENEDGE_THREE;Luminance only
-!TP_SHARPENING_AMOUNT;Amount
-!TP_SHARPENING_CONTRAST;Contrast threshold
-!TP_SHARPENING_EDRADIUS;Radius
-!TP_SHARPENING_EDTOLERANCE;Edge tolerance
-!TP_SHARPENING_HALOCONTROL;Halo control
-!TP_SHARPENING_HCAMOUNT;Amount
-!TP_SHARPENING_LABEL;Sharpening
-!TP_SHARPENING_METHOD;Method
-!TP_SHARPENING_ONLYEDGES;Sharpen only edges
-!TP_SHARPENING_RADIUS;Radius
-!TP_SHARPENING_RLD;RL Deconvolution
-!TP_SHARPENING_RLD_AMOUNT;Amount
-!TP_SHARPENING_RLD_DAMPING;Damping
-!TP_SHARPENING_RLD_ITERATIONS;Iterations
-!TP_SHARPENING_THRESHOLD;Threshold
-!TP_SHARPENING_USM;Unsharp Mask
-!TP_SHARPENMICRO_AMOUNT;Quantity
-!TP_SHARPENMICRO_CONTRAST;Contrast threshold
-!TP_SHARPENMICRO_LABEL;Microcontrast
-!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
-!TP_SHARPENMICRO_UNIFORMITY;Uniformity
-!TP_TM_FATTAL_AMOUNT;Amount
-!TP_TM_FATTAL_ANCHOR;Anchor
-!TP_TM_FATTAL_LABEL;Dynamic Range Compression
-!TP_TM_FATTAL_THRESHOLD;Threshold
-!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Red/Purple
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE2;Red
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE3;Red/Yellow
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE4;Yellow
-!TP_VIBRANCE_CURVEEDITOR_SKINTONES_TOOLTIP;Hue according to hue H=f(H)
-!TP_VIBRANCE_LABEL;Vibrance
-!TP_VIBRANCE_PASTELS;Pastel Tones
-!TP_VIBRANCE_PASTSATTOG;Link pastel and saturated tones
-!TP_VIBRANCE_PROTECTSKINS;Protect skin-tones
-!TP_VIBRANCE_PSTHRESHOLD;Pastel/saturated tones threshold
-!TP_VIBRANCE_PSTHRESHOLD_SATTHRESH;Saturation threshold
-!TP_VIBRANCE_PSTHRESHOLD_TOOLTIP;The vertical axis represents pastel tones at the bottom and saturated tones at the top.\nThe horizontal axis represents the saturation range.
-!TP_VIBRANCE_PSTHRESHOLD_WEIGTHING;Pastel/saturated transition's weighting
-!TP_VIBRANCE_SATURATED;Saturated Tones
-!TP_VIGNETTING_AMOUNT;Amount
-!TP_VIGNETTING_CENTER;Center
-!TP_VIGNETTING_CENTER_X;Center X
-!TP_VIGNETTING_CENTER_Y;Center Y
-!TP_VIGNETTING_LABEL;Vignetting Correction
-!TP_VIGNETTING_RADIUS;Radius
-!TP_VIGNETTING_STRENGTH;Strength
-!TP_WAVELET_1;Level 1
-!TP_WAVELET_2;Level 2
-!TP_WAVELET_3;Level 3
-!TP_WAVELET_4;Level 4
-!TP_WAVELET_5;Level 5
-!TP_WAVELET_6;Level 6
-!TP_WAVELET_7;Level 7
-!TP_WAVELET_8;Level 8
-!TP_WAVELET_9;Level 9
-!TP_WAVELET_APPLYTO;Apply To
-!TP_WAVELET_AVOID;Avoid color shift
-!TP_WAVELET_B0;Black
-!TP_WAVELET_B1;Grey
-!TP_WAVELET_B2;Residual
-!TP_WAVELET_BACKGROUND;Background
-!TP_WAVELET_BACUR;Curve
-!TP_WAVELET_BALANCE;Contrast balance d/v-h
-!TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chroma or residual tone mapping are activated, the effect due to balance is amplified.
-!TP_WAVELET_BALCHRO;Chroma balance
-!TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chroma balance.
-!TP_WAVELET_BANONE;None
-!TP_WAVELET_BASLI;Slider
-!TP_WAVELET_BATYPE;Contrast balance method
-!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_CCURVE;Local contrast
-!TP_WAVELET_CH1;Whole chroma range
-!TP_WAVELET_CH2;Saturated/pastel
-!TP_WAVELET_CH3;Link contrast levels
-!TP_WAVELET_CHCU;Curve
-!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_CHSL;Sliders
-!TP_WAVELET_CHTYPE;Chrominance method
-!TP_WAVELET_COLORT;Opacity Red-Green
-!TP_WAVELET_COMPCONT;Contrast
-!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_DAUB2;D2 - low
-!TP_WAVELET_DAUB4;D4 - standard
-!TP_WAVELET_DAUB6;D6 - standard plus
-!TP_WAVELET_DAUB10;D10 - medium
-!TP_WAVELET_DAUB14;D14 - high
-!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_DONE;Vertical
-!TP_WAVELET_DTHR;Diagonal
-!TP_WAVELET_DTWO;Horizontal
-!TP_WAVELET_EDCU;Curve
-!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGEAMPLI;Base amplification
-!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 centered on the first levels. Be careful with negative values, they increase the action of high levels and can introduce artifacts.
-!TP_WAVELET_EDRAD;Radius
-!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_EDSL;Threshold Sliders
-!TP_WAVELET_EDTYPE;Local contrast method
-!TP_WAVELET_EDVAL;Strength
-!TP_WAVELET_FINAL;Final Touchup
-!TP_WAVELET_FINEST;Finest
-!TP_WAVELET_HIGHLIGHT;Highlight luminance range
-!TP_WAVELET_HS1;Whole luminance range
-!TP_WAVELET_HS2;Shadows/Highlights
-!TP_WAVELET_HUESKIN;Skin hue
-!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 white balance is incorrect.
-!TP_WAVELET_HUESKY;Sky hue
-!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 white balance is incorrect.
-!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_LABEL;Wavelet Levels
-!TP_WAVELET_LARGEST;Coarsest
-!TP_WAVELET_LEVCH;Chroma
-!TP_WAVELET_LEVDIR_ALL;All levels in all directions
-!TP_WAVELET_LEVDIR_INF;Below or equal the level
-!TP_WAVELET_LEVDIR_ONE;One 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_LEVF;Contrast
-!TP_WAVELET_LEVLABEL;Preview maximum possible levels = %1
-!TP_WAVELET_LEVONE;Level 2
-!TP_WAVELET_LEVTHRE;Level 4
-!TP_WAVELET_LEVTWO;Level 3
-!TP_WAVELET_LEVZERO;Level 1
-!TP_WAVELET_LINKEDG;Link with Edge Sharpness' Strength
-!TP_WAVELET_LIPST;Enhanced algoritm
-!TP_WAVELET_LOWLIGHT;Shadow luminance range
-!TP_WAVELET_MEDGREINF;First level
-!TP_WAVELET_MEDI;Reduce artifacts in blue sky
-!TP_WAVELET_MEDILEV;Edge detection
-!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_NEUTRAL;Neutral
-!TP_WAVELET_NOIS;Denoise
-!TP_WAVELET_NOISE;Denoise and Refine
-!TP_WAVELET_NPHIGH;High
-!TP_WAVELET_NPLOW;Low
-!TP_WAVELET_NPNONE;None
-!TP_WAVELET_NPTYPE;Neighboring pixels
-!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_PROC;Process
-!TP_WAVELET_RE1;Reinforced
-!TP_WAVELET_RE2;Unchanged
-!TP_WAVELET_RE3;Reduced
-!TP_WAVELET_RESCHRO;Chroma
-!TP_WAVELET_RESCON;Shadows
-!TP_WAVELET_RESCONH;Highlights
-!TP_WAVELET_RESID;Residual Image
-!TP_WAVELET_SAT;Saturated chroma
-!TP_WAVELET_SETTINGS;Wavelet Settings
-!TP_WAVELET_SKIN;Skin targetting/protection
-!TP_WAVELET_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_WAVELET_SKY;Sky targetting/protection
-!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_STREN;Strength
-!TP_WAVELET_STRENGTH;Strength
-!TP_WAVELET_SUPE;Extra
-!TP_WAVELET_THR;Shadows threshold
-!TP_WAVELET_THRESHOLD;Highlight levels
-!TP_WAVELET_THRESHOLD2;Shadow levels
-!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_THRH;Highlights threshold
-!TP_WAVELET_TILESBIG;Big tiles
-!TP_WAVELET_TILESFULL;Full image
-!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
-!TP_WBALANCE_AUTO;Auto
-!TP_WBALANCE_CAMERA;Camera
-!TP_WBALANCE_CLOUDY;Cloudy
-!TP_WBALANCE_CUSTOM;Custom
-!TP_WBALANCE_DAYLIGHT;Daylight (sunny)
-!TP_WBALANCE_EQBLUERED;Blue/Red equalizer
-!TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behavior of "white balance" by modulating the blue/red balance.\nThis can be useful when shooting conditions:\na) are far from the standard illuminant (e.g. underwater),\nb) are far from conditions where calibrations were performed,\nc) where the matrices or ICC profiles are unsuitable.
-!TP_WBALANCE_FLASH55;Leica
-!TP_WBALANCE_FLASH60;Standard, Canon, Pentax, Olympus
-!TP_WBALANCE_FLASH65;Nikon, Panasonic, Sony, Minolta
-!TP_WBALANCE_FLASH_HEADER;Flash
-!TP_WBALANCE_FLUO1;F1 - Daylight
-!TP_WBALANCE_FLUO2;F2 - Cool White
-!TP_WBALANCE_FLUO3;F3 - White
-!TP_WBALANCE_FLUO4;F4 - Warm White
-!TP_WBALANCE_FLUO5;F5 - Daylight
-!TP_WBALANCE_FLUO6;F6 - Lite White
-!TP_WBALANCE_FLUO7;F7 - D65 Daylight Simulator
-!TP_WBALANCE_FLUO8;F8 - D50 / Sylvania F40 Design
-!TP_WBALANCE_FLUO9;F9 - Cool White Deluxe
-!TP_WBALANCE_FLUO10;F10 - Philips TL85
-!TP_WBALANCE_FLUO11;F11 - Philips TL84
-!TP_WBALANCE_FLUO12;F12 - Philips TL83
-!TP_WBALANCE_FLUO_HEADER;Fluorescent
-!TP_WBALANCE_GREEN;Tint
-!TP_WBALANCE_GTI;GTI
-!TP_WBALANCE_HMI;HMI
-!TP_WBALANCE_JUDGEIII;JudgeIII
-!TP_WBALANCE_LABEL;White Balance
-!TP_WBALANCE_LAMP_HEADER;Lamp
-!TP_WBALANCE_LED_CRS;CRS SP12 WWMR16
-!TP_WBALANCE_LED_HEADER;LED
-!TP_WBALANCE_LED_LSI;LSI Lumelex 2040
-!TP_WBALANCE_METHOD;Method
-!TP_WBALANCE_SHADE;Shade
-!TP_WBALANCE_SIZE;Size:
-!TP_WBALANCE_SOLUX35;Solux 3500K
-!TP_WBALANCE_SOLUX41;Solux 4100K
-!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
-!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
-!TP_WBALANCE_SPOTWB;Spot WB
-!TP_WBALANCE_TEMPBIAS;AWB temperature bias
-!TP_WBALANCE_TEMPBIAS_TOOLTIP;Allows to alter the computation of the "auto white balance"\nby biasing it towards warmer or cooler temperatures. The bias\nis expressed as a percentage of the computed temperature,\nso that the result is given by "computedTemp + computedTemp * bias".
-!TP_WBALANCE_TEMPERATURE;Temperature
-!TP_WBALANCE_TUNGSTEN;Tungsten
-!TP_WBALANCE_WATER1;UnderWater 1
-!TP_WBALANCE_WATER2;UnderWater 2
-!TP_WBALANCE_WATER_HEADER;UnderWater
-!ZOOMPANEL_100;(100%)
-!ZOOMPANEL_NEWCROPWINDOW;Open (new) detail window
-!ZOOMPANEL_ZOOM100;Zoom to 100%\nShortcut: z
-!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: f
-!ZOOMPANEL_ZOOMFITSCREEN;Fit whole image to screen\nShortcut: Alt-f
-!ZOOMPANEL_ZOOMIN;Zoom In\nShortcut: +
-!ZOOMPANEL_ZOOMOUT;Zoom Out\nShortcut: -
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
+!PREFERENCES_TAB_PERFORMANCE;Performance
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
+!TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain.
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 089381e47..774e2d580 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -756,7 +756,6 @@ PREFERENCES_METADATA;Метаданные
PREFERENCES_MONITOR;Монитор
PREFERENCES_MULTITAB;Много вкладок
PREFERENCES_MULTITABDUALMON;Много вкладок, на втором мониторе (если возможно)
-PREFERENCES_NOISE;Подавление шумов
PREFERENCES_OUTDIR;Каталог для сохранения изображений
PREFERENCES_OUTDIRFOLDER;Сохранять в каталог
PREFERENCES_OUTDIRFOLDERHINT;Сохранение изображений в выбранный каталог
@@ -781,8 +780,6 @@ PREFERENCES_PROFILESAVECACHE;Сохранять профиль обработк
PREFERENCES_PROFILESAVEINPUT;Сохранять профиль обработки в одном каталоге с исходным файлом
PREFERENCES_PROPERTY;Свойство
PREFERENCES_PSPATH;Каталог установки Adobe Photoshop
-PREFERENCES_RGBDTL_LABEL;Максимальное количество потоков для подавления шума
-PREFERENCES_RGBDTL_TOOLTIP;Оставьте 0 чтоб использовать максимально возможное количество потоков. Чем больше потоков будет запущено одновременно, тем быстрее будет расчёт. Требования к памяти указаны в RawPedia
PREFERENCES_SELECTFONT;Выбрать шрифт
PREFERENCES_SELECTLANG;Выбрать язык
PREFERENCES_SELECTTHEME;Выбрать тему
@@ -803,7 +800,6 @@ PREFERENCES_TAB_COLORMGR;Управление цветом
PREFERENCES_TAB_DYNAMICPROFILE;Динамические профили
PREFERENCES_TAB_GENERAL;Основное
PREFERENCES_TAB_IMPROC;Обработка изображения
-PREFERENCES_TAB_PERFORMANCE;Производительность
PREFERENCES_TAB_SOUND;Звуки
PREFERENCES_THEME;Тема
PREFERENCES_TP_LABEL;Панель инструментов:
@@ -1419,7 +1415,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!FILECHOOSER_FILTER_PP;Processing profiles
!FILECHOOSER_FILTER_SAME;Same format as current photo
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_235;B&W - CM - Auto
!HISTORY_MSG_237;B&W - CM
!HISTORY_MSG_252;CbDL - Skin tar/prot
@@ -1643,16 +1641,69 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1678,8 +1729,10 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!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_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -1690,19 +1743,16 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CLUTSDIR;HaldCLUT directory
@@ -1713,11 +1763,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!PREFERENCES_CROP_GUIDES_FRAME;Frame
!PREFERENCES_CROP_GUIDES_FULL;Original
!PREFERENCES_CROP_GUIDES_NONE;None
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1730,13 +1777,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!PREFERENCES_INSPECT_LABEL;Inspect
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONPROFILE;Default color profile
!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported.
@@ -1745,6 +1786,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PRINTER;Printer (Soft-Proofing)
!PREFERENCES_PROFILESAVEBOTH;Save processing profile both to the cache and next to the input file
!PREFERENCES_PROFILESAVELOCATION;Processing profile saving location
@@ -1759,21 +1802,12 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1786,6 +1820,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!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;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
@@ -1920,6 +1955,12 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_PREPROCESS_DEADPIXFILT;Dead pixel filter
!TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tries to suppress dead pixels.
!TP_PREPROCESS_HOTPIXFILT;Hot pixel filter
@@ -1933,6 +1974,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1942,10 +1985,13 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_IMAGENUM;Sub-image
!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
@@ -1978,7 +2024,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for base ISO.\nIncrease the value for high ISO shots, 5.0 is a good starting point.\nWatch the motion mask while changing the value.
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
-!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_RCDVNG4;RCD+VNG4
+!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.\n+fast gives less artifacts in flat areas
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1990,7 +2038,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2057,6 +2105,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2129,7 +2179,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index ddfb8b80d..675e710aa 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -693,8 +693,6 @@ PREFERENCES_PROFILESAVECACHE;Сачувај параметре обраде у
PREFERENCES_PROFILESAVEINPUT;Сачувај парамтре обраде поред улазне датотеке
PREFERENCES_PROPERTY;Особина
PREFERENCES_PSPATH;Директоријум са инсталираним Адобе Фотошопом
-PREFERENCES_RGBDTL_LABEL;Највећи број нири приликом уклањања шума
-PREFERENCES_RGBDTL_TOOLTIP;Уклањање шума захтева око 128MB РАМ меморије за слику од 10 мегапиксела или 512MB за слику од 40 мегапиксела, уз додатних 128MB меморије по свакој нити. Што више нити се извршавају заједно то ће брже бити рачунање. Оставите ову вредност на „0“ како би програм аутоматски доделило што је више нитова могуће.
PREFERENCES_SELECTFONT;Изаберите фонт
PREFERENCES_SELECTLANG;Језик
PREFERENCES_SELECTTHEME;Тема
@@ -714,7 +712,6 @@ PREFERENCES_TAB_BROWSER;Преглед датотека
PREFERENCES_TAB_COLORMGR;Управљање бојама
PREFERENCES_TAB_GENERAL;Опште
PREFERENCES_TAB_IMPROC;Обрада сликe
-PREFERENCES_TAB_PERFORMANCE;Перформанса
PREFERENCES_TAB_SOUND;Звуци
PREFERENCES_TP_LABEL;Површ алата:
PREFERENCES_TP_USEICONORTEXT;Користи иконице језичка уместо текста
@@ -1315,7 +1312,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1325,8 +1322,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
!HISTORY_MSG_235;B&W - CM - Auto
@@ -1557,10 +1556,16 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1572,8 +1577,55 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1603,11 +1655,13 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@@ -1632,19 +1686,16 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PARTIALPASTE_METAGROUP;Metadata settings
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CLUTSDIR;HaldCLUT directory
@@ -1661,11 +1712,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1679,23 +1727,18 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1714,22 +1757,13 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1742,6 +1776,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1885,6 +1920,12 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -1907,6 +1948,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1916,13 +1959,16 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -1966,10 +2012,12 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1985,7 +2033,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2052,6 +2100,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2124,7 +2174,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 3af583ba8..f41d7e36e 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -693,8 +693,6 @@ PREFERENCES_PROFILESAVECACHE;Sačuvaj parametre obrade u ostavu
PREFERENCES_PROFILESAVEINPUT;Sačuvaj paramtre obrade pored ulazne datoteke
PREFERENCES_PROPERTY;Osobina
PREFERENCES_PSPATH;Direktorijum sa instaliranim Adobe Fotošopom
-PREFERENCES_RGBDTL_LABEL;Najveći broj niri prilikom uklanjanja šuma
-PREFERENCES_RGBDTL_TOOLTIP;Uklanjanje šuma zahteva oko 128MB RAM memorije za sliku od 10 megapiksela ili 512MB za sliku od 40 megapiksela, uz dodatnih 128MB memorije po svakoj niti. Što više niti se izvršavaju zajedno to će brže biti računanje. Ostavite ovu vrednost na „0“ kako bi program automatski dodelilo što je više nitova moguće.
PREFERENCES_SELECTFONT;Izaberite font
PREFERENCES_SELECTLANG;Jezik
PREFERENCES_SELECTTHEME;Tema
@@ -714,7 +712,6 @@ PREFERENCES_TAB_BROWSER;Pregled datoteka
PREFERENCES_TAB_COLORMGR;Upravljanje bojama
PREFERENCES_TAB_GENERAL;Opšte
PREFERENCES_TAB_IMPROC;Obrada slike
-PREFERENCES_TAB_PERFORMANCE;Performansa
PREFERENCES_TAB_SOUND;Zvuci
PREFERENCES_TP_LABEL;Površ alata:
PREFERENCES_TP_USEICONORTEXT;Koristi ikonice jezička umesto teksta
@@ -1315,7 +1312,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!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.
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -1325,8 +1322,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!GENERAL_ASIMAGE;As Image
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
!HISTORY_MSG_235;B&W - CM - Auto
@@ -1557,10 +1556,16 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1572,8 +1577,55 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1603,11 +1655,13 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@@ -1632,19 +1686,16 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PARTIALPASTE_METAGROUP;Metadata settings
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_CLUTSCACHE;HaldCLUT Cache
!PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
!PREFERENCES_CLUTSDIR;HaldCLUT directory
@@ -1661,11 +1712,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PREFERENCES_CURVEBBOXPOS_LEFT;Left
!PREFERENCES_CURVEBBOXPOS_RIGHT;Right
!PREFERENCES_D50_OLD;5000K
-!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_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!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_GREY18_OLD;Yb=18 CIE L#50
@@ -1679,23 +1727,18 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images
!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_LANG;Language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
-!PREFERENCES_MIN;Mini (100x115)
!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
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1714,22 +1757,13 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
-!PREFERENCES_SMA;Small (250x287)
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_PDYNAMIC;Dynamic
!QINFO_FRAMECOUNT;%2 frames
!QINFO_HDR;HDR / %2 frame(s)
@@ -1742,6 +1776,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1885,6 +1920,12 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!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_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -1907,6 +1948,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CASTR;Strength
!TP_RAWEXPOS_BLACK_0;Green 1 (lead)
!TP_RAWEXPOS_BLACK_1;Red
@@ -1916,13 +1959,16 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -1966,10 +2012,12 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1985,7 +2033,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2052,6 +2100,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2124,7 +2174,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 3ba135a71..b5ff03253 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -633,7 +633,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -647,12 +647,13 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_88;Impulse NR threshold
!HISTORY_MSG_93;CbDL - Value
@@ -1039,10 +1040,16 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1054,9 +1061,56 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1086,6 +1140,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
@@ -1122,6 +1177,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1174,6 +1230,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1181,6 +1238,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1192,16 +1250,11 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
!PREFERENCES_BEHSETALL;All to 'Set'
@@ -1237,12 +1290,9 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1275,12 +1325,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1288,7 +1333,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1296,12 +1340,13 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1314,8 +1359,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
@@ -1323,35 +1366,25 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
!PROFILEPANEL_LOADPPASTE;Parameters to load
@@ -1376,6 +1409,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1690,10 +1724,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1740,6 +1770,12 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
!TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction.
!TP_LABCURVE_CHROMATICITY;Chromaticity
@@ -1812,6 +1848,8 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1827,13 +1865,16 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1883,10 +1924,12 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1907,7 +1950,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1991,6 +2034,8 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2084,7 +2129,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index ce22a396b..e0ca416d0 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -559,7 +559,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -575,13 +575,14 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -978,10 +979,16 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -993,9 +1000,56 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1026,11 +1080,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1067,6 +1122,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1122,6 +1178,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1129,6 +1186,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1140,17 +1198,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1188,13 +1241,10 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1227,12 +1277,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1240,7 +1285,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1249,13 +1293,14 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1269,8 +1314,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1280,36 +1323,26 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1337,6 +1370,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1661,10 +1695,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1711,6 +1741,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1798,6 +1834,8 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1813,15 +1851,18 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1871,10 +1912,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1898,7 +1941,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1982,6 +2025,8 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2075,7 +2120,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 819cf8340..049162e68 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -811,13 +811,7 @@ PARTIALPASTE_WAVELETGROUP;Wavelet-nivåer
PARTIALPASTE_WHITEBALANCE;Vitbalans
PREFERENCES_ADD;Lägg till
PREFERENCES_APPLNEXTSTARTUP;Kräver omstart av RawTherapee
-PREFERENCES_AUTLISLOW;Låg
-PREFERENCES_AUTLISMAX;Max - Medel av alla indelningar
-PREFERENCES_AUTLISSTD;Hög
-PREFERENCES_AUTLISVLOW;Ingen
-PREFERENCES_AUTLOW;Låg
PREFERENCES_AUTOMONPROFILE;Använd operativsystemets skärmfärgprofil
-PREFERENCES_AUTSTD;Standard
PREFERENCES_BATCH_PROCESSING;Batchbehandling
PREFERENCES_BEHADDALL;Sätt allt till 'Lägg till'
PREFERENCES_BEHADDALLHINT;Sätt alla parametrar till Lägg till-läge.\nFörändringar i parametrar batch-verktyget kommer att vara skillnader gentemot de lagrade värdena.
@@ -860,8 +854,6 @@ PREFERENCES_DARKFRAMESHOTS;bilder
PREFERENCES_DARKFRAMETEMPLATES;mallar
PREFERENCES_DATEFORMAT;Datumformat
PREFERENCES_DATEFORMATHINT;Du kan använda följande format:\n%y: år\n%m: månad\n%d: dag\n\nTill exempel är det svenska datumformatet:\n%y-%m-%d
-PREFERENCES_DAUB_LABEL;Använd Daubechies D6-wavelets istället för D4
-PREFERENCES_DAUB_TOOLTIP;Brusreduceringen och wavelet-verktyget använder en Debauchies moder-wavelet. Om du väljer D6 istället för D4 ökas antalet ortogonala Daubechies-koefficienter och troligtvis ökas också kvaliteten på de småskaliga nivåerna. Det blir ingen skillnad i minnesanvändning eller beräkningstid.
PREFERENCES_DIRDARKFRAMES;Katalog för svartbilder
PREFERENCES_DIRHOME;Hemkatalog
PREFERENCES_DIRLAST;Senaste besökta katalog
@@ -869,7 +861,6 @@ PREFERENCES_DIROTHER;Annan
PREFERENCES_DIRSELECTDLG;Välj bildkatalog vid uppstart...
PREFERENCES_DIRSOFTWARE;Installationskatalog
PREFERENCES_EDITORLAYOUT;Layout för redigeringsvyn
-PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;Externt bildredigeringsprogram
PREFERENCES_FBROWSEROPTS;Inställningar för filvyn/miniatyrbilderna
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Filvyns verktygsrad som en rad (avmarkera för lågupplösta skärmar)
@@ -912,11 +903,7 @@ PREFERENCES_INTENT_RELATIVE;Relativ kolorimetrisk
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"
@@ -924,12 +911,10 @@ 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
PREFERENCES_NAVIGATIONFRAME;Navigering
-PREFERENCES_NOISE;Brusreducering
PREFERENCES_OUTDIR;Utmatningskatalog
PREFERENCES_OUTDIRFOLDER;Spara till katalog
PREFERENCES_OUTDIRFOLDERHINT;Spara de behandlade bilderna i den valda katalogen
@@ -960,8 +945,6 @@ PREFERENCES_PROPERTY;Egenskaper
PREFERENCES_PSPATH;Adobe Photoshops installationskatalog
PREFERENCES_REMEMBERZOOMPAN;Kom ihåg förstoringsprocent och panorering
PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Kom ihåg förstoringsgraden i % och panoreringen för den aktuella bilden när du öppnar en ny bild.\n\nDet här valet fungerar bara i Enkelfliksläget och när "Demosaicing-metod som ska användas för förstoringsgrader <100 %" är satt til "Som i PP3".
-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
@@ -974,35 +957,24 @@ 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_SMA;Liten (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Batchkön färdig
PREFERENCES_SND_HELP;Fyll i en sökväg till ett ljud.\nI Windows kan "SystemDefault", "SystemAsterisk" o.s.v. användas.\nPå Linuxbaserade system kan du prova med "complete", "windows-attention" o.s.v.
PREFERENCES_SND_LNGEDITPROCDONE;När behandlingen är klar
PREFERENCES_SND_THRESHOLDSECS;Ljudet kommer efter så här många sekunder
PREFERENCES_STARTUPIMDIR;Bildkatalog som visas vid uppstart
-PREFERENCES_STDAUT;Standard
PREFERENCES_TAB_BROWSER;Filbläddrare
PREFERENCES_TAB_COLORMGR;Färghantering
PREFERENCES_TAB_GENERAL;Allmän
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_VIEW;Utenhetens vitbalansvärde (datorskärm, TV, bildkanon, etc.)
-PREFERENCES_WAVLEV;Öka waveletnivån vid kvalitet "hög"
-PREFERENCES_WLONE;En nivå
-PREFERENCES_WLTWO;Två nivåer
-PREFERENCES_WLZER;Nej
PREFERENCES_WORKFLOW;Arbetsflöde
PROFILEPANEL_COPYPPASTE;Parametrar att kopiera
PROFILEPANEL_GLOBALPROFILES;Förinstallerade profiler
@@ -1876,8 +1848,10 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!EXPORT_USE_NORMAL_PIPELINE;Standard (bypass some steps, resize at the end)
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTORY_MSG_173;NR - Detail recovery
!HISTORY_MSG_203;NR - Color space
!HISTORY_MSG_235;B&W - CM - Auto
@@ -1943,10 +1917,16 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -1958,8 +1938,55 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1989,10 +2016,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead.
@@ -2001,10 +2030,13 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_CMMBPC;Black point compensation
!PREFERENCES_CROP;Crop editing
@@ -2019,11 +2051,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
!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_LANG;Language
-!PREFERENCES_LISS;Auto multi-zone smoothing
!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_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PRINTER;Printer (Soft-Proofing)
!PREFERENCES_PROFILESAVEBOTH;Save processing profile both to the cache and next to the input file
!PREFERENCES_PROFILESAVELOCATION;Processing profile saving location
@@ -2032,6 +2065,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
@@ -2049,6 +2083,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!SAMPLEFORMAT_16;16-bit floating-point
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled.
!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set.
!TP_BWMIX_MIXC;Channel Mixer
@@ -2092,6 +2127,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_ICM_APPLYLOOKTABLE;Look table
!TP_ICM_PROFILEINTENT;Rendering Intent
!TP_ICM_SAVEREFERENCE;Save Reference Image
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_LOCALCONTRAST_AMOUNT;Amount
!TP_LOCALCONTRAST_DARKNESS;Darkness level
!TP_LOCALCONTRAST_LABEL;Local Contrast
@@ -2108,13 +2149,18 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@@ -2156,11 +2202,13 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_MAP;Mask equalizer
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts!
-!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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_TOOLTIP;Restore tones by applying gamma before and after Retinex. Different from Retinex curves or others curves (Lab, Exposure, etc.).
!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.
@@ -2182,6 +2230,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!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_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2193,7 +2243,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!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_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_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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGEDETECTTHR;Threshold low (noise)
!TP_WAVELET_EDGEDETECTTHR2;Threshold high (detection)
!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.
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index e57ab4c1e..bae5f69de 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -558,7 +558,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
!FILECHOOSER_FILTER_ANY;All files
-!FILECHOOSER_FILTER_COLPROF;Color profiles
+!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files
!FILECHOOSER_FILTER_LCP;Lens correction profiles
!FILECHOOSER_FILTER_PP;Processing profiles
@@ -574,13 +574,14 @@ TP_WBALANCE_TEMPERATURE;Isı
!GENERAL_NONE;None
!GENERAL_OPEN;Open
!GENERAL_RESET;Reset
+!GENERAL_SAVE_AS;Save as...
!GENERAL_SLIDER;Slider
!GENERAL_UNCHANGED;(Unchanged)
!GENERAL_WARNING;Warning
!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+!HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
+!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
!HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
!HISTORY_MSG_82;Profile changed
!HISTORY_MSG_83;S/H - Sharp mask
@@ -977,10 +978,16 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
-!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -992,9 +999,56 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+!HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+!HISTORY_MSG_RAW_BORDER;Raw border
+!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
+!ICCPROFCREATOR_COPYRIGHT;Copyright:
+!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+!ICCPROFCREATOR_CUSTOM;Custom
+!ICCPROFCREATOR_DESCRIPTION;Description:
+!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+!ICCPROFCREATOR_GAMMA;Gamma
+!ICCPROFCREATOR_ICCVERSION;ICC version:
+!ICCPROFCREATOR_ILL;Illuminant:
+!ICCPROFCREATOR_ILL_41;D41
+!ICCPROFCREATOR_ILL_50;D50
+!ICCPROFCREATOR_ILL_55;D55
+!ICCPROFCREATOR_ILL_60;D60
+!ICCPROFCREATOR_ILL_65;D65
+!ICCPROFCREATOR_ILL_80;D80
+!ICCPROFCREATOR_ILL_DEF;Default
+!ICCPROFCREATOR_ILL_INC;StdA 2856K
+!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+!ICCPROFCREATOR_PRIMARIES;Primaries:
+!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+!ICCPROFCREATOR_PRIM_BEST;BestRGB
+!ICCPROFCREATOR_PRIM_BETA;BetaRGB
+!ICCPROFCREATOR_PRIM_BLUX;Blue X
+!ICCPROFCREATOR_PRIM_BLUY;Blue Y
+!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+!ICCPROFCREATOR_PRIM_GREX;Green X
+!ICCPROFCREATOR_PRIM_GREY;Green Y
+!ICCPROFCREATOR_PRIM_PROPH;Prophoto
+!ICCPROFCREATOR_PRIM_REC2020;Rec2020
+!ICCPROFCREATOR_PRIM_REDX;Red X
+!ICCPROFCREATOR_PRIM_REDY;Red Y
+!ICCPROFCREATOR_PRIM_SRGB;sRGB
+!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+!ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+!ICCPROFCREATOR_PROF_V2;ICC v2
+!ICCPROFCREATOR_PROF_V4;ICC v4
+!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+!ICCPROFCREATOR_SLOPE;Slope
+!ICCPROFCREATOR_TRC_PRESET;Tone response curve:
!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
@@ -1025,11 +1079,12 @@ TP_WBALANCE_TEMPERATURE;Isı
!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
!MAIN_BUTTON_FULLSCREEN;Fullscreen
+!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
!MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
!MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
!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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
!MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+!MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
!MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
!MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
@@ -1066,6 +1121,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
!MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l
@@ -1121,6 +1177,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1128,6 +1185,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
+!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1139,17 +1197,12 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+!PARTIALPASTE_SOFTLIGHT;Soft light
+!PARTIALPASTE_TM_FATTAL;Dynamic range compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
-!PREFERENCES_AUTLISLOW;Low
-!PREFERENCES_AUTLISMAX;Max - Average of all tiles
-!PREFERENCES_AUTLISSTD;High
-!PREFERENCES_AUTLISVLOW;None
-!PREFERENCES_AUTLOW;Low
!PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_AUTSTD;Standard
!PREFERENCES_BATCH_PROCESSING;Batch Processing
!PREFERENCES_BEHADDALL;All to 'Add'
!PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1187,13 +1240,10 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_DARKFRAMEFOUND;Found
!PREFERENCES_DARKFRAMESHOTS;shots
!PREFERENCES_DARKFRAMETEMPLATES;templates
-!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_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_DIRECTORIES;Directories
!PREFERENCES_EDITORCMDLINE;Custom command line
!PREFERENCES_EDITORLAYOUT;Editor Layout
-!PREFERENCES_EXPAUT;Expert
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FLATFIELDFOUND;Found
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
@@ -1226,12 +1276,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
!PREFERENCES_LANG;Language
!PREFERENCES_LANGAUTODETECT;Use system language
-!PREFERENCES_LEVAUTDN;Denoising level
-!PREFERENCES_LEVDN;Cell size
-!PREFERENCES_LISS;Auto multi-zone smoothing
-!PREFERENCES_MAX;Maxi (Tile)
!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-!PREFERENCES_MED;Medium (Tile/2)
!PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
!PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
!PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1239,7 +1284,6 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_MENUGROUPRANK;Group "Rank"
!PREFERENCES_MENUOPTIONS;Context Menu Options
!PREFERENCES_METADATA;Metadata
-!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_MONINTENT;Default rendering intent
!PREFERENCES_MONITOR;Monitor
!PREFERENCES_MONPROFILE;Default color profile
@@ -1248,13 +1292,14 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
!PREFERENCES_NAVIGATIONFRAME;Navigation
-!PREFERENCES_NOISE;Noise Reduction
!PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails in the file browser
!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel
!PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
!PREFERENCES_PANFACTORLABEL;Pan rate amplification
!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+!PREFERENCES_PERFORMANCE_THREADS;Threads
+!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
!PREFERENCES_PREVDEMO;Preview Demosaic Method
!PREFERENCES_PREVDEMO_FAST;Fast
!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1268,8 +1313,6 @@ TP_WBALANCE_TEMPERATURE;Isı
!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
-!PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1279,36 +1322,26 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_SET;Set
!PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
-!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SINGLETAB;Single Editor Tab Mode
!PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
!PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_THRESHOLDSECS;After seconds
-!PREFERENCES_STDAUT;Standard
!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
-!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+!PREFERENCES_TAB_PERFORMANCE;Performance
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_THEME;Theme
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-!PREFERENCES_TIMAX;High
-!PREFERENCES_TINB;Number of tiles
-!PREFERENCES_TISTD;Standard
!PREFERENCES_TP_LABEL;Tool panel:
!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
!PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
!PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
!PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-!PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-!PREFERENCES_WLONE;One level
-!PREFERENCES_WLTWO;Two levels
-!PREFERENCES_WLZER;No
!PREFERENCES_WORKFLOW;Layout
!PROFILEPANEL_COPYPPASTE;Parameters to copy
!PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1336,6 +1369,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
+!SAVEDLG_FILEFORMAT_FLOAT; floating-point
!SAVEDLG_FORCEFORMATOPTS;Force saving options
!SAVEDLG_SUBSAMP;Subsampling
!SAVEDLG_SUBSAMP_1;Best compression
@@ -1660,10 +1694,6 @@ TP_WBALANCE_TEMPERATURE;Isı
!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_FLATFIELD_LABEL;Flat-Field
-!TP_GAMMA_CURV;Gamma
-!TP_GAMMA_FREE;Free gamma
-!TP_GAMMA_OUTPUT;Output gamma
-!TP_GAMMA_SLOP;Slope (linear)
!TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
!TP_GRADIENT_CENTER;Center
!TP_GRADIENT_CENTER_X;Center X
@@ -1710,6 +1740,12 @@ TP_WBALANCE_TEMPERATURE;Isı
!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.
!TP_ICM_TONECURVE;Tone curve
!TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
+!TP_ICM_WORKING_TRC;Tone response curve:
+!TP_ICM_WORKING_TRC_CUSTOM;Custom
+!TP_ICM_WORKING_TRC_GAMMA;Gamma
+!TP_ICM_WORKING_TRC_NONE;None
+!TP_ICM_WORKING_TRC_SLOPE;Slope
+!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
!TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
!TP_IMPULSEDENOISE_THRESH;Threshold
!TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1797,6 +1833,8 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_AUTO;Auto-correction
+!TP_RAWCACORR_AUTOIT;Iterations
+!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
!TP_RAWCACORR_CABLUE;Blue
!TP_RAWCACORR_CARED;Red
!TP_RAWCACORR_CASTR;Strength
@@ -1812,15 +1850,18 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
-!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-!TP_RAW_3PASSBEST;3-Pass (Best)
-!TP_RAW_4PASS;4-Pass
+!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+!TP_RAW_2PASS;1-pass+fast
+!TP_RAW_3PASSBEST;3-pass (Markesteijn)
+!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
+!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@@ -1870,10 +1911,12 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
+!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-!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_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.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
+!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@@ -1897,7 +1940,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -1981,6 +2024,8 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
+!TP_SOFTLIGHT_LABEL;Soft Light
+!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2074,7 +2119,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
-!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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 31f0fdcbd..50f2bcdf6 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -205,7 +205,7 @@ FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0
FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n+ - Multiple Editor Tabs Mode,\nAlt-+ - Single Editor Tab Mode.
FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n- - Multiple Editor Tabs Mode,\nAlt-- - Single Editor Tab Mode.
FILECHOOSER_FILTER_ANY;All files
-FILECHOOSER_FILTER_COLPROF;Color profiles
+FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
FILECHOOSER_FILTER_CURVE;Curve files
FILECHOOSER_FILTER_LCP;Lens correction profiles
FILECHOOSER_FILTER_PP;Processing profiles
@@ -233,16 +233,17 @@ GENERAL_OPEN;Open
GENERAL_PORTRAIT;Portrait
GENERAL_RESET;Reset
GENERAL_SAVE;Save
+GENERAL_SAVE_AS;Save as...
GENERAL_SLIDER;Slider
GENERAL_UNCHANGED;(Unchanged)
GENERAL_WARNING;Warning
GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
HISTOGRAM_TOOLTIP_B;Show/Hide blue histogram.
-HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
+HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.
HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
-HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
HISTOGRAM_TOOLTIP_G;Show/Hide green histogram.
HISTOGRAM_TOOLTIP_L;Show/Hide CIELab luminance histogram.
+HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
HISTOGRAM_TOOLTIP_R;Show/Hide red histogram.
HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
HISTORY_CHANGED;Changed
@@ -839,10 +840,16 @@ HISTORY_MSG_589;Local - deNoise bilateral
HISTORY_MSG_590;Local - deNoise Scope
HISTORY_MSG_591;Local - Avoid color shift
-HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
-HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
+HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
+HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
+HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D
+HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type
+HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma
+HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope
+HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method
HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
@@ -854,12 +861,59 @@ HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
+HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations
+HISTORY_MSG_RAWCACORR_COLOURSHIFT;Raw CA Correction - Avoid color shift
+HISTORY_MSG_RAW_BORDER;Raw border
+HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
+HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
+HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
HISTORY_SNAPSHOT;Snapshot
HISTORY_SNAPSHOTS;Snapshots
+ICCPROFCREATOR_COPYRIGHT;Copyright:
+ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0"
+ICCPROFCREATOR_CUSTOM;Custom
+ICCPROFCREATOR_DESCRIPTION;Description:
+ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description
+ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description.
+ICCPROFCREATOR_GAMMA;Gamma
+ICCPROFCREATOR_ICCVERSION;ICC version:
+ICCPROFCREATOR_ILL;Illuminant:
+ICCPROFCREATOR_ILL_41;D41
+ICCPROFCREATOR_ILL_50;D50
+ICCPROFCREATOR_ILL_55;D55
+ICCPROFCREATOR_ILL_60;D60
+ICCPROFCREATOR_ILL_65;D65
+ICCPROFCREATOR_ILL_80;D80
+ICCPROFCREATOR_ILL_DEF;Default
+ICCPROFCREATOR_ILL_INC;StdA 2856K
+ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles.
+ICCPROFCREATOR_PRIMARIES;Primaries:
+ICCPROFCREATOR_PRIM_ACESP0;ACES AP0
+ICCPROFCREATOR_PRIM_ACESP1;ACES AP1
+ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998)
+ICCPROFCREATOR_PRIM_BEST;BestRGB
+ICCPROFCREATOR_PRIM_BETA;BetaRGB
+ICCPROFCREATOR_PRIM_BLUX;Blue X
+ICCPROFCREATOR_PRIM_BLUY;Blue Y
+ICCPROFCREATOR_PRIM_BRUCE;BruceRGB
+ICCPROFCREATOR_PRIM_GREX;Green X
+ICCPROFCREATOR_PRIM_GREY;Green Y
+ICCPROFCREATOR_PRIM_PROPH;Prophoto
+ICCPROFCREATOR_PRIM_REC2020;Rec2020
+ICCPROFCREATOR_PRIM_REDX;Red X
+ICCPROFCREATOR_PRIM_REDY;Red Y
+ICCPROFCREATOR_PRIM_SRGB;sRGB
+ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles.
+ICCPROFCREATOR_PRIM_WIDEG;Widegamut
+ICCPROFCREATOR_PROF_V2;ICC v2
+ICCPROFCREATOR_PROF_V4;ICC v4
+ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as...
+ICCPROFCREATOR_SLOPE;Slope
+ICCPROFCREATOR_TRC_PRESET;Tone response curve:
IPTCPANEL_CATEGORY;Category
IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
IPTCPANEL_CITY;City
@@ -907,12 +961,13 @@ LENSPROFILE_CORRECTION_LCPFILE;LCP File
LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
MAIN_BUTTON_FULLSCREEN;Fullscreen
+MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator
MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4
MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3
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: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out).
MAIN_BUTTON_PREFERENCES;Preferences
MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Put current image to processing queue.\nShortcut: Ctrl+b
-MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s
+MAIN_BUTTON_SAVE_TOOLTIP;Save current image.\nShortcut: Ctrl+s\nSave current profile (.pp3).\nShortcut: Ctrl+Shift+s
MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor
MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Edit current image in external editor.\nShortcut: Ctrl+e
MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels.\nShortcut: m
@@ -973,10 +1028,10 @@ MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <
MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: >
MAIN_TOOLTIP_PREVIEWB;Preview the Blue channel.\nShortcut: b
MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the Focus Mask.\nShortcut: Shift-f\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\n\nTo improve detection accuracy for noisy images evaluate at smaller zoom, about 10-30%.
-MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%
MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
+MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%.
MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: i
MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: l
MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: Alt-l
@@ -1049,6 +1104,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
+PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
PARTIALPASTE_PRSHARPENING;Post-resize sharpening
PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@@ -1056,6 +1112,7 @@ PARTIALPASTE_RAWEXPOS_BLACK;Black levels
PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
PARTIALPASTE_RAWGROUP;Raw Settings
+PARTIALPASTE_RAW_BORDER;Raw border
PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
PARTIALPASTE_RAW_DMETHOD;Demosaic method
@@ -1071,20 +1128,15 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Shadows/highlights
PARTIALPASTE_SHARPENEDGE;Edges
PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
PARTIALPASTE_SHARPENMICRO;Microcontrast
-PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
+PARTIALPASTE_SOFTLIGHT;Soft light
+PARTIALPASTE_TM_FATTAL;Dynamic range compression
PARTIALPASTE_VIBRANCE;Vibrance
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_ADD;Add
PREFERENCES_APPLNEXTSTARTUP;restart required
-PREFERENCES_AUTLISLOW;Low
-PREFERENCES_AUTLISMAX;Max - Average of all tiles
-PREFERENCES_AUTLISSTD;High
-PREFERENCES_AUTLISVLOW;None
-PREFERENCES_AUTLOW;Low
PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-PREFERENCES_AUTSTD;Standard
PREFERENCES_BATCH_PROCESSING;Batch Processing
PREFERENCES_BEHADDALL;All to 'Add'
PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values.
@@ -1132,8 +1184,6 @@ PREFERENCES_DARKFRAMESHOTS;shots
PREFERENCES_DARKFRAMETEMPLATES;templates
PREFERENCES_DATEFORMAT;Date format
PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y - year\n%m - month\n%d - day\n\nFor example, the ISO 8601 standard dictates the date format as follows:\n%y-%m-%d
-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_DIRDARKFRAMES;Dark-frames directory
PREFERENCES_DIRECTORIES;Directories
PREFERENCES_DIRHOME;Home directory
@@ -1143,7 +1193,6 @@ PREFERENCES_DIRSELECTDLG;Select Image Directory at Startup...
PREFERENCES_DIRSOFTWARE;Installation directory
PREFERENCES_EDITORCMDLINE;Custom command line
PREFERENCES_EDITORLAYOUT;Editor Layout
-PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;External Editor
PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
@@ -1189,12 +1238,7 @@ PREFERENCES_INTENT_SATURATION;Saturation
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
PREFERENCES_LANG;Language
PREFERENCES_LANGAUTODETECT;Use system language
-PREFERENCES_LEVAUTDN;Denoising level
-PREFERENCES_LEVDN;Cell size
-PREFERENCES_LISS;Auto multi-zone smoothing
-PREFERENCES_MAX;Maxi (Tile)
PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders
-PREFERENCES_MED;Medium (Tile/2)
PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File operations"
PREFERENCES_MENUGROUPLABEL;Group "Color label"
@@ -1202,7 +1246,6 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Group "Processing profile operations"
PREFERENCES_MENUGROUPRANK;Group "Rank"
PREFERENCES_MENUOPTIONS;Context Menu Options
PREFERENCES_METADATA;Metadata
-PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONINTENT;Default rendering intent
PREFERENCES_MONITOR;Monitor
PREFERENCES_MONPROFILE;Default color profile
@@ -1211,7 +1254,6 @@ PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
PREFERENCES_NAVIGATIONFRAME;Navigation
-PREFERENCES_NOISE;Noise Reduction
PREFERENCES_OUTDIR;Output Directory
PREFERENCES_OUTDIRFOLDER;Save to folder
PREFERENCES_OUTDIRFOLDERHINT;Save images to the selected folder.
@@ -1227,6 +1269,8 @@ PREFERENCES_PARSEDEXTADDHINT;Add entered extension to the list.
PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list.
PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list.
PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list.
+PREFERENCES_PERFORMANCE_THREADS;Threads
+PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic)
PREFERENCES_PREVDEMO;Preview Demosaic Method
PREFERENCES_PREVDEMO_FAST;Fast
PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom:
@@ -1247,8 +1291,6 @@ 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".
-PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction and Wavelet Levels
-PREFERENCES_RGBDTL_TOOLTIP;Leave the setting at "0" to automatically use as many threads as possible. The more threads run in parallel, the faster the computation. Refer to RawPedia for memory requirements.
PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
PREFERENCES_SELECTFONT;Select main font
PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
@@ -1263,41 +1305,31 @@ PREFERENCES_SHOWDATETIME;Show date and time
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
-PREFERENCES_SIMPLAUT;Tool mode
PREFERENCES_SINGLETAB;Single Editor Tab Mode
PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
-PREFERENCES_SMA;Small (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
PREFERENCES_SND_THRESHOLDSECS;After seconds
PREFERENCES_STARTUPIMDIR;Image Directory at Startup
-PREFERENCES_STDAUT;Standard
PREFERENCES_TAB_BROWSER;File Browser
PREFERENCES_TAB_COLORMGR;Color Management
PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
PREFERENCES_TAB_GENERAL;General
PREFERENCES_TAB_IMPROC;Image Processing
-PREFERENCES_TAB_PERFORMANCE;Performance & Quality
+PREFERENCES_TAB_PERFORMANCE;Performance
PREFERENCES_TAB_SOUND;Sounds
PREFERENCES_THEME;Theme
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
-PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
+PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
-PREFERENCES_TIMAX;High
-PREFERENCES_TINB;Number of tiles
-PREFERENCES_TISTD;Standard
PREFERENCES_TP_LABEL;Tool panel:
PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
-PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
-PREFERENCES_WLONE;One level
-PREFERENCES_WLTWO;Two levels
-PREFERENCES_WLZER;No
PREFERENCES_WORKFLOW;Layout
PROFILEPANEL_COPYPPASTE;Parameters to copy
PROFILEPANEL_GLOBALPROFILES;Bundled profiles
@@ -1347,6 +1379,7 @@ SAMPLEFORMAT_32;24-bit floating-point
SAMPLEFORMAT_64;32-bit floating-point
SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
SAVEDLG_FILEFORMAT;File format
+SAVEDLG_FILEFORMAT_FLOAT; floating-point
SAVEDLG_FORCEFORMATOPTS;Force saving options
SAVEDLG_JPEGQUAL;JPEG quality
SAVEDLG_PUTTOQUEUE;Put into processing queue
@@ -1715,10 +1748,6 @@ TP_FLATFIELD_BT_VERTICAL;Vertical
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_FLATFIELD_LABEL;Flat-Field
-TP_GAMMA_CURV;Gamma
-TP_GAMMA_FREE;Free gamma
-TP_GAMMA_OUTPUT;Output gamma
-TP_GAMMA_SLOP;Slope (linear)
TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1.
TP_GRADIENT_CENTER;Center
TP_GRADIENT_CENTER_X;Center X
@@ -1779,6 +1808,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile
TP_ICM_TONECURVE;Tone curve
TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve.
TP_ICM_WORKINGPROFILE;Working Profile
+TP_ICM_WORKING_TRC;Tone response curve:
+TP_ICM_WORKING_TRC_CUSTOM;Custom
+TP_ICM_WORKING_TRC_GAMMA;Gamma
+TP_ICM_WORKING_TRC_NONE;None
+TP_ICM_WORKING_TRC_SLOPE;Slope
+TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles.
TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
TP_IMPULSEDENOISE_THRESH;Threshold
TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift
@@ -1977,6 +2012,8 @@ TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by o
TP_PRSHARPENING_LABEL;Post-Resize Sharpening
TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
TP_RAWCACORR_AUTO;Auto-correction
+TP_RAWCACORR_AUTOIT;Iterations
+TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift
TP_RAWCACORR_CABLUE;Blue
TP_RAWCACORR_CARED;Red
TP_RAWCACORR_CASTR;Strength
@@ -1992,15 +2029,18 @@ TP_RAWEXPOS_LINEAR;White-point correction
TP_RAWEXPOS_PRESER;Highlight preservation
TP_RAWEXPOS_RGB;Red, Green, Blue
TP_RAWEXPOS_TWOGREEN;Link greens
-TP_RAW_1PASSMEDIUM;1-Pass (Medium)
-TP_RAW_3PASSBEST;3-Pass (Best)
-TP_RAW_4PASS;4-Pass
+TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
+TP_RAW_2PASS;1-pass+fast
+TP_RAW_3PASSBEST;3-pass (Markesteijn)
+TP_RAW_4PASS;3-pass+fast
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
TP_RAW_AMAZEVNG4;AMaZE+VNG4
+TP_RAW_BORDER;Border
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB enhancement
TP_RAW_DCBITERATIONS;Number of DCB iterations
+TP_RAW_DCBVNG4;DCB+VNG4
TP_RAW_DMETHOD;Method
TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@@ -2052,10 +2092,12 @@ TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for b
TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
TP_RAW_RCD;RCD
+TP_RAW_RCDVNG4;RCD+VNG4
TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
-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_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.\n+fast gives less artifacts in flat areas
TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
TP_RAW_VNG4;VNG4
+TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
TP_RESIZE_APPLIESTO;Applies to:
TP_RESIZE_CROPPEDAREA;Cropped Area
TP_RESIZE_FITBOX;Bounding Box
@@ -2085,7 +2127,7 @@ 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_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the 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
@@ -2194,6 +2236,8 @@ TP_SHARPENMICRO_CONTRAST;Contrast threshold
TP_SHARPENMICRO_LABEL;Microcontrast
TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
TP_SHARPENMICRO_UNIFORMITY;Uniformity
+TP_SOFTLIGHT_LABEL;Soft Light
+TP_SOFTLIGHT_STRENGTH;Strength
TP_TM_FATTAL_AMOUNT;Amount
TP_TM_FATTAL_ANCHOR;Anchor
TP_TM_FATTAL_LABEL;Dynamic Range Compression
@@ -2290,7 +2334,7 @@ TP_WAVELET_DTHR;Diagonal
TP_WAVELET_DTWO;Horizontal
TP_WAVELET_EDCU;Curve
TP_WAVELET_EDGCONT;Local contrast
-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_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
TP_WAVELET_EDGE;Edge Sharpness
TP_WAVELET_EDGEAMPLI;Base amplification
TP_WAVELET_EDGEDETECT;Gradient sensitivity
@@ -2425,7 +2469,7 @@ TP_WBALANCE_SOLUX35;Solux 3500K
TP_WBALANCE_SOLUX41;Solux 4100K
TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
-TP_WBALANCE_SPOTWB;Spot WB
+TP_WBALANCE_SPOTWB;Use the pipette to pick the white balance from a neutral patch in the preview.
TP_WBALANCE_TEMPBIAS;AWB temperature bias
TP_WBALANCE_TEMPBIAS_TOOLTIP;Allows to alter the computation of the "auto white balance"\nby biasing it towards warmer or cooler temperatures. The bias\nis expressed as a percentage of the computed temperature,\nso that the result is given by "computedTemp + computedTemp * bias".
TP_WBALANCE_TEMPERATURE;Temperature
diff --git a/rtdata/icons/mime-types b/rtdata/mime-types
similarity index 100%
rename from rtdata/icons/mime-types
rename to rtdata/mime-types
diff --git a/rtdata/options/options.lin b/rtdata/options/options.lin
index 924e8b9a2..91520dc0e 100644
--- a/rtdata/options/options.lin
+++ b/rtdata/options/options.lin
@@ -2,7 +2,7 @@
# After the first run, all the parameters will be available in this global option file
# or in a new local option file, depending on the MultiUser value below
-# Most ot the options are modifiable through the Preference window
+# Most of the options are modifiable through the Preference window
[General]
# Setting MultiUser to false will use the application's installation directory as cache directory,
diff --git a/rtdata/icons/rawtherapee.desktop.in b/rtdata/rawtherapee.desktop.in
similarity index 100%
rename from rtdata/icons/rawtherapee.desktop.in
rename to rtdata/rawtherapee.desktop.in
diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css
index cc533320b..91aff9a99 100644
--- a/rtdata/themes/RawTherapee-GTK3-20_.css
+++ b/rtdata/themes/RawTherapee-GTK3-20_.css
@@ -18,19 +18,24 @@
along with RawTherapee. If not, see .
*/
-/* Scrollbar stuck workaround */
-scrollbar:not(.overlay-indicator):hover {
- min-width: 1px;
-}
+/* text-shadow causes a serious performance degradation in rendering the UI,
+ * at least in comboboxes with many entries (i.e. Profiled Lens Correction).
+*/
* {
color: #AAAAAA;
+ text-shadow: none;
}
*:disabled {
color: #666666;
}
+/* Scrollbar stuck workaround */
+scrollbar:not(.overlay-indicator):hover {
+ min-width: 1px;
+}
+
.view:selected:not(check):not(radio) {
color: #262626;
background-color: #AAAAAA
@@ -220,6 +225,7 @@ scrollbar.vertical.overlay-indicator:not(.hovering) slider {
button {
padding: 0;
+ box-shadow: none;
min-height: 5px;
min-width: 5px;
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
@@ -626,7 +632,6 @@ flowboxchild:selected {
/* Editor tab button */
#MainNotebook grid label, #MainNotebook grid image {
- /* OK */
padding: 1px;
}
@@ -949,5 +954,65 @@ button#MyFileChooserButton {
}
#ToolPanelNotebook button {
- margin: 0px;
+ margin: 0px;
}
+
+button.flat {
+ background: none;
+ border: none;
+ outline: none;
+}
+
+button.flat:checked {
+ background: #262626;
+}
+
+.text-button, .image-button, .independent {
+ box-shadow: none;
+ min-height: 24px;
+ min-width: 24px;
+ padding: 0px;
+}
+
+/* Makes image-comboboxes (e.g. tone curve types) have same size as image buttons */
+combobox, .popupbutton-arrow {
+ min-height: 24px;
+}
+
+/* Makes image-combobox small icons centered */
+button.toggle > grid > image {
+ padding: 4px;
+}
+
+#histButton {
+ background: none;
+ min-height: 16px;
+ min-width: 16px;
+}
+
+/* -gtk-icon-shadow looks buggy on the small histogram icons */
+#histButton:hover {
+ -gtk-icon-shadow: none;
+}
+
+.narrowbutton {
+ min-width: 10px;
+}
+
+
+.smallbuttonbox button {
+ min-width: 16px;
+ min-height: 16px;
+}
+
+/* Adds padding around sides of text-buttons */
+button.text-button {
+ padding: 0 8px;
+}
+
+/* Adds gap between combobox contents and combobox edges */
+button.combo, .image-combo .toggle, #MyFileChooserButton {
+ padding-left: 4px;
+ padding-right: 4px;
+}
+
diff --git a/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css b/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
index 888533053..d1bb4fdbc 100644
--- a/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
@@ -41,7 +41,7 @@
/*** Change me end *****************************************************************************/
-@define-color bg-light-grey rgb(115,115,115);
+@define-color bg-light-grey rgb(119,119,119);
@define-color bg-grey rgb(95,95,95);
@define-color bg-dark-grey rgb(55,55,55);
diff --git a/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css b/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
index 23e32e1ec..581549750 100644
--- a/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
@@ -25,7 +25,7 @@
/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
-@define-color accent-color rgb(33,82,145); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
+@define-color accent-color rgb(33,82,150); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
@define-color text-hl-color rgb(200,200,200); /*** Active text color * Default: rgb(200,200,200) ***/
@define-color bg-highlighted-text-color rgb(33,82,145); /*** Highlighted text color background* Default: rgb(33,82,145) ***/
@@ -33,7 +33,7 @@
@define-color bg-image rgb(58,58,58); /*** Image area & File Browser background * Default: rgb(58,58,58) ***/
-@define-color accent-color2 rgb(33,82,145); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
+@define-color accent-color2 rgb(33,82,150); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
@define-color accent-color4 rgb(98,98,98); /*** Slider knob * Default: rgb(98,98,98) ***/
@define-color accent-color3 rgb(33,82,145); /*** Selected thumbnail background color * Default: rgb(33,82,145) ***/
diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css
index a65fb2d3e..af0173441 100644
--- a/rtdata/themes/TooWaBlue-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-GTK3-20_.css
@@ -1,8 +1,8 @@
/*
This file is part of RawTherapee.
- Copyright (c) 2016-2017 TooWaBoo
- Version 2.62
+ Copyright (c) 2016-2018 TooWaBoo
+ Version 2.74
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -72,25 +72,38 @@
outline-style: none; /* removes the ugly dashed focus line */
border-image: none;
transition: none;
+ -gtk-icon-shadow: none;
+}
+
+#ToolBarPanelFileBrowser button:not(.smallbutton) image,
+#EditorTopPanel button:not(.narrowbutton) image,
+#IopsPanel button:not(.Right) image,
+#ProfilePanel button image,
+#MainNotebook > stack > :nth-child(2) > box:nth-child(3) image,
+#MainNotebook > header button:not(#CloseButton) image {
+ -gtk-icon-transform: scale(calc(22/24));
}
*:disabled {
color: @fg-disabled;
+ -gtk-icon-effect: dim;
}
#ToolPanelNotebook {
- min-width: 24.08334em;
+ min-width: 22.25em;
}
#HistoryPanel {
- min-width: 18em;
+ min-width: 17.5em;
}
window.background {
background-color: @bg-light-grey;
}
+/* Single Window */
window > box {
- padding: 0.41667em;
+ padding: 0.4167em;
}
+/**/
dialog {
background-color: @bg-grey;
border-radius: 0;
@@ -100,7 +113,7 @@ dialog {
-GtkDialog-action-area-border: 0;
}
dialog > box {
- padding: 0.66667em;
+ padding: 0.6667em;
}
messagedialog {
background-color: @bg-light-grey;
@@ -108,8 +121,8 @@ messagedialog {
}
tooltip {
background-color: @bg-tooltip;
- border: 0.08334em solid @border-tooltip;
- border-radius: 0.33334em;
+ border: 0.0834em solid @border-tooltip;
+ border-radius: 0.3334em;
padding: 0;
margin: 0;
box-shadow: none;
@@ -136,10 +149,6 @@ label {
margin: 0;
}
-.drawingarea:not(.slider) {
- background-color: @bg-dark-grey;
-}
-
/*** Frames ************************************************************************************/
frame {
border: none;
@@ -155,7 +164,7 @@ frame {
#BatchQueueButtonsMainContainer frame,
#MyExpander frame,
dialog frame {
- margin: 0.16667em 0.5em;
+ margin: 0.1667em 0.5em;
}
/* affects selection list*/
entry > window > frame,
@@ -164,7 +173,7 @@ filechooser frame {
}
#PlacesPaned frame {
- margin: -8px 0 0;
+ margin: -5px 0 0;
}
frame > border {
@@ -183,7 +192,7 @@ frame > border {
dialog frame > border {
padding: 0.5em;
border-radius: 0;
- border: 0.08334em solid @border-color;
+ border: 0.0834em solid @border-color;
background-color: transparent;
margin: 0 -0.5em;
}
@@ -204,18 +213,18 @@ filechooser > frame > border {
#ToolPanelNotebook frame > label,
dialog frame > label {
margin: 0;
- padding: 0.16667em 0.5em;
+ padding: 0.1667em 0.5em;
}
#BatchQueueButtonsMainContainer frame > border {
- margin-bottom: 0.83334em;
+ margin-bottom: 0.8334em;
}
#BatchQueueButtonsMainContainer frame:nth-child(3) > border {
- padding-left: 0.91667em;
+ padding-left: 0.9167em;
}
frame > label {
margin: 0;
- padding: 0.5em 0;
+ padding: 0.4167em 0 0.3334em 0.0834em;
color: @headline-frame;
}
frame > checkbutton label{
@@ -227,7 +236,7 @@ frame > checkbutton label{
textview.view, treeview.view {
background-color: @bg-dark-grey;
border-color: @view-grid-border;
- padding: 0.16667em;
+ padding: 0.1667em;
margin: 0;
}
textview:hover, treeview:hover {
@@ -240,24 +249,27 @@ textview:selected, treeview:selected {
}
#RightNotebook > stack > :nth-child(1) treeview {
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
border-bottom: none;
}
#PlacesPaned > box:nth-child(1) treeview {
- padding: 0.08334em 0 0.08334em 0.5em;
+ padding: 0.0834em 0 0.0834em 0.41667em;
-gtk-icon-style: symbolic;
}
#HistoryPanel {
- margin-top: 0.5em;
+ margin-top: 0.25em;
+}
+#RightNotebook #HistoryPanel {
+ margin-top: 0.3334em;
}
#HistoryPanel > border {
margin-top: 1.75em;
}
#HistoryPanel > label {
- margin: 0 0 -1.33334em 0;
- padding: 0;
+ margin: 0 0 -1.5em 0;
+ padding: 0 0 0 0.0834em;
}
#Snapshots > border {
@@ -270,8 +282,12 @@ textview:selected, treeview:selected {
margin-top: -8px;
margin-bottom: -4px;
}
+#Snapshots button image{
+ min-height: 24px;
+ min-width: 24px;
+}
#Snapshots > box > :nth-child(1) {
- margin-bottom: 0.41667em;
+ margin-bottom: 0.4167em;
}
#PlacesPaned > box:nth-child(3) > box:nth-child(2),
@@ -279,28 +295,28 @@ textview:selected, treeview:selected {
#HistoryPanel > border,
#Snapshots > box > :nth-child(1) {
background-color: @bg-dark-grey;
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
}
/*Corrects the space of the snapshot view to the paned separator*/
#Snapshots {
- margin-top: -0.33334em;
+ margin-top: 0.1667em;
}
/**/
/*** end ***************************************************************************************/
/*** Navigator *********************************************************************************/
-#Navigator .drawingarea {
- border-top: 0.41667em solid @bg-dark-grey;
- border-bottom: 0.25em solid @bg-dark-grey;
-}
#Navigator {
- background-color: @bg-dark-grey;
+ padding-top: 0.75em;
padding-bottom: 0.25em;
+ background-color: @bg-dark-grey;
}
#Navigator box label {
- padding: 0.16667em 0;
+ padding: 0.1667em 0;
+}
+#Navigator > label:nth-child(2) {
+ margin-top: 0.5em;
}
/*** end ***************************************************************************************/
@@ -320,11 +336,11 @@ filechooser box {
}
filechooser > box > paned > box {
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
filechooser placessidebar {
- padding: 0 0.08334em;
+ padding: 0 0.0834em;
background-color: @bg-dark-grey;
}
@@ -338,7 +354,7 @@ filechooser list {
filechooser list row {
margin: 0;
padding: 0;
- min-height: calc(1.41667em + 8px);
+ min-height: calc(1.4166em + 8px);
}
filechooser list row label{
margin: 0;
@@ -356,35 +372,62 @@ filechooser list row:selected {
/*** Histogram *********************************************************************************/
#HistogramPanel {
- margin: -2px 0;
+ min-height: 0;
+ margin: 0;
+ padding: 0;
border: none;
+ background-color: transparent;
}
-#HistogramArea,
-#HistogramRGBArea {
- border: 0.08334em solid @bg-dark-grey;
+
+#HistogramPanel > :nth-child(2) {
+ border: none;
+ border-left: 0.0834em solid @bg-light-grey;
+ background-color: @bg-dark-grey;
+}
+
+#HistogramPanel > :nth-child(1) {
+ border: none;
+ background-color: transparent;
+}
+
+#EditorLeftPaned #HistogramPanel > :nth-child(1) {
+ border: none;
+ border-right: 0.0834em solid @bg-light-grey;
+ background-color: @bg-dark-grey;
+}
+
+#EditorLeftPaned #HistogramPanel > :nth-child(2) {
+ border: none;
+ background-color: transparent;
+}
+
+#HistogramArea,
+#HistogramRGBArea {
+ border: 0.0834em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
-#fullButton,
#histButton {
- padding: 0.47em 0.41667em;
+ padding: 0;
margin: 0;
- border-color: @bg-light-grey;
- border-style: solid;
- border-width: 0 0 0 0.08334em;
+ border: none;
background-color: @bg-dark-grey;
background-image: none;
box-shadow: none;
- min-height: 0;
- min-width: 0;
+ min-height: 1.4166em;
+ min-width: calc(1.3333em + 6px);
border-radius: 0;
}
-#fullButton {
- padding: 0.47em 0.41667em 0.58334em;
+
+#histButton:first-child {
+ margin-top: 3px;
}
-#EditorLeftPaned #fullButton,
-#EditorLeftPaned #histButton {
- border-width: 0 0.08334em 0 0;
+#histButton:last-child {
+ margin-bottom: 3px;
+}
+
+#HistogramPanel image {
+ -gtk-icon-transform: scale(calc(14/16));
}
/*** end ***************************************************************************************/
@@ -393,7 +436,7 @@ separator {
background-color: transparent;
}
grid separator.horizontal, box separator.horizontal {
- margin: 0.16667em 0;
+ margin: 0.1667em 0;
padding: 0;
}
grid separator.vertical, box separator.vertical {
@@ -413,11 +456,11 @@ popover separator:not(:only-child) {
paned.horizontal > separator {
background-color: transparent;
- min-width: 0.41667em;
- border-left: 0.25em solid @bg-light-grey;
- border-right: 0.25em solid @bg-light-grey;
+ background-image: none;
+ min-width: 0.4166em;
+ border: none;
margin: 0 -0.25em;
- padding: 0;
+ padding: 0 0.25em;
}
paned.vertical > separator {
@@ -426,14 +469,19 @@ paned.vertical > separator {
min-height: 0.5em;
border-top: 1px solid @bg-light-grey;
border-bottom: 1px solid @bg-light-grey;
- margin: 0.25em 0 0;
+ margin: 0.25em 0 -0.5em;
padding: 0.2em 0 0;
}
+/*Filmstrip*/
+#EditorRightPaned > paned.horizontal > paned.vertical > separator {
+ margin-bottom: 0;
+ min-height: 0.4167em;
+}
dialog paned.horizontal > separator {
background-color: @bg-grey;
border-color: @bg-grey;
- min-width: 0.33334em;
+ min-width: 0.3333em;
}
menu separator {
@@ -451,13 +499,13 @@ menu separator {
#IopsPanel separator,
#FileBrowser separator {
background-color: shade(@bg-light-grey,.75);
- margin-top: 0.33334em;
- margin-bottom: 0.33334em;
+ margin-top: 0.1667em;
+ margin-bottom: 0.1667em;
}
#MyExpander separator {
background-color: @view-grid-border;
- margin: 0.33334em 0;
+ margin: 0.3334em 0;
}
#MyFileChooserButton separator {
background-color: transparent;
@@ -470,24 +518,24 @@ menu separator {
/*** PartialPaste ******************************************************************************/
#PartialPaste {
- border-bottom: 0.08334em solid @border-color;
- border-top: 0.08334em solid @border-color;
+ border-bottom: 0.0834em solid @border-color;
+ border-top: 0.0834em solid @border-color;
padding-top: 0.5em;
padding-bottom: 0.5em;
}
#PartialPaste separator.vertical {
- margin: 0 0.33334em;
+ margin: 0 0.3334em;
padding: 0;
}
#PartialPaste separator { /* Struggles with #PartialPasteHeaderSep */
background-color: @border-color;
- margin: 0.16667em 0.5em 0.16667em 1.16667em;
+ margin: 0.1667em 0.5em 0.1667em 1.1667em;
}
#PartialPasteHeaderSep.horizontal {
background-color: rgb(192,192,192);
- margin: 0.16667em 0.5em;
+ margin: 0.1667em 0.5em;
}
#PartialPasteHeader label {
@@ -522,10 +570,10 @@ scrollbar:not(.overlay-indicator) {
background-color: rgba(0,0,0,.30);
}
scrollbar:not(.overlay-indicator).horizontal {
- border-width: 0 0.08334em 0.08334em 0.08334em;
+ border-width: 0 0.0834em 0.0834em 0.0834em;
}
scrollbar:not(.overlay-indicator).vertical {
- border-width: 0.08334em 0.08334em 0.08334em 0;
+ border-width: 0.0834em 0.0834em 0.0834em 0;
}
scrollbar:not(.overlay-indicator) slider {
background-color: shade(@text-color, .9);
@@ -546,9 +594,9 @@ scrollbar.horizontal.hovering.fine-tune slider {
scrollbar.horizontal.overlay-indicator:not(.hovering) slider {
min-width: 2em;
min-height: 0.25em;
- border-width: 0.08334em;
+ border-width: 0.0834em;
border-radius: 0.25em;
- margin: 0 0.16667em;
+ margin: 0 0.1667em;
}
scrollbar:not(.overlay-indicator).vertical slider,
@@ -566,9 +614,9 @@ scrollbar.vertical.hovering.fine-tune slider {
scrollbar.vertical.overlay-indicator:not(.hovering) slider {
min-width: 0.25em;
min-height: 2em;
- border-width: 0.08334em;
+ border-width: 0.0834em;
border-radius: 0.5em;
- margin: 0.16667em 0;
+ margin: 0.1667em 0;
}
scrollbar:not(.overlay-indicator) slider:hover,
@@ -586,7 +634,7 @@ scrollbar:not(.overlay-indicator):hover {
/*** Scale**************************************************************************************/
scale {
padding: 0;
- min-height: 1.83334em;
+ min-height: 1.8333em;
margin: 0 0.25em;
}
@@ -594,10 +642,10 @@ scale slider {
/* Slider size is min-width x min-height; margin have to be half of those values, but negative */
min-width: 1em;
min-height: 1em;
- margin: calc(-0.33334em - 1px);
- border-radius: 0.83334em;
+ margin: calc(-0.166em - 4px);
+ border-radius: 0.8334em;
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
- border: 0.08334em solid @bg-button-border;
+ border: 0.0834em solid @bg-button-border;
box-shadow: none;
}
scale slider:hover {
@@ -607,14 +655,14 @@ scale slider:hover {
scale trough {
margin: 0.5em; /* has to be half of "scale slider / min-width min-height*/
background-color: @bg-scale-entry;
- border: 0.08334em solid @bg-button-border;
- box-shadow: inset 0 0.08334em rgba(255, 255, 255, 0.11), 0 0.08334em rgba(242, 242, 242, 0.11);
+ border: 0.0834em solid @bg-button-border;
+ box-shadow: inset 0 0.0834em rgba(255, 255, 255, 0.11), 0 0.0834em rgba(242, 242, 242, 0.11);
border-radius: 0.5em;
}
scale:not(:disabled) trough highlight {
background-color: @accent-color2;
- border: 0.08334em solid @bg-button-border;
- box-shadow: inset 0 0.08334em shade(@accent-color2, 1.3);
+ border: 0.0834em solid @bg-dark-grey;
+ box-shadow: inset 0 0.1667em shade(@accent-color2, 1.25);
border-radius: 0.5em;
}
@@ -663,14 +711,14 @@ progressbar.vertical trough progress {
}
progressbar.horizontal trough {
- min-height: 0.41667em;
+ min-height: 0.4166em;
background-color: transparent;
border: none;
border-radius: 0.5em;
- margin-top: 0.58334em;
+ margin-top: 0.5834em;
}
progressbar.horizontal trough progress {
- min-height: 0.41667em;
+ min-height: 0.4166em;
margin: -1px 0;
background-color: @accent-color2;
border: none;
@@ -680,7 +728,7 @@ progressbar.horizontal trough progress {
#IopsPanel progressbar.horizontal trough {
min-height: 0.5em;
background-color: @bg-scale-entry;
- border: 0.08334em solid @bg-button-border;
+ border: 0.0834em solid @bg-button-border;
margin-top: 0.25em;
}
#IopsPanel progressbar.horizontal trough progress {
@@ -709,36 +757,36 @@ notebook stack {
}
notebook header {
background-color: @bg-dark-grey;
- padding: 0 0.41667em;
+ padding: 0 0.4167em;
}
notebook header.left {
- padding: 0.41667em 0;
+ padding: 0.4167em 0;
}
notebook tabs {
background-color: transparent;
}
notebook header tab {
background-color: transparent;
- margin: 0.41667em 0.25em;
- padding: 0 0.33334em;
+ margin: 0.4167em 0.25em;
+ padding: 0 0.3334em;
}
notebook header.left tab {
- margin: 0.25em 0.41667em;
- padding: 0.33334em 0;
+ margin: 0.25em 0.4167em;
+ padding: 0.3334em 0;
}
notebook header tab > grid > image {
- min-height: 2.33334em;
+ min-height: 2.5em;
min-width: 0;
- padding: 0 0.16667em 0 0;
+ padding: 0 0.25em 0 0;
margin: 0;
}
notebook header.left tab > grid > image {
min-height: 0;
- min-width: 2.33334em;
- padding: 0.16667em 0 0;
+ min-width: 2.5em;
+ padding: 0.25em 0 0;
}
notebook header tab label {
- margin: 0.33334em;
+ margin: 0.0834em;
}
notebook header tab:hover label {
color: @headline-hl;
@@ -754,11 +802,11 @@ notebook > header > tabs > arrow {
border-radius: 0.2em;
min-width: 0;
min-height: 0;
- padding: 0 0.16667em;
+ padding: 0 0.1667em;
margin: 0.5em 0;
}
notebook > header.left > tabs > arrow {
- padding: 0.16667em 0;
+ padding: 0.1667em 0;
margin: 0 0.5em;
}
notebook > header > tabs > arrow:hover {
@@ -777,11 +825,11 @@ dialog notebook stack {
/*?win*/
#MainNotebook > stack {
- padding: 0.41667em;
+ padding: 0.4167em;
}
#MainNotebook > stack > :nth-child(2) > box:nth-child(3) {
- margin-top: 0.41667em;
+ margin-top: 0.4167em;
}
@@ -789,49 +837,58 @@ dialog notebook stack {
dialog.csd #PrefNotebook > header,
dialog.csd #AboutNotebook > header,
window.csd:not(.fullscreen) #MainNotebook > header.top {
- border-top: 0.083334em solid rgba(200,200,200,.18);
+ border-top: 0.08334em solid rgba(200,200,200,.18);
}
/**/
#ToolPanelNotebook > header tabs {
- margin-bottom: 0.33334em;
+ margin-bottom: 0.3334em;
}
#ToolPanelNotebook > header tab {
margin-left: 0;
margin-right: 0;
- padding: 0 0.33334em;
+ padding: 0 0.3334em;
}
#ToolPanelNotebook > header tab + tab {
- margin-left: 0.33333em;
+ margin-left: 0.25em;
}
-#ToolPanelNotebook > header tab image{
- min-height: 2.5em;
- min-width: 2em;
- padding: 0;
+#ToolPanelNotebook > header tab #TextOrIcon image{
+ min-height: 2.3333em;
+ min-width: calc(2em + 4px);
+ padding: 2px 0;
margin: 0;
}
#RightNotebook > header {
- margin: 0 0.41667em 0 0;
+ margin: 0 0.4167em 0 0;
}
#RightNotebook > stack {
background-color: @bg-grey;
padding: 0;
}
+#RightNotebook header tab label {
+ padding-left: 0.1667em;
+ padding-right: 0.1667em;
+}
#RightNotebook > stack > :nth-child(1) > * > box,
#RightNotebook > stack > :nth-child(4) > * > box {
padding: 0.5em;
- border: 0.08334em solid @bg-entry-border;
+ border: 0.0834em solid @bg-entry-border;
}
#PrefNotebook header {
- margin: -0.66667em -0.66667em 0.33334em;
+ margin: -0.6667em -0.6667em 0.3334em;
}
+#PrefNotebook header tab label {
+ padding-top: 0.1667em;
+ padding-bottom: 0.1667em;
+}
+
#AboutNotebook header {
- margin: -0.66667em -0.66667em 0.66667em;
+ margin: -0.6667em -0.6667em 0.6667em;
}
#AboutNotebook stack text {
@@ -843,15 +900,15 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#MetaPanelNotebook header {
background-color: @bg-grey;
- padding: 0.33334em;
+ padding: 0.3334em;
margin: 0 0.5em 0;
}
#MetaPanelNotebook > header > tabs {
background-color: @bg-dark-grey;
- padding-left: 0.33334em;
+ padding-left: 0.3334em;
}
#MetaPanelNotebook > header tab label{
- margin: 0.08334em;
+ margin: 0.0834em;
}
#MetaPanelNotebook > stack > box {
@@ -859,11 +916,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
background-color: @bg-grey;
border-radius: 0;
border-top-style: none;
- padding: 0 0.33334em 0.25em;
+ padding: 0 0.3334em 0.25em;
margin: 0 0.5em -0.5em;
}
#MetaPanelNotebook > stack > box:nth-child(1) > scrolledwindow {
- margin: 0 0 0.33334em;
+ margin: 0 0 0.3334em;
padding: 0;
}
@@ -873,23 +930,23 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#MetaPanelNotebook separator {
background-color: @border-color;
- margin: 0.16667em 0;
+ margin: 0.1667em 0;
}
#MetaPanelNotebook entry, #MetaPanelNotebook button, #MetaPanelNotebook combobox button {
margin-top: 0;
margin-bottom: 0;
- min-height: 1.66667em;
- min-width: 0.83334em;
+ min-height: 1.6666em;
+ min-width: 0.8333em;
}
#MetaPanelNotebook entry {
- padding: 0 0.33334em;
+ padding: 0 0.3334em;
background-color: @bg-dark-grey;
margin: 0;
border-radius: 0;
}
#MetaPanelNotebook > stack > box:nth-child(1) > :nth-child(1) {
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
}
#MetaPanelNotebook > stack > box:nth-child(2) > scrolledwindow scrolledwindow {
background-color: @bg-dark-grey;
@@ -897,13 +954,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0;
}
#MetaPanelNotebook > stack > box:nth-child(2) .view {
- border: 0.08334em solid @bg-dark-grey;
- padding: 0.16667em;
+ border: 0.0834em solid @bg-dark-grey;
+ padding: 0.1667em;
margin: 0;
}
#MetaPanelNotebook textview.view {
background-color: @bg-dark-grey;
- padding: 0.08334em 0.33334em;
+ padding: 0.0834em 0.3334em;
margin: 0;
}
#MetaPanelNotebook text {
@@ -919,17 +976,17 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
#MetaPanelNotebook combobox + button,
#MetaPanelNotebook combobox + button + button {
- margin-left: 0.16667em;
- min-width: 1.66667em;
+ margin-left: 0.1667em;
+ min-width: 1.6666em;
}
#MetaPanelNotebook > stack > box > grid > button {
- margin-top: 0.08334em;
- margin-bottom: 0.08334em;
- min-height: 2.16667em;
+ margin-top: 0.0834em;
+ margin-bottom: 0.0834em;
+ min-height: 2.1666em;
}
#MetaPanelNotebook label {
- padding: 0.08334em 0;
+ padding: 0.0834em 0;
}
/*** end ***************************************************************************************/
@@ -937,7 +994,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/*** File Browser ******************************************************************************/
#FileCatalog {
background-color: @bg-image;
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
}
#FileCatalog:selected {
background-color: @accent-color3;
@@ -951,46 +1008,64 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
#ToolBarPanelFileBrowser {
- margin: -2px -1px;
+ margin: 0.4167em -1px;
min-height: 0;
min-width: 0;
- padding: 0.41667em 0;
+ padding: 0;
}
#ToolBarPanelFileBrowser > box > button,
#ToolBarPanelFileBrowser > button {
- margin: 0 0.08334em;
+ margin: 0 0.0834em;
}
-#ToolBarPanelFileBrowser > box > box > button {
- min-height: 0.91667em;
- min-width: 1.33333em;
+/* Filter */
+#ToolBarPanelFileBrowser .smallbuttonbox {
+ min-height: 1.0834em;
padding: 0;
- margin: 0.16667em 0 0 0;
+ margin: 0;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox:nth-child(2) {
+ margin: 1px 0 -1px 0;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton {
+ min-height: 0;
+ min-width: 1.0834em;
+ padding: 0;
+ margin: 0 2px;
border: none;
+ border-radius: 0;
background-color: transparent;
background-image: none;
box-shadow: none;
}
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton:checked {
+ background-color: @bg-dark-grey;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton image{
+ -gtk-icon-transform: scale(calc(14/16));
+ margin: -2px
+}
+/**/
#ToolBarPanelFileBrowser entry + button.flat,
#FileBrowser entry + button.flat {
- min-height: 1.66667em;
- min-width: 1.66667em;
- margin: 0 0 0 -1.66667em;
+ min-height: 1.6666em;
+ min-width: 1.6666em;
+ margin: 0 0 0 -1.6667em;
border-radius: 0 0.2em 0.2em 0;
- border: 0.08334em solid transparent;
+ border: 0.0834em solid transparent;
padding: 0;
}
#ToolBarPanelFileBrowser entry,
#FileBrowser entry {
- min-height: 1.66667em;
+ min-height: 1.6666em;
min-width: 12em;
margin: 0 -2px 0 0;
- padding: 0 2em 0 0.33334em;
+ padding: 0 2em 0 0.3334em;
}
#ToolBarPanelFileBrowser label,
#FileBrowser label {
- margin: 0 0.33334em 0 0.5em;
+ margin: 0 0.3334em 0 0.5em;
}
/*** end ***************************************************************************************/
@@ -1001,49 +1076,65 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#BeforeAfterContainer {
background-color: @bg-grey;
- border: 0.08334em solid @bg-dark-grey;
+ border: 0.0834em solid @bg-dark-grey;
border-radius: 0;
padding: 0;
- margin: 0.41667em 0;
+ margin: -2px 0 0.4167em;
}
#BeforeAfterContainer > box:nth-child(2) > box:nth-child(2),
#BeforeAfterContainer > box:nth-child(1) > box:nth-child(2){
- border-top: 0.08334em solid @bg-dark-grey;
+ border-top: 0.0834em solid @bg-dark-grey;
}
#BeforeAfterContainer > box:nth-child(2){
- border-left: 0.08334em solid @bg-dark-grey;
+ border-left: 0.0834em solid @bg-dark-grey;
}
#BeforeAfterContainer label {
- min-height: 2.41667em;
+ min-height: 2.6666em;
padding: 0 0.5em;
}
/* Small Lock Button */
#BeforeAfterContainer button {
- min-height: 1.66667em;
- min-width: 1.75em;
- margin: 0.25em;
- padding: 0 0 0 0.08334em;
+ min-height: 2em;
+ min-width: 2em;
+ margin: 0.25em 0.25em 0.25em 0;
+ padding: 0;
+}
+#BeforeAfterContainer button image{
+ margin: 0 0 0 1px;
+}
+#BeforeAfterContainer button:checked image{
+ margin: 0 -2px 0 3px;
}
/**/
-#EditorTopPanel {
- margin: -2px -2px;
+#EditorToolbarTop {
+ margin: -2px -2px 0.4167em;
padding: 0;
min-height: 0;
}
+/* Single Window */
+window > box > #EditorRightPaned > paned > paned > box {
+ margin-top: -2px;
+ padding: 0;
+}
+window > box > #EditorRightPaned > paned > paned > box > #EditorToolbarTop {
+ margin-top: 0;
+}
+/**/
+
#EditorTopPanel button {
- margin: 0 0.08334em;
- min-height: 2.16667em;
- min-width: 2.16667em;
+ margin: 0 0.0834em;
+ min-height: 2.1666em;
+ min-width: 2.1666em;
}
/* Removes margin from the last button. Otherwise the filmstrip will cut of the right border. */
#EditorTopPanel :last-child > button:last-child {
margin-right: 0;
}
-#EditorTopPanel > box:nth-child(9) > button.image-button {
- min-width: 1.05em;
+#EditorTopPanel button.narrowbutton {
+ min-width: 1em;
padding: 0;
}
@@ -1056,8 +1147,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
padding: 0 2px 0 3px;
}
#EditorZoomPanel button {
- margin-left: 0.08334em;
- margin-right: 0.08334em;
+ margin-left: 0.0834em;
+ margin-right: 0.0834em;
}
/*** end ***************************************************************************************/
@@ -1072,13 +1163,14 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
/**/
#MyExpander .drawingarea:not(.slider) {
- border: 0.08334em solid @bg-light-grey;
+ border: 0.0834em solid @bg-light-grey;
+ background-color: @bg-dark-grey;
}
#MyExpander .slider,
-#MyExpander .drawingarea:nth-child(2) {
+#MyExpander #CurveSHCSelector {
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
background-color: @accent-color4;
- border: 0.08334em solid rgb(15,15,15);
+ border: 0.0834em solid rgb(15,15,15);
}
#MyExpander .drawingarea:disabled {
background-color: shade(@bg-grey,.85);
@@ -1086,16 +1178,12 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
background-image: none;
}
#ThresholdAdjuster {
- margin: 0.08334em 0 0.16667em 0;
+ margin: 0.0834em 0 0.1667em 0;
}
#ToolPanelNotebook scrolledwindow viewport.frame {
padding: 0 0.56em;
}
-/* #MyExpander.withScrollbar {
- padding: 0 6px;
-}
- */
#MyExpander {
margin: 0;
@@ -1112,7 +1200,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/* Sub-tool (MyExpander) */
#ExpanderBox2 > box, #ExpanderBox2 > grid {
background-color: transparent;
- border: 0.08334em solid @border-color;
+ border: 0.0834em solid @border-color;
border-radius: 0;
margin: 0;
padding: 0.5em;
@@ -1120,13 +1208,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#MyExpanderTitle > box {
margin: 0;
- padding: 0.33334em 0;
+ padding: 0.25em 0;
}
#MyExpanderTitle label {
color: @headline-big;
padding: 0;
- margin: 0 0.25em 0 0.5em;
+ margin: 0.0834em 0.25em 0 0.5em;
}
#MyExpanderTitle:hover label {
@@ -1141,13 +1229,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
border: none;
padding: 0;
margin: 0;
- box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.50), 0 0 0 0.08334em @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.50), 0 0 0 0.0834em @bg-dark-grey;
}
menu {
background-color: @bg-dark-grey;
- border: 0.08334em solid @accent-color;
- padding: 0.08334em;
+ border: 0.0834em solid @accent-color;
+ padding: 0.0834em;
margin: 0;
}
menu > .top,
@@ -1161,8 +1249,8 @@ menu > .bottom:hover {
}
menuitem {
- padding: 0 0.33334em;
- margin: 0.08334em;
+ padding: 0 0.3334em;
+ margin: 0.0834em;
min-height: 2em;
}
menuitem:hover {
@@ -1176,7 +1264,7 @@ menuitem:hover > * {
menu image {
min-height: 2em;
padding: 0;
- margin: 0 0.33334em 0 0;
+ margin: 0 0.3334em 0 0;
}
/*** Selection popup list (used in filechooser) ***/
@@ -1185,11 +1273,11 @@ entry > window > frame {
}
entry > window > frame > border {
background-color: @bg-dark-grey;
- padding: 0.08334em;
- border: 0.08334em solid @accent-color;
+ padding: 0.0834em;
+ border: 0.0834em solid @accent-color;
}
entry > window > frame > border {
- margin: 0.08334em;
+ margin: 0.0834em;
}
/* end */
@@ -1199,7 +1287,7 @@ entry > window > frame > border {
popover.background {
background-color: @bg-dark-grey;
- border: 0.08334em solid @accent-color;
+ border: 0.0834em solid @accent-color;
border-radius: 0;
padding: 0;
margin: 0;
@@ -1211,7 +1299,7 @@ popover.background > box {
}
popover.background modelbutton {
min-height: 2em;
- padding: 0 0.41667em;
+ padding: 0 0.4167em;
margin: 0;
border-radius: 0;
}
@@ -1228,24 +1316,24 @@ popover.background modelbutton:hover {
/*** Switch ***********************************************************************************/
switch {
- min-height: 2.16667em;
+ min-height: 2.1666em;
min-width: 11em;
margin: 0;
padding: 0;
border-radius: 0.2em;
background-image: none;
- box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1);
- border: 0.08334em solid @bg-entry-border;
+ box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1);
+ border: 0.0834em solid @bg-entry-border;
background-color: @bg-scale-entry;
margin-bottom: 0.5em;
}
switch slider {
- border: 0.08334em solid @bg-entry-border;
+ border: 0.0834em solid @bg-entry-border;
background-color: shade (@bg-light-grey, .85);
background-image: linear-gradient(to bottom, rgba(125,125,125,.4), rgba(60,60,60,.4));
- border: 0.08334em solid @bg-entry-border;
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1);
+ border: 0.0834em solid @bg-entry-border;
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1);
border-radius: 0.2em 0 0 0.2em;
}
switch:checked slider{
@@ -1273,14 +1361,14 @@ switch:disabled:not(:checked) {
/*** Buttons ***********************************************************************************/
button {
- min-height: 2.16667em;
- min-width: 2.16667em;
+ min-height: 2.1666em;
+ min-width: 2.1666em;
margin: 0;
padding: 0; /* x */
border-radius: 0.2em;
- border: 0.08334em solid @bg-button-border;
+ border: 0.0834em solid @bg-button-border;
background-color: transparent;
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
}
button.flat {
@@ -1291,66 +1379,65 @@ button.text-button label {
}
#PrefNotebook > stack > :nth-child(5) combobox {
- /* margin: 0.16667em 0; */
+ /* margin: 0.1667em 0; */
margin: 2px 0;
}
#PrefNotebook > stack > :nth-child(2) #MyFileChooserButton {
- /* margin: 0.25em 0.33334em; */
+ /* margin: 0.25em 0.3334em; */
margin: 3px 5px;
}
filechooser button image,
#MyFileChooserButton image {
- opacity: .8;
+ opacity: .70;
-gtk-icon-style: symbolic;
}
#MainNotebook > header > grid > button,
button.flat {
- border: 0.08334em solid transparent;
+ border: 0.0834em solid transparent;
box-shadow: none;
background-image: none;
background-color: transparent;
}
-/* Resetbutton Queue & Save as*/
-dialog scale + button.flat,
-scale + button.flat {
- min-height: 1.33334em;
- min-width: 1.25em;
- margin: 0.25em 0 0.16667em 0.16667em;
- padding: 0 0 0 0.08334em;
- -gtk-icon-shadow: none;
-}
/* Resetbutton */
-#MyExpander button.flat {
- min-height: 1.33334em;
- min-width: 1.25em;
- margin: 0.08334em 0 0.08334em 0.16667em;
- padding: 0 0 0 0.08334em;
- -gtk-icon-shadow: none;
+#MyExpander button:last-child.flat,
+#MyExpander scale + button.flat,
+dialog scale + button.flat,
+#MainNotebook > stack > :nth-child(2) > box:nth-child(1) scale + button.flat,
+entry + button.flat {
+ min-height: 1.1666em;
+ min-width: 1.5em;
+ margin: 0.0834em 0 0.0834em 0.1667em;
+ padding: 0 0 0 0.1667em;
+}
+dialog entry + button:last-child.flat {
+ min-height: 1.6666em;
}
-#MyExpander scale + button.flat {
- margin: 0 0 0 0.16667em;
+#MyExpander scale + button:last-child.flat,
+#MyExpander spinbutton + button:last-child.flat {
+ margin: 0 0 0 0.1667em;
}
-#MyExpander image + button.flat {
- margin: 0 0 0 0.41667em;
-}
-#MyExpander spinbutton + button.flat {
- margin: 0 0 0 0.16667em;
- padding-top: 0.08334em;
+#MyExpander image + button:last-child.flat {
+ margin: 0 0 0 0.25em;
}
/**/
/* Buttons Curve drawingarea*/
#MyExpander button.flat + button.flat,
#MyExpander button.flat:first-child {
- min-height: 2.16667em;
- min-width: 2.16667em;
- margin: 0.08334em;
+ min-height: 2em;
+ min-width: 2em;
+ margin: 0.1667em 0.1667em 0 0;
padding: 0;
}
+#MyExpander button.flat + button.flat image,
+#MyExpander button.flat:first-child image{
+ -gtk-icon-transform: scale(calc(20/24));
+ margin: -2px;
+}
/**/
#ToolBarPanelFileBrowser entry + button:hover,
@@ -1358,7 +1445,7 @@ scale + button.flat {
button.flat:hover,
button:hover {
border-color: @bg-button-border;
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
background-color: @bg-button-hover;
}
@@ -1370,7 +1457,7 @@ button.flat:checked,
button:active,
button:checked {
border-color: @bg-button-border;
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.08);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.08);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
background-color: @bg-button-active;
}
@@ -1378,19 +1465,27 @@ button:checked {
/* Add space between connected buttons */
button.Right,
button.MiddleH {
- margin-left: 0.16667em;
- border: 0.08334em solid @bg-button-border;
+ margin-left: 0.1667em;
+ border: 0.0834em solid @bg-button-border;
}
/**/
/* Applies special styles in main notebook */
#ProfilePanel {
margin-bottom: -2px;
- padding-bottom: 0.41667em;
+ padding-bottom: 0.4167em;
+}
+#ProfilePanel > label {
+ margin-bottom: 0.0834em;
}
#ProfilePanel combobox {
- margin-left: 0.16667em;
+ margin-left: 0.1667em;
+ margin-right: 0.1667em;
}
+#ProfilePanel button.Left {
+ margin-left: -2px;
+}
+
#PlacesPaned button.Left,
#PlacesPaned button.Right {
margin-top: 3px;
@@ -1401,67 +1496,93 @@ button.MiddleH {
/**/
/* Button base format for Toolbox and dialogs */
-#ToolPanelNotebook > stack > box > box > combobox .combo,
+#ToolPanelNotebook > stack > box > box > combobox button,
dialog button,
#MyExpander button,
#BatchQueueButtonsMainContainer button {
- min-height: 1.66667em;
+ min-height: 1.6666em;
min-width: 0;
padding: 0 0.375em;
- margin: 0.08334em 0;
+ margin: 0.0834em 0;
}
#MyExpander #MyFileChooserButton + button.image-button{
- min-width: 1.66667em;
+ min-width: 1.6666em;
padding: 0;
}
-combobox .combo,
-dialog combobox .combo,
-#ToolPanelNotebook combobox .combo,
-#BatchQueueButtonsMainContainer combobox .combo {
- padding: 0 0.26667em;
+
+#ToolPanelNotebook > stack > box > box > combobox button.combo,
+dialog button.combo,
+#MyExpander button.combo,
+#BatchQueueButtonsMainContainer button.combo {
+ padding: 0;
+}
+#ToolPanelNotebook > stack > box > box > combobox {
+ margin-right: 0.25em;
+}
+combobox button cellview {
+ padding: 0 0 0 0.1667em;
+}
+combobox arrow {
+ padding: 0 0.1667em 0 0;
+ margin: 0;
+}
+#MetaPanelNotebook combobox arrow {
+ padding: 0;
+ min-width: 1.25em;
+}
+.popupbutton-arrow {
+ min-width: 0;
}
/**/
/* Add/remove space between buttons and labels in toolbox*/
+#ToolPanelNotebook > stack > box > box > label {
+ margin: 0 0 0 0.25em;
+}
+
#MyExpander combobox:not(:first-child):not(:only-child),
-#MyExpander button:not(.flat).Left,
+#MyExpander .image-combo:not(:first-child),
#MyExpander button:not(.flat) + combobox,
#MyExpander combobox + button:not(.flat),
-#MyExpander combobox + combobox
-/* Crash
+#MyExpander combobox + combobox,
#MyExpander button + label,
-#MyExpander combobox + label */ {
- margin-left: 0.16667em;
+#MyExpander combobox + label {
+ margin-left: 0.1667em;
}
#MyExpander label + * > button:not(.flat).Left,
#MyExpander label + combobox:not(:first-child):not(:only-child),
#MyExpander label + button:not(.flat):not(spinbutton) {
- margin-left: 0.33334em;
+ margin-left: 0.3334em;
}
buttonbox:not(.dialog-action-area) button{
- margin: 0.08334em 0 0.33334em 0.16667em;
+ margin: 0.0834em 0 0.3334em 0.1667em;
}
#PrefNotebook buttonbox:not(.dialog-action-area) {
margin-right: -5px;
}
+#PrefNotebook radiobutton + entry + button:last-child image {
+ -gtk-icon-transform: scale(calc(17/24));
+ margin: -5px;
+}
/* Arrow toggle combo button */
-#IopsPanel button:not(.flat).Left + button:not(.flat).Right,
-#MyExpander button:not(.flat).Left + button:not(.flat).Right {
+#IopsPanel .image-combo button.Right,
+#MyExpander .image-combo button.Right {
border-left: none;
margin-left: 0;
- padding-left: 0.33334em;
- padding-right: 0.33334em;
+ padding-left: 0;
+ padding-right: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
+ min-width: 1.3333em;
}
-#IopsPanel button:not(.flat).Left,
-#MyExpander button:not(.flat).Left {
+#IopsPanel .image-combo button.Left,
+#MyExpander .image-combo button.Left {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
- min-width: 2.16667em;
+ min-width: 2.1666em;
}
/**/
@@ -1470,30 +1591,36 @@ buttonbox:not(.dialog-action-area) button{
margin: 0;/* x */
}
/* Graduated filter big button */
-#ExpanderBox > box > box:first-child > button:not(.flat):not(.text-button):first-child {
- min-height: 2.16667em;
- min-width: 2.16667em;
+#MyExpander button:not(.image-button).independent:first-child:not(.flat):only-child {
+ min-height: 2em;
+ min-width: 2em;
padding: 0;
- margin: 0 0 0.5em;
+ margin: 0 0 0.3334em;
}
-
-.popupbutton-arrow {
- min-width: 0;
+#MyExpander button:not(.image-button).independent:first-child:not(.flat):only-child image {
+ -gtk-icon-transform: scale(calc(20/24));
+ margin: -2px;
}
+/* WB pipete big button*/
+#MyExpander button.image-button.independent:first-child:not(.flat):not(:only-child) image {
+ -gtk-icon-transform: scale(calc(18/24));
+ margin: -4px;
+}
+/**/
button.color {
- min-height: 1.16667em;
+ min-height: 1.1666em;
padding: 0.25em;
}
/* Save, Cancel, OK ... buttons */
.dialog-action-area button {
- min-height: 2.16667em;
- margin-top: 0.33334em;
+ min-height: 2.1666em;
+ margin-top: 0.3334em;
}
messagedialog .dialog-action-area button {
- margin: 0 0.66667em 0.66667em 0.66667em;
- min-height: 1.83334em;
+ margin: 0 0.6667em 0.6667em 0.6667em;
+ min-height: 1.8333em;
}
messagedialog .dialog-action-area button:not(:only-child):nth-child(1) {
margin-right: 0.25em;
@@ -1510,8 +1637,8 @@ window .view button {
background-image: none;
box-shadow: none;
min-height: 2em;
- min-width: 1.33334em;
- padding: 0 0.33334em;
+ min-width: 1.3333em;
+ padding: 0 0.3334em;
margin: 0;
}
dialog .view button.text-button label,
@@ -1520,10 +1647,10 @@ window .view button.text-button label {
}
window .view button {
border: none;
- border-bottom: 0.08334em solid @border-color;
+ border-bottom: 0.0834em solid @border-color;
}
dialog .view button {
- border: 0.08334em solid @border-color;
+ border: 0.0834em solid @border-color;
}
.view button:checked,
@@ -1569,7 +1696,7 @@ window .view header button,
}
.path-bar button label {
margin: 0;
- padding: 0 0.33334em;
+ padding: 0 0.3334em;
}
/**/
@@ -1577,12 +1704,12 @@ window .view header button,
popover button.text-button {
background-color: @bg-dark-grey;
background-image: none;
- border: 0.08334em solid @border-color;
+ border: 0.0834em solid @border-color;
box-shadow: none;
background-image: none;
- margin: 0.083334em 0;
- min-height: 1.66667em;
- padding: 0 0.66667em;
+ margin: 0.08334em 0;
+ min-height: 1.6666em;
+ padding: 0 0.6667em;
}
popover button.text-button label {
padding: 0;
@@ -1606,10 +1733,10 @@ popover button.text-button:active {
/* Titlebar & Notebook buttons */
#MainNotebook > header.top > grid > button {
- margin: 0 0 0 0.41667em;
+ margin: 0 0 0 0.4167em;
}
#MainNotebook > header.left > grid > button {
- margin: 0.41667em 0 0;
+ margin: 0.4167em 0 0;
}
headerbar button.titlebutton image {
@@ -1617,9 +1744,9 @@ headerbar button.titlebutton image {
margin: 0;
}
headerbar button.titlebutton {
- margin: 0 0 0 0.33334em;
+ margin: 0 0 0 0.3334em;
background-image: none;
- border: 0.08334em solid transparent;
+ border: 0.0834em solid transparent;
background-color: transparent;
box-shadow: none;
min-width: 1.55em;
@@ -1634,7 +1761,7 @@ messagedialog headerbar button.titlebutton {
#MainNotebook tab #CloseButton {
padding: 0;
- margin: 0.33334em -3px 0.33334em 0.08334em;
+ margin: 0.3334em -2px 0.5em 0.25em;
min-width: 1.5em;
min-height: 1.5em;
}
@@ -1642,14 +1769,14 @@ messagedialog headerbar button.titlebutton {
#MainNotebook tab #CloseButton:hover,
headerbar button.titlebutton:hover{
border-color: rgba(0,0,0,.8);
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.11);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.11);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
background-color: rgba(128, 128, 128,.20);
}
#MainNotebook > header > grid > button:active,
headerbar button.titlebutton:active{
border-color: rgba(0,0,0,.8);
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.15);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.15);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
background-color: rgba(128, 128, 128,.40);
}
@@ -1657,13 +1784,13 @@ headerbar button.titlebutton:active{
headerbar button.titlebutton.close:hover{
border-color: rgba(0,0,0,.8);
background-image: linear-gradient(to bottom, rgb(180,0,0), rgb(160,0,0) 40%, rgb(130,0,0));
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.32);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.32);
}
#MainNotebook tab #CloseButton:active,
headerbar button.titlebutton.close:active{
border-color: rgba(0,0,0,.8);
background-image: linear-gradient(to bottom, rgb(215,0,0), rgb(185,0,0) 40%, rgb(150,0,0));
- box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.4);
+ box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.4);
}
/**/
@@ -1679,22 +1806,21 @@ radiobutton {
}
#PrefNotebook checkbox,
#PrefNotebook checkbutton {
- min-height: 1.6667em;
+ min-height: 1.6666em;
}
check,
radio {
- border: calc(0.083334em + 0.18px) solid @text-color;
+ border: calc(0.08334em + 0.18px) solid shade(@text-color, 0.95);
background-image: none;
background-color: transparent;
margin: 0;
padding: 0;
- min-height: 1.16667em;
- min-width: 1.16667em;
+ min-height: 1.1666em;
+ min-width: 1.1666em;
box-shadow: none;
background-repeat: no-repeat;
- -gtk-icon-shadow: none;
- color: @text-color;
+ color: shade(@text-color, 0.95);
}
radiobutton label,
checkbutton label {
@@ -1702,11 +1828,11 @@ checkbutton label {
padding: 0;
}
check {
- border-radius: 0.16667em;
+ border-radius: 0.1667em;
}
radio{
- border-radius: 1.16667em;
+ border-radius: 1.1667em;
}
check:disabled,
radio:disabled {
@@ -1719,7 +1845,7 @@ frame > checkbutton check{
#PartialPaste checkbutton:not(#PartialPasteHeader) {
min-height: 1.4em;
- margin-left: 1.16667em;
+ margin-left: 1.1667em;
}
#PartialPasteHeader {
min-height: 1.4em;
@@ -1727,7 +1853,7 @@ frame > checkbutton check{
}
#MyExpander button + checkbutton:last-child {
- margin-left: 0.33334em;
+ margin-left: 0.3334em;
}
/*** end ***************************************************************************************/
@@ -1735,44 +1861,44 @@ frame > checkbutton check{
/*** Entry & Spinbutton ************************************************************************/
#MyExpander entry,
entry {
- margin: 0.08334em 0;
- padding: 0 0.33334em;
- min-height: 1.66667em;
+ margin: 0.0834em 0;
+ padding: 0 0.3334em;
+ min-height: 1.6666em;
min-width: 0;
border-radius: 0.2em;
- box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1);
- border: 0.08334em solid @bg-entry-border;
+ box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1);
+ border: 0.0834em solid @bg-entry-border;
background-color: @bg-scale-entry;
}
spinbutton {
- margin: 0.08334em 0;
+ margin: 0.0834em 0;
padding: 0;
- min-height: 1.66667em;
+ min-height: 1.6666em;
min-width: 0;
border-radius: 0.2em;
background-color: @bg-scale-entry;
- border: 0.08334em solid @bg-entry-border;
- box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1);
+ border: 0.0834em solid @bg-entry-border;
+ box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1);
}
#MyExpander spinbutton {
- margin: 0.16667em 0;
+ margin: 0.1667em 0;
padding: 0;
- min-height: 1.33334em;
+ min-height: 1.3333em;
min-width: 0;
- border-top-left-radius: 1.83334em;
- border-bottom-left-radius: 1.83334em;
+ border-top-left-radius: 1.8334em;
+ border-bottom-left-radius: 1.8334em;
background-color: @bg-tb-spinbutton;
- border: 0.08334em solid @bg-button-border;
+ border: 0.0834em solid @bg-button-border;
color: @text-tbEntry;
- box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, .12), 0 0.08334em rgba(255, 255, 255, 0.12);
+ box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, .12), 0 0.0834em rgba(255, 255, 255, 0.12);
}
#MyExpander button + label + spinbutton {
margin: 0.25em 0; /* Needed for Reset & and Auto button height*/
}
#MyExpander checkbutton + label + spinbutton {
- margin: 0.33334em 0; /* Needed for Reset & and Auto checkbox button height*/
+ margin: 0.3334em 0; /* Needed for Reset & and Auto checkbox button height*/
}
#MyExpander image + spinbutton {
@@ -1785,17 +1911,16 @@ spinbutton button {
padding: 0;
margin: 0;
min-height: 0;
- min-width: 1.33334em;
+ min-width: 1.3333em;
background-image: none;
background-color: transparent;
border: none;
border-radius: 0;
box-shadow: none;
- -gtk-icon-shadow: none;
}
#MyExpander spinbutton entry,
spinbutton entry {
- padding: 0 0.33334em;
+ padding: 0 0.3334em;
margin: 0;
min-height: 0;
min-width: 0;
@@ -1804,7 +1929,7 @@ spinbutton entry {
background-color: transparent;
}
#MyExpander spinbutton entry {
- padding: 0 0.33334em 0 0.83334em;
+ padding: 0 0.3334em 0 0.8334em;
}
#BatchQueueButtonsMainContainer spinbutton button:hover,
@@ -1852,7 +1977,7 @@ entry:focus > selection {
.view entry {
background-color: @bg-dark-grey;
margin: 0 -2px;
- border: 0.08334em solid @accent-color;
+ border: 0.0834em solid @accent-color;
box-shadow: none;
}
/* end*/
@@ -1863,20 +1988,20 @@ entry:focus > selection {
:not(.popup):not(tooltip) > decoration {
background-color: @winHeaderbar;
background-image: none;
- border-radius: 0.41667em 0.41667em 0 0;
+ border-radius: 0.4167em 0.4167em 0 0;
border: none;
padding: 0;
- box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.5), 0 0 0 0.08334em @bg-dark-grey;
- margin: 0.83334em;
+ box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.5), 0 0 0 0.0834em @bg-dark-grey;
+ margin: 0.8334em;
}
headerbar {
background-color: shade(@winHeaderbar,1.12);
- box-shadow: inset 0 0.08334em rgba(200,200,200,.13);
+ box-shadow: inset 0 0.0834em rgba(200,200,200,.13);
background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
- border-bottom: 0.08334em solid @bg-dark-grey;
- border-radius: 0.41667em 0.41667em 0 0;
- min-height: 2.16667em;
- padding: 0.08334em 0.41667em 0;
+ border-bottom: 0.0834em solid @bg-dark-grey;
+ border-radius: 0.4167em 0.4167em 0 0;
+ min-height: 2.1666em;
+ padding: 0.0834em 0.4167em 0;
margin: 0;
}
messagedialog headerbar {
@@ -1895,7 +2020,7 @@ headerbar .title{
/* Window in background */
:not(.popup):not(tooltip) > decoration:backdrop {
- box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.3), 0 0 0 0.08334em @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.3), 0 0 0 0.0834em @bg-dark-grey;
}
headerbar:backdrop {
box-shadow: none;
diff --git a/rtdata/themes/TooWaGrey - Bright-GTK3-20_.css b/rtdata/themes/TooWaGrey - Bright-GTK3-20_.css
new file mode 100644
index 000000000..74dd5c7f0
--- /dev/null
+++ b/rtdata/themes/TooWaGrey - Bright-GTK3-20_.css
@@ -0,0 +1,72 @@
+/*
+ This file is part of RawTherapee.
+
+ Copyright (c) 2016-2017 TooWaBoo
+ Requires RT 5.0 (Gtk+ >= 3.20)
+
+ RawTherapee is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ RawTherapee is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with RawTherapee. If not, see .
+*/
+
+
+/*****************************************/
+/**/ @import "TooWaBlue-GTK3-20_.css"; /**/
+/*****************************************/
+
+/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
+
+@define-color accent-color rgb(112,112,112); /*** Active color for Lists, Menu, Borders ... * Default: rgb(35,99,166) ***/
+@define-color text-hl-color rgb(255,255,255); /*** Active text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-highlighted-text-color rgb(43,119,196); /*** Highlighted text color background* Default: rgb(35,99,166) ***/
+@define-color highlighted-text-color rgb(255,255,255); /*** Highlighted text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-image rgb(95,95,95); /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
+
+@define-color accent-color2 rgb(43,119,196); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(35,99,166) ***/
+@define-color accent-color4 rgb(135,135,135); /*** Slider knob * Default: rgb(115,115,115) ***/
+
+@define-color accent-color3 rgb(55,55,55); /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
+@define-color text-hl-color3 rgb(210,210,210); /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(119,119,119);
+@define-color bg-grey rgb(95,95,95);
+@define-color bg-dark-grey rgb(55,55,55);
+
+@define-color bg-button-hover rgba(0,0,0,.25);
+@define-color bg-button-active rgba(0,0,0,.60);
+
+@define-color winHeaderbar rgb(75,75,75);
+@define-color winTitle rgb(210,210,210);
+
+@define-color bg-tooltip rgb(210,210,210);
+@define-color border-tooltip rgb(36,36,36);
+@define-color text-tooltip rgb(36,36,36);
+/***********************************************/
+@define-color text-color rgb(210,210,210);
+@define-color text-tbEntry rgb(230,230,230);
+@define-color border-color rgba(255,255,255,.35);
+@define-color bg-list-hover rgb(75,75,75);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.45);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.25);
+@define-color headline-big rgb(210,210,210);
+@define-color headline-hl rgb(255,255,255);
+@define-color headline-frame rgb(245,245,245);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(160,160,160);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.3);
+/***********************************************************************************************/
diff --git a/rtdata/themes/TooWaGrey - Dark-GTK3-20_.css b/rtdata/themes/TooWaGrey - Dark-GTK3-20_.css
new file mode 100644
index 000000000..0f61e0935
--- /dev/null
+++ b/rtdata/themes/TooWaGrey - Dark-GTK3-20_.css
@@ -0,0 +1,72 @@
+/*
+ This file is part of RawTherapee.
+
+ Copyright (c) 2016-2017 TooWaBoo
+ Requires RT 5.0 (Gtk+ >= 3.20)
+
+ RawTherapee is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ RawTherapee is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with RawTherapee. If not, see .
+*/
+
+
+/*****************************************/
+/**/ @import "TooWaBlue-GTK3-20_.css"; /**/
+/*****************************************/
+
+/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
+
+@define-color accent-color rgb(65,65,65); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
+@define-color text-hl-color rgb(200,200,200); /*** Active text color * Default: rgb(200,200,200) ***/
+
+@define-color bg-highlighted-text-color rgb(33,82,150); /*** Highlighted text color background* Default: rgb(33,82,145) ***/
+@define-color highlighted-text-color rgb(200,200,200); /*** Highlighted text color * Default: rgb(200,200,200) ***/
+
+@define-color bg-image rgb(58,58,58); /*** Image area & File Browser background * Default: rgb(58,58,58) ***/
+
+@define-color accent-color2 rgb(33,82,150); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
+@define-color accent-color4 rgb(98,98,98); /*** Slider knob * Default: rgb(98,98,98) ***/
+
+@define-color accent-color3 rgb(30,30,30); /*** Selected thumbnail background color * Default: rgb(33,82,145) ***/
+@define-color text-hl-color3 rgb(200,200,200); /*** Selected thumbnail text color * Default: rgb(200,200,200) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(75,75,75);
+@define-color bg-grey rgb(58,58,58);
+@define-color bg-dark-grey rgb(30,30,30);
+
+@define-color bg-button-hover rgba(0,0,0,.3);
+@define-color bg-button-active rgba(0,0,0,.7);
+
+@define-color winHeaderbar rgb(50,50,50);
+@define-color winTitle rgb(190,190,190);
+
+@define-color bg-tooltip rgb(170,170,170);
+@define-color border-tooltip rgb(36,36,36);
+@define-color text-tooltip rgb(36,36,36);
+/***********************************************/
+@define-color text-color rgb(176,176,176);
+@define-color text-tbEntry rgb(192,192,192);
+@define-color border-color rgba(255,255,255,.30);
+@define-color bg-list-hover rgb(50,50,50);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.60);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.15);
+@define-color headline-big rgb(187,187,187);
+@define-color headline-hl rgb(215,215,215);
+@define-color headline-frame rgb(210,210,210);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(128,128,128);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.35);
+/***********************************************************************************************/
diff --git a/rtdata/themes/TooWaGrey-GTK3-20_.css b/rtdata/themes/TooWaGrey-GTK3-20_.css
new file mode 100644
index 000000000..f681ef374
--- /dev/null
+++ b/rtdata/themes/TooWaGrey-GTK3-20_.css
@@ -0,0 +1,72 @@
+/*
+ This file is part of RawTherapee.
+
+ Copyright (c) 2016-2017 TooWaBoo
+ Version 2.66
+
+ RawTherapee is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ RawTherapee is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with RawTherapee. If not, see .
+*/
+
+
+/*****************************************/
+/**/ @import "TooWaBlue-GTK3-20_.css"; /**/
+/*****************************************/
+
+/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
+
+@define-color accent-color rgb(88,88,88); /*** Active color for Lists, Menu, Borders ... * Default: rgb(35,99,166) ***/
+@define-color text-hl-color rgb(210,210,210); /*** Active text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-highlighted-text-color rgb(35,99,166); /*** Highlighted text color background* Default: rgb(35,99,166) ***/
+@define-color highlighted-text-color rgb(210,210,210); /*** Highlighted text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-image rgb(75,75,75); /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
+
+@define-color accent-color2 rgb(35,99,166); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(35,99,166) ***/
+@define-color accent-color4 rgb(115,115,115); /*** Slider knob * Default: rgb(115,115,115) ***/
+
+@define-color accent-color3 rgb(40,40,40); /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
+@define-color text-hl-color3 rgb(210,210,210); /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(95,95,95);
+@define-color bg-grey rgb(75,75,75);
+@define-color bg-dark-grey rgb(40,40,40);
+
+@define-color bg-button-hover rgba(0,0,0,.25);
+@define-color bg-button-active rgba(0,0,0,.60);
+
+@define-color winHeaderbar rgb(55,55,55);
+@define-color winTitle rgb(190,190,190);
+
+@define-color bg-tooltip rgb(185,185,185);
+@define-color border-tooltip rgb(40,40,40);
+@define-color text-tooltip rgb(40,40,40);
+/***********************************************/
+@define-color text-color rgb(186,186,186);
+@define-color text-tbEntry rgb(192,192,192);
+@define-color border-color rgba(255,255,255,.30);
+@define-color bg-list-hover rgb(50,50,50);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.60);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.15);
+@define-color headline-big rgb(195,195,195);
+@define-color headline-hl rgb(230,230,230);
+@define-color headline-frame rgb(215,215,215);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(128,128,128);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.33);
+/***********************************************************************************************/
diff --git a/rtengine/CA_correct_RT.cc b/rtengine/CA_correct_RT.cc
index a2f34584f..a27ee7998 100644
--- a/rtengine/CA_correct_RT.cc
+++ b/rtengine/CA_correct_RT.cc
@@ -1,11 +1,11 @@
////////////////////////////////////////////////////////////////
//
-// Chromatic Aberration Auto-correction
+// Chromatic Aberration correction on raw bayer cfa data
//
-// copyright (c) 2008-2010 Emil Martinec
+// copyright (c) 2008-2010 Emil Martinec
+// copyright (c) for improvements (speedups, iterated correction and avoid colour shift) 2018 Ingo Weyrich
//
-//
-// code dated: November 26, 2010
+// code dated: September 8, 2018
//
// CA_correct_RT.cc is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,19 +14,20 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
//
////////////////////////////////////////////////////////////////
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#include "rtengine.h"
#include "rawimagesource.h"
#include "rt_math.h"
+#include "gauss.h"
#include "median.h"
+//#define BENCHMARK
#include "StopWatch.h"
namespace {
@@ -49,22 +50,22 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
int i, j, k;
- for(k = 0; k < (nDim - 1); k++) { // base row of matrix
+ for (k = 0; k < (nDim - 1); k++) { // base row of matrix
// search of line with max element
- double fMaxElem = fabs( pfMatr[k * nDim + k] );
+ double fMaxElem = fabs(pfMatr[k * nDim + k]);
int m = k;
for (i = k + 1; i < nDim; i++) {
- if(fMaxElem < fabs(pfMatr[i * nDim + k]) ) {
+ if (fMaxElem < fabs(pfMatr[i * nDim + k])) {
fMaxElem = pfMatr[i * nDim + k];
m = i;
}
}
// permutation of base line (index k) and max element line(index m)
- if(m != k) {
- for(i = k; i < nDim; i++) {
- fAcc = pfMatr[k * nDim + i];
+ if (m != k) {
+ for (i = k; i < nDim; i++) {
+ fAcc = pfMatr[k * nDim + i];
pfMatr[k * nDim + i] = pfMatr[m * nDim + i];
pfMatr[m * nDim + i] = fAcc;
}
@@ -74,16 +75,16 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
pfVect[m] = fAcc;
}
- if( pfMatr[k * nDim + k] == 0.) {
+ if (pfMatr[k * nDim + k] == 0.) {
//linear system has no solution
return false; // needs improvement !!!
}
// triangulation of matrix with coefficients
- for(j = (k + 1); j < nDim; j++) { // current row of matrix
+ for (j = (k + 1); j < nDim; j++) { // current row of matrix
fAcc = - pfMatr[j * nDim + k] / pfMatr[k * nDim + k];
- for(i = k; i < nDim; i++) {
+ for (i = k; i < nDim; i++) {
pfMatr[j * nDim + i] = pfMatr[j * nDim + i] + fAcc * pfMatr[k * nDim + i];
}
@@ -91,10 +92,10 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
}
}
- for(k = (nDim - 1); k >= 0; k--) {
+ for (k = (nDim - 1); k >= 0; k--) {
pfSolution[k] = pfVect[k];
- for(i = (k + 1); i < nDim; i++) {
+ for (i = (k + 1); i < nDim; i++) {
pfSolution[k] -= (pfMatr[k * nDim + i] * pfSolution[i]);
}
@@ -104,32 +105,61 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
return true;
}
//end of linear equation solver
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
}
using namespace std;
using namespace rtengine;
-float* RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const double cablue, const double caautostrength, array2D &rawData, double *fitParamsTransfer, bool fitParamsIn, bool fitParamsOut, float *buffer, bool freeBuffer)
+float* RawImageSource::CA_correct_RT(
+ bool autoCA,
+ size_t autoIterations,
+ double cared,
+ double cablue,
+ bool avoidColourshift,
+ const array2D &rawData,
+ double* fitParamsTransfer,
+ bool fitParamsIn,
+ bool fitParamsOut,
+ float* buffer,
+ bool freeBuffer
+)
{
+ BENCHFUN
// multithreaded and vectorized by Ingo Weyrich
constexpr int ts = 128;
constexpr int tsh = ts / 2;
- //shifts to location of vertical and diagonal neighbors
+ //shifts to location of vertical and diagonal neighbours
constexpr int v1 = ts, v2 = 2 * ts, v3 = 3 * ts, v4 = 4 * ts; //, p1=-ts+1, p2=-2*ts+2, p3=-3*ts+3, m1=ts+1, m2=2*ts+2, m3=3*ts+3;
// Test for RGB cfa
- for(int i = 0; i < 2; i++)
- for(int j = 0; j < 2; j++)
- if(FC(i, j) == 3) {
- printf("CA correction supports only RGB Colour filter arrays\n");
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < 2; j++) {
+ if (FC(i, j) == 3) {
+ std::cout << "CA correction supports only RGB Colour filter arrays" << std::endl;
return buffer;
}
+ }
+ }
- volatile double progress = 0.0;
+ array2D* redFactor = nullptr;
+ array2D* blueFactor = nullptr;
+ array2D* oldraw = nullptr;
+ if (avoidColourshift) {
+ redFactor = new array2D((W+1)/2, (H+1)/2);
+ blueFactor = new array2D((W+1)/2, (H+1)/2);
+ oldraw = new array2D((W + 1) / 2, H);
+ // copy raw values before ca correction
+ #pragma omp parallel for
+ for (int i = 0; i < H; ++i) {
+ for (int j = FC(i, 0) & 1; j < W; j += 2) {
+ (*oldraw)[i][j / 2] = rawData[i][j];
+ }
+ }
+ }
- if(plistener) {
+ double progress = 0.0;
+
+ if (plistener) {
plistener->setProgress (progress);
}
@@ -147,1064 +177,1153 @@ float* RawImageSource::CA_correct_RT(const bool autoCA, const double cared, cons
if (!buffer) {
buffer = static_cast(malloc ((height * width + vblsz * hblsz * (2 * 2 + 1)) * sizeof(float)));
}
- float *Gtmp = buffer;
- float *RawDataTmp = buffer + (height * width) / 2;
+ float* Gtmp = buffer;
+ float* RawDataTmp = buffer + (height * width) / 2;
//block CA shift values and weight assigned to block
- float *const blockwt = buffer + (height * width);
+ float* const blockwt = buffer + (height * width);
memset(blockwt, 0, vblsz * hblsz * (2 * 2 + 1) * sizeof(float));
float (*blockshifts)[2][2] = (float (*)[2][2])(blockwt + vblsz * hblsz);
- float blockave[2][2] = {{0, 0}, {0, 0}}, blocksqave[2][2] = {{0, 0}, {0, 0}}, blockdenom[2][2] = {{0, 0}, {0, 0}}, blockvar[2][2];
-
// Because we can't break parallel processing, we need a switch do handle the errors
bool processpasstwo = true;
-
double fitparams[2][2][16];
- const bool fitParamsSet = fitParamsTransfer && fitParamsIn;
- if(autoCA && fitParamsSet) {
+
+ const size_t iterations =
+ autoCA
+ ? std::max(autoIterations, 1)
+ : 1;
+
+ const bool fitParamsSet = fitParamsTransfer && fitParamsIn && iterations < 2;
+ if (autoCA && fitParamsSet) {
// use stored parameters
int index = 0;
- for(int c = 0; c < 2; ++c) {
- for(int d = 0; d < 2; ++d) {
- for(int e = 0; e < 16; ++e) {
+ for (int c = 0; c < 2; ++c) {
+ for (int d = 0; d < 2; ++d) {
+ for (int e = 0; e < 16; ++e) {
fitparams[c][d][e] = fitParamsTransfer[index++];
}
}
}
}
- //order of 2d polynomial fit (polyord), and numpar=polyord^2
- int polyord = 4, numpar = 16;
- constexpr float eps = 1e-5f, eps2 = 1e-10f; //tolerance to avoid dividing by zero
+ for (size_t it = 0; it < iterations && processpasstwo; ++it) {
+ float blockave[2][2] = {};
+ float blocksqave[2][2] = {};
+ float blockdenom[2][2] = {};
+ float blockvar[2][2];
- #pragma omp parallel
- {
- int progresscounter = 0;
+ //order of 2d polynomial fit (polyord), and numpar=polyord^2
+ int polyord = 4, numpar = 16;
- //direction of the CA shift in a tile
- int GRBdir[2][3];
+ constexpr float eps = 1e-5f, eps2 = 1e-10f; //tolerance to avoid dividing by zero
- int shifthfloor[3], shiftvfloor[3], shifthceil[3], shiftvceil[3];
+ #pragma omp parallel
+ {
+ int progresscounter = 0;
- //polynomial fit coefficients
- //residual CA shift amount within a plaquette
- float shifthfrac[3], shiftvfrac[3];
+ //direction of the CA shift in a tile
+ int GRBdir[2][3];
- // assign working space
- constexpr int buffersize = sizeof(float) * ts * ts + 8 * sizeof(float) * ts * tsh + 8 * 64 + 63;
- constexpr int buffersizePassTwo = sizeof(float) * ts * ts + 4 * sizeof(float) * ts * tsh + 4 * 64 + 63;
- char * const bufferThr = (char *) malloc((autoCA && !fitParamsSet) ? buffersize : buffersizePassTwo);
+ int shifthfloor[3], shiftvfloor[3], shifthceil[3], shiftvceil[3];
- char * const data = (char*)( ( uintptr_t(bufferThr) + uintptr_t(63)) / 64 * 64);
+ //polynomial fit coefficients
+ //residual CA shift amount within a plaquette
+ float shifthfrac[3], shiftvfrac[3];
- // shift the beginning of all arrays but the first by 64 bytes to avoid cache miss conflicts on CPUs which have <= 4-way associative L1-Cache
+ // assign working space
+ constexpr int buffersize = sizeof(float) * ts * ts + 8 * sizeof(float) * ts * tsh + 8 * 64 + 63;
+ constexpr int buffersizePassTwo = sizeof(float) * ts * ts + 4 * sizeof(float) * ts * tsh + 4 * 64 + 63;
+ char * const bufferThr = (char *) malloc((autoCA && !fitParamsSet) ? buffersize : buffersizePassTwo);
- //rgb data in a tile
- float* rgb[3];
- rgb[0] = (float (*)) data;
- rgb[1] = (float (*)) (data + sizeof(float) * ts * tsh + 1 * 64);
- rgb[2] = (float (*)) (data + sizeof(float) * (ts * ts + ts * tsh) + 2 * 64);
+ char * const data = (char*)((uintptr_t(bufferThr) + uintptr_t(63)) / 64 * 64);
- if (autoCA && !fitParamsSet) {
- //high pass filter for R/B in vertical direction
- float *rbhpfh = (float (*)) (data + 2 * sizeof(float) * ts * ts + 3 * 64);
- //high pass filter for R/B in horizontal direction
- float *rbhpfv = (float (*)) (data + 2 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 4 * 64);
- //low pass filter for R/B in horizontal direction
- float *rblpfh = (float (*)) (data + 3 * sizeof(float) * ts * ts + 5 * 64);
- //low pass filter for R/B in vertical direction
- float *rblpfv = (float (*)) (data + 3 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 6 * 64);
- //low pass filter for colour differences in horizontal direction
- float *grblpfh = (float (*)) (data + 4 * sizeof(float) * ts * ts + 7 * 64);
- //low pass filter for colour differences in vertical direction
- float *grblpfv = (float (*)) (data + 4 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 8 * 64);
- // Main algorithm: Tile loop calculating correction parameters per tile
+ // shift the beginning of all arrays but the first by 64 bytes to avoid cache miss conflicts on CPUs which have <= 4-way associative L1-Cache
- //local quadratic fit to shift data within a tile
- float coeff[2][3][2];
- //measured CA shift parameters for a tile
- float CAshift[2][2];
+ //rgb data in a tile
+ float* rgb[3];
+ rgb[0] = (float*) data;
+ rgb[1] = (float*) (data + sizeof(float) * ts * tsh + 1 * 64);
+ rgb[2] = (float*) (data + sizeof(float) * (ts * ts + ts * tsh) + 2 * 64);
- //per thread data for evaluation of block CA shift variance
- float blockavethr[2][2] = {{0, 0}, {0, 0}}, blocksqavethr[2][2] = {{0, 0}, {0, 0}}, blockdenomthr[2][2] = {{0, 0}, {0, 0}};
+ if (autoCA && !fitParamsSet) {
+ constexpr float caAutostrength = 8.f;
+ //high pass filter for R/B in vertical direction
+ float* rbhpfh = (float*) (data + 2 * sizeof(float) * ts * ts + 3 * 64);
+ //high pass filter for R/B in horizontal direction
+ float* rbhpfv = (float*) (data + 2 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 4 * 64);
+ //low pass filter for R/B in horizontal direction
+ float* rblpfh = (float*) (data + 3 * sizeof(float) * ts * ts + 5 * 64);
+ //low pass filter for R/B in vertical direction
+ float* rblpfv = (float*) (data + 3 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 6 * 64);
+ //low pass filter for colour differences in horizontal direction
+ float* grblpfh = (float*) (data + 4 * sizeof(float) * ts * ts + 7 * 64);
+ //low pass filter for colour differences in vertical direction
+ float* grblpfv = (float*) (data + 4 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 8 * 64);
+ // Main algorithm: Tile loop calculating correction parameters per tile
- #pragma omp for collapse(2) schedule(dynamic) nowait
- for (int top = -border ; top < height; top += ts - border2)
- for (int left = -border; left < width - (W & 1); left += ts - border2) {
- memset(bufferThr, 0, buffersize);
- const int vblock = ((top + border) / (ts - border2)) + 1;
- const int hblock = ((left + border) / (ts - border2)) + 1;
- const int bottom = min(top + ts, height + border);
- const int right = min(left + ts, width - (W & 1) + border);
- const int rr1 = bottom - top;
- const int cc1 = right - left;
- const int rrmin = top < 0 ? border : 0;
- const int rrmax = bottom > height ? height - top : rr1;
- const int ccmin = left < 0 ? border : 0;
- const int ccmax = (right > width - (W & 1)) ? width - (W & 1) - left : cc1;
+ //local quadratic fit to shift data within a tile
+ float coeff[2][3][2];
+ //measured CA shift parameters for a tile
+ float CAshift[2][2];
- // rgb from input CFA data
- // rgb values should be floating point numbers between 0 and 1
- // after white balance multipliers are applied
+ //per thread data for evaluation of block CA shift variance
+ float blockavethr[2][2] = {};
+ float blocksqavethr[2][2] = {};
+ float blockdenomthr[2][2] = {};
+
+ #pragma omp for collapse(2) schedule(dynamic) nowait
+ for (int top = -border ; top < height; top += ts - border2) {
+ for (int left = -border; left < width - (W & 1); left += ts - border2) {
+ memset(bufferThr, 0, buffersize);
+ const int vblock = (top + border) / (ts - border2) + 1;
+ const int hblock = (left + border) / (ts - border2) + 1;
+ const int bottom = min(top + ts, height + border);
+ const int right = min(left + ts, width - (W & 1) + border);
+ const int rr1 = bottom - top;
+ const int cc1 = right - left;
+ const int rrmin = top < 0 ? border : 0;
+ const int rrmax = bottom > height ? height - top : rr1;
+ const int ccmin = left < 0 ? border : 0;
+ const int ccmax = (right > width - (W & 1)) ? width - (W & 1) - left : cc1;
+
+ // rgb from input CFA data
+ // rgb values should be floating point numbers between 0 and 1
+ // after white balance multipliers are applied
#ifdef __SSE2__
- vfloat c65535v = F2V(65535.f);
+ vfloat c65535v = F2V(65535.f);
#endif
- for (int rr = rrmin; rr < rrmax; rr++) {
- int row = rr + top;
- int cc = ccmin;
- int col = cc + left;
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ int row = rr + top;
+ int cc = ccmin;
+ int col = cc + left;
#ifdef __SSE2__
- int c0 = FC(rr, cc);
- if(c0 == 1) {
- rgb[c0][rr * ts + cc] = rawData[row][col] / 65535.f;
- cc++;
- col++;
- c0 = FC(rr, cc);
- }
- int indx1 = rr * ts + cc;
- for (; cc < ccmax - 7; cc+=8, col+=8, indx1 += 8) {
- vfloat val1 = LVFU(rawData[row][col]) / c65535v;
- vfloat val2 = LVFU(rawData[row][col + 4]) / c65535v;
- vfloat nonGreenv = _mm_shuffle_ps(val1,val2,_MM_SHUFFLE( 2,0,2,0 ));
- STVFU(rgb[c0][indx1 >> 1], nonGreenv);
- STVFU(rgb[1][indx1], val1);
- STVFU(rgb[1][indx1 + 4], val2);
- }
-#endif
- for (; cc < ccmax; cc++, col++) {
- int c = FC(rr, cc);
+ int c0 = FC(rr, cc);
+ if (c0 == 1) {
+ rgb[c0][rr * ts + cc] = rawData[row][col] / 65535.f;
+ cc++;
+ col++;
+ c0 = FC(rr, cc);
+ }
int indx1 = rr * ts + cc;
- rgb[c][indx1 >> ((c & 1) ^ 1)] = rawData[row][col] / 65535.f;
- }
- }
-
- // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- //fill borders
- if (rrmin > 0) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = ccmin; cc < ccmax; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][((border2 - rr) * ts + cc) >> ((c & 1) ^ 1)];
- }
- }
-
- if (rrmax < rr1) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = ccmin; cc < ccmax; cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][left + cc] / 65535.f;
- }
- }
-
- if (ccmin > 0) {
- for (int rr = rrmin; rr < rrmax; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][(rr * ts + border2 - cc) >> ((c & 1) ^ 1)];
- }
- }
-
- if (ccmax < cc1) {
- for (int rr = rrmin; rr < rrmax; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(top + rr)][(width - cc - 2)] / 65535.f;
- }
- }
-
- //also, fill the image corners
- if (rrmin > 0 && ccmin > 0) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rawData[border2 - rr][border2 - cc] / 65535.f;
- }
- }
-
- if (rrmax < rr1 && ccmax < cc1) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][(width - cc - 2)] / 65535.f;
- }
- }
-
- if (rrmin > 0 && ccmax < cc1) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(border2 - rr)][(width - cc - 2)] / 65535.f;
- }
- }
-
- if (rrmax < rr1 && ccmin > 0) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][(border2 - cc)] / 65535.f;
- }
- }
-
- //end of border fill
- // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- //end of initialization
-
-
-#ifdef __SSE2__
- vfloat onev = F2V(1.f);
- vfloat epsv = F2V(eps);
-#endif
- for (int rr = 3; rr < rr1 - 3; rr++) {
- int row = rr + top;
- int cc = 3 + (FC(rr,3) & 1);
- int indx = rr * ts + cc;
- int c = FC(rr,cc);
-#ifdef __SSE2__
- for (; cc < cc1 - 9; cc+=8, indx+=8) {
- //compute directional weights using image gradients
- vfloat rgb1mv1v = LC2VFU(rgb[1][indx - v1]);
- vfloat rgb1pv1v = LC2VFU(rgb[1][indx + v1]);
- vfloat rgbcv = LVFU(rgb[c][indx >> 1]);
- vfloat temp1v = epsv + vabsf(rgb1mv1v - rgb1pv1v);
- vfloat wtuv = onev / SQRV(temp1v + vabsf(rgbcv - LVFU(rgb[c][(indx - v2) >> 1])) + vabsf(rgb1mv1v - LC2VFU(rgb[1][indx - v3])));
- vfloat wtdv = onev / SQRV(temp1v + vabsf(rgbcv - LVFU(rgb[c][(indx + v2) >> 1])) + vabsf(rgb1pv1v - LC2VFU(rgb[1][indx + v3])));
- vfloat rgb1m1v = LC2VFU(rgb[1][indx - 1]);
- vfloat rgb1p1v = LC2VFU(rgb[1][indx + 1]);
- vfloat temp2v = epsv + vabsf(rgb1m1v - rgb1p1v);
- vfloat wtlv = onev / SQRV(temp2v + vabsf(rgbcv - LVFU(rgb[c][(indx - 2) >> 1])) + vabsf(rgb1m1v - LC2VFU(rgb[1][indx - 3])));
- vfloat wtrv = onev / SQRV(temp2v + vabsf(rgbcv - LVFU(rgb[c][(indx + 2) >> 1])) + vabsf(rgb1p1v - LC2VFU(rgb[1][indx + 3])));
-
- //store in rgb array the interpolated G value at R/B grid points using directional weighted average
- STC2VFU(rgb[1][indx], (wtuv * rgb1mv1v + wtdv * rgb1pv1v + wtlv * rgb1m1v + wtrv * rgb1p1v) / (wtuv + wtdv + wtlv + wtrv));
- }
-
-#endif
- for (; cc < cc1 - 3; cc+=2, indx+=2) {
- //compute directional weights using image gradients
- float wtu = 1.f / SQR(eps + fabsf(rgb[1][indx + v1] - rgb[1][indx - v1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx - v2) >> 1]) + fabsf(rgb[1][indx - v1] - rgb[1][indx - v3]));
- float wtd = 1.f / SQR(eps + fabsf(rgb[1][indx - v1] - rgb[1][indx + v1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx + v2) >> 1]) + fabsf(rgb[1][indx + v1] - rgb[1][indx + v3]));
- float wtl = 1.f / SQR(eps + fabsf(rgb[1][indx + 1] - rgb[1][indx - 1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx - 2) >> 1]) + fabsf(rgb[1][indx - 1] - rgb[1][indx - 3]));
- float wtr = 1.f / SQR(eps + fabsf(rgb[1][indx - 1] - rgb[1][indx + 1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx + 2) >> 1]) + fabsf(rgb[1][indx + 1] - rgb[1][indx + 3]));
-
- //store in rgb array the interpolated G value at R/B grid points using directional weighted average
- rgb[1][indx] = (wtu * rgb[1][indx - v1] + wtd * rgb[1][indx + v1] + wtl * rgb[1][indx - 1] + wtr * rgb[1][indx + 1]) / (wtu + wtd + wtl + wtr);
- }
-
- if (row > -1 && row < height) {
- int offset = (FC(row,max(left + 3, 0)) & 1);
- int col = max(left + 3, 0) + offset;
- int indx = rr * ts + 3 - (left < 0 ? (left+3) : 0) + offset;
-#ifdef __SSE2__
- for(; col < min(cc1 + left - 3, width) - 7; col+=8, indx+=8) {
- STVFU(Gtmp[(row * width + col) >> 1], LC2VFU(rgb[1][indx]));
+ for (; cc < ccmax - 7; cc+=8, col+=8, indx1 += 8) {
+ vfloat val1 = LVFU(rawData[row][col]) / c65535v;
+ vfloat val2 = LVFU(rawData[row][col + 4]) / c65535v;
+ vfloat nonGreenv = _mm_shuffle_ps(val1,val2,_MM_SHUFFLE(2,0,2,0));
+ STVFU(rgb[c0][indx1 >> 1], nonGreenv);
+ STVFU(rgb[1][indx1], val1);
+ STVFU(rgb[1][indx1 + 4], val2);
}
#endif
- for(; col < min(cc1 + left - 3, width); col+=2, indx+=2) {
- Gtmp[(row * width + col) >> 1] = rgb[1][indx];
+ for (; cc < ccmax; cc++, col++) {
+ int c = FC(rr, cc);
+ int indx1 = rr * ts + cc;
+ rgb[c][indx1 >> ((c & 1) ^ 1)] = rawData[row][col] / 65535.f;
}
}
- }
- //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#ifdef __SSE2__
- vfloat zd25v = F2V(0.25f);
-#endif
- for (int rr = 4; rr < rr1 - 4; rr++) {
- int cc = 4 + (FC(rr, 2) & 1);
- int indx = rr * ts + cc;
- int c = FC(rr, cc);
-#ifdef __SSE2__
- for (; cc < cc1 - 10; cc += 8, indx += 8) {
- vfloat rgb1v = LC2VFU(rgb[1][indx]);
- vfloat rgbcv = LVFU(rgb[c][indx >> 1]);
- vfloat rgb1mv4 = LC2VFU(rgb[1][indx - v4]);
- vfloat rgb1pv4 = LC2VFU(rgb[1][indx + v4]);
- vfloat temp1v = vabsf(vabsf((rgb1v - rgbcv) - (rgb1pv4 - LVFU(rgb[c][(indx + v4) >> 1]))) +
- vabsf(rgb1mv4 - LVFU(rgb[c][(indx - v4) >> 1]) - rgb1v + rgbcv) -
- vabsf(rgb1mv4 - LVFU(rgb[c][(indx - v4) >> 1]) - rgb1pv4 + LVFU(rgb[c][(indx + v4) >> 1])));
- STVFU(rbhpfv[indx >> 1], temp1v);
- vfloat rgb1m4 = LC2VFU(rgb[1][indx - 4]);
- vfloat rgb1p4 = LC2VFU(rgb[1][indx + 4]);
- vfloat temp2v = vabsf(vabsf((rgb1v - rgbcv) - (rgb1p4 - LVFU(rgb[c][(indx + 4) >> 1]))) +
- vabsf(rgb1m4 - LVFU(rgb[c][(indx - 4) >> 1]) - rgb1v + rgbcv) -
- vabsf(rgb1m4 - LVFU(rgb[c][(indx - 4) >> 1]) - rgb1p4 + LVFU(rgb[c][(indx + 4) >> 1])));
- STVFU(rbhpfh[indx >> 1], temp2v);
-
- //low and high pass 1D filters of G in vertical/horizontal directions
- rgb1v = vmul2f(rgb1v);
- vfloat glpfvv = (rgb1v + LC2VFU(rgb[1][indx + v2]) + LC2VFU(rgb[1][indx - v2]));
- vfloat glpfhv = (rgb1v + LC2VFU(rgb[1][indx + 2]) + LC2VFU(rgb[1][indx - 2]));
- rgbcv = vmul2f(rgbcv);
- STVFU(rblpfv[indx >> 1], zd25v * vabsf(glpfvv - (rgbcv + LVFU(rgb[c][(indx + v2) >> 1]) + LVFU(rgb[c][(indx - v2) >> 1]))));
- STVFU(rblpfh[indx >> 1], zd25v * vabsf(glpfhv - (rgbcv + LVFU(rgb[c][(indx + 2) >> 1]) + LVFU(rgb[c][(indx - 2) >> 1]))));
- STVFU(grblpfv[indx >> 1], zd25v * (glpfvv + (rgbcv + LVFU(rgb[c][(indx + v2) >> 1]) + LVFU(rgb[c][(indx - v2) >> 1]))));
- STVFU(grblpfh[indx >> 1], zd25v * (glpfhv + (rgbcv + LVFU(rgb[c][(indx + 2) >> 1]) + LVFU(rgb[c][(indx - 2) >> 1]))));
- }
-
-#endif
- for (; cc < cc1 - 4; cc += 2, indx += 2) {
- rbhpfv[indx >> 1] = fabsf(fabsf((rgb[1][indx] - rgb[c][indx >> 1]) - (rgb[1][indx + v4] - rgb[c][(indx + v4) >> 1])) +
- fabsf((rgb[1][indx - v4] - rgb[c][(indx - v4) >> 1]) - (rgb[1][indx] - rgb[c][indx >> 1])) -
- fabsf((rgb[1][indx - v4] - rgb[c][(indx - v4) >> 1]) - (rgb[1][indx + v4] - rgb[c][(indx + v4) >> 1])));
- rbhpfh[indx >> 1] = fabsf(fabsf((rgb[1][indx] - rgb[c][indx >> 1]) - (rgb[1][indx + 4] - rgb[c][(indx + 4) >> 1])) +
- fabsf((rgb[1][indx - 4] - rgb[c][(indx - 4) >> 1]) - (rgb[1][indx] - rgb[c][indx >> 1])) -
- fabsf((rgb[1][indx - 4] - rgb[c][(indx - 4) >> 1]) - (rgb[1][indx + 4] - rgb[c][(indx + 4) >> 1])));
-
- //low and high pass 1D filters of G in vertical/horizontal directions
- float glpfv = (2.f * rgb[1][indx] + rgb[1][indx + v2] + rgb[1][indx - v2]);
- float glpfh = (2.f * rgb[1][indx] + rgb[1][indx + 2] + rgb[1][indx - 2]);
- rblpfv[indx >> 1] = 0.25f * fabsf(glpfv - (2.f * rgb[c][indx >> 1] + rgb[c][(indx + v2) >> 1] + rgb[c][(indx - v2) >> 1]));
- rblpfh[indx >> 1] = 0.25f * fabsf(glpfh - (2.f * rgb[c][indx >> 1] + rgb[c][(indx + 2) >> 1] + rgb[c][(indx - 2) >> 1]));
- grblpfv[indx >> 1] = 0.25f * (glpfv + (2.f * rgb[c][indx >> 1] + rgb[c][(indx + v2) >> 1] + rgb[c][(indx - v2) >> 1]));
- grblpfh[indx >> 1] = 0.25f * (glpfh + (2.f * rgb[c][indx >> 1] + rgb[c][(indx + 2) >> 1] + rgb[c][(indx - 2) >> 1]));
- }
- }
-
- for (int dir = 0; dir < 2; dir++) {
- for (int k = 0; k < 3; k++) {
- for (int c = 0; c < 2; c++) {
- coeff[dir][k][c] = 0;
- }
- }
- }
-
-#ifdef __SSE2__
- vfloat zd3v = F2V(0.3f);
- vfloat zd1v = F2V(0.1f);
- vfloat zd5v = F2V(0.5f);
-#endif
-
- // along line segments, find the point along each segment that minimizes the colour variance
- // averaged over the tile; evaluate for up/down and left/right away from R/B grid point
- for (int rr = 8; rr < rr1 - 8; rr++) {
- int cc = 8 + (FC(rr, 2) & 1);
- int indx = rr * ts + cc;
- int c = FC(rr, cc);
-#ifdef __SSE2__
- vfloat coeff00v = ZEROV;
- vfloat coeff01v = ZEROV;
- vfloat coeff02v = ZEROV;
- vfloat coeff10v = ZEROV;
- vfloat coeff11v = ZEROV;
- vfloat coeff12v = ZEROV;
- for (; cc < cc1 - 14; cc += 8, indx += 8) {
-
- //in linear interpolation, colour differences are a quadratic function of interpolation position;
- //solve for the interpolation position that minimizes colour difference variance over the tile
-
- //vertical
- vfloat temp1 = zd3v * (LC2VFU(rgb[1][indx + ts + 1]) - LC2VFU(rgb[1][indx - ts - 1]));
- vfloat temp2 = zd3v * (LC2VFU(rgb[1][indx - ts + 1]) - LC2VFU(rgb[1][indx + ts - 1]));
- vfloat gdiffvv = (LC2VFU(rgb[1][indx + ts]) - LC2VFU(rgb[1][indx - ts])) + (temp1 - temp2);
- vfloat deltgrbv = LVFU(rgb[c][indx >> 1]) - LC2VFU(rgb[1][indx]);
-
- vfloat gradwtvv = (LVFU(rbhpfv[indx >> 1]) + zd5v * (LVFU(rbhpfv[(indx >> 1) + 1]) + LVFU(rbhpfv[(indx >> 1) - 1]))) * (LVFU(grblpfv[(indx >> 1) - v1]) + LVFU(grblpfv[(indx >> 1) + v1])) / (epsv + zd1v * (LVFU(grblpfv[(indx >> 1) - v1]) + LVFU(grblpfv[(indx >> 1) + v1])) + LVFU(rblpfv[(indx >> 1) - v1]) + LVFU(rblpfv[(indx >> 1) + v1]));
-
- coeff00v += gradwtvv * deltgrbv * deltgrbv;
- coeff01v += gradwtvv * gdiffvv * deltgrbv;
- coeff02v += gradwtvv * gdiffvv * gdiffvv;
-
- //horizontal
- vfloat gdiffhv = (LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx - 1])) + (temp1 + temp2);
-
- vfloat gradwthv = (LVFU(rbhpfh[indx >> 1]) + zd5v * (LVFU(rbhpfh[(indx >> 1) + v1]) + LVFU(rbhpfh[(indx >> 1) - v1]))) * (LVFU(grblpfh[(indx >> 1) - 1]) + LVFU(grblpfh[(indx >> 1) + 1])) / (epsv + zd1v * (LVFU(grblpfh[(indx >> 1) - 1]) + LVFU(grblpfh[(indx >> 1) + 1])) + LVFU(rblpfh[(indx >> 1) - 1]) + LVFU(rblpfh[(indx >> 1) + 1]));
-
- coeff10v += gradwthv * deltgrbv * deltgrbv;
- coeff11v += gradwthv * gdiffhv * deltgrbv;
- coeff12v += gradwthv * gdiffhv * gdiffhv;
- }
-
- coeff[0][0][c>>1] += vhadd(coeff00v);
- coeff[0][1][c>>1] += vhadd(coeff01v);
- coeff[0][2][c>>1] += vhadd(coeff02v);
- coeff[1][0][c>>1] += vhadd(coeff10v);
- coeff[1][1][c>>1] += vhadd(coeff11v);
- coeff[1][2][c>>1] += vhadd(coeff12v);
-
-#endif
- for (; cc < cc1 - 8; cc += 2, indx += 2) {
-
- //in linear interpolation, colour differences are a quadratic function of interpolation position;
- //solve for the interpolation position that minimizes colour difference variance over the tile
-
- //vertical
- float gdiff = (rgb[1][indx + ts] - rgb[1][indx - ts]) + 0.3f * (rgb[1][indx + ts + 1] - rgb[1][indx - ts + 1] + rgb[1][indx + ts - 1] - rgb[1][indx - ts - 1]);
- float deltgrb = (rgb[c][indx >> 1] - rgb[1][indx]);
-
- float gradwt = (rbhpfv[indx >> 1] + 0.5f * (rbhpfv[(indx >> 1) + 1] + rbhpfv[(indx >> 1) - 1]) ) * (grblpfv[(indx >> 1) - v1] + grblpfv[(indx >> 1) + v1]) / (eps + 0.1f * (grblpfv[(indx >> 1) - v1] + grblpfv[(indx >> 1) + v1]) + rblpfv[(indx >> 1) - v1] + rblpfv[(indx >> 1) + v1]);
-
- coeff[0][0][c>>1] += gradwt * deltgrb * deltgrb;
- coeff[0][1][c>>1] += gradwt * gdiff * deltgrb;
- coeff[0][2][c>>1] += gradwt * gdiff * gdiff;
-
- //horizontal
- gdiff = (rgb[1][indx + 1] - rgb[1][indx - 1]) + 0.3f * (rgb[1][indx + 1 + ts] - rgb[1][indx - 1 + ts] + rgb[1][indx + 1 - ts] - rgb[1][indx - 1 - ts]);
-
- gradwt = (rbhpfh[indx >> 1] + 0.5f * (rbhpfh[(indx >> 1) + v1] + rbhpfh[(indx >> 1) - v1]) ) * (grblpfh[(indx >> 1) - 1] + grblpfh[(indx >> 1) + 1]) / (eps + 0.1f * (grblpfh[(indx >> 1) - 1] + grblpfh[(indx >> 1) + 1]) + rblpfh[(indx >> 1) - 1] + rblpfh[(indx >> 1) + 1]);
-
- coeff[1][0][c>>1] += gradwt * deltgrb * deltgrb;
- coeff[1][1][c>>1] += gradwt * gdiff * deltgrb;
- coeff[1][2][c>>1] += gradwt * gdiff * gdiff;
-
- // In Mathematica,
- // f[x_]=Expand[Total[Flatten[
- // ((1-x) RotateLeft[Gint,shift1]+x RotateLeft[Gint,shift2]-cfapad)^2[[dv;;-1;;2,dh;;-1;;2]]]]];
- // extremum = -.5Coefficient[f[x],x]/Coefficient[f[x],x^2]
- }
- }
-
- for (int dir = 0; dir < 2; dir++) {
- for (int k = 0; k < 3; k++) {
- for (int c = 0; c < 2; c++) {
- coeff[dir][k][c] *= 0.25f;
- if(k == 1) {
- coeff[dir][k][c] *= 0.3125f;
- } else if(k == 2) {
- coeff[dir][k][c] *= SQR(0.3125f);
+ //fill borders
+ if (rrmin > 0) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = ccmin; cc < ccmax; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][((border2 - rr) * ts + cc) >> ((c & 1) ^ 1)];
}
}
}
- }
- for (int c = 0; c < 2; c++) {
- for (int dir = 0; dir < 2; dir++) { // vert/hor
-
- // CAshift[dir][c] are the locations
- // that minimize colour difference variances;
- // This is the approximate _optical_ location of the R/B pixels
- if (coeff[dir][2][c] > eps2) {
- CAshift[dir][c] = coeff[dir][1][c] / coeff[dir][2][c];
- blockwt[vblock * hblsz + hblock] = coeff[dir][2][c] / (eps + coeff[dir][0][c]) ;
- } else {
- CAshift[dir][c] = 17.0;
- blockwt[vblock * hblsz + hblock] = 0;
- }
-
- //data structure = CAshift[vert/hor][colour]
- //dir : 0=vert, 1=hor
-
- //offset gives NW corner of square containing the min; dir : 0=vert, 1=hor
- if (fabsf(CAshift[dir][c]) < 2.0f) {
- blockavethr[dir][c] += CAshift[dir][c];
- blocksqavethr[dir][c] += SQR(CAshift[dir][c]);
- blockdenomthr[dir][c] += 1;
- }
- //evaluate the shifts to the location that minimizes CA within the tile
- blockshifts[vblock * hblsz + hblock][c][dir] = CAshift[dir][c]; //vert/hor CA shift for R/B
-
- }//vert/hor
- }//colour
-
- if(plistener) {
- progresscounter++;
-
- if(progresscounter % 8 == 0)
- #pragma omp critical (cadetectpass1)
- {
- progress += (double)(8.0 * (ts - border2) * (ts - border2)) / (2 * height * width);
-
- if (progress > 1.0) {
- progress = 1.0;
- }
-
- plistener->setProgress(progress);
- }
- }
-
- }
-
- //end of diagnostic pass
- #pragma omp critical (cadetectpass2)
- {
- for (int dir = 0; dir < 2; dir++)
- for (int c = 0; c < 2; c++) {
- blockdenom[dir][c] += blockdenomthr[dir][c];
- blocksqave[dir][c] += blocksqavethr[dir][c];
- blockave[dir][c] += blockavethr[dir][c];
- }
- }
- #pragma omp barrier
-
- #pragma omp single
- {
- for (int dir = 0; dir < 2; dir++)
- for (int c = 0; c < 2; c++) {
- if (blockdenom[dir][c]) {
- blockvar[dir][c] = blocksqave[dir][c] / blockdenom[dir][c] - SQR(blockave[dir][c] / blockdenom[dir][c]);
- } else {
- processpasstwo = false;
- printf ("blockdenom vanishes \n");
- break;
- }
- }
-
- // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
- //now prepare for CA correction pass
- //first, fill border blocks of blockshift array
- if(processpasstwo) {
- for (int vblock = 1; vblock < vblsz - 1; vblock++) { //left and right sides
- for (int c = 0; c < 2; c++) {
- for (int i = 0; i < 2; i++) {
- blockshifts[vblock * hblsz][c][i] = blockshifts[(vblock) * hblsz + 2][c][i];
- blockshifts[vblock * hblsz + hblsz - 1][c][i] = blockshifts[(vblock) * hblsz + hblsz - 3][c][i];
- }
- }
- }
-
- for (int hblock = 0; hblock < hblsz; hblock++) { //top and bottom sides
- for (int c = 0; c < 2; c++) {
- for (int i = 0; i < 2; i++) {
- blockshifts[hblock][c][i] = blockshifts[2 * hblsz + hblock][c][i];
- blockshifts[(vblsz - 1)*hblsz + hblock][c][i] = blockshifts[(vblsz - 3) * hblsz + hblock][c][i];
- }
- }
- }
-
- //end of filling border pixels of blockshift array
-
- //initialize fit arrays
- double polymat[2][2][256], shiftmat[2][2][16];
-
- for (int i = 0; i < 256; i++) {
- polymat[0][0][i] = polymat[0][1][i] = polymat[1][0][i] = polymat[1][1][i] = 0;
- }
-
- for (int i = 0; i < 16; i++) {
- shiftmat[0][0][i] = shiftmat[0][1][i] = shiftmat[1][0][i] = shiftmat[1][1][i] = 0;
- }
-
- int numblox[2] = {0, 0};
-
- for (int vblock = 1; vblock < vblsz - 1; vblock++)
- for (int hblock = 1; hblock < hblsz - 1; hblock++) {
- // block 3x3 median of blockshifts for robustness
- for (int c = 0; c < 2; c ++) {
- float bstemp[2];
- for (int dir = 0; dir < 2; dir++) {
- //temporary storage for median filter
- const std::array p = {
- blockshifts[(vblock - 1) * hblsz + hblock - 1][c][dir],
- blockshifts[(vblock - 1) * hblsz + hblock][c][dir],
- blockshifts[(vblock - 1) * hblsz + hblock + 1][c][dir],
- blockshifts[(vblock) * hblsz + hblock - 1][c][dir],
- blockshifts[(vblock) * hblsz + hblock][c][dir],
- blockshifts[(vblock) * hblsz + hblock + 1][c][dir],
- blockshifts[(vblock + 1) * hblsz + hblock - 1][c][dir],
- blockshifts[(vblock + 1) * hblsz + hblock][c][dir],
- blockshifts[(vblock + 1) * hblsz + hblock + 1][c][dir]
- };
- bstemp[dir] = median(p);
- }
-
- //now prepare coefficient matrix; use only data points within caautostrength/2 std devs of zero
- if (SQR(bstemp[0]) > caautostrength * blockvar[0][c] || SQR(bstemp[1]) > caautostrength * blockvar[1][c]) {
- continue;
- }
-
- numblox[c]++;
-
- for (int dir = 0; dir < 2; dir++) {
- double powVblockInit = 1.0;
- for (int i = 0; i < polyord; i++) {
- double powHblockInit = 1.0;
- for (int j = 0; j < polyord; j++) {
- double powVblock = powVblockInit;
- for (int m = 0; m < polyord; m++) {
- double powHblock = powHblockInit;
- for (int n = 0; n < polyord; n++) {
- polymat[c][dir][numpar * (polyord * i + j) + (polyord * m + n)] += powVblock * powHblock * blockwt[vblock * hblsz + hblock];
- powHblock *= hblock;
- }
- powVblock *= vblock;
- }
- shiftmat[c][dir][(polyord * i + j)] += powVblockInit * powHblockInit * bstemp[dir] * blockwt[vblock * hblsz + hblock];
- powHblockInit *= hblock;
- }
- powVblockInit *= vblock;
- }//monomials
- }//dir
- }//c
- }//blocks
-
- numblox[1] = min(numblox[0], numblox[1]);
-
- //if too few data points, restrict the order of the fit to linear
- if (numblox[1] < 32) {
- polyord = 2;
- numpar = 4;
-
- if (numblox[1] < 10) {
-
- printf ("numblox = %d \n", numblox[1]);
- processpasstwo = false;
- }
- }
-
- if(processpasstwo)
-
- //fit parameters to blockshifts
- for (int c = 0; c < 2; c++)
- for (int dir = 0; dir < 2; dir++) {
- if (!LinEqSolve(numpar, polymat[c][dir], shiftmat[c][dir], fitparams[c][dir])) {
- printf("CA correction pass failed -- can't solve linear equations for colour %d direction %d...\n", c, dir);
- processpasstwo = false;
+ if (rrmax < rr1) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = ccmin; cc < ccmax; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][left + cc] / 65535.f;
}
}
- }
+ }
- //fitparams[polyord*i+j] gives the coefficients of (vblock^i hblock^j) in a polynomial fit for i,j<=4
- }
- //end of initialization for CA correction pass
- //only executed if autoCA is true
- }
+ if (ccmin > 0) {
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][(rr * ts + border2 - cc) >> ((c & 1) ^ 1)];
+ }
+ }
+ }
- // Main algorithm: Tile loop
- if(processpasstwo) {
- float *grbdiff = (float (*)) (data + 2 * sizeof(float) * ts * ts + 3 * 64); // there is no overlap in buffer usage => share
- //green interpolated to optical sample points for R/B
- float *gshift = (float (*)) (data + 2 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 4 * 64); // there is no overlap in buffer usage => share
- #pragma omp for schedule(dynamic) collapse(2) nowait
+ if (ccmax < cc1) {
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(top + rr)][(width - cc - 2)] / 65535.f;
+ }
+ }
+ }
- for (int top = -border; top < height; top += ts - border2)
- for (int left = -border; left < width - (W & 1); left += ts - border2) {
- memset(bufferThr, 0, buffersizePassTwo);
- float lblockshifts[2][2];
- const int vblock = ((top + border) / (ts - border2)) + 1;
- const int hblock = ((left + border) / (ts - border2)) + 1;
- const int bottom = min(top + ts, height + border);
- const int right = min(left + ts, width - (W & 1) + border);
- const int rr1 = bottom - top;
- const int cc1 = right - left;
+ //also, fill the image corners
+ if (rrmin > 0 && ccmin > 0) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rawData[border2 - rr][border2 - cc] / 65535.f;
+ }
+ }
+ }
- const int rrmin = top < 0 ? border : 0;
- const int rrmax = bottom > height ? height - top : rr1;
- const int ccmin = left < 0 ? border : 0;
- const int ccmax = (right > width - (W & 1)) ? width - (W & 1) - left : cc1;
+ if (rrmax < rr1 && ccmax < cc1) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][(width - cc - 2)] / 65535.f;
+ }
+ }
+ }
- // rgb from input CFA data
- // rgb values should be floating point number between 0 and 1
- // after white balance multipliers are applied
+ if (rrmin > 0 && ccmax < cc1) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = rawData[(border2 - rr)][(width - cc - 2)] / 65535.f;
+ }
+ }
+ }
+
+ if (rrmax < rr1 && ccmin > 0) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = rawData[(height - rr - 2)][(border2 - cc)] / 65535.f;
+ }
+ }
+ }
+
+ //end of border fill
+ //end of initialization
#ifdef __SSE2__
- vfloat c65535v = F2V(65535.f);
- vmask gmask = _mm_set_epi32(0, 0xffffffff, 0, 0xffffffff);
+ vfloat onev = F2V(1.f);
+ vfloat epsv = F2V(eps);
#endif
- for (int rr = rrmin; rr < rrmax; rr++) {
- int row = rr + top;
- int cc = ccmin;
- int col = cc + left;
- int indx = row * width + col;
- int indx1 = rr * ts + cc;
-#ifdef __SSE2__
- int c = FC(rr, cc);
- if(c & 1) {
- rgb[1][indx1] = rawData[row][col] / 65535.f;
- indx++;
- indx1++;
- cc++;
- col++;
- c = FC(rr, cc);
- }
- for (; cc < ccmax - 7; cc += 8, col += 8, indx += 8, indx1 += 8) {
- vfloat val1v = LVFU(rawData[row][col]) / c65535v;
- vfloat val2v = LVFU(rawData[row][col + 4]) / c65535v;
- STVFU(rgb[c][indx1 >> 1], _mm_shuffle_ps(val1v, val2v, _MM_SHUFFLE(2, 0, 2, 0)));
- vfloat gtmpv = LVFU(Gtmp[indx >> 1]);
- STVFU(rgb[1][indx1], vself(gmask, PERMUTEPS(gtmpv, _MM_SHUFFLE(1, 1, 0, 0)), val1v));
- STVFU(rgb[1][indx1 + 4], vself(gmask, PERMUTEPS(gtmpv, _MM_SHUFFLE(3, 3, 2, 2)), val2v));
- }
-#endif
- for (; cc < ccmax; cc++, col++, indx++, indx1++) {
- int c = FC(rr, cc);
- rgb[c][indx1 >> ((c & 1) ^ 1)] = rawData[row][col] / 65535.f;
-
- if ((c & 1) == 0) {
- rgb[1][indx1] = Gtmp[indx >> 1];
- }
- }
- }
- // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- //fill borders
- if (rrmin > 0) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = ccmin; cc < ccmax; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][((border2 - rr) * ts + cc) >> ((c & 1) ^ 1)];
- rgb[1][rr * ts + cc] = rgb[1][(border2 - rr) * ts + cc];
- }
- }
-
- if (rrmax < rr1) {
- for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
- for (int cc = ccmin; cc < ccmax; cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][left + cc]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][(rrmax + rr)*ts + cc] = Gtmp[((height - rr - 2) * width + left + cc) >> 1];
- }
- }
- }
-
- if (ccmin > 0) {
- for (int rr = rrmin; rr < rrmax; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][(rr * ts + border2 - cc) >> ((c & 1) ^ 1)];
- rgb[1][rr * ts + cc] = rgb[1][rr * ts + border2 - cc];
- }
- }
-
- if (ccmax < cc1) {
- for (int rr = rrmin; rr < rrmax; rr++)
- for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(top + rr)][(width - cc - 2)]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][rr * ts + ccmax + cc] = Gtmp[((top + rr) * width + (width - cc - 2)) >> 1];
- }
- }
- }
-
- //also, fill the image corners
- if (rrmin > 0 && ccmin > 0) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = (rawData[border2 - rr][border2 - cc]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][rr * ts + cc] = Gtmp[((border2 - rr) * width + border2 - cc) >> 1];
- }
- }
- }
-
- if (rrmax < rr1 && ccmax < cc1) {
- for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
- for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(width - cc - 2)]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][(rrmax + rr)*ts + ccmax + cc] = Gtmp[((height - rr - 2) * width + (width - cc - 2)) >> 1];
- }
- }
- }
-
- if (rrmin > 0 && ccmax < cc1) {
- for (int rr = 0; rr < border; rr++)
- for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
- int c = FC(rr, cc);
- rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(border2 - rr)][(width - cc - 2)]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][rr * ts + ccmax + cc] = Gtmp[((border2 - rr) * width + (width - cc - 2)) >> 1];
- }
- }
- }
-
- if (rrmax < rr1 && ccmin > 0) {
- for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
- for (int cc = 0; cc < border; cc++) {
- int c = FC(rr, cc);
- rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(border2 - cc)]) / 65535.f;
- if ((c & 1) == 0) {
- rgb[1][(rrmax + rr)*ts + cc] = Gtmp[((height - rr - 2) * width + (border2 - cc)) >> 1];
- }
- }
- }
-
- //end of border fill
- // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
- if (!autoCA || fitParamsIn) {
-#ifdef __SSE2__
- const vfloat onev = F2V(1.f);
- const vfloat epsv = F2V(eps);
-#endif
-
- //manual CA correction; use red/blue slider values to set CA shift parameters
for (int rr = 3; rr < rr1 - 3; rr++) {
- int cc = 3 + FC(rr, 1), c = FC(rr,cc), indx = rr * ts + cc;
+ int row = rr + top;
+ int cc = 3 + (FC(rr,3) & 1);
+ int indx = rr * ts + cc;
+ int c = FC(rr,cc);
#ifdef __SSE2__
- for (; cc < cc1 - 10; cc += 8, indx += 8) {
+ for (; cc < cc1 - 9; cc+=8, indx+=8) {
//compute directional weights using image gradients
- vfloat val1v = epsv + vabsf(LC2VFU(rgb[1][(rr + 1) * ts + cc]) - LC2VFU(rgb[1][(rr - 1) * ts + cc]));
- vfloat val2v = epsv + vabsf(LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx - 1]));
- vfloat wtuv = onev / SQRV(val1v + vabsf(LVFU(rgb[c][(rr * ts + cc) >> 1]) - LVFU(rgb[c][((rr - 2) * ts + cc) >> 1])) + vabsf(LC2VFU(rgb[1][(rr - 1) * ts + cc]) - LC2VFU(rgb[1][(rr - 3) * ts + cc])));
- vfloat wtdv = onev / SQRV(val1v + vabsf(LVFU(rgb[c][(rr * ts + cc) >> 1]) - LVFU(rgb[c][((rr + 2) * ts + cc) >> 1])) + vabsf(LC2VFU(rgb[1][(rr + 1) * ts + cc]) - LC2VFU(rgb[1][(rr + 3) * ts + cc])));
- vfloat wtlv = onev / SQRV(val2v + vabsf(LVFU(rgb[c][indx >> 1]) - LVFU(rgb[c][(indx - 2) >> 1])) + vabsf(LC2VFU(rgb[1][indx - 1]) - LC2VFU(rgb[1][indx - 3])));
- vfloat wtrv = onev / SQRV(val2v + vabsf(LVFU(rgb[c][indx >> 1]) - LVFU(rgb[c][(indx + 2) >> 1])) + vabsf(LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx + 3])));
+ vfloat rgb1mv1v = LC2VFU(rgb[1][indx - v1]);
+ vfloat rgb1pv1v = LC2VFU(rgb[1][indx + v1]);
+ vfloat rgbcv = LVFU(rgb[c][indx >> 1]);
+ vfloat temp1v = epsv + vabsf(rgb1mv1v - rgb1pv1v);
+ vfloat wtuv = onev / SQRV(temp1v + vabsf(rgbcv - LVFU(rgb[c][(indx - v2) >> 1])) + vabsf(rgb1mv1v - LC2VFU(rgb[1][indx - v3])));
+ vfloat wtdv = onev / SQRV(temp1v + vabsf(rgbcv - LVFU(rgb[c][(indx + v2) >> 1])) + vabsf(rgb1pv1v - LC2VFU(rgb[1][indx + v3])));
+ vfloat rgb1m1v = LC2VFU(rgb[1][indx - 1]);
+ vfloat rgb1p1v = LC2VFU(rgb[1][indx + 1]);
+ vfloat temp2v = epsv + vabsf(rgb1m1v - rgb1p1v);
+ vfloat wtlv = onev / SQRV(temp2v + vabsf(rgbcv - LVFU(rgb[c][(indx - 2) >> 1])) + vabsf(rgb1m1v - LC2VFU(rgb[1][indx - 3])));
+ vfloat wtrv = onev / SQRV(temp2v + vabsf(rgbcv - LVFU(rgb[c][(indx + 2) >> 1])) + vabsf(rgb1p1v - LC2VFU(rgb[1][indx + 3])));
//store in rgb array the interpolated G value at R/B grid points using directional weighted average
- STC2VFU(rgb[1][indx], (wtuv * LC2VFU(rgb[1][indx - v1]) + wtdv * LC2VFU(rgb[1][indx + v1]) + wtlv * LC2VFU(rgb[1][indx - 1]) + wtrv * LC2VFU(rgb[1][indx + 1])) / (wtuv + wtdv + wtlv + wtrv));
+ STC2VFU(rgb[1][indx], (wtuv * rgb1mv1v + wtdv * rgb1pv1v + wtlv * rgb1m1v + wtrv * rgb1p1v) / (wtuv + wtdv + wtlv + wtrv));
}
+
#endif
- for (; cc < cc1 - 3; cc += 2, indx += 2) {
+ for (; cc < cc1 - 3; cc+=2, indx+=2) {
//compute directional weights using image gradients
- float wtu = 1.f / SQR(eps + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr - 1) * ts + cc]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][((rr - 2) * ts + cc) >> 1]) + fabsf(rgb[1][(rr - 1) * ts + cc] - rgb[1][(rr - 3) * ts + cc]));
- float wtd = 1.f / SQR(eps + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr - 1) * ts + cc]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][((rr + 2) * ts + cc) >> 1]) + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr + 3) * ts + cc]));
- float wtl = 1.f / SQR(eps + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc - 1]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][(rr * ts + cc - 2) >> 1]) + fabsf(rgb[1][rr * ts + cc - 1] - rgb[1][rr * ts + cc - 3]));
- float wtr = 1.f / SQR(eps + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc - 1]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][(rr * ts + cc + 2) >> 1]) + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc + 3]));
+ float wtu = 1.f / SQR(eps + fabsf(rgb[1][indx + v1] - rgb[1][indx - v1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx - v2) >> 1]) + fabsf(rgb[1][indx - v1] - rgb[1][indx - v3]));
+ float wtd = 1.f / SQR(eps + fabsf(rgb[1][indx - v1] - rgb[1][indx + v1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx + v2) >> 1]) + fabsf(rgb[1][indx + v1] - rgb[1][indx + v3]));
+ float wtl = 1.f / SQR(eps + fabsf(rgb[1][indx + 1] - rgb[1][indx - 1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx - 2) >> 1]) + fabsf(rgb[1][indx - 1] - rgb[1][indx - 3]));
+ float wtr = 1.f / SQR(eps + fabsf(rgb[1][indx - 1] - rgb[1][indx + 1]) + fabsf(rgb[c][indx >> 1] - rgb[c][(indx + 2) >> 1]) + fabsf(rgb[1][indx + 1] - rgb[1][indx + 3]));
//store in rgb array the interpolated G value at R/B grid points using directional weighted average
rgb[1][indx] = (wtu * rgb[1][indx - v1] + wtd * rgb[1][indx + v1] + wtl * rgb[1][indx - 1] + wtr * rgb[1][indx + 1]) / (wtu + wtd + wtl + wtr);
}
- }
- }
- if (!autoCA) {
- float hfrac = -((float)(hblock - 0.5) / (hblsz - 2) - 0.5);
- float vfrac = -((float)(vblock - 0.5) / (vblsz - 2) - 0.5) * height / width;
- lblockshifts[0][0] = 2 * vfrac * cared;
- lblockshifts[0][1] = 2 * hfrac * cared;
- lblockshifts[1][0] = 2 * vfrac * cablue;
- lblockshifts[1][1] = 2 * hfrac * cablue;
- } else {
- //CA auto correction; use CA diagnostic pass to set shift parameters
- lblockshifts[0][0] = lblockshifts[0][1] = 0;
- lblockshifts[1][0] = lblockshifts[1][1] = 0;
- double powVblock = 1.0;
- for (int i = 0; i < polyord; i++) {
- double powHblock = powVblock;
- for (int j = 0; j < polyord; j++) {
- lblockshifts[0][0] += powHblock * fitparams[0][0][polyord * i + j];
- lblockshifts[0][1] += powHblock * fitparams[0][1][polyord * i + j];
- lblockshifts[1][0] += powHblock * fitparams[1][0][polyord * i + j];
- lblockshifts[1][1] += powHblock * fitparams[1][1][polyord * i + j];
- powHblock *= hblock;
- }
- powVblock *= vblock;
- }
- constexpr float bslim = 3.99; //max allowed CA shift
- lblockshifts[0][0] = LIM(lblockshifts[0][0], -bslim, bslim);
- lblockshifts[0][1] = LIM(lblockshifts[0][1], -bslim, bslim);
- lblockshifts[1][0] = LIM(lblockshifts[1][0], -bslim, bslim);
- lblockshifts[1][1] = LIM(lblockshifts[1][1], -bslim, bslim);
- }//end of setting CA shift parameters
-
- for (int c = 0; c < 3; c += 2) {
-
- //some parameters for the bilinear interpolation
- shiftvfloor[c] = floor((float)lblockshifts[c>>1][0]);
- shiftvceil[c] = ceil((float)lblockshifts[c>>1][0]);
- shiftvfrac[c] = lblockshifts[c>>1][0] - shiftvfloor[c];
-
- shifthfloor[c] = floor((float)lblockshifts[c>>1][1]);
- shifthceil[c] = ceil((float)lblockshifts[c>>1][1]);
- shifthfrac[c] = lblockshifts[c>>1][1] - shifthfloor[c];
-
- GRBdir[0][c] = lblockshifts[c>>1][0] > 0 ? 2 : -2;
- GRBdir[1][c] = lblockshifts[c>>1][1] > 0 ? 2 : -2;
-
- }
-
-
- for (int rr = 4; rr < rr1 - 4; rr++) {
- int cc = 4 + (FC(rr, 2) & 1);
- int c = FC(rr, cc);
- int indx = (rr * ts + cc) >> 1;
- int indxfc = (rr + shiftvfloor[c]) * ts + cc + shifthceil[c];
- int indxff = (rr + shiftvfloor[c]) * ts + cc + shifthfloor[c];
- int indxcc = (rr + shiftvceil[c]) * ts + cc + shifthceil[c];
- int indxcf = (rr + shiftvceil[c]) * ts + cc + shifthfloor[c];
+ if (row > -1 && row < height) {
+ int offset = (FC(row,max(left + 3, 0)) & 1);
+ int col = max(left + 3, 0) + offset;
+ int indx = rr * ts + 3 - (left < 0 ? (left+3) : 0) + offset;
#ifdef __SSE2__
- vfloat shifthfracv = F2V(shifthfrac[c]);
- vfloat shiftvfracv = F2V(shiftvfrac[c]);
- for (; cc < cc1 - 10; cc += 8, indxfc += 8, indxff += 8, indxcc += 8, indxcf += 8, indx += 4) {
- //perform CA correction using colour ratios or colour differences
- vfloat Ginthfloorv = vintpf(shifthfracv, LC2VFU(rgb[1][indxfc]), LC2VFU(rgb[1][indxff]));
- vfloat Ginthceilv = vintpf(shifthfracv, LC2VFU(rgb[1][indxcc]), LC2VFU(rgb[1][indxcf]));
- //Gint is bilinear interpolation of G at CA shift point
- vfloat Gintv = vintpf(shiftvfracv, Ginthceilv, Ginthfloorv);
-
- //determine R/B at grid points using colour differences at shift point plus interpolated G value at grid point
- //but first we need to interpolate G-R/G-B to grid points...
- STVFU(grbdiff[indx], Gintv - LVFU(rgb[c][indx]));
- STVFU(gshift[indx], Gintv);
- }
-
-#endif
- for (; cc < cc1 - 4; cc += 2, indxfc += 2, indxff += 2, indxcc += 2, indxcf += 2, ++indx) {
- //perform CA correction using colour ratios or colour differences
- float Ginthfloor = intp(shifthfrac[c], rgb[1][indxfc], rgb[1][indxff]);
- float Ginthceil = intp(shifthfrac[c], rgb[1][indxcc], rgb[1][indxcf]);
- //Gint is bilinear interpolation of G at CA shift point
- float Gint = intp(shiftvfrac[c], Ginthceil, Ginthfloor);
-
- //determine R/B at grid points using colour differences at shift point plus interpolated G value at grid point
- //but first we need to interpolate G-R/G-B to grid points...
- grbdiff[indx] = Gint - rgb[c][indx];
- gshift[indx] = Gint;
- }
- }
-
- shifthfrac[0] /= 2.f;
- shifthfrac[2] /= 2.f;
- shiftvfrac[0] /= 2.f;
- shiftvfrac[2] /= 2.f;
-
-#ifdef __SSE2__
- vfloat zd25v = F2V(0.25f);
- vfloat onev = F2V(1.f);
- vfloat zd5v = F2V(0.5f);
- vfloat epsv = F2V(eps);
-#endif
- for (int rr = 8; rr < rr1 - 8; rr++) {
- int cc = 8 + (FC(rr, 2) & 1);
- int c = FC(rr, cc);
- int GRBdir0 = GRBdir[0][c];
- int GRBdir1 = GRBdir[1][c];
-#ifdef __SSE2__
- vfloat shifthfracc = F2V(shifthfrac[c]);
- vfloat shiftvfracc = F2V(shiftvfrac[c]);
- for (int indx = rr * ts + cc; cc < cc1 - 14; cc += 8, indx += 8) {
- //interpolate colour difference from optical R/B locations to grid locations
- vfloat grbdiffinthfloor = vintpf(shifthfracc, LVFU(grbdiff[(indx - GRBdir1) >> 1]), LVFU(grbdiff[indx >> 1]));
- vfloat grbdiffinthceil = vintpf(shifthfracc, LVFU(grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]), LVFU(grbdiff[((rr - GRBdir0) * ts + cc) >> 1]));
- //grbdiffint is bilinear interpolation of G-R/G-B at grid point
- vfloat grbdiffint = vintpf(shiftvfracc, grbdiffinthceil, grbdiffinthfloor);
-
- //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
- vfloat cinv = LVFU(rgb[c][indx >> 1]);
- vfloat rinv = LC2VFU(rgb[1][indx]);
- vfloat RBint = rinv - grbdiffint;
- vmask cmask = vmaskf_ge(vabsf(RBint - cinv), zd25v * (RBint + cinv));
- if(_mm_movemask_ps((vfloat)cmask)) {
- // if for any of the 4 pixels the condition is true, do the math for all 4 pixels and mask the unused out at the end
- //gradient weights using difference from G at CA shift points and G at grid points
- vfloat p0 = onev / (epsv + vabsf(rinv - LVFU(gshift[indx >> 1])));
- vfloat p1 = onev / (epsv + vabsf(rinv - LVFU(gshift[(indx - GRBdir1) >> 1])));
- vfloat p2 = onev / (epsv + vabsf(rinv - LVFU(gshift[((rr - GRBdir0) * ts + cc) >> 1])));
- vfloat p3 = onev / (epsv + vabsf(rinv - LVFU(gshift[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1])));
-
- grbdiffint = vself(cmask, (p0 * LVFU(grbdiff[indx >> 1]) + p1 * LVFU(grbdiff[(indx - GRBdir1) >> 1]) +
- p2 * LVFU(grbdiff[((rr - GRBdir0) * ts + cc) >> 1]) + p3 * LVFU(grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1])) / (p0 + p1 + p2 + p3), grbdiffint);
-
- }
- vfloat grbdiffold = rinv - cinv;
- RBint = rinv - grbdiffint;
- RBint = vself(vmaskf_gt(vabsf(grbdiffold), vabsf(grbdiffint)), RBint, cinv);
- RBint = vself(vmaskf_lt(grbdiffold * grbdiffint, ZEROV), rinv - zd5v * (grbdiffold + grbdiffint), RBint);
- STVFU(rgb[c][indx >> 1], RBint);
- }
-#endif
- for (int c = FC(rr, cc), indx = rr * ts + cc; cc < cc1 - 8; cc += 2, indx += 2) {
- float grbdiffold = rgb[1][indx] - rgb[c][indx >> 1];
-
- //interpolate colour difference from optical R/B locations to grid locations
- float grbdiffinthfloor = intp(shifthfrac[c], grbdiff[(indx - GRBdir1) >> 1], grbdiff[indx >> 1]);
- float grbdiffinthceil = intp(shifthfrac[c], grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1], grbdiff[((rr - GRBdir0) * ts + cc) >> 1]);
- //grbdiffint is bilinear interpolation of G-R/G-B at grid point
- float grbdiffint = intp(shiftvfrac[c], grbdiffinthceil, grbdiffinthfloor);
-
- //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
- float RBint = rgb[1][indx] - grbdiffint;
-
- if (fabsf(RBint - rgb[c][indx >> 1]) < 0.25f * (RBint + rgb[c][indx >> 1])) {
- if (fabsf(grbdiffold) > fabsf(grbdiffint) ) {
- rgb[c][indx >> 1] = RBint;
+ for (; col < min(cc1 + left - 3, width) - 7; col+=8, indx+=8) {
+ STVFU(Gtmp[(row * width + col) >> 1], LC2VFU(rgb[1][indx]));
}
+#endif
+ for (; col < min(cc1 + left - 3, width); col+=2, indx+=2) {
+ Gtmp[(row * width + col) >> 1] = rgb[1][indx];
+ }
+ }
+ }
+
+#ifdef __SSE2__
+ vfloat zd25v = F2V(0.25f);
+#endif
+ for (int rr = 4; rr < rr1 - 4; rr++) {
+ int cc = 4 + (FC(rr, 2) & 1);
+ int indx = rr * ts + cc;
+ int c = FC(rr, cc);
+#ifdef __SSE2__
+ for (; cc < cc1 - 10; cc += 8, indx += 8) {
+ vfloat rgb1v = LC2VFU(rgb[1][indx]);
+ vfloat rgbcv = LVFU(rgb[c][indx >> 1]);
+ vfloat rgb1mv4 = LC2VFU(rgb[1][indx - v4]);
+ vfloat rgb1pv4 = LC2VFU(rgb[1][indx + v4]);
+ vfloat temp1v = vabsf(vabsf((rgb1v - rgbcv) - (rgb1pv4 - LVFU(rgb[c][(indx + v4) >> 1]))) +
+ vabsf(rgb1mv4 - LVFU(rgb[c][(indx - v4) >> 1]) - rgb1v + rgbcv) -
+ vabsf(rgb1mv4 - LVFU(rgb[c][(indx - v4) >> 1]) - rgb1pv4 + LVFU(rgb[c][(indx + v4) >> 1])));
+ STVFU(rbhpfv[indx >> 1], temp1v);
+ vfloat rgb1m4 = LC2VFU(rgb[1][indx - 4]);
+ vfloat rgb1p4 = LC2VFU(rgb[1][indx + 4]);
+ vfloat temp2v = vabsf(vabsf((rgb1v - rgbcv) - (rgb1p4 - LVFU(rgb[c][(indx + 4) >> 1]))) +
+ vabsf(rgb1m4 - LVFU(rgb[c][(indx - 4) >> 1]) - rgb1v + rgbcv) -
+ vabsf(rgb1m4 - LVFU(rgb[c][(indx - 4) >> 1]) - rgb1p4 + LVFU(rgb[c][(indx + 4) >> 1])));
+ STVFU(rbhpfh[indx >> 1], temp2v);
+
+ //low and high pass 1D filters of G in vertical/horizontal directions
+ rgb1v = vmul2f(rgb1v);
+ vfloat glpfvv = (rgb1v + LC2VFU(rgb[1][indx + v2]) + LC2VFU(rgb[1][indx - v2]));
+ vfloat glpfhv = (rgb1v + LC2VFU(rgb[1][indx + 2]) + LC2VFU(rgb[1][indx - 2]));
+ rgbcv = vmul2f(rgbcv);
+ STVFU(rblpfv[indx >> 1], zd25v * vabsf(glpfvv - (rgbcv + LVFU(rgb[c][(indx + v2) >> 1]) + LVFU(rgb[c][(indx - v2) >> 1]))));
+ STVFU(rblpfh[indx >> 1], zd25v * vabsf(glpfhv - (rgbcv + LVFU(rgb[c][(indx + 2) >> 1]) + LVFU(rgb[c][(indx - 2) >> 1]))));
+ STVFU(grblpfv[indx >> 1], zd25v * (glpfvv + (rgbcv + LVFU(rgb[c][(indx + v2) >> 1]) + LVFU(rgb[c][(indx - v2) >> 1]))));
+ STVFU(grblpfh[indx >> 1], zd25v * (glpfhv + (rgbcv + LVFU(rgb[c][(indx + 2) >> 1]) + LVFU(rgb[c][(indx - 2) >> 1]))));
+ }
+#endif
+ for (; cc < cc1 - 4; cc += 2, indx += 2) {
+ rbhpfv[indx >> 1] = fabsf(fabsf((rgb[1][indx] - rgb[c][indx >> 1]) - (rgb[1][indx + v4] - rgb[c][(indx + v4) >> 1])) +
+ fabsf((rgb[1][indx - v4] - rgb[c][(indx - v4) >> 1]) - (rgb[1][indx] - rgb[c][indx >> 1])) -
+ fabsf((rgb[1][indx - v4] - rgb[c][(indx - v4) >> 1]) - (rgb[1][indx + v4] - rgb[c][(indx + v4) >> 1])));
+ rbhpfh[indx >> 1] = fabsf(fabsf((rgb[1][indx] - rgb[c][indx >> 1]) - (rgb[1][indx + 4] - rgb[c][(indx + 4) >> 1])) +
+ fabsf((rgb[1][indx - 4] - rgb[c][(indx - 4) >> 1]) - (rgb[1][indx] - rgb[c][indx >> 1])) -
+ fabsf((rgb[1][indx - 4] - rgb[c][(indx - 4) >> 1]) - (rgb[1][indx + 4] - rgb[c][(indx + 4) >> 1])));
+
+ //low and high pass 1D filters of G in vertical/horizontal directions
+ float glpfv = (2.f * rgb[1][indx] + rgb[1][indx + v2] + rgb[1][indx - v2]);
+ float glpfh = (2.f * rgb[1][indx] + rgb[1][indx + 2] + rgb[1][indx - 2]);
+ rblpfv[indx >> 1] = 0.25f * fabsf(glpfv - (2.f * rgb[c][indx >> 1] + rgb[c][(indx + v2) >> 1] + rgb[c][(indx - v2) >> 1]));
+ rblpfh[indx >> 1] = 0.25f * fabsf(glpfh - (2.f * rgb[c][indx >> 1] + rgb[c][(indx + 2) >> 1] + rgb[c][(indx - 2) >> 1]));
+ grblpfv[indx >> 1] = 0.25f * (glpfv + (2.f * rgb[c][indx >> 1] + rgb[c][(indx + v2) >> 1] + rgb[c][(indx - v2) >> 1]));
+ grblpfh[indx >> 1] = 0.25f * (glpfh + (2.f * rgb[c][indx >> 1] + rgb[c][(indx + 2) >> 1] + rgb[c][(indx - 2) >> 1]));
+ }
+ }
+
+ for (int dir = 0; dir < 2; dir++) {
+ for (int k = 0; k < 3; k++) {
+ for (int c = 0; c < 2; c++) {
+ coeff[dir][k][c] = 0;
+ }
+ }
+ }
+
+#ifdef __SSE2__
+ vfloat zd3v = F2V(0.3f);
+ vfloat zd1v = F2V(0.1f);
+ vfloat zd5v = F2V(0.5f);
+#endif
+
+ // along line segments, find the point along each segment that minimizes the colour variance
+ // averaged over the tile; evaluate for up/down and left/right away from R/B grid point
+ for (int rr = 8; rr < rr1 - 8; rr++) {
+ int cc = 8 + (FC(rr, 2) & 1);
+ int indx = rr * ts + cc;
+ int c = FC(rr, cc);
+#ifdef __SSE2__
+ vfloat coeff00v = ZEROV;
+ vfloat coeff01v = ZEROV;
+ vfloat coeff02v = ZEROV;
+ vfloat coeff10v = ZEROV;
+ vfloat coeff11v = ZEROV;
+ vfloat coeff12v = ZEROV;
+ for (; cc < cc1 - 14; cc += 8, indx += 8) {
+ //in linear interpolation, colour differences are a quadratic function of interpolation position;
+ //solve for the interpolation position that minimizes colour difference variance over the tile
+
+ //vertical
+ vfloat temp1 = zd3v * (LC2VFU(rgb[1][indx + ts + 1]) - LC2VFU(rgb[1][indx - ts - 1]));
+ vfloat temp2 = zd3v * (LC2VFU(rgb[1][indx - ts + 1]) - LC2VFU(rgb[1][indx + ts - 1]));
+ vfloat gdiffvv = (LC2VFU(rgb[1][indx + ts]) - LC2VFU(rgb[1][indx - ts])) + (temp1 - temp2);
+ vfloat deltgrbv = LVFU(rgb[c][indx >> 1]) - LC2VFU(rgb[1][indx]);
+
+ vfloat gradwtvv = (LVFU(rbhpfv[indx >> 1]) + zd5v * (LVFU(rbhpfv[(indx >> 1) + 1]) + LVFU(rbhpfv[(indx >> 1) - 1]))) * (LVFU(grblpfv[(indx >> 1) - v1]) + LVFU(grblpfv[(indx >> 1) + v1])) / (epsv + zd1v * (LVFU(grblpfv[(indx >> 1) - v1]) + LVFU(grblpfv[(indx >> 1) + v1])) + LVFU(rblpfv[(indx >> 1) - v1]) + LVFU(rblpfv[(indx >> 1) + v1]));
+
+ coeff00v += gradwtvv * deltgrbv * deltgrbv;
+ coeff01v += gradwtvv * gdiffvv * deltgrbv;
+ coeff02v += gradwtvv * gdiffvv * gdiffvv;
+
+ //horizontal
+ vfloat gdiffhv = (LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx - 1])) + (temp1 + temp2);
+
+ vfloat gradwthv = (LVFU(rbhpfh[indx >> 1]) + zd5v * (LVFU(rbhpfh[(indx >> 1) + v1]) + LVFU(rbhpfh[(indx >> 1) - v1]))) * (LVFU(grblpfh[(indx >> 1) - 1]) + LVFU(grblpfh[(indx >> 1) + 1])) / (epsv + zd1v * (LVFU(grblpfh[(indx >> 1) - 1]) + LVFU(grblpfh[(indx >> 1) + 1])) + LVFU(rblpfh[(indx >> 1) - 1]) + LVFU(rblpfh[(indx >> 1) + 1]));
+
+ coeff10v += gradwthv * deltgrbv * deltgrbv;
+ coeff11v += gradwthv * gdiffhv * deltgrbv;
+ coeff12v += gradwthv * gdiffhv * gdiffhv;
+ }
+
+ coeff[0][0][c>>1] += vhadd(coeff00v);
+ coeff[0][1][c>>1] += vhadd(coeff01v);
+ coeff[0][2][c>>1] += vhadd(coeff02v);
+ coeff[1][0][c>>1] += vhadd(coeff10v);
+ coeff[1][1][c>>1] += vhadd(coeff11v);
+ coeff[1][2][c>>1] += vhadd(coeff12v);
+
+#endif
+ for (; cc < cc1 - 8; cc += 2, indx += 2) {
+ //in linear interpolation, colour differences are a quadratic function of interpolation position;
+ //solve for the interpolation position that minimizes colour difference variance over the tile
+
+ //vertical
+ float gdiff = (rgb[1][indx + ts] - rgb[1][indx - ts]) + 0.3f * (rgb[1][indx + ts + 1] - rgb[1][indx - ts + 1] + rgb[1][indx + ts - 1] - rgb[1][indx - ts - 1]);
+ float deltgrb = (rgb[c][indx >> 1] - rgb[1][indx]);
+
+ float gradwt = (rbhpfv[indx >> 1] + 0.5f * (rbhpfv[(indx >> 1) + 1] + rbhpfv[(indx >> 1) - 1])) * (grblpfv[(indx >> 1) - v1] + grblpfv[(indx >> 1) + v1]) / (eps + 0.1f * (grblpfv[(indx >> 1) - v1] + grblpfv[(indx >> 1) + v1]) + rblpfv[(indx >> 1) - v1] + rblpfv[(indx >> 1) + v1]);
+
+ coeff[0][0][c>>1] += gradwt * deltgrb * deltgrb;
+ coeff[0][1][c>>1] += gradwt * gdiff * deltgrb;
+ coeff[0][2][c>>1] += gradwt * gdiff * gdiff;
+
+ //horizontal
+ gdiff = (rgb[1][indx + 1] - rgb[1][indx - 1]) + 0.3f * (rgb[1][indx + 1 + ts] - rgb[1][indx - 1 + ts] + rgb[1][indx + 1 - ts] - rgb[1][indx - 1 - ts]);
+
+ gradwt = (rbhpfh[indx >> 1] + 0.5f * (rbhpfh[(indx >> 1) + v1] + rbhpfh[(indx >> 1) - v1])) * (grblpfh[(indx >> 1) - 1] + grblpfh[(indx >> 1) + 1]) / (eps + 0.1f * (grblpfh[(indx >> 1) - 1] + grblpfh[(indx >> 1) + 1]) + rblpfh[(indx >> 1) - 1] + rblpfh[(indx >> 1) + 1]);
+
+ coeff[1][0][c>>1] += gradwt * deltgrb * deltgrb;
+ coeff[1][1][c>>1] += gradwt * gdiff * deltgrb;
+ coeff[1][2][c>>1] += gradwt * gdiff * gdiff;
+
+ // In Mathematica,
+ // f[x_]=Expand[Total[Flatten[
+ // ((1-x) RotateLeft[Gint,shift1]+x RotateLeft[Gint,shift2]-cfapad)^2[[dv;;-1;;2,dh;;-1;;2]]]]];
+ // extremum = -.5Coefficient[f[x],x]/Coefficient[f[x],x^2]
+ }
+ }
+
+ for (int dir = 0; dir < 2; dir++) {
+ for (int k = 0; k < 3; k++) {
+ for (int c = 0; c < 2; c++) {
+ coeff[dir][k][c] *= 0.25f;
+ if (k == 1) {
+ coeff[dir][k][c] *= 0.3125f;
+ } else if (k == 2) {
+ coeff[dir][k][c] *= SQR(0.3125f);
+ }
+ }
+ }
+ }
+
+ for (int c = 0; c < 2; c++) {
+ for (int dir = 0; dir < 2; dir++) { // vert/hor
+
+ // CAshift[dir][c] are the locations
+ // that minimize colour difference variances;
+ // This is the approximate _optical_ location of the R/B pixels
+ if (coeff[dir][2][c] > eps2) {
+ CAshift[dir][c] = coeff[dir][1][c] / coeff[dir][2][c];
+ blockwt[vblock * hblsz + hblock] = coeff[dir][2][c] / (eps + coeff[dir][0][c]) ;
+ } else {
+ CAshift[dir][c] = 17.0;
+ blockwt[vblock * hblsz + hblock] = 0;
+ }
+
+ //data structure = CAshift[vert/hor][colour]
+ //dir : 0=vert, 1=hor
+
+ //offset gives NW corner of square containing the min; dir : 0=vert, 1=hor
+ if (fabsf(CAshift[dir][c]) < 2.0f) {
+ blockavethr[dir][c] += CAshift[dir][c];
+ blocksqavethr[dir][c] += SQR(CAshift[dir][c]);
+ blockdenomthr[dir][c] += 1;
+ }
+ //evaluate the shifts to the location that minimizes CA within the tile
+ blockshifts[vblock * hblsz + hblock][c][dir] = CAshift[dir][c]; //vert/hor CA shift for R/B
+ }//vert/hor
+ }//colour
+
+ if (plistener) {
+ progresscounter++;
+
+ if (progresscounter % 8 == 0) {
+ #pragma omp critical (cadetectpass1)
+ {
+ progress += 4.0 * SQR(ts - border2) / (iterations * height * width);
+ progress = std::min(progress, 1.0);
+ plistener->setProgress(progress);
+ }
+ }
+ }
+ }
+ }
+ //end of diagnostic pass
+ #pragma omp critical (cadetectpass2)
+ {
+ for (int dir = 0; dir < 2; dir++) {
+ for (int c = 0; c < 2; c++) {
+ blockdenom[dir][c] += blockdenomthr[dir][c];
+ blocksqave[dir][c] += blocksqavethr[dir][c];
+ blockave[dir][c] += blockavethr[dir][c];
+ }
+ }
+ }
+ #pragma omp barrier
+
+ #pragma omp single
+ {
+ for (int dir = 0; dir < 2; dir++)
+ for (int c = 0; c < 2; c++) {
+ if (blockdenom[dir][c]) {
+ blockvar[dir][c] = blocksqave[dir][c] / blockdenom[dir][c] - SQR(blockave[dir][c] / blockdenom[dir][c]);
} else {
+ processpasstwo = false;
+ std::cout << "blockdenom vanishes" << std::endl;
+ break;
+ }
+ }
- //gradient weights using difference from G at CA shift points and G at grid points
- float p0 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[indx >> 1]));
- float p1 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[(indx - GRBdir1) >> 1]));
- float p2 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[((rr - GRBdir0) * ts + cc) >> 1]));
- float p3 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]));
-
- grbdiffint = (p0 * grbdiff[indx >> 1] + p1 * grbdiff[(indx - GRBdir1) >> 1] +
- p2 * grbdiff[((rr - GRBdir0) * ts + cc) >> 1] + p3 * grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]) / (p0 + p1 + p2 + p3) ;
-
- //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
- if (fabsf(grbdiffold) > fabsf(grbdiffint) ) {
- rgb[c][indx >> 1] = rgb[1][indx] - grbdiffint;
+ //now prepare for CA correction pass
+ //first, fill border blocks of blockshift array
+ if (processpasstwo) {
+ for (int vblock = 1; vblock < vblsz - 1; vblock++) { //left and right sides
+ for (int c = 0; c < 2; c++) {
+ for (int i = 0; i < 2; i++) {
+ blockshifts[vblock * hblsz][c][i] = blockshifts[(vblock) * hblsz + 2][c][i];
+ blockshifts[vblock * hblsz + hblsz - 1][c][i] = blockshifts[(vblock) * hblsz + hblsz - 3][c][i];
}
}
+ }
- //if colour difference interpolation overshot the correction, just desaturate
- if (grbdiffold * grbdiffint < 0) {
- rgb[c][indx >> 1] = rgb[1][indx] - 0.5f * (grbdiffold + grbdiffint);
+ for (int hblock = 0; hblock < hblsz; hblock++) { //top and bottom sides
+ for (int c = 0; c < 2; c++) {
+ for (int i = 0; i < 2; i++) {
+ blockshifts[hblock][c][i] = blockshifts[2 * hblsz + hblock][c][i];
+ blockshifts[(vblsz - 1)*hblsz + hblock][c][i] = blockshifts[(vblsz - 3) * hblsz + hblock][c][i];
+ }
+ }
+ }
+
+ //end of filling border pixels of blockshift array
+
+ //initialize fit arrays
+ double polymat[2][2][256], shiftmat[2][2][16];
+
+ for (int i = 0; i < 256; i++) {
+ polymat[0][0][i] = polymat[0][1][i] = polymat[1][0][i] = polymat[1][1][i] = 0;
+ }
+
+ for (int i = 0; i < 16; i++) {
+ shiftmat[0][0][i] = shiftmat[0][1][i] = shiftmat[1][0][i] = shiftmat[1][1][i] = 0;
+ }
+
+ int numblox[2] = {0, 0};
+
+ for (int vblock = 1; vblock < vblsz - 1; vblock++) {
+ for (int hblock = 1; hblock < hblsz - 1; hblock++) {
+ // block 3x3 median of blockshifts for robustness
+ for (int c = 0; c < 2; c ++) {
+ float bstemp[2];
+ for (int dir = 0; dir < 2; dir++) {
+ //temporary storage for median filter
+ const std::array p = {
+ blockshifts[(vblock - 1) * hblsz + hblock - 1][c][dir],
+ blockshifts[(vblock - 1) * hblsz + hblock][c][dir],
+ blockshifts[(vblock - 1) * hblsz + hblock + 1][c][dir],
+ blockshifts[(vblock) * hblsz + hblock - 1][c][dir],
+ blockshifts[(vblock) * hblsz + hblock][c][dir],
+ blockshifts[(vblock) * hblsz + hblock + 1][c][dir],
+ blockshifts[(vblock + 1) * hblsz + hblock - 1][c][dir],
+ blockshifts[(vblock + 1) * hblsz + hblock][c][dir],
+ blockshifts[(vblock + 1) * hblsz + hblock + 1][c][dir]
+ };
+ bstemp[dir] = median(p);
+ }
+
+ //now prepare coefficient matrix; use only data points within caAutostrength/2 std devs of zero
+ if (SQR(bstemp[0]) > caAutostrength * blockvar[0][c] || SQR(bstemp[1]) > caAutostrength * blockvar[1][c]) {
+ continue;
+ }
+
+ numblox[c]++;
+
+ for (int dir = 0; dir < 2; dir++) {
+ double powVblockInit = 1.0;
+ for (int i = 0; i < polyord; i++) {
+ double powHblockInit = 1.0;
+ for (int j = 0; j < polyord; j++) {
+ double powVblock = powVblockInit;
+ for (int m = 0; m < polyord; m++) {
+ double powHblock = powHblockInit;
+ for (int n = 0; n < polyord; n++) {
+ polymat[c][dir][numpar * (polyord * i + j) + (polyord * m + n)] += powVblock * powHblock * blockwt[vblock * hblsz + hblock];
+ powHblock *= hblock;
+ }
+ powVblock *= vblock;
+ }
+ shiftmat[c][dir][(polyord * i + j)] += powVblockInit * powHblockInit * bstemp[dir] * blockwt[vblock * hblsz + hblock];
+ powHblockInit *= hblock;
+ }
+ powVblockInit *= vblock;
+ }//monomials
+ }//dir
+ }//c
+ }//blocks
+ }
+ numblox[1] = min(numblox[0], numblox[1]);
+
+ //if too few data points, restrict the order of the fit to linear
+ if (numblox[1] < 32) {
+ polyord = 2;
+ numpar = 4;
+
+ if (numblox[1] < 10) {
+ std::cout << "numblox = " << numblox[1] << std::endl;
+ processpasstwo = false;
+ }
+ }
+
+ if (processpasstwo) {
+ //fit parameters to blockshifts
+ for (int c = 0; c < 2; c++) {
+ for (int dir = 0; dir < 2; dir++) {
+ if (!LinEqSolve(numpar, polymat[c][dir], shiftmat[c][dir], fitparams[c][dir])) {
+ std::cout << "CA correction pass failed -- can't solve linear equations for colour %d direction " << c << std::endl;
+ processpasstwo = false;
+ }
+ }
}
}
}
-
- // copy CA corrected results to temporary image matrix
- for (int rr = border; rr < rr1 - border; rr++) {
- int c = FC(rr + top, left + border + (FC(rr + top, 2) & 1));
- int row = rr + top;
- int cc = border + (FC(rr, 2) & 1);
- int indx = (row * width + cc + left) >> 1;
- int indx1 = (rr * ts + cc) >> 1;
-#ifdef __SSE2__
- for (; indx < (row * width + cc1 - border - 7 + left) >> 1; indx+=4, indx1 += 4) {
- STVFU(RawDataTmp[indx], c65535v * LVFU(rgb[c][indx1]));
- }
-#endif
- for (; indx < (row * width + cc1 - border + left) >> 1; indx++, indx1++) {
- RawDataTmp[indx] = 65535.f * rgb[c][indx1];
- }
- }
-
- if(plistener) {
- progresscounter++;
-
- if(progresscounter % 8 == 0)
- #pragma omp critical (cacorrect)
- {
- progress += (double)(8.0 * (ts - border2) * (ts - border2)) / (2 * height * width);
-
- if (progress > 1.0) {
- progress = 1.0;
- }
-
- plistener->setProgress(progress);
- }
- }
-
- }
-
- #pragma omp barrier
-// copy temporary image matrix back to image matrix
- #pragma omp for
-
- for(int row = 0; row < height; row++) {
- int col = FC(row, 0) & 1;
- int indx = (row * width + col) >> 1;
-#ifdef __SSE2__
- for(; col < width - 7; col += 8, indx += 4) {
- STC2VFU(rawData[row][col], LVFU(RawDataTmp[indx]));
- }
-#endif
- for(; col < width - (W & 1); col += 2, indx++) {
- rawData[row][col] = RawDataTmp[indx];
+ //fitparams[polyord*i+j] gives the coefficients of (vblock^i hblock^j) in a polynomial fit for i,j<=4
}
+ //end of initialization for CA correction pass
+ //only executed if autoCA is true
}
- }
+ // Main algorithm: Tile loop
+ if (processpasstwo) {
+ float* grbdiff = (float (*)) (data + 2 * sizeof(float) * ts * ts + 3 * 64); // there is no overlap in buffer usage => share
+ //green interpolated to optical sample points for R/B
+ float* gshift = (float (*)) (data + 2 * sizeof(float) * ts * ts + sizeof(float) * ts * tsh + 4 * 64); // there is no overlap in buffer usage => share
+ #pragma omp for schedule(dynamic) collapse(2)
+ for (int top = -border; top < height; top += ts - border2) {
+ for (int left = -border; left < width - (W & 1); left += ts - border2) {
+ memset(bufferThr, 0, buffersizePassTwo);
+ float lblockshifts[2][2];
+ const int vblock = ((top + border) / (ts - border2)) + 1;
+ const int hblock = ((left + border) / (ts - border2)) + 1;
+ const int bottom = min(top + ts, height + border);
+ const int right = min(left + ts, width - (W & 1) + border);
+ const int rr1 = bottom - top;
+ const int cc1 = right - left;
- // clean up
- free(bufferThr);
+ const int rrmin = top < 0 ? border : 0;
+ const int rrmax = bottom > height ? height - top : rr1;
+ const int ccmin = left < 0 ? border : 0;
+ const int ccmax = (right > width - (W & 1)) ? width - (W & 1) - left : cc1;
+
+ // rgb from input CFA data
+ // rgb values should be floating point number between 0 and 1
+ // after white balance multipliers are applied
+
+#ifdef __SSE2__
+ vfloat c65535v = F2V(65535.f);
+ vmask gmask = _mm_set_epi32(0, 0xffffffff, 0, 0xffffffff);
+#endif
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ int row = rr + top;
+ int cc = ccmin;
+ int col = cc + left;
+ int indx = row * width + col;
+ int indx1 = rr * ts + cc;
+#ifdef __SSE2__
+ int c = FC(rr, cc);
+ if (c & 1) {
+ rgb[1][indx1] = rawData[row][col] / 65535.f;
+ indx++;
+ indx1++;
+ cc++;
+ col++;
+ c = FC(rr, cc);
+ }
+ for (; cc < ccmax - 7; cc += 8, col += 8, indx += 8, indx1 += 8) {
+ vfloat val1v = LVFU(rawData[row][col]) / c65535v;
+ vfloat val2v = LVFU(rawData[row][col + 4]) / c65535v;
+ STVFU(rgb[c][indx1 >> 1], _mm_shuffle_ps(val1v, val2v, _MM_SHUFFLE(2, 0, 2, 0)));
+ vfloat gtmpv = LVFU(Gtmp[indx >> 1]);
+ STVFU(rgb[1][indx1], vself(gmask, PERMUTEPS(gtmpv, _MM_SHUFFLE(1, 1, 0, 0)), val1v));
+ STVFU(rgb[1][indx1 + 4], vself(gmask, PERMUTEPS(gtmpv, _MM_SHUFFLE(3, 3, 2, 2)), val2v));
+ }
+#endif
+ for (; cc < ccmax; cc++, col++, indx++, indx1++) {
+ int c = FC(rr, cc);
+ rgb[c][indx1 >> ((c & 1) ^ 1)] = rawData[row][col] / 65535.f;
+
+ if ((c & 1) == 0) {
+ rgb[1][indx1] = Gtmp[indx >> 1];
+ }
+ }
+ }
+
+ //fill borders
+ if (rrmin > 0) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = ccmin; cc < ccmax; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][((border2 - rr) * ts + cc) >> ((c & 1) ^ 1)];
+ rgb[1][rr * ts + cc] = rgb[1][(border2 - rr) * ts + cc];
+ }
+ }
+ }
+
+ if (rrmax < rr1) {
+ for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++) {
+ for (int cc = ccmin; cc < ccmax; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][left + cc]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][(rrmax + rr)*ts + cc] = Gtmp[((height - rr - 2) * width + left + cc) >> 1];
+ }
+ }
+ }
+ }
+
+ if (ccmin > 0) {
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = rgb[c][(rr * ts + border2 - cc) >> ((c & 1) ^ 1)];
+ rgb[1][rr * ts + cc] = rgb[1][rr * ts + border2 - cc];
+ }
+ }
+ }
+
+ if (ccmax < cc1) {
+ for (int rr = rrmin; rr < rrmax; rr++) {
+ for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(top + rr)][(width - cc - 2)]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][rr * ts + ccmax + cc] = Gtmp[((top + rr) * width + (width - cc - 2)) >> 1];
+ }
+ }
+ }
+ }
+
+ //also, fill the image corners
+ if (rrmin > 0 && ccmin > 0) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + cc) >> ((c & 1) ^ 1)] = (rawData[border2 - rr][border2 - cc]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][rr * ts + cc] = Gtmp[((border2 - rr) * width + border2 - cc) >> 1];
+ }
+ }
+ }
+ }
+
+ if (rrmax < rr1 && ccmax < cc1) {
+ for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++) {
+ for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(width - cc - 2)]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][(rrmax + rr)*ts + ccmax + cc] = Gtmp[((height - rr - 2) * width + (width - cc - 2)) >> 1];
+ }
+ }
+ }
+ }
+
+ if (rrmin > 0 && ccmax < cc1) {
+ for (int rr = 0; rr < border; rr++) {
+ for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
+ int c = FC(rr, cc);
+ rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(border2 - rr)][(width - cc - 2)]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][rr * ts + ccmax + cc] = Gtmp[((border2 - rr) * width + (width - cc - 2)) >> 1];
+ }
+ }
+ }
+ }
+
+ if (rrmax < rr1 && ccmin > 0) {
+ for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++) {
+ for (int cc = 0; cc < border; cc++) {
+ int c = FC(rr, cc);
+ rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(border2 - cc)]) / 65535.f;
+ if ((c & 1) == 0) {
+ rgb[1][(rrmax + rr)*ts + cc] = Gtmp[((height - rr - 2) * width + (border2 - cc)) >> 1];
+ }
+ }
+ }
+ }
+ //end of border fill
+
+ if (!autoCA || fitParamsIn) {
+#ifdef __SSE2__
+ const vfloat onev = F2V(1.f);
+ const vfloat epsv = F2V(eps);
+#endif
+ //manual CA correction; use red/blue slider values to set CA shift parameters
+ for (int rr = 3; rr < rr1 - 3; rr++) {
+ int cc = 3 + FC(rr, 1), c = FC(rr,cc), indx = rr * ts + cc;
+#ifdef __SSE2__
+ for (; cc < cc1 - 10; cc += 8, indx += 8) {
+ //compute directional weights using image gradients
+ vfloat val1v = epsv + vabsf(LC2VFU(rgb[1][(rr + 1) * ts + cc]) - LC2VFU(rgb[1][(rr - 1) * ts + cc]));
+ vfloat val2v = epsv + vabsf(LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx - 1]));
+ vfloat wtuv = onev / SQRV(val1v + vabsf(LVFU(rgb[c][(rr * ts + cc) >> 1]) - LVFU(rgb[c][((rr - 2) * ts + cc) >> 1])) + vabsf(LC2VFU(rgb[1][(rr - 1) * ts + cc]) - LC2VFU(rgb[1][(rr - 3) * ts + cc])));
+ vfloat wtdv = onev / SQRV(val1v + vabsf(LVFU(rgb[c][(rr * ts + cc) >> 1]) - LVFU(rgb[c][((rr + 2) * ts + cc) >> 1])) + vabsf(LC2VFU(rgb[1][(rr + 1) * ts + cc]) - LC2VFU(rgb[1][(rr + 3) * ts + cc])));
+ vfloat wtlv = onev / SQRV(val2v + vabsf(LVFU(rgb[c][indx >> 1]) - LVFU(rgb[c][(indx - 2) >> 1])) + vabsf(LC2VFU(rgb[1][indx - 1]) - LC2VFU(rgb[1][indx - 3])));
+ vfloat wtrv = onev / SQRV(val2v + vabsf(LVFU(rgb[c][indx >> 1]) - LVFU(rgb[c][(indx + 2) >> 1])) + vabsf(LC2VFU(rgb[1][indx + 1]) - LC2VFU(rgb[1][indx + 3])));
+
+ //store in rgb array the interpolated G value at R/B grid points using directional weighted average
+ STC2VFU(rgb[1][indx], (wtuv * LC2VFU(rgb[1][indx - v1]) + wtdv * LC2VFU(rgb[1][indx + v1]) + wtlv * LC2VFU(rgb[1][indx - 1]) + wtrv * LC2VFU(rgb[1][indx + 1])) / (wtuv + wtdv + wtlv + wtrv));
+ }
+#endif
+ for (; cc < cc1 - 3; cc += 2, indx += 2) {
+ //compute directional weights using image gradients
+ float wtu = 1.f / SQR(eps + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr - 1) * ts + cc]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][((rr - 2) * ts + cc) >> 1]) + fabsf(rgb[1][(rr - 1) * ts + cc] - rgb[1][(rr - 3) * ts + cc]));
+ float wtd = 1.f / SQR(eps + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr - 1) * ts + cc]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][((rr + 2) * ts + cc) >> 1]) + fabsf(rgb[1][(rr + 1) * ts + cc] - rgb[1][(rr + 3) * ts + cc]));
+ float wtl = 1.f / SQR(eps + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc - 1]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][(rr * ts + cc - 2) >> 1]) + fabsf(rgb[1][rr * ts + cc - 1] - rgb[1][rr * ts + cc - 3]));
+ float wtr = 1.f / SQR(eps + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc - 1]) + fabsf(rgb[c][(rr * ts + cc) >> 1] - rgb[c][(rr * ts + cc + 2) >> 1]) + fabsf(rgb[1][rr * ts + cc + 1] - rgb[1][rr * ts + cc + 3]));
+
+ //store in rgb array the interpolated G value at R/B grid points using directional weighted average
+ rgb[1][indx] = (wtu * rgb[1][indx - v1] + wtd * rgb[1][indx + v1] + wtl * rgb[1][indx - 1] + wtr * rgb[1][indx + 1]) / (wtu + wtd + wtl + wtr);
+ }
+ }
+ }
+
+ if (!autoCA) {
+ float hfrac = -((float)(hblock - 0.5) / (hblsz - 2) - 0.5);
+ float vfrac = -((float)(vblock - 0.5) / (vblsz - 2) - 0.5) * height / width;
+ lblockshifts[0][0] = 2 * vfrac * cared;
+ lblockshifts[0][1] = 2 * hfrac * cared;
+ lblockshifts[1][0] = 2 * vfrac * cablue;
+ lblockshifts[1][1] = 2 * hfrac * cablue;
+ } else {
+ //CA auto correction; use CA diagnostic pass to set shift parameters
+ lblockshifts[0][0] = lblockshifts[0][1] = 0;
+ lblockshifts[1][0] = lblockshifts[1][1] = 0;
+ double powVblock = 1.0;
+ for (int i = 0; i < polyord; i++) {
+ double powHblock = powVblock;
+ for (int j = 0; j < polyord; j++) {
+ lblockshifts[0][0] += powHblock * fitparams[0][0][polyord * i + j];
+ lblockshifts[0][1] += powHblock * fitparams[0][1][polyord * i + j];
+ lblockshifts[1][0] += powHblock * fitparams[1][0][polyord * i + j];
+ lblockshifts[1][1] += powHblock * fitparams[1][1][polyord * i + j];
+ powHblock *= hblock;
+ }
+ powVblock *= vblock;
+ }
+ constexpr float bslim = 3.99; //max allowed CA shift
+ lblockshifts[0][0] = LIM(lblockshifts[0][0], -bslim, bslim);
+ lblockshifts[0][1] = LIM(lblockshifts[0][1], -bslim, bslim);
+ lblockshifts[1][0] = LIM(lblockshifts[1][0], -bslim, bslim);
+ lblockshifts[1][1] = LIM(lblockshifts[1][1], -bslim, bslim);
+ }//end of setting CA shift parameters
+
+ for (int c = 0; c < 3; c += 2) {
+
+ //some parameters for the bilinear interpolation
+ shiftvfloor[c] = floor((float)lblockshifts[c>>1][0]);
+ shiftvceil[c] = ceil((float)lblockshifts[c>>1][0]);
+ if (lblockshifts[c>>1][0] < 0.f) {
+ std::swap(shiftvfloor[c], shiftvceil[c]);
+ }
+ shiftvfrac[c] = fabs(lblockshifts[c>>1][0] - shiftvfloor[c]);
+
+ shifthfloor[c] = floor((float)lblockshifts[c>>1][1]);
+ shifthceil[c] = ceil((float)lblockshifts[c>>1][1]);
+ if (lblockshifts[c>>1][1] < 0.f) {
+ std::swap(shifthfloor[c], shifthceil[c]);
+ }
+ shifthfrac[c] = fabs(lblockshifts[c>>1][1] - shifthfloor[c]);
+
+ GRBdir[0][c] = lblockshifts[c>>1][0] > 0 ? 2 : -2;
+ GRBdir[1][c] = lblockshifts[c>>1][1] > 0 ? 2 : -2;
+ }
+
+ for (int rr = 4; rr < rr1 - 4; rr++) {
+ int cc = 4 + (FC(rr, 2) & 1);
+ int c = FC(rr, cc);
+ int indx = (rr * ts + cc) >> 1;
+ int indxfc = (rr + shiftvfloor[c]) * ts + cc + shifthceil[c];
+ int indxff = (rr + shiftvfloor[c]) * ts + cc + shifthfloor[c];
+ int indxcc = (rr + shiftvceil[c]) * ts + cc + shifthceil[c];
+ int indxcf = (rr + shiftvceil[c]) * ts + cc + shifthfloor[c];
+#ifdef __SSE2__
+ vfloat shifthfracv = F2V(shifthfrac[c]);
+ vfloat shiftvfracv = F2V(shiftvfrac[c]);
+ for (; cc < cc1 - 10; cc += 8, indxfc += 8, indxff += 8, indxcc += 8, indxcf += 8, indx += 4) {
+ //perform CA correction using colour ratios or colour differences
+ vfloat Ginthfloorv = vintpf(shifthfracv, LC2VFU(rgb[1][indxfc]), LC2VFU(rgb[1][indxff]));
+ vfloat Ginthceilv = vintpf(shifthfracv, LC2VFU(rgb[1][indxcc]), LC2VFU(rgb[1][indxcf]));
+ //Gint is bilinear interpolation of G at CA shift point
+ vfloat Gintv = vintpf(shiftvfracv, Ginthceilv, Ginthfloorv);
+
+ //determine R/B at grid points using colour differences at shift point plus interpolated G value at grid point
+ //but first we need to interpolate G-R/G-B to grid points...
+ STVFU(grbdiff[indx], Gintv - LVFU(rgb[c][indx]));
+ STVFU(gshift[indx], Gintv);
+ }
+
+#endif
+ for (; cc < cc1 - 4; cc += 2, indxfc += 2, indxff += 2, indxcc += 2, indxcf += 2, ++indx) {
+ //perform CA correction using colour ratios or colour differences
+ float Ginthfloor = intp(shifthfrac[c], rgb[1][indxfc], rgb[1][indxff]);
+ float Ginthceil = intp(shifthfrac[c], rgb[1][indxcc], rgb[1][indxcf]);
+ //Gint is bilinear interpolation of G at CA shift point
+ float Gint = intp(shiftvfrac[c], Ginthceil, Ginthfloor);
+
+ //determine R/B at grid points using colour differences at shift point plus interpolated G value at grid point
+ //but first we need to interpolate G-R/G-B to grid points...
+ grbdiff[indx] = Gint - rgb[c][indx];
+ gshift[indx] = Gint;
+ }
+ }
+
+ shifthfrac[0] /= 2.f;
+ shifthfrac[2] /= 2.f;
+ shiftvfrac[0] /= 2.f;
+ shiftvfrac[2] /= 2.f;
+
+#ifdef __SSE2__
+ vfloat zd25v = F2V(0.25f);
+ vfloat onev = F2V(1.f);
+ vfloat zd5v = F2V(0.5f);
+ vfloat epsv = F2V(eps);
+#endif
+ for (int rr = 8; rr < rr1 - 8; rr++) {
+ int cc = 8 + (FC(rr, 2) & 1);
+ int c = FC(rr, cc);
+ int GRBdir0 = GRBdir[0][c];
+ int GRBdir1 = GRBdir[1][c];
+#ifdef __SSE2__
+ vfloat shifthfracc = F2V(shifthfrac[c]);
+ vfloat shiftvfracc = F2V(shiftvfrac[c]);
+ for (int indx = rr * ts + cc; cc < cc1 - 14; cc += 8, indx += 8) {
+ //interpolate colour difference from optical R/B locations to grid locations
+ vfloat grbdiffinthfloor = vintpf(shifthfracc, LVFU(grbdiff[(indx - GRBdir1) >> 1]), LVFU(grbdiff[indx >> 1]));
+ vfloat grbdiffinthceil = vintpf(shifthfracc, LVFU(grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]), LVFU(grbdiff[((rr - GRBdir0) * ts + cc) >> 1]));
+ //grbdiffint is bilinear interpolation of G-R/G-B at grid point
+ vfloat grbdiffint = vintpf(shiftvfracc, grbdiffinthceil, grbdiffinthfloor);
+
+ //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
+ vfloat cinv = LVFU(rgb[c][indx >> 1]);
+ vfloat rinv = LC2VFU(rgb[1][indx]);
+ vfloat RBint = rinv - grbdiffint;
+ vmask cmask = vmaskf_ge(vabsf(RBint - cinv), zd25v * (RBint + cinv));
+ if (_mm_movemask_ps((vfloat)cmask)) {
+ // if for any of the 4 pixels the condition is true, do the math for all 4 pixels and mask the unused out at the end
+ //gradient weights using difference from G at CA shift points and G at grid points
+ vfloat p0 = onev / (epsv + vabsf(rinv - LVFU(gshift[indx >> 1])));
+ vfloat p1 = onev / (epsv + vabsf(rinv - LVFU(gshift[(indx - GRBdir1) >> 1])));
+ vfloat p2 = onev / (epsv + vabsf(rinv - LVFU(gshift[((rr - GRBdir0) * ts + cc) >> 1])));
+ vfloat p3 = onev / (epsv + vabsf(rinv - LVFU(gshift[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1])));
+
+ grbdiffint = vself(cmask, (p0 * LVFU(grbdiff[indx >> 1]) + p1 * LVFU(grbdiff[(indx - GRBdir1) >> 1]) +
+ p2 * LVFU(grbdiff[((rr - GRBdir0) * ts + cc) >> 1]) + p3 * LVFU(grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1])) / (p0 + p1 + p2 + p3), grbdiffint);
+
+ }
+ vfloat grbdiffold = rinv - cinv;
+ RBint = rinv - grbdiffint;
+ RBint = vself(vmaskf_gt(vabsf(grbdiffold), vabsf(grbdiffint)), RBint, cinv);
+ RBint = vself(vmaskf_lt(grbdiffold * grbdiffint, ZEROV), rinv - zd5v * (grbdiffold + grbdiffint), RBint);
+ STVFU(rgb[c][indx >> 1], RBint);
+ }
+#endif
+ for (int c = FC(rr, cc), indx = rr * ts + cc; cc < cc1 - 8; cc += 2, indx += 2) {
+ float grbdiffold = rgb[1][indx] - rgb[c][indx >> 1];
+
+ //interpolate colour difference from optical R/B locations to grid locations
+ float grbdiffinthfloor = intp(shifthfrac[c], grbdiff[(indx - GRBdir1) >> 1], grbdiff[indx >> 1]);
+ float grbdiffinthceil = intp(shifthfrac[c], grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1], grbdiff[((rr - GRBdir0) * ts + cc) >> 1]);
+ //grbdiffint is bilinear interpolation of G-R/G-B at grid point
+ float grbdiffint = intp(shiftvfrac[c], grbdiffinthceil, grbdiffinthfloor);
+
+ //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
+ float RBint = rgb[1][indx] - grbdiffint;
+
+ if (fabsf(RBint - rgb[c][indx >> 1]) < 0.25f * (RBint + rgb[c][indx >> 1])) {
+ if (fabsf(grbdiffold) > fabsf(grbdiffint)) {
+ rgb[c][indx >> 1] = RBint;
+ }
+ } else {
+
+ //gradient weights using difference from G at CA shift points and G at grid points
+ float p0 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[indx >> 1]));
+ float p1 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[(indx - GRBdir1) >> 1]));
+ float p2 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[((rr - GRBdir0) * ts + cc) >> 1]));
+ float p3 = 1.f / (eps + fabsf(rgb[1][indx] - gshift[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]));
+
+ grbdiffint = (p0 * grbdiff[indx >> 1] + p1 * grbdiff[(indx - GRBdir1) >> 1] +
+ p2 * grbdiff[((rr - GRBdir0) * ts + cc) >> 1] + p3 * grbdiff[((rr - GRBdir0) * ts + cc - GRBdir1) >> 1]) / (p0 + p1 + p2 + p3) ;
+
+ //now determine R/B at grid points using interpolated colour differences and interpolated G value at grid point
+ if (fabsf(grbdiffold) > fabsf(grbdiffint)) {
+ rgb[c][indx >> 1] = rgb[1][indx] - grbdiffint;
+ }
+ }
+
+ //if colour difference interpolation overshot the correction, just desaturate
+ if (grbdiffold * grbdiffint < 0) {
+ rgb[c][indx >> 1] = rgb[1][indx] - 0.5f * (grbdiffold + grbdiffint);
+ }
+ }
+ }
+
+ // copy CA corrected results to temporary image matrix
+ for (int rr = border; rr < rr1 - border; rr++) {
+ int c = FC(rr + top, left + border + (FC(rr + top, 2) & 1));
+ int row = rr + top;
+ int cc = border + (FC(rr, 2) & 1);
+ int indx = (row * width + cc + left) >> 1;
+ int indx1 = (rr * ts + cc) >> 1;
+#ifdef __SSE2__
+ for (; indx < (row * width + cc1 - border - 7 + left) >> 1; indx+=4, indx1 += 4) {
+ STVFU(RawDataTmp[indx], c65535v * LVFU(rgb[c][indx1]));
+ }
+#endif
+ for (; indx < (row * width + cc1 - border + left) >> 1; indx++, indx1++) {
+ RawDataTmp[indx] = 65535.f * rgb[c][indx1];
+ }
+ }
+
+ if (plistener) {
+ progresscounter++;
+
+ if (progresscounter % 8 == 0)
+ #pragma omp critical (cacorrect)
+ {
+ progress += 4.0 * SQR(ts - border2) / (iterations * height * width);
+ progress = std::min(progress, 1.0);
+ plistener->setProgress(progress);
+ }
+ }
+ }
+ }
+
+ // copy temporary image matrix back to image matrix
+ #pragma omp for
+
+ for (int row = 0; row < height; row++) {
+ int col = FC(row, 0) & 1;
+ int indx = (row * width + col) >> 1;
+#ifdef __SSE2__
+ for (; col < width - 7 - (3 * (W & 1)); col += 8, indx += 4) {
+ STC2VFU(rawData[row][col], LVFU(RawDataTmp[indx]));
+ }
+#endif
+ for (; col < width - (3 * (W & 1)); col += 2, indx++) {
+ rawData[row][col] = RawDataTmp[indx];
+ }
+ }
+
+ }
+ // clean up
+ free(bufferThr);
+ }
+ if (avoidColourshift) {
+ // to avoid or at least reduce the colour shift caused by raw ca correction we compute the per pixel difference factors
+ // of red and blue channel and apply a gaussian blur to them.
+ // Then we apply the resulting factors per pixel on the result of raw ca correction
+
+ #pragma omp parallel
+ {
+ #ifdef __SSE2__
+ const vfloat onev = F2V(1.f);
+ const vfloat twov = F2V(2.f);
+ const vfloat zd5v = F2V(0.5f);
+ #endif
+ #pragma omp for
+ for (int i = 0; i < H; ++i) {
+ const int firstCol = FC(i, 0) & 1;
+ const int colour = FC(i, firstCol);
+ const array2D* nonGreen = colour == 0 ? redFactor : blueFactor;
+ int j = firstCol;
+ #ifdef __SSE2__
+ for (; j < W - 7; j += 8) {
+ const vfloat newvals = LC2VFU(rawData[i][j]);
+ const vfloat oldvals = LVFU((*oldraw)[i][j / 2]);
+ vfloat factors = oldvals / newvals;
+ factors = vself(vmaskf_le(newvals, onev), onev, factors);
+ factors = vself(vmaskf_le(oldvals, onev), onev, factors);
+ STVFU((*nonGreen)[i/2][j/2], LIMV(factors, zd5v, twov));
+ }
+ #endif
+ for (; j < W; j += 2) {
+ (*nonGreen)[i/2][j/2] = (rawData[i][j] <= 1.f || (*oldraw)[i][j / 2] <= 1.f) ? 1.f : rtengine::LIM((*oldraw)[i][j / 2] / rawData[i][j], 0.5f, 2.f);
+ }
+ }
+
+ #pragma omp single
+ {
+ if (H % 2) {
+ // odd height => factors for one channel are not set in last row => use values of preceding row
+ const int firstCol = FC(0, 0) & 1;
+ const int colour = FC(0, firstCol);
+ const array2D* nonGreen = colour == 0 ? blueFactor : redFactor;
+ for (int j = 0; j < (W + 1) / 2; ++j) {
+ (*nonGreen)[(H + 1) / 2 - 1][j] = (*nonGreen)[(H + 1) / 2 - 2][j];
+ }
+ }
+
+ if (W % 2) {
+ // odd width => factors for one channel are not set in last column => use value of preceding column
+ const int ngRow = 1 - (FC(0, 0) & 1);
+ const int ngCol = FC(ngRow, 0) & 1;
+ const int colour = FC(ngRow, ngCol);
+ const array2D* nonGreen = colour == 0 ? redFactor : blueFactor;
+ for (int i = 0; i < (H + 1) / 2; ++i) {
+ (*nonGreen)[i][(W + 1) / 2 - 1] = (*nonGreen)[i][(W + 1) / 2 - 2];
+ }
+ }
+ }
+
+ // blur correction factors
+ gaussianBlur(*redFactor, *redFactor, (W+1)/2, (H+1)/2, 30.0);
+ gaussianBlur(*blueFactor, *blueFactor, (W+1)/2, (H+1)/2, 30.0);
+
+ // apply correction factors to avoid (reduce) colour shift
+ #pragma omp for
+ for (int i = 0; i < H; ++i) {
+ const int firstCol = FC(i, 0) & 1;
+ const int colour = FC(i, firstCol);
+ const array2D* nonGreen = colour == 0 ? redFactor : blueFactor;
+ for (int j = firstCol; j < W; j += 2) {
+ rawData[i][j] *= (*nonGreen)[i/2][j/2];
+ }
+ }
+ }
+ }
}
- if(autoCA && fitParamsTransfer && fitParamsOut) {
+ if (autoCA && fitParamsTransfer && fitParamsOut) {
// store calculated parameters
int index = 0;
- for(int c = 0; c < 2; ++c) {
- for(int d = 0; d < 2; ++d) {
- for(int e = 0; e < 16; ++e) {
+ for (int c = 0; c < 2; ++c) {
+ for (int d = 0; d < 2; ++d) {
+ for (int e = 0; e < 16; ++e) {
fitParamsTransfer[index++] = fitparams[c][d][e];
}
}
}
}
- if(freeBuffer) {
+ if (freeBuffer) {
free(buffer);
buffer = nullptr;
}
- if(plistener) {
+ if (avoidColourshift) {
+ delete oldraw;
+ delete redFactor;
+ delete blueFactor;
+ }
+
+ if (plistener) {
plistener->setProgress(1.0);
}
return buffer;
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index 06e398fad..91c66f751 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -32,8 +32,8 @@ set(RTENGINESOURCEFILES
EdgePreservingDecomposition.cc
FTblockDN.cc
PF_correct_RT.cc
+ ahd_demosaic_RT.cc
amaze_demosaic_RT.cc
- amaze_vng4_demosaic_RT.cc
cJSON.c
calc_distort.cc
camconst.cc
@@ -53,7 +53,9 @@ set(RTENGINESOURCEFILES
dfmanager.cc
diagonalcurves.cc
dirpyr_equalizer.cc
+ dual_demosaic_RT.cc
dynamicprofile.cc
+ eahd_demosaic.cc
expo_before_b.cc
fast_demo.cc
ffmanager.cc
@@ -125,6 +127,7 @@ set(RTENGINESOURCEFILES
ipshadowshighlights.cc
xtrans_demosaic.cc
vng4_demosaic_RT.cc
+ ipsoftlight.cc
)
if(LENSFUN_HAS_LOAD_DIRECTORY)
diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc
index fdc00e0ce..43985ea2a 100644
--- a/rtengine/FTblockDN.cc
+++ b/rtengine/FTblockDN.cc
@@ -547,7 +547,7 @@ BENCHFUN
if (useNoiseLCurve || useNoiseCCurve) {
int hei = calclum->getHeight();
int wid = calclum->getWidth();
- TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
+ TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
const float wpi[3][3] = {
{static_cast(wprofi[0][0]), static_cast(wprofi[0][1]), static_cast(wprofi[0][2])},
@@ -815,7 +815,7 @@ BENCHFUN
}
}
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.workingProfile);
//inverse matrix user select
const float wip[3][3] = {
{static_cast(wiprof[0][0]), static_cast(wiprof[0][1]), static_cast(wiprof[0][2])},
@@ -823,7 +823,7 @@ BENCHFUN
{static_cast(wiprof[2][0]), static_cast(wiprof[2][1]), static_cast(wiprof[2][2])}
};
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
const float wp[3][3] = {
{static_cast(wprof[0][0]), static_cast(wprof[0][1]), static_cast(wprof[0][2])},
@@ -3338,7 +3338,7 @@ void ImProcFunctions::RGB_denoise_info(Imagefloat * src, Imagefloat * provicalc,
float** bcalc;
hei = provicalc->getHeight();
wid = provicalc->getWidth();
- TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
+ TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
const float wpi[3][3] = {
{static_cast(wprofi[0][0]), static_cast(wprofi[0][1]), static_cast(wprofi[0][2])},
@@ -3413,7 +3413,7 @@ void ImProcFunctions::RGB_denoise_info(Imagefloat * src, Imagefloat * provicalc,
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
const float wp[3][3] = {
{static_cast(wprof[0][0]), static_cast(wprof[0][1]), static_cast(wprof[0][2])},
{static_cast(wprof[1][0]), static_cast(wprof[1][1]), static_cast(wprof[1][2])},
diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc
new file mode 100644
index 000000000..7931bf17d
--- /dev/null
+++ b/rtengine/ahd_demosaic_RT.cc
@@ -0,0 +1,226 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2018 Ingo Weyrich (heckflosse67@gmx.de)
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+
+//
+// Adaptive Homogeneity-Directed interpolation is based on
+// the work of Keigo Hirakawa, Thomas Parks, and Paul Lee.
+// Optimized for speed and reduced memory usage 2018 Ingo Weyrich
+//
+
+#include
+#include "rtengine.h"
+#include "rawimagesource.h"
+#include "rt_math.h"
+#include "../rtgui/multilangmgr.h"
+#include "median.h"
+//#define BENCHMARK
+#include "StopWatch.h"
+
+namespace rtengine
+{
+#define TS 144
+void RawImageSource::ahd_demosaic()
+{
+ BENCHFUN
+
+ constexpr int dir[4] = { -1, 1, -TS, TS };
+ float xyz_cam[3][3];
+ LUTf cbrt(65536);
+
+ int width = W, height = H;
+
+ constexpr double xyz_rgb[3][3] = { /* XYZ from RGB */
+ { 0.412453, 0.357580, 0.180423 },
+ { 0.212671, 0.715160, 0.072169 },
+ { 0.019334, 0.119193, 0.950227 }
+ };
+
+ constexpr float d65_white[3] = { 0.950456, 1, 1.088754 };
+
+ double progress = 0.0;
+ if (plistener) {
+ plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD)));
+ plistener->setProgress (0.0);
+ }
+
+ for (int i = 0; i < 65536; i++) {
+ const double r = i / 65535.0;
+ cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0;
+ }
+
+ for (int i = 0; i < 3; i++)
+ for (unsigned int j = 0; j < 3; j++) {
+ xyz_cam[i][j] = 0;
+ for (int k = 0; k < 3; k++) {
+ xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i];
+ }
+ }
+
+ border_interpolate2(W, H, 5, rawData, red, green, blue);
+
+#ifdef _OPENMP
+#pragma omp parallel
+#endif
+{
+ int progresscounter = 0;
+ float *buffer = new float[13 * TS * TS]; /* 1053 kB per core */
+ auto rgb = (float(*)[TS][TS][3]) buffer;
+ auto lab = (float(*)[TS][TS][3])(buffer + 6 * TS * TS);
+ auto homo = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS);
+
+#ifdef _OPENMP
+ #pragma omp for collapse(2) schedule(dynamic) nowait
+#endif
+ for (int top = 2; top < height - 5; top += TS - 6) {
+ for (int left = 2; left < width - 5; left += TS - 6) {
+ // Interpolate green horizontally and vertically:
+ for (int row = top; row < top + TS && row < height - 2; row++) {
+ for (int col = left + (FC(row, left) & 1); col < std::min(left + TS, width - 2); col += 2) {
+ auto pix = &rawData[row][col];
+ float val0 = 0.25f * ((pix[-1] + pix[0] + pix[1]) * 2
+ - pix[-2] - pix[2]) ;
+ rgb[0][row - top][col - left][1] = median(val0, pix[-1], pix[1]);
+ float val1 = 0.25f * ((pix[-width] + pix[0] + pix[width]) * 2
+ - pix[-2 * width] - pix[2 * width]) ;
+ rgb[1][row - top][col - left][1] = median(val1, pix[-width], pix[width]);
+ }
+ }
+
+ // Interpolate red and blue, and convert to CIELab:
+ for (int d = 0; d < 2; d++)
+ for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) {
+ int cng = FC(row + 1, FC(row + 1, 0) & 1);
+ for (int col = left + 1; col < std::min(left + TS - 1, width - 3); col++) {
+ auto pix = &rawData[row][col];
+ auto rix = &rgb[d][row - top][col - left];
+ auto lix = lab[d][row - top][col - left];
+ if (FC(row, col) == 1) {
+ rix[0][2 - cng] = CLIP(pix[0] + (0.5f * (pix[-1] + pix[1]
+ - rix[-1][1] - rix[1][1] ) ));
+ rix[0][cng] = CLIP(pix[0] + (0.5f * (pix[-width] + pix[width]
+ - rix[-TS][1] - rix[TS][1])));
+ rix[0][1] = pix[0];
+ } else {
+ rix[0][cng] = CLIP(rix[0][1] + (0.25f * (pix[-width - 1] + pix[-width + 1]
+ + pix[+width - 1] + pix[+width + 1]
+ - rix[-TS - 1][1] - rix[-TS + 1][1]
+ - rix[+TS - 1][1] - rix[+TS + 1][1])));
+ rix[0][2 - cng] = pix[0];
+ }
+ float xyz[3] = {};
+
+ for(unsigned int c = 0; c < 3; ++c) {
+ xyz[0] += xyz_cam[0][c] * rix[0][c];
+ xyz[1] += xyz_cam[1][c] * rix[0][c];
+ xyz[2] += xyz_cam[2][c] * rix[0][c];
+ }
+
+ xyz[0] = cbrt[xyz[0]];
+ xyz[1] = cbrt[xyz[1]];
+ xyz[2] = cbrt[xyz[2]];
+
+ lix[0] = 116.f * xyz[1] - 16.f;
+ lix[1] = 500.f * (xyz[0] - xyz[1]);
+ lix[2] = 200.f * (xyz[1] - xyz[2]);
+ }
+ }
+
+ // Build homogeneity maps from the CIELab images:
+
+ for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) {
+ int tr = row - top;
+ float ldiff[2][4], abdiff[2][4];
+
+ for (int col = left + 2, tc = 2; col < left + TS - 2 && col < width - 4; col++, tc++) {
+ for (int d = 0; d < 2; d++) {
+ auto lix = &lab[d][tr][tc];
+
+ for (int i = 0; i < 4; i++) {
+ ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]);
+ abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1])
+ + SQR(lix[0][2] - lix[dir[i]][2]);
+ }
+ }
+
+ float leps = std::min(std::max(ldiff[0][0], ldiff[0][1]),
+ std::max(ldiff[1][2], ldiff[1][3]));
+ float abeps = std::min(std::max(abdiff[0][0], abdiff[0][1]),
+ std::max(abdiff[1][2], abdiff[1][3]));
+
+ for (int d = 0; d < 2; d++) {
+ homo[d][tr][tc] = 0;
+ for (int i = 0; i < 4; i++) {
+ homo[d][tr][tc] += (ldiff[d][i] <= leps) * (abdiff[d][i] <= abeps);
+ }
+ }
+ }
+ }
+
+ // Combine the most homogenous pixels for the final result:
+ for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) {
+ int tr = row - top;
+
+ for (int col = left + 3, tc = 3; col < std::min(left + TS - 3, width - 5); col++, tc++) {
+ uint16_t hm0 = 0, hm1 = 0;
+ for (int i = tr - 1; i <= tr + 1; i++)
+ for (int j = tc - 1; j <= tc + 1; j++) {
+ hm0 += homo[0][i][j];
+ hm1 += homo[1][i][j];
+ }
+
+ if (hm0 != hm1) {
+ int dir = hm1 > hm0;
+ red[row][col] = rgb[dir][tr][tc][0];
+ green[row][col] = rgb[dir][tr][tc][1];
+ blue[row][col] = rgb[dir][tr][tc][2];
+ } else {
+ red[row][col] = 0.5f * (rgb[0][tr][tc][0] + rgb[1][tr][tc][0]);
+ green[row][col] = 0.5f * (rgb[0][tr][tc][1] + rgb[1][tr][tc][1]);
+ blue[row][col] = 0.5f * (rgb[0][tr][tc][2] + rgb[1][tr][tc][2]);
+ }
+ }
+ }
+
+ if(plistener) {
+ progresscounter++;
+
+ if(progresscounter % 32 == 0) {
+#ifdef _OPENMP
+ #pragma omp critical (ahdprogress)
+#endif
+ {
+ progress += 32.0 * SQR(TS - 6) / (height * width);
+ progress = std::min(progress, 1.0);
+ plistener->setProgress(progress);
+ }
+ }
+ }
+
+ }
+ }
+ delete [] buffer;
+}
+ if(plistener) {
+ plistener->setProgress (1.0);
+ }
+
+}
+#undef TS
+
+}
\ No newline at end of file
diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc
index 1e1b97768..31419022d 100644
--- a/rtengine/amaze_demosaic_RT.cc
+++ b/rtengine/amaze_demosaic_RT.cc
@@ -1584,6 +1584,9 @@ void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, c
// clean up
free(buffer);
}
+ if(border < 4) {
+ border_interpolate2(W, H, 3, rawData, red, green, blue);
+ }
if(plistener) {
plistener->setProgress(1.0);
diff --git a/rtengine/amaze_vng4_demosaic_RT.cc b/rtengine/amaze_vng4_demosaic_RT.cc
deleted file mode 100644
index 08e142a4e..000000000
--- a/rtengine/amaze_vng4_demosaic_RT.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-////////////////////////////////////////////////////////////////
-//
-// combined AMaZE + VNG4 demosaic algorithm
-//
-//
-// copyright (c) 2018 Ingo Weyrich
-//
-// blends AMaZE and VNG4 output based on contrast
-//
-//
-// amaze_vng4_demosaic_RT.cc is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-//
-////////////////////////////////////////////////////////////////
-
-#include "rtengine.h"
-#include "rawimagesource.h"
-#include "rt_math.h"
-//#define BENCHMARK
-#include "StopWatch.h"
-#include "rt_algo.h"
-
-using namespace std;
-
-namespace rtengine
-{
-
-void RawImageSource::amaze_vng4_demosaic_RT(int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue, double contrast)
-{
- BENCHFUN
-
- if (contrast == 0.0) {
- // contrast == 0.0 means only AMaZE will be used
- amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
- return;
- }
-
- vng4_demosaic(rawData, red, green, blue);
-
- array2D redTmp(winw, winh);
- array2D greenTmp(winw, winh);
- array2D blueTmp(winw, winh);
- array2D L(winw, winh);
-
- amaze_demosaic_RT(0, 0, winw, winh, rawData, redTmp, greenTmp, blueTmp);
- const float xyz_rgb[3][3] = { // XYZ from RGB
- { 0.412453, 0.357580, 0.180423 },
- { 0.212671, 0.715160, 0.072169 },
- { 0.019334, 0.119193, 0.950227 }
- };
- #pragma omp parallel
- {
- #pragma omp for
- for(int i = 0; i < winh; ++i) {
- Color::RGB2L(redTmp[i], greenTmp[i], blueTmp[i], L[i], xyz_rgb, winw);
- }
- }
- // calculate contrast based blend factors to use vng4 in regions with low contrast
- JaggedArray blend(winw, winh);
- buildBlendMask(L, blend, winw, winh, contrast / 100.f);
-
- // the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
- #pragma omp parallel for
- for(int i = 0; i < winh; ++i) {
- for(int j = 0; j < winw; ++j) {
- red[i][j] = intp(blend[i][j], redTmp[i][j], red[i][j]);
- }
- }
- #pragma omp parallel for
- for(int i = 0; i < winh; ++i) {
- for(int j = 0; j < winw; ++j) {
- green[i][j] = intp(blend[i][j], greenTmp[i][j], green[i][j]);
- }
- }
- #pragma omp parallel for
- for(int i = 0; i < winh; ++i) {
- for(int j = 0; j < winw; ++j) {
- blue[i][j] = intp(blend[i][j], blueTmp[i][j], blue[i][j]);
- }
- }
-
-}
-}
diff --git a/rtengine/cJSON.c b/rtengine/cJSON.c
index 7e71ea9e8..fb8ce27e8 100644
--- a/rtengine/cJSON.c
+++ b/rtengine/cJSON.c
@@ -505,7 +505,7 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out
}
}
- /* sprintf failed or buffer overrun occured */
+ /* sprintf failed or buffer overrun occurred */
if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
{
return false;
@@ -1556,7 +1556,7 @@ static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_bu
buffer_skip_whitespace(input_buffer);
if (!parse_string(current_item, input_buffer))
{
- goto fail; /* faile to parse name */
+ goto fail; /* failed to parse name */
}
buffer_skip_whitespace(input_buffer);
diff --git a/rtengine/cJSON.h b/rtengine/cJSON.h
index a9c68fa2c..786dd2e0e 100644
--- a/rtengine/cJSON.h
+++ b/rtengine/cJSON.h
@@ -217,7 +217,7 @@ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJ
CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
-/* Remove/Detatch items from Arrays/Objects. */
+/* Remove/Detach items from Arrays/Objects. */
CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 449484e8a..fd7b4bf0f 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -660,7 +660,7 @@ Camera constants:
}
},
- { // Quality A, ISO and aperture WL data copyed from Shalrath's 60D data at RawTherapee forums
+ { // Quality A, ISO and aperture WL data copied from Shalrath's 60D data at RawTherapee forums
"make_model": "Canon EOS 60Da",
"dcraw_matrix": [ 17492,-7240,-2023,-1791,10323,1701,-186,1329,5406 ], // 60Da dng d65
"ranges": {
@@ -912,7 +912,7 @@ Camera constants:
}
},
- { // Quality C, white levels and apperture scaling copied from Canon EOS77d
+ { // Quality C, white levels and aperture scaling copied from Canon EOS77d
"make_model": [ "Canon EOS Rebel T7i", "Canon EOS 800D", "Canon EOS Kiss X9i" ],
"dcraw_matrix": [ 6970,-512,-968,-4425,12161,2553,-739,1982,5601 ], // DNG_V9.10.1 D65
"raw_crop": [ 264, 36, 6024, 4020 ], // full size 6288x4056, official crop 276,48,6275,4047
@@ -944,7 +944,7 @@ Camera constants:
}
},
- { // Quality B, apperture scaling copied from Canon EOS77d
+ { // Quality B, aperture scaling copied from Canon EOS77d
"make_model": [ "Canon EOS Rebel SL2", "Canon EOS 200D", "Canon EOS Kiss X9" ],
"dcraw_matrix": [ 7377,-742,-998,-4235,11981,2549,-673,1918,5538 ], // DNG_V9.12 D65
"raw_crop": [ 264, 36, 6024, 4020 ], // full size 6288x4056, official crop 276,48,6275,4047
@@ -1213,6 +1213,13 @@ Camera constants:
"ranges": { "white": 4050 } // nominal 4080-4093
},
+ { // Quality C
+ "make_model": [ "DJI FC2103" ],
+ "ranges": {
+ "black": 4080
+ }
+ },
+
{ // Quality B
"make_model": "FUJIFILM GFX 50S",
"dcraw_matrix": [ 11756,-4754,-874,-3056,11045,2305,-381,1457,6006 ], // DNGv9.9 D65
@@ -2496,6 +2503,11 @@ Camera constants:
"dcraw_matrix": [ 4932, -835, 141, -4878, 11868, 3437, -1138, 1961, 7067 ]
},
+ { // Quality C
+ "make_model": [ "Hasselblad H6D-100cMS" ],
+ "raw_crop": [ 64, 108, 11608, 8708 ]
+ },
+
// Dummy test entry to test the parser and show the format with all entries active
{
"make_model": "DummyMake DummyModel",
diff --git a/rtengine/clutstore.cc b/rtengine/clutstore.cc
index 4124e38bb..87ce25d97 100644
--- a/rtengine/clutstore.cc
+++ b/rtengine/clutstore.cc
@@ -50,7 +50,7 @@ bool loadFile(
const PreviewProps pp(0, 0, fw, fh, 1);
rtengine::procparams::ColorManagementParams icm;
- icm.working = working_color_space;
+ icm.workingProfile = working_color_space;
img_src.getImage(curr_wb, TR_NONE, img_float.get(), pp, rtengine::procparams::ToneCurveParams(), rtengine::procparams::RAWParams());
diff --git a/rtengine/color.cc b/rtengine/color.cc
index b5fdbe9fe..3f8fddacd 100644
--- a/rtengine/color.cc
+++ b/rtengine/color.cc
@@ -192,7 +192,6 @@ void Color::init()
{
gammatab_srgb[i] = gammatab_srgb1[i] = gamma2(i / 65535.0);
}
-
gammatab_srgb *= 65535.f;
gamma2curve.share(gammatab_srgb, LUT_CLIP_BELOW | LUT_CLIP_ABOVE); // shares the buffer with gammatab_srgb but has different clip flags
}
@@ -411,7 +410,7 @@ void Color::rgb2lab01(const Glib::ustring &profile, const Glib::ustring &profile
r = pow_F(r, 1.8f);
g = pow_F(g, 1.8f);
b = pow_F(b, 1.8f);
- } else if (profile == "Rec2020") {
+ } else if (profileW == "Rec2020") {
if (r > 0.0795f) {
r = pow_F(((r + 0.0954f) / 1.0954f), 2.2f);
} else {
@@ -435,17 +434,17 @@ void Color::rgb2lab01(const Glib::ustring &profile, const Glib::ustring &profile
b = pow_F(b, 2.2f);
}
} else { //display output profile
- if (profile == "RT_sRGB" || profile == "RT_sRGB_gBT709" || profile == "RT_sRGB_g10") {
+ if (profile == settings->srgb) {
// use default "sRGB"
- } else if (profile == "ProPhoto" || profile == "RT_Large_gBT709" || profile == "RT_Large_g10" || profile == "RT_Large_gsRGB") {
+ } else if (profile == "ProPhoto" || profile == settings->prophoto) {
profileCalc = "ProPhoto";
- } else if (profile == "AdobeRGB1998" || profile == "RT_Medium_gsRGB") {
+ } else if (profile == "AdobeRGB1998" || profile == settings->adobe) {
profileCalc = "Adobe RGB";
- } else if (profile == "WideGamutRGB") {
+ } else if (profile == settings->widegamut) {
profileCalc = "WideGamut";
}
- if (profile == "RT_sRGB" || profile == "RT_Large_gsRGB" || profile == "RT_Medium_gsRGB") { //apply sRGB inverse gamma
+ if (profile == settings->srgb || profile == settings->adobe) { //apply sRGB inverse gamma
if (r > 0.04045f) {
r = pow_F(((r + 0.055f) / 1.055f), rtengine::Color::sRGBGammaCurve);
} else {
@@ -463,7 +462,7 @@ void Color::rgb2lab01(const Glib::ustring &profile, const Glib::ustring &profile
} else {
b /= 12.92f;
}
- } else if (profile == "RT_sRGB_gBT709" || profile == "RT_Large_gBT709" || profile == "Rec2020") {
+ } else if (profile == settings->prophoto || profile == settings->rec2020) {
if (r > 0.0795f) {
r = pow_F(((r + 0.0954f) / 1.0954f), 2.2f);
} else {
@@ -487,9 +486,6 @@ void Color::rgb2lab01(const Glib::ustring &profile, const Glib::ustring &profile
r = pow_F(r, 1.8f);
g = pow_F(g, 1.8f);
b = pow_F(b, 1.8f);
- } else if (profile == "RT_sRGB_g10" || profile == "RT_Large_g10") {
- // gamma 1.0, do nothing
-
} else {// apply inverse gamma 2.2
r = pow_F(r, 2.2f);
@@ -1613,7 +1609,7 @@ void Color::calcGamma(double pwr, double ts, int mode, GammaValues &gamma)
bnd[g[1] >= 1.] = 1.;
if (g[1] && (g[1] - 1.) * (g[0] - 1.) <= 0.) {
- for (i = 0; i < 48; i++) {
+ for (i = 0; i < 99; i++) {
g[2] = (bnd[0] + bnd[1]) / 2.;
if (g[0]) {
diff --git a/rtengine/color.h b/rtengine/color.h
index b0527bc9b..239997110 100644
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -20,11 +20,13 @@
#pragma once
#include
+#include
#include "rt_math.h"
#include "LUT.h"
#include "labimage.h"
#include "iccmatrices.h"
+#include "lcms2.h"
#include "sleef.c"
#define SAT(a,b,c) ((float)max(a,b,c)-(float)min(a,b,c))/(float)max(a,b,c)
@@ -1075,25 +1077,35 @@ public:
/**
* @brief sRGB gamma
- * See also calcGamma above with the following values: pwr=2.4 ts=12.92 mode=0.003041 imax=0.055011
+ * See also calcGamma above with the following values: pwr=2.399 ts=12.92310 mode=0.003041 imax=0.055
* @param x red, green or blue channel's value [0 ; 1]
* @return the gamma modified's value [0 ; 1]
*/
static inline double gamma2(double x) // g3 1+g4
{
- return x <= 0.003041 ? x * 12.92 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;
+ // return x <= 0.003041 ? x * 12.92310 : 1.055 * exp(log(x) / 2.39990) - 0.055;//calculate with calcgamma
+ //return x <= 0.0031308 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//standard discontinuous
+ //very small differences between the 2
+ return x <= 0.003040 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//continuous
+ // return x <= 0.003041 ? x * 12.92310 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;//continuous
+
}
/**
* @brief Inverse sRGB gamma
- * See also calcGamma above with the following values: pwr=2.4 ts=12.92 mode=0.003041 imax=0.055011
+ * See also calcGamma above with the following values: pwr=2.3999 ts=12.92310 mode=0.003041 imax=0.055
* @param x red, green or blue channel's value [0 ; 1]
* @return the inverse gamma modified's value [0 ; 1]
*/
static inline double igamma2(double x) //g2
{
- return x <= 0.039293 ? x / 12.92 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);
+ // return x <= 0.039289 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * 2.39990);//calculate with calcgamma
+ // return x <= 0.04045 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//standard discontinuous
+ //very small differences between the 4
+ return x <= 0.039286 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//continuous
+ // return x <= 0.039293 ? x / 12.92310 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);//continuous
+
}
diff --git a/rtengine/colortemp.cc b/rtengine/colortemp.cc
index 75b32c83c..a7a769d93 100644
--- a/rtengine/colortemp.cc
+++ b/rtengine/colortemp.cc
@@ -1102,7 +1102,7 @@ void ColorTemp::temp2mul (double temp, double green, double equal, double& rmul,
// only for lamp different of tungstene
// first calcul with illuminant (choice)
// and calcul with : blackbody at equivalent temp of lamp
- // CRI_color-1 = dispaly Lab values of color CRI_color -1
+ // CRI_color-1 = display Lab values of color CRI_color -1
const double whiteD50[3] = {0.9646019585, 1.0, 0.8244507152}; //calculate with this tool : spect 5nm
double CAM02BB00, CAM02BB01, CAM02BB02, CAM02BB10, CAM02BB11, CAM02BB12, CAM02BB20, CAM02BB21, CAM02BB22; //for CIECAT02
double Xchk[50], Ychk[50], Zchk[50]; //50 : I think it's a good limit for number of color : for CRI and Palette
diff --git a/rtengine/curves.h b/rtengine/curves.h
index 6b5119a26..3e6c52734 100644
--- a/rtengine/curves.h
+++ b/rtengine/curves.h
@@ -267,19 +267,19 @@ public:
// standard srgb gamma and its inverse
static inline double gamma2(double x)
{
- return x <= 0.00304 ? x * 12.92 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;
+ return x <= 0.00304 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;
}
static inline double igamma2(double x)
{
- return x <= 0.03928 ? x / 12.92 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);
+ return x <= 0.03928 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);
}
static inline float gamma2(float x)
{
- return x <= 0.00304 ? x * 12.92 : 1.055 * expf(logf(x) / sRGBGammaCurve) - 0.055;
+ return x <= 0.00304 ? x * 12.92310 : 1.055 * expf(logf(x) / sRGBGammaCurve) - 0.055;
}
static inline float igamma2(float x)
{
- return x <= 0.03928 ? x / 12.92 : expf(logf((x + 0.055) / 1.055) * sRGBGammaCurve);
+ return x <= 0.03928 ? x / 12.92310 : expf(logf((x + 0.055) / 1.055) * sRGBGammaCurve);
}
// gamma function with adjustable parameters
static inline double gamma(double x, double gamma, double start, double slope, double mul, double add)
@@ -462,6 +462,7 @@ protected:
DiagonalCurveType kind;
void spline_cubic_set();
+ void catmull_rom_set();
void NURBS_set();
public:
diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc
index ec65a030a..c18ee8915 100644
--- a/rtengine/dcp.cc
+++ b/rtengine/dcp.cc
@@ -1813,7 +1813,7 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
try {
if (!Glib::file_test(dirname, Glib::FILE_TEST_IS_DIR)) {
- return;
+ continue;
}
dir.reset(new Glib::Dir(dirname));
diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 05f1a32a2..bd9fa4b47 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -27,10 +27,12 @@
#include
#include
#include "opthelper.h"
+//#define BENCHMARK
+#include "StopWatch.h"
/*
dcraw.c -- Dave Coffin's raw photo decoder
- Copyright 1997-2016 by Dave Coffin, dcoffin a cybercom o net
+ Copyright 1997-2018 by Dave Coffin, dcoffin a cybercom o net
This is a command-line ANSI C program to convert raw photos from
any digital camera on any computer running any operating system.
@@ -49,11 +51,11 @@
*If you have not modified dcraw.c in any way, a link to my
homepage qualifies as "full source code".
- $Revision: 1.477 $
- $Date: 2016/05/10 21:30:43 $
+ $Revision: 1.478 $
+ $Date: 2018/06/01 20:36:25 $
*/
-#define DCRAW_VERSION "9.27"
+#define DCRAW_VERSION "9.28"
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -602,6 +604,36 @@ inline unsigned CLASS getbithuff_t::operator() (int nbits, ushort *huff)
#define getbits(n) getbithuff(n,0)
#define gethuff(h) getbithuff(*h,h+1)
+inline unsigned CLASS nikbithuff_t::operator() (int nbits, ushort *huff)
+{
+ unsigned c;
+
+ if (UNLIKELY(nbits == 0)) {
+ return 0;
+ }
+ if (vbits < nbits && LIKELY((c = fgetc(ifp)) != EOF)) {
+ bitbuf = (bitbuf << 8) | c;
+ vbits += 8;
+ if (vbits < nbits && LIKELY((c = fgetc(ifp)) != EOF)) {
+ bitbuf = (bitbuf << 8) | c;
+ vbits += 8;
+ }
+ }
+ c = bitbuf << (32-vbits) >> (32-nbits);
+ if (huff) {
+ vbits -= huff[c] >> 8;
+ c = (uchar) huff[c];
+ derror(vbits < 0);
+ } else {
+ vbits -= nbits;
+ }
+ return c;
+}
+
+#define nikinit(n) nikbithuff()
+#define nikbits(n) nikbithuff(n,0)
+#define nikhuff(h) nikbithuff(*h,h+1)
+
/*
Construct a decode tree according the specification in *source.
The first 16 bytes specify how many codes should be 1-bit, 2-bit
@@ -1104,7 +1136,7 @@ void CLASS lossless_dng_load_raw()
fseek (ifp, get4(), SEEK_SET);
if (!ljpeg_start (&jh, 0)) break;
jwide = jh.wide;
- if (filters) jwide *= jh.clrs;
+ if (filters || (colors == 1 && jh.clrs > 1)) jwide *= jh.clrs;
jwide /= MIN (is_raw, tiff_samples);
switch (jh.algo) {
case 0xc1:
@@ -1188,67 +1220,101 @@ void CLASS pentax_load_raw()
void CLASS nikon_load_raw()
{
- static const uchar nikon_tree[][32] = {
- { 0,1,5,1,1,1,1,1,1,2,0,0,0,0,0,0, /* 12-bit lossy */
- 5,4,3,6,2,7,1,0,8,9,11,10,12 },
- { 0,1,5,1,1,1,1,1,1,2,0,0,0,0,0,0, /* 12-bit lossy after split */
- 0x39,0x5a,0x38,0x27,0x16,5,4,3,2,1,0,11,12,12 },
- { 0,1,4,2,3,1,2,0,0,0,0,0,0,0,0,0, /* 12-bit lossless */
- 5,4,6,3,7,2,8,1,9,0,10,11,12 },
- { 0,1,4,3,1,1,1,1,1,2,0,0,0,0,0,0, /* 14-bit lossy */
- 5,6,4,7,8,3,9,2,1,0,10,11,12,13,14 },
- { 0,1,5,1,1,1,1,1,1,1,2,0,0,0,0,0, /* 14-bit lossy after split */
- 8,0x5c,0x4b,0x3a,0x29,7,6,5,4,3,2,1,0,13,14 },
- { 0,1,4,2,2,3,1,2,0,0,0,0,0,0,0,0, /* 14-bit lossless */
- 7,6,8,5,9,4,10,3,11,12,2,0,1,13,14 } };
- ushort *huff, ver0, ver1, vpred[2][2], hpred[2], csize;
- int i, min, max, step=0, tree=0, split=0, row, col, len, shl, diff;
+ static const uchar nikon_tree[][32] = {
+ { 0,1,5,1,1,1,1,1,1,2,0,0,0,0,0,0, /* 12-bit lossy */
+ 5,4,3,6,2,7,1,0,8,9,11,10,12 },
+ { 0,1,5,1,1,1,1,1,1,2,0,0,0,0,0,0, /* 12-bit lossy after split */
+ 0x39,0x5a,0x38,0x27,0x16,5,4,3,2,1,0,11,12,12 },
+ { 0,1,4,2,3,1,2,0,0,0,0,0,0,0,0,0, /* 12-bit lossless */
+ 5,4,6,3,7,2,8,1,9,0,10,11,12 },
+ { 0,1,4,3,1,1,1,1,1,2,0,0,0,0,0,0, /* 14-bit lossy */
+ 5,6,4,7,8,3,9,2,1,0,10,11,12,13,14 },
+ { 0,1,5,1,1,1,1,1,1,1,2,0,0,0,0,0, /* 14-bit lossy after split */
+ 8,0x5c,0x4b,0x3a,0x29,7,6,5,4,3,2,1,0,13,14 },
+ { 0,1,4,2,2,3,1,2,0,0,0,0,0,0,0,0, /* 14-bit lossless */
+ 7,6,8,5,9,4,10,3,11,12,2,0,1,13,14 } };
+ ushort *huff, ver0, ver1, vpred[2][2], hpred[2], csize;
+ int max, step=0, tree=0, split=0;
- fseek (ifp, meta_offset, SEEK_SET);
- ver0 = fgetc(ifp);
- ver1 = fgetc(ifp);
- if (ver0 == 0x49 || ver1 == 0x58)
- fseek (ifp, 2110, SEEK_CUR);
- if (ver0 == 0x46) tree = 2;
- if (tiff_bps == 14) tree += 3;
- read_shorts (vpred[0], 4);
- max = 1 << tiff_bps & 0x7fff;
- if ((csize = get2()) > 1)
- step = max / (csize-1);
- if (ver0 == 0x44 && ver1 == 0x20 && step > 0) {
- for (i=0; i < csize; i++)
- curve[i*step] = get2();
- for (i=0; i < max; i++)
- curve[i] = ( curve[i-i%step]*(step-i%step) +
- curve[i-i%step+step]*(i%step) ) / step;
- fseek (ifp, meta_offset+562, SEEK_SET);
- split = get2();
- } else if (ver0 != 0x46 && csize <= 0x4001)
- read_shorts (curve, max=csize);
- while (curve[max-2] == curve[max-1]) max--;
- huff = make_decoder (nikon_tree[tree]);
- fseek (ifp, data_offset, SEEK_SET);
- getbits(-1);
- for (min=row=0; row < height; row++) {
- if (split && row == split) {
- free (huff);
- huff = make_decoder (nikon_tree[tree+1]);
- max += (min = 16) << 1;
+ fseek (ifp, meta_offset, SEEK_SET);
+ ver0 = fgetc(ifp);
+ ver1 = fgetc(ifp);
+ if (ver0 == 0x49 || ver1 == 0x58)
+ fseek (ifp, 2110, SEEK_CUR);
+ if (ver0 == 0x46) tree = 2;
+ if (tiff_bps == 14) tree += 3;
+ read_shorts (vpred[0], 4);
+ max = 1 << tiff_bps & 0x7fff;
+ if ((csize = get2()) > 1)
+ step = max / (csize-1);
+ if (ver0 == 0x44 && ver1 == 0x20 && step > 0) {
+ for (int i=0; i < csize; i++)
+ curve[i*step] = get2();
+ for (int i=0; i < max; i++)
+ curve[i] = ( curve[i-i%step]*(step-i%step) +
+ curve[i-i%step+step]*(i%step) ) / step;
+ fseek (ifp, meta_offset+562, SEEK_SET);
+ split = get2();
+ } else if (ver0 != 0x46 && csize <= 0x4001)
+ read_shorts (curve, max=csize);
+ while (curve[max-2] == curve[max-1]) max--;
+
+ // instead of accessing curve[LIM((short)hpred[col & 1],0,0x3fff)] in the inner loop, we just fill the curve with the correct values and access curve[hpred[col & 1]]
+ for(int i = 0x4000; i < 0x8000; ++i)
+ curve[i] = curve[0x3fff];
+ for(int i = 0x8000; i < 0x10000; ++i)
+ curve[i] = curve[0];
+
+ huff = make_decoder (nikon_tree[tree]);
+ fseek (ifp, data_offset, SEEK_SET);
+ nikinit();
+ if (split) {
+ for (int min = 0, row = 0; row < height; row++) {
+ if (row == split) {
+ free (huff);
+ huff = make_decoder (nikon_tree[tree+1]);
+ max += (min = 16) << 1;
+ }
+ for (int col=0; col < raw_width; col++) {
+ int i = nikhuff(huff);
+ int len = i & 15;
+ int shl = i >> 4;
+ int diff = ((nikbits(len-shl) << 1) + 1) << shl >> 1;
+ if ((diff & (1 << (len-1))) == 0)
+ diff -= (1 << len) - !shl;
+ if (col < 2) hpred[col] = vpred[row & 1][col] += diff;
+ else hpred[col & 1] += diff;
+ derror((ushort)(hpred[col & 1] + min) >= max);
+ RAW(row,col) = curve[hpred[col & 1]];
+ }
+ }
+ } else {
+ for (int row=0; row < height; row++) {
+ for (int col=0; col < 2; col++) {
+ int len = nikhuff(huff);
+ int diff = nikbits(len);
+ if ((diff & (1 << (len-1))) == 0)
+ diff -= (1 << len) - 1;
+ hpred[col] = vpred[row & 1][col] += diff;
+ derror(hpred[col] >= max);
+ RAW(row,col) = curve[hpred[col]];
+ }
+ for (int col=2; col < raw_width; col++) {
+ int len = nikhuff(huff);
+ int diff = nikbits(len);
+ if ((diff & (1 << (len-1))) == 0)
+ diff -= (1 << len) - 1;
+ hpred[col & 1] += diff;
+ derror(hpred[col & 1] >= max);
+ RAW(row,col) = curve[hpred[col & 1]];
+ }
+ }
}
- for (col=0; col < raw_width; col++) {
- i = gethuff(huff);
- len = i & 15;
- shl = i >> 4;
- diff = ((getbits(len-shl) << 1) + 1) << shl >> 1;
- if ((diff & (1 << (len-1))) == 0)
- diff -= (1 << len) - !shl;
- if (col < 2) hpred[col] = vpred[row & 1][col] += diff;
- else hpred[col & 1] += diff;
- if ((ushort)(hpred[col & 1] + min) >= max) derror();
- RAW(row,col) = curve[LIM((short)hpred[col & 1],0,0x3fff)];
+ free (huff);
+ data_error += nikbithuff.errorCount();
+ if(data_error) {
+ std::cerr << ifname << " decoded with " << data_error << " errors. File possibly corrupted." << std::endl;
}
- }
- free (huff);
}
void CLASS nikon_yuv_load_raw()
@@ -2010,7 +2076,7 @@ void CLASS parse_hasselblad_gain()
hbd.unknown1 = offset ? base + offset : 0;
fseek(ifp, 32, SEEK_CUR);
offset = get4();
- hbd.flatfield = offset ? base + offset : 0;
+ hbd.flatfield = (offset && (base + offset < ifp->size)) ? base + offset : 0;
}
void CLASS hasselblad_correct()
@@ -2080,8 +2146,12 @@ void CLASS hasselblad_correct()
ffcols = get2();
ffrows = get2();
fseek(ifp, hbd.flatfield + 16 * 2, SEEK_SET);
+ unsigned toRead = sizeof(ushort) * 4 * ffcols * ffrows;
+ if (toRead > ifp->size) { // there must be something wrong, see Issue #4748
+ return;
+ }
- ushort *ffmap = (ushort *)malloc(sizeof(*ffmap) * 4 * ffcols * ffrows);
+ ushort *ffmap = (ushort *)malloc(toRead);
for (i = 0; i < 4 * ffcols * ffrows; i++) ffmap[i] = get2();
/* Get reference values from center of field. This seems to be what Phocus does too,
@@ -2432,10 +2502,10 @@ void CLASS packed_load_raw()
UINT64 bitbuf=0;
bwide = raw_width * tiff_bps / 8;
- bwide += bwide & load_flags >> 7;
+ bwide += bwide & load_flags >> 9;
rbits = bwide * 8 - raw_width * tiff_bps;
if (load_flags & 1) bwide = bwide * 16 / 15;
- bite = 8 + (load_flags & 24);
+ bite = 8 + (load_flags & 56);
half = (raw_height+1) >> 1;
for (irow=0; irow < raw_height; irow++) {
row = irow;
@@ -2453,10 +2523,10 @@ void CLASS packed_load_raw()
for (vbits -= tiff_bps; vbits < 0; vbits += bite) {
bitbuf <<= bite;
for (i=0; i < bite; i+=8)
- bitbuf |= (unsigned) (fgetc(ifp) << i);
+ bitbuf |= ((UINT64) fgetc(ifp) << i);
}
val = bitbuf << (64-tiff_bps-vbits) >> (64-tiff_bps);
- RAW(row,col ^ (load_flags >> 6 & 1)) = val;
+ RAW(row,col ^ (load_flags >> 6 & 3)) = val;
if (load_flags & 1 && (col % 10) == 9 && fgetc(ifp) &&
row < height+top_margin && col < width+left_margin) derror();
}
@@ -2896,7 +2966,7 @@ void CLASS lossy_dng_load_raw()
}
order = sorder;
} else {
- gamma_curve (1/2.4, 12.92, 1, 255);
+ gamma_curve (1/2.4, 12.92310, 1, 255);
FORC3 memcpy (cur[c], curve, sizeof cur[0]);
}
cinfo.err = jpeg_std_error (&jerr);
@@ -4334,7 +4404,7 @@ void CLASS crop_masked_pixels()
load_raw == &CLASS sony_load_raw ||
(load_raw == &CLASS eight_bit_load_raw && strncmp(model,"DC2",3)) ||
load_raw == &CLASS kodak_262_load_raw ||
- (load_raw == &CLASS packed_load_raw && (load_flags & 32))) {
+ (load_raw == &CLASS packed_load_raw && (load_flags & 256))) {
sides:
mask[0][0] = mask[1][0] = top_margin;
mask[0][2] = mask[1][2] = top_margin+height;
@@ -5974,14 +6044,13 @@ int CLASS parse_tiff_ifd (int base)
case 258: /* BitsPerSample */
case 61443:
tiff_ifd[ifd].samples = len & 7;
- tiff_ifd[ifd].bps = getint(type);
+ if ((tiff_ifd[ifd].bps = getint(type)) > 32)
+ tiff_ifd[ifd].bps = 8;
if (tiff_bps < tiff_ifd[ifd].bps)
tiff_bps = tiff_ifd[ifd].bps;
break;
case 61446:
raw_height = 0;
- if (tiff_ifd[ifd].bps > 12) break;
- load_raw = &CLASS packed_load_raw;
load_flags = get4() ? 24:80;
break;
case 259: /* Compression */
@@ -6548,6 +6617,7 @@ void CLASS apply_tiff()
case 32767:
if (tiff_ifd[raw].bytes == raw_width*raw_height) {
tiff_bps = 12;
+ maximum = 4095;
load_raw = &CLASS sony_arw2_load_raw; break;
}
if (tiff_ifd[raw].bytes*8 != raw_width*raw_height*tiff_bps) {
@@ -6563,7 +6633,9 @@ void CLASS apply_tiff()
if (!strncmp(make,"OLYMPUS",7) &&
tiff_ifd[raw].bytes*2 == raw_width*raw_height*3)
load_flags = 24;
- if (tiff_ifd[raw].bytes*5 == raw_width*raw_height*8) {
+ if (!strcmp(make,"SONY") && tiff_bps < 14 &&
+ tiff_ifd[raw].bytes == raw_width*raw_height*2)
+ tiff_bps = 14; if (tiff_ifd[raw].bytes*5 == raw_width*raw_height*8) {
load_flags = 81;
tiff_bps = 12;
} slr:
@@ -6577,7 +6649,9 @@ void CLASS apply_tiff()
load_raw = &CLASS packed_load_raw;
break;
}
- case 14: load_flags = 0;
+ case 14: load_raw = &CLASS packed_load_raw;
+ if (tiff_ifd[raw].bytes*4 == raw_width*raw_height*7) break;
+ load_flags = 0;
case 16: load_raw = &CLASS unpacked_load_raw;
if (!strncmp(make,"OLYMPUS",7) &&
tiff_ifd[raw].bytes*7 > raw_width*raw_height)
@@ -6594,6 +6668,9 @@ void CLASS apply_tiff()
}
// ------------------
}
+// if (filters == 9 && tiff_ifd[raw].bytes*8 < raw_width*raw_height*tiff_bps)
+// load_raw = &CLASS fuji_xtrans_load_raw;
+
break;
case 6: case 7: case 99:
load_raw = &CLASS lossless_jpeg_load_raw; break;
@@ -6608,7 +6685,7 @@ void CLASS apply_tiff()
if (model[0] == 'N') load_flags = 80;
} else if (raw_width*raw_height*3 == tiff_ifd[raw].bytes) {
load_raw = &CLASS nikon_yuv_load_raw;
- gamma_curve (1/2.4, 12.92, 1, 4095);
+ gamma_curve (1/2.4, 12.92310, 1, 4095);
memset (cblack, 0, sizeof cblack);
filters = 0;
} else if (raw_width*raw_height*2 == tiff_ifd[raw].bytes) {
@@ -7052,7 +7129,7 @@ void CLASS parse_fuji (int offset)
FORC(36) xtrans_abs[0][35-c] = fgetc(ifp) & 3;
} else if (tag == 0x2ff0) {
FORC4 cam_mul[c ^ 1] = get2();
- } else if (tag == 0xc000) {
+ } else if (tag == 0xc000 && len > 20000) {
c = order;
order = 0x4949;
while ((tag = get4()) > raw_width);
@@ -7378,12 +7455,16 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6188,-1341,-890,-7168,14489,2937,-2640,3228,8483 } },
{ "Canon EOS 5DS", 0, 0x3c96,
{ 6250,-711,-808,-5153,12794,2636,-1249,2198,5610 } },
+ { "Canon EOS 5D Mark IV", 0, 0,
+ { 6446,-366,-864,-4436,12204,2513,-952,2496,6348 } },
{ "Canon EOS 5D Mark III", 0, 0x3c80,
{ 6722,-635,-963,-4287,12460,2028,-908,2162,5668 } },
{ "Canon EOS 5D Mark II", 0, 0x3cf0,
{ 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } },
{ "Canon EOS 5D", 0, 0xe6c,
{ 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } },
+ { "Canon EOS 6D Mark II", 0, 0,
+ { 6875,-970,-932,-4691,12459,2501,-874,1953,5809 } },
{ "Canon EOS 6D", 0, 0x3c82,
{ 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } },
{ "Canon EOS 7D Mark II", 0, 0x3510,
@@ -7406,10 +7487,14 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6719,-994,-925,-4408,12426,2211,-887,2129,6051 } },
{ "Canon EOS 70D", 0, 0x3bc7,
{ 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } },
+ { "Canon EOS 77D", 0, 0,
+ { 7377,-742,-998,-4235,11981,2549,-673,1918,5538 } },
{ "Canon EOS 80D", 0, 0,
{ 7457,-671,-937,-4849,12495,2643,-1213,2354,5492 } },
{ "Canon EOS 100D", 0, 0x350f,
{ 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } },
+ { "Canon EOS 200D", 0, 0,
+ { 7377,-742,-998,-4235,11981,2549,-673,1918,5538 } },
{ "Canon EOS 300D", 0, 0xfa0,
{ 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } },
{ "Canon EOS 350D", 0, 0xfff,
@@ -7432,6 +7517,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6362,-823,-847,-4426,12109,2616,-743,1857,5635 } },
{ "Canon EOS 760D", 0, 0x350f,
{ 6362,-823,-847,-4426,12109,2616,-743,1857,5635 } },
+ { "Canon EOS 800D", 0, 0,
+ { 6970,-512,-968,-4425,12161,2553,-739,1982,5601 } },
{ "Canon EOS 1000D", 0, 0xe43,
{ 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } },
{ "Canon EOS 1100D", 0, 0x3510,
@@ -7440,8 +7527,18 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } },
{ "Canon EOS 1300D", 0, 0x3510,
{ 6939,-1016,-866,-4428,12473,2177,-1175,2178,6162 } },
+ { "Canon EOS 1500D", 0, 0,
+ { 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 } },
+ { "Canon EOS 3000D", 0, 0,
+ { 6939,-1016,-866,-4428,12473,2177,-1175,2178,6162 } },
+ { "Canon EOS M6", 0, 0,
+ { 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 } },
+ { "Canon EOS M5", 0, 0, /* also M50 */
+ { 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 } },
{ "Canon EOS M3", 0, 0,
{ 6362,-823,-847,-4426,12109,2616,-743,1857,5635 } },
+ { "Canon EOS M100", 0, 0,
+ { 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 } },
{ "Canon EOS M10", 0, 0,
{ 6400,-480,-888,-5294,13416,2047,-1296,2203,6137 } },
{ "Canon EOS M", 0, 0,
@@ -7486,6 +7583,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 7474,-2301,-567,-4056,11456,2975,-222,716,4181 } },
{ "Canon PowerShot G16", 0, 0,
{ 8020,-2687,-682,-3704,11879,2052,-965,1921,5556 } },
+ { "Canon PowerShot G1 X Mark III", 0, 0,
+ { 8532,-701,-1167,-4095,11879,2508,-797,2424,7010 } },
{ "Canon PowerShot G1 X", 0, 0,
{ 7378,-1255,-1043,-4088,12251,2048,-876,1946,5805 } },
{ "Canon PowerShot G1", 0, 0,
@@ -7504,6 +7603,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 9877,-3775,-871,-7613,14807,3072,-1448,1305,7485 } },
{ "Canon PowerShot G7 X", 0, 0,
{ 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 } },
+ { "Canon PowerShot G9 X Mark II", 0, 0,
+ { 10056,-4131,-944,-2576,11143,1625,-238,1294,5179 } },
{ "Canon PowerShot G9 X", 0, 0,
{ 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 } },
{ "Canon PowerShot G9", 0, 0,
@@ -7598,6 +7699,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } },
{ "Fujifilm F8", 0, 0,
{ 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
+ { "Fujifilm GFX 50S", 0, 0,
+ { 11756,-4754,-874,-3056,11045,2305,-381,1457,6006 } },
{ "Fujifilm S100FS", 514, 0,
{ 11521,-4355,-1065,-6524,13767,3058,-1466,1984,6045 } },
{ "Fujifilm S1", 0, 0,
@@ -7606,9 +7709,9 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } },
{ "Fujifilm S20", 512, 0x3fff,
{ 11401,-4498,-1312,-5088,12751,2613,-838,1568,5941 } },
- { "Fujifilm S2Pro", 128, 0,
+ { "Fujifilm S2Pro", 128, 0xf15,
{ 12492,-4690,-1402,-7033,15423,1647,-1507,2111,7697 } },
- { "Fujifilm S3Pro", 0, 0,
+ { "Fujifilm S3Pro", 0, 0x3dff,
{ 11807,-4612,-1294,-8927,16968,1988,-2120,2741,8006 } },
{ "Fujifilm S5Pro", 0, 0,
{ 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } },
@@ -7642,7 +7745,7 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } },
{ "Fujifilm HS10 HS11", 0, 0xf68,
{ 12440,-3954,-1183,-1123,9674,1708,-83,1614,4086 } },
- { "Fujifilm HS2", 0, 0,
+ { "Fujifilm HS2", 0, 0xfef,
{ 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
{ "Fujifilm HS3", 0, 0,
{ 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
@@ -7650,6 +7753,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 12085,-4727,-953,-3257,11489,2002,-511,2046,4592 } },
{ "Fujifilm F900EXR", 0, 0,
{ 12085,-4727,-953,-3257,11489,2002,-511,2046,4592 } },
+ { "Fujifilm X100F", 0, 0,
+ { 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } },
{ "Fujifilm X100S", 0, 0,
{ 10592,-4262,-1008,-3514,11355,2465,-870,2025,6386 } },
{ "Fujifilm X100T", 0, 0,
@@ -7668,26 +7773,42 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } },
{ "Fujifilm X-Pro2", 0, 0,
{ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } },
+ { "Fujifilm X-A10", 0, 0,
+ { 11540,-4999,-991,-2949,10963,2278,-382,1049,5605 } },
+ { "Fujifilm X-A20", 0, 0,
+ { 11540,-4999,-991,-2949,10963,2278,-382,1049,5605 } },
{ "Fujifilm X-A1", 0, 0,
{ 11086,-4555,-839,-3512,11310,2517,-815,1341,5940 } },
{ "Fujifilm X-A2", 0, 0,
{ 10763,-4560,-917,-3346,11311,2322,-475,1135,5843 } },
+ { "Fujifilm X-A3", 0, 0,
+ { 12407,-5222,-1086,-2971,11116,2120,-294,1029,5284 } },
+ { "Fujifilm X-A5", 0, 0,
+ { 11673,-4760,-1041,-3988,12058,2166,-771,1417,5569 } },
{ "Fujifilm X-E1", 0, 0,
{ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } },
{ "Fujifilm X-E2S", 0, 0,
{ 11562,-5118,-961,-3022,11007,2311,-525,1569,6097 } },
{ "Fujifilm X-E2", 0, 0,
{ 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 } },
+ { "Fujifilm X-E3", 0, 0,
+ { 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } },
+ { "Fujifilm X-H1", 0, 0,
+ { 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } },
{ "Fujifilm X-M1", 0, 0,
{ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } },
{ "Fujifilm X-S1", 0, 0,
{ 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } },
{ "Fujifilm X-T1", 0, 0, /* also X-T10 */
{ 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 } },
+ { "Fujifilm X-T2", 0, 0, /* also X-T20 */
+ { 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } },
{ "Fujifilm XF1", 0, 0,
{ 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } },
{ "Fujifilm XQ", 0, 0, /* XQ1 and XQ2 */
{ 9252,-2704,-1064,-5893,14265,1717,-1101,2341,4349 } },
+ { "GoPro HERO5 Black", 0, 0,
+ { 10344,-4210,-620,-2315,10625,1948,93,1058,5541 } },
{ "Imacon Ixpress", 0, 0, /* DJC */
{ 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } },
{ "Kodak NC2000", 0, 0,
@@ -7800,6 +7921,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 7013,-1408,-635,-5268,12902,2640,-1470,2801,7379 } },
{ "Nikon D3300", 0, 0,
{ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 } },
+ { "Nikon D3400", 0, 0,
+ { 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 } },
{ "Nikon D300", 0, 0,
{ 9030,-1992,-715,-8465,16302,2255,-2689,3217,8069 } },
{ "Nikon D3X", 0, 0,
@@ -7828,6 +7951,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 } },
{ "Nikon D5500", 0, 0,
{ 8821,-2938,-785,-4178,12142,2287,-824,1651,6860 } },
+ { "Nikon D5600", 0, 0,
+ { 8821,-2938,-785,-4178,12142,2287,-824,1651,6860 } },
{ "Nikon D500", 0, 0,
{ 8813,-3210,-1036,-4703,12868,2021,-1054,1940,6129 } },
{ "Nikon D50", 0, 0,
@@ -7846,12 +7971,16 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8322,-3112,-1047,-6367,14342,2179,-988,1638,6394 } },
{ "Nikon D7200", 0, 0,
{ 8322,-3112,-1047,-6367,14342,2179,-988,1638,6394 } },
+ { "Nikon D7500", 0, 0,
+ { 8813,-3210,-1036,-4703,12868,2021,-1054,1940,6129 } },
{ "Nikon D750", 0, 0,
{ 9020,-2890,-715,-4535,12436,2348,-934,1919,7086 } },
{ "Nikon D700", 0, 0,
{ 8139,-2171,-663,-8747,16541,2295,-1925,2008,8093 } },
{ "Nikon D70", 0, 0,
{ 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } },
+ { "Nikon D850", 0, 0,
+ { 10405,-3755,-1270,-5461,13787,1793,-1040,2015,6785 } },
{ "Nikon D810", 0, 0,
{ 9369,-3195,-791,-4488,12430,2301,-893,1796,6872 } },
{ "Nikon D800", 0, 0,
@@ -7892,6 +8021,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 7971,-2314,-913,-8451,15762,2894,-1442,1520,7610 } },
{ "Nikon COOLPIX A", 0, 0,
{ 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } },
+ { "Nikon COOLPIX B700", 200, 0,
+ { 14387,-6014,-1299,-1357,9975,1616,467,1047,4744 } },
{ "Nikon COOLPIX P330", 200, 0,
{ 10321,-3920,-931,-2750,11146,1824,-442,1545,5539 } },
{ "Nikon COOLPIX P340", 200, 0,
@@ -7990,12 +8121,18 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } },
{ "Olympus E-PL7", 0, 0,
{ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 } },
+ { "Olympus E-PL8", 0, 0,
+ { 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 } },
+ { "Olympus E-PL9", 0, 0,
+ { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } },
{ "Olympus E-PM1", 0, 0,
{ 7575,-2159,-571,-3722,11341,2725,-1434,2819,6271 } },
{ "Olympus E-PM2", 0, 0,
{ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } },
- { "Olympus E-M10", 0, 0, /* also E-M10 Mark II */
+ { "Olympus E-M10", 0, 0, /* also E-M10 Mark II & III */
{ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } },
+ { "Olympus E-M1Mark II", 0, 0,
+ { 9383,-3170,-763,-2457,10702,2020,-384,1236,5552 } },
{ "Olympus E-M1", 0, 0,
{ 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 } },
{ "Olympus E-M5MarkII", 0, 0,
@@ -8024,6 +8161,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8360,-2420,-880,-3928,12353,1739,-1381,2416,5173 } },
{ "Olympus TG-4", 0, 0,
{ 11426,-4159,-1126,-2066,10678,1593,-120,1327,4998 } },
+ { "Olympus TG-5", 0, 0,
+ { 10899,-3833,-1082,-2112,10736,1575,-267,1452,5269 } },
{ "Olympus XZ-10", 0, 0,
{ 9777,-3483,-925,-2886,11297,1800,-602,1663,5134 } },
{ "Olympus XZ-1", 0, 0,
@@ -8059,7 +8198,7 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ "Pentax K-r", 0, 0,
{ 9895,-3077,-850,-5304,13035,2521,-883,1768,6936 } },
{ "Pentax K-1", 0, 0,
- { 8566,-2746,-1201,-3612,12204,1550,-893,1680,6264 } },
+ { 8596,-2981,-639,-4202,12046,2431,-685,1424,6122 } },
{ "Pentax K-30", 0, 0,
{ 8710,-2632,-1167,-3995,12301,1881,-981,1719,6535 } },
{ "Pentax K-3 II", 0, 0,
@@ -8070,37 +8209,45 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8170,-2725,-639,-4440,12017,2744,-771,1465,6599 } },
{ "Pentax K-5", 0, 0,
{ 8713,-2833,-743,-4342,11900,2772,-722,1543,6247 } },
+ { "Pentax K-70", 0, 0,
+ { 8270,-2117,-1299,-4359,12953,1515,-1078,1933,5975 } },
{ "Pentax K-7", 0, 0,
{ 9142,-2947,-678,-8648,16967,1663,-2224,2898,8615 } },
{ "Pentax K-S1", 0, 0,
{ 8512,-3211,-787,-4167,11966,2487,-638,1288,6054 } },
{ "Pentax K-S2", 0, 0,
{ 8662,-3280,-798,-3928,11771,2444,-586,1232,6054 } },
+ { "Pentax KP", 0, 0,
+ { 8617,-3228,-1034,-4674,12821,2044,-803,1577,5728 } },
{ "Pentax Q-S1", 0, 0,
{ 12995,-5593,-1107,-1879,10139,2027,-64,1233,4919 } },
{ "Pentax 645D", 0, 0x3e00,
{ 10646,-3593,-1158,-3329,11699,1831,-667,2874,6287 } },
{ "Panasonic DMC-CM1", 15, 0,
{ 8770,-3194,-820,-2871,11281,1803,-513,1552,4434 } },
+ { "Panasonic DC-FZ80", 0, 0,
+ { 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 } },
{ "Panasonic DMC-FZ8", 0, 0xf7f,
{ 8986,-2755,-802,-6341,13575,3077,-1476,2144,6379 } },
{ "Panasonic DMC-FZ18", 0, 0,
{ 9932,-3060,-935,-5809,13331,2753,-1267,2155,5575 } },
{ "Panasonic DMC-FZ28", 15, 0xf96,
{ 10109,-3488,-993,-5412,12812,2916,-1305,2140,5543 } },
+ { "Panasonic DMC-FZ2500", 15, 0,
+ { 7386,-2443,-743,-3437,11864,1757,-608,1660,4766 } },
{ "Panasonic DMC-FZ330", 15, 0,
{ 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 } },
{ "Panasonic DMC-FZ300", 15, 0,
{ 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 } },
{ "Panasonic DMC-FZ30", 0, 0xf94,
{ 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } },
- { "Panasonic DMC-FZ3", 15, 0,
+ { "Panasonic DMC-FZ3", 15, 0, /* FZ35, FZ38 */
{ 9938,-2780,-890,-4604,12393,2480,-1117,2304,4620 } },
- { "Panasonic DMC-FZ4", 15, 0,
+ { "Panasonic DMC-FZ4", 15, 0, /* FZ40, FZ45 */
{ 13639,-5535,-1371,-1698,9633,2430,316,1152,4108 } },
{ "Panasonic DMC-FZ50", 0, 0,
{ 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } },
- { "Panasonic DMC-FZ7", 15, 0,
+ { "Panasonic DMC-FZ7", 15, 0, /* FZ70, FZ72 */
{ 11532,-4324,-1066,-2375,10847,1749,-564,1699,4351 } },
{ "Leica V-LUX1", 0, 0,
{ 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } },
@@ -8142,6 +8289,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 10148,-3743,-991,-2837,11366,1659,-701,1893,4899 } },
{ "Leica D-LUX 6", 15, 0,
{ 10148,-3743,-991,-2837,11366,1659,-701,1893,4899 } },
+ { "Panasonic DMC-LX9", 15, 0,
+ { 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 } },
{ "Panasonic DMC-FZ1000", 15, 0,
{ 7830,-2696,-763,-3325,11667,1866,-641,1712,4824 } },
{ "Leica V-LUX (Typ 114)", 15, 0,
@@ -8174,6 +8323,10 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8294,-2891,-651,-3869,11590,2595,-1183,2267,5352 } },
{ "Panasonic DMC-G7", 15, 0xfff,
{ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
+ { "Panasonic DMC-G8", 15, 0xfff, /* G8, G80, G81, G85 */
+ { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
+ { "Panasonic DC-G9", 15, 0xfff,
+ { 7685,-2375,-634,-3687,11700,2249,-748,1546,5111 } },
{ "Panasonic DMC-GF1", 15, 0xf92,
{ 7888,-1902,-1011,-8106,16085,2099,-2353,2866,7330 } },
{ "Panasonic DMC-GF2", 15, 0xfff,
@@ -8188,6 +8341,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
{ "Panasonic DMC-GF8", 15, 0,
{ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
+ { "Panasonic DC-GF9", 15, 0,
+ { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
{ "Panasonic DMC-GH1", 15, 0xf92,
{ 6299,-1466,-532,-6535,13852,2969,-2331,3112,5984 } },
{ "Panasonic DMC-GH2", 15, 0xf95,
@@ -8196,6 +8351,10 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 } },
{ "Panasonic DMC-GH4", 15, 0,
{ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 } },
+ { "Panasonic DC-GH5S", 15, 0,
+ { 6929,-2355,-708,-4192,12534,1828,-1097,1989,5195 } },
+ { "Panasonic DC-GH5", 15, 0,
+ { 7641,-2336,-605,-3218,11299,2187,-485,1338,5121 } },
{ "Panasonic DMC-GM1", 15, 0,
{ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 } },
{ "Panasonic DMC-GM5", 15, 0,
@@ -8204,24 +8363,26 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6763,-1919,-863,-3868,11515,2684,-1216,2387,5879 } },
{ "Panasonic DMC-GX7", 15, 0,
{ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } },
+ { "Panasonic DMC-GX85", 15, 0,
+ { 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 } },
{ "Panasonic DMC-GX8", 15, 0,
{ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 } },
- { "Panasonic DMC-TZ1", 15, 0,
+ { "Panasonic DC-GX9", 15, 0,
+ { 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 } },
+ { "Panasonic DMC-ZS100", 15, 0,
{ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 } },
- { "Panasonic DMC-ZS1", 15, 0,
+ { "Panasonic DC-ZS200", 15, 0,
{ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 } },
- { "Panasonic DMC-TZ6", 15, 0,
+ { "Panasonic DMC-ZS40", 15, 0,
{ 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 } },
- { "Panasonic DMC-ZS4", 15, 0,
- { 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 } },
- { "Panasonic DMC-TZ7", 15, 0,
+ { "Panasonic DMC-ZS50", 15, 0,
{ 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 } },
- { "Panasonic DMC-ZS5", 15, 0,
- { 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 } },
- { "Panasonic DMC-TZ8", 15, 0,
+ { "Panasonic DMC-TZ82", 15, 0,
{ 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 } },
{ "Panasonic DMC-ZS6", 15, 0,
{ 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 } },
+ { "Panasonic DMC-ZS70", 15, 0,
+ { 9052,-3117,-883,-3045,11346,1927,-205,1520,4730 } },
{ "Leica S (Typ 007)", 0, 0,
{ 6063,-2234,-231,-5210,13787,1500,-1043,2866,6997 } },
{ "Leica X", 0, 0, /* X and X-U, both (Typ 113) */
@@ -8231,7 +8392,15 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ "Leica M (Typ 262)", 0, 0,
{ 6653,-1486,-611,-4221,13303,929,-881,2416,7226 } },
{ "Leica SL (Typ 601)", 0, 0,
- { 11865,-4523,-1441,-5423,14458,935,-1587,2687,4830} },
+ { 11865,-4523,-1441,-5423,14458,935,-1587,2687,4830 } },
+ { "Leica TL2", 0, 0,
+ { 5836,-1626,-647,-5384,13326,2261,-1207,2129,5861 } },
+ { "Leica TL", 0, 0,
+ { 5463,-988,-364,-4634,12036,2946,-766,1389,6522 } },
+ { "Leica CL", 0, 0,
+ { 7414,-2393,-840,-5127,13180,2138,-1585,2468,5064 } },
+ { "Leica M10", 0, 0,
+ { 8249,-2849,-620,-5415,14756,565,-957,3074,6517 } },
{ "Phase One H 20", 0, 0, /* DJC */
{ 1313,1855,-109,-6715,15908,808,-327,1840,6020 } },
{ "Phase One H 25", 0, 0,
@@ -8302,16 +8471,20 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 8512,-2641,-694,-8042,15670,2526,-1821,2117,7414 } },
{ "Sony DSC-V3", 0, 0,
{ 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } },
- { "Sony DSC-RX100M", 0, 0, /* M2, M3, and M4 */
+ { "Sony DSC-RX100M", 0, 0, /* M2, M3, M4, and M5 */
{ 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 } },
{ "Sony DSC-RX100", 0, 0,
{ 8651,-2754,-1057,-3464,12207,1373,-568,1398,4434 } },
- { "Sony DSC-RX10", 0, 0,
+ { "Sony DSC-RX10M4", 0, 0,
+ { 7699,-2566,-629,-2967,11270,1928,-378,1286,4807 } },
+ { "Sony DSC-RX10", 0, 0, /* also RX10M2, RX10M3 */
{ 6679,-1825,-745,-5047,13256,1953,-1580,2422,5183 } },
{ "Sony DSC-RX1RM2", 0, 0,
{ 6629,-1900,-483,-4618,12349,2550,-622,1381,6514 } },
{ "Sony DSC-RX1", 0, 0,
{ 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } },
+ { "Sony DSC-RX0", 200, 0,
+ { 9396,-3507,-843,-2497,11111,1572,-343,1355,5089 } },
{ "Sony DSLR-A100", 0, 0xfeb,
{ 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } },
{ "Sony DSLR-A290", 0, 0,
@@ -8346,18 +8519,26 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 6435,-1903,-536,-4722,12449,2550,-663,1363,6517 } },
{ "Sony ILCA-77M2", 0, 0,
{ 5991,-1732,-443,-4100,11989,2381,-704,1467,5992 } },
- { "Sony ILCE-6300", 0, 0,
+ { "Sony ILCA-99M2", 0, 0,
+ { 6660,-1918,-471,-4613,12398,2485,-649,1433,6447 } },
+ { "Sony ILCE-6", 0, 0, /* 6300, 6500 */
{ 5973,-1695,-419,-3826,11797,2293,-639,1398,5789 } },
{ "Sony ILCE-7M2", 0, 0,
{ 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 } },
+ { "Sony ILCE-7M3", 0, 0,
+ { 7374,-2389,-551,-5435,13162,2519,-1006,1795,6552 } },
{ "Sony ILCE-7S", 0, 0, /* also ILCE-7SM2 */
{ 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 } },
+ { "Sony ILCE-7RM3", 0, 0,
+ { 6640,-1847,-503,-5238,13010,2474,-993,1673,6527 } },
{ "Sony ILCE-7RM2", 0, 0,
{ 6629,-1900,-483,-4618,12349,2550,-622,1381,6514 } },
{ "Sony ILCE-7R", 0, 0,
{ 4913,-541,-202,-6130,13513,2906,-1564,2151,7183 } },
{ "Sony ILCE-7", 0, 0,
{ 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 } },
+ { "Sony ILCE-9", 0, 0,
+ { 6389,-1703,-378,-4562,12265,2587,-670,1489,6550 } },
{ "Sony ILCE", 0, 0, /* 3000, 5000, 5100, 6000, and QX1 */
{ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } },
{ "Sony NEX-5N", 0, 0,
@@ -8400,6 +8581,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } },
{ "Sony SLT-A99", 0, 0,
{ 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } },
+ { "YI M1", 0, 0,
+ { 7712,-2059,-653,-3882,11494,2726,-710,1332,5958 } },
};
double cam_xyz[4][3];
char name[130];
@@ -8582,8 +8765,11 @@ void CLASS identify()
{ 5712, 3774, 62, 20, 10, 2 },
{ 5792, 3804, 158, 51, 0, 0 },
{ 5920, 3950, 122, 80, 2, 0 },
+ { 6096, 4051, 76, 35, 0, 0 },
{ 6096, 4056, 72, 34, 0, 0 },
- { 6288, 4056, 264, 34, 0, 0 },
+ { 6288, 4056, 264, 36, 0, 0 },
+ { 6384, 4224, 120, 44, 0, 0 },
+ { 6880, 4544, 136, 42, 0, 0 },
{ 8896, 5920, 160, 64, 0, 0 },
};
static const struct {
@@ -8597,7 +8783,10 @@ void CLASS identify()
{ 0x261, "EOS 50D" }, { 0x281, "EOS-1D Mark IV" },
{ 0x287, "EOS 60D" }, { 0x167, "EOS-1DS" },
{ 0x325, "EOS 70D" },
+ { 0x408, "EOS 77D" }, { 0x331, "EOS M" },
{ 0x350, "EOS 80D" }, { 0x328, "EOS-1D X Mark II" },
+ { 0x346, "EOS 100D" },
+ { 0x417, "EOS 200D" },
{ 0x170, "EOS 300D" }, { 0x188, "EOS-1Ds Mark II" },
{ 0x176, "EOS 450D" }, { 0x215, "EOS-1Ds Mark III" },
{ 0x189, "EOS 350D" }, { 0x324, "EOS-1D C" },
@@ -8608,12 +8797,14 @@ void CLASS identify()
{ 0x301, "EOS 650D" }, { 0x302, "EOS 6D" },
{ 0x326, "EOS 700D" }, { 0x250, "EOS 7D" },
{ 0x393, "EOS 750D" }, { 0x289, "EOS 7D Mark II" },
- { 0x347, "EOS 760D" },
+ { 0x347, "EOS 760D" }, { 0x406, "EOS 6D Mark II" },
+ { 0x405, "EOS 800D" }, { 0x349, "EOS 5D Mark IV" },
{ 0x254, "EOS 1000D" },
{ 0x288, "EOS 1100D" },
- { 0x327, "EOS 1200D" }, { 0x382, "Canon EOS 5DS" },
- { 0x404, "EOS 1300D" }, { 0x401, "Canon EOS 5DS R" },
- { 0x346, "EOS 100D" },
+ { 0x327, "EOS 1200D" }, { 0x382, "EOS 5DS" },
+ { 0x404, "EOS 1300D" }, { 0x401, "EOS 5DS R" },
+ { 0x422, "EOS 1500D" },
+ { 0x432, "EOS 3000D" },
}, sonique[] = {
{ 0x002, "DSC-R1" }, { 0x100, "DSLR-A100" },
{ 0x101, "DSLR-A900" }, { 0x102, "DSLR-A700" },
@@ -8643,7 +8834,30 @@ void CLASS identify()
{ 0x155, "DSC-RX100M4" },{ 0x156, "DSC-RX10M2" },
{ 0x158, "DSC-RX1RM2" }, { 0x15a, "ILCE-QX1" },
{ 0x15b, "ILCE-7RM2" }, { 0x15e, "ILCE-7SM2" },
- { 0x161, "ILCA-68" }, { 0x165, "ILCE-6300" },
+ { 0x161, "ILCA-68" }, { 0x162, "ILCA-99M2" },
+ { 0x163, "DSC-RX10M3" }, { 0x164, "DSC-RX100M5" },
+ { 0x165, "ILCE-6300" }, { 0x166, "ILCE-9" },
+ { 0x168, "ILCE-6500" }, { 0x16a, "ILCE-7RM3" },
+ { 0x16b, "ILCE-7M3" }, { 0x16c, "DSC-RX0" },
+ { 0x16d, "DSC-RX10M4" },
+ };
+ static const char *orig, panalias[][12] = {
+ "@DC-FZ80", "DC-FZ82", "DC-FZ85",
+ "@DC-FZ81", "DC-FZ83",
+ "@DC-GF9", "DC-GX800", "DC-GX850",
+ "@DC-GF10", "DC-GF90",
+ "@DC-GX9", "DC-GX7MK3",
+ "@DC-ZS70", "DC-TZ90", "DC-TZ91", "DC-TZ92", "DC-TZ93",
+ "@DMC-FZ40", "DMC-FZ45",
+ "@DMC-FZ2500", "DMC-FZ2000", "DMC-FZH1",
+ "@DMC-G8", "DMC-G80", "DMC-G81", "DMC-G85",
+ "@DMC-GX85", "DMC-GX80", "DMC-GX7MK2",
+ "@DMC-LX9", "DMC-LX10", "DMC-LX15",
+ "@DMC-ZS40", "DMC-TZ60", "DMC-TZ61",
+ "@DMC-ZS50", "DMC-TZ70", "DMC-TZ71",
+ "@DMC-ZS60", "DMC-TZ80", "DMC-TZ81", "DMC-TZ85",
+ "@DMC-ZS100", "DMC-ZS110", "DMC-TZ100", "DMC-TZ101", "DMC-TZ110", "DMC-TX1",
+ "@DC-ZS200", "DC-TX2", "DC-TZ200", "DC-TZ202", "DC-TZ220", "DC-ZS220",
};
static const struct {
unsigned fsize;
@@ -8663,25 +8877,24 @@ void CLASS identify()
{ 15980544,3264,2448, 0, 0, 0, 0, 8,0x61,0,1,"AgfaPhoto","DC-833m" },
{ 9631728,2532,1902, 0, 0, 0, 0,96,0x61,0,0,"Alcatel","5035D" },
{ 2868726,1384,1036, 0, 0, 0, 0,64,0x49,0,8,"Baumer","TXG14",1078 },
- { 5298000,2400,1766,12,12,44, 2,40,0x94,0,2,"Canon","PowerShot SD300" },
- { 6553440,2664,1968, 4, 4,44, 4,40,0x94,0,2,"Canon","PowerShot A460" },
- { 6573120,2672,1968,12, 8,44, 0,40,0x94,0,2,"Canon","PowerShot A610" },
- { 6653280,2672,1992,10, 6,42, 2,40,0x94,0,2,"Canon","PowerShot A530" },
- { 7710960,2888,2136,44, 8, 4, 0,40,0x94,0,2,"Canon","PowerShot S3 IS" },
- { 9219600,3152,2340,36,12, 4, 0,40,0x94,0,2,"Canon","PowerShot A620" },
- { 9243240,3152,2346,12, 7,44,13,40,0x49,0,2,"Canon","PowerShot A470" },
- { 10341600,3336,2480, 6, 5,32, 3,40,0x94,0,2,"Canon","PowerShot A720 IS" },
- { 10383120,3344,2484,12, 6,44, 6,40,0x94,0,2,"Canon","PowerShot A630" },
- { 12945240,3736,2772,12, 6,52, 6,40,0x94,0,2,"Canon","PowerShot A640" },
- { 15636240,4104,3048,48,12,24,12,40,0x94,0,2,"Canon","PowerShot A650" },
- { 15467760,3720,2772, 6,12,30, 0,40,0x94,0,2,"Canon","PowerShot SX110 IS" },
- { 15534576,3728,2778,12, 9,44, 9,40,0x94,0,2,"Canon","PowerShot SX120 IS" },
- { 18653760,4080,3048,24,12,24,12,40,0x94,0,2,"Canon","PowerShot SX20 IS" },
- { 19131120,4168,3060,92,16, 4, 1,40,0x94,0,2,"Canon","PowerShot SX220 HS" },
- { 21936096,4464,3276,25,10,73,12,40,0x16,0,2,"Canon","PowerShot SX30 IS" },
- { 24724224,4704,3504, 8,16,56, 8,40,0x94,0,2,"Canon","PowerShot A3300 IS" },
- { 30858240,5248,3920, 8,16,56,16,40,0x94,0,2,"Canon","IXUS 160" },
- { 1976352,1632,1211, 0, 2, 0, 1, 0,0x94,0,1,"Casio","QV-2000UX" },
+ { 5298000,2400,1766,12,12,44, 2, 8,0x94,0,2,"Canon","PowerShot SD300" },
+ { 6553440,2664,1968, 4, 4,44, 4, 8,0x94,0,2,"Canon","PowerShot A460" },
+ { 6573120,2672,1968,12, 8,44, 0, 8,0x94,0,2,"Canon","PowerShot A610" },
+ { 6653280,2672,1992,10, 6,42, 2, 8,0x94,0,2,"Canon","PowerShot A530" },
+ { 7710960,2888,2136,44, 8, 4, 0, 8,0x94,0,2,"Canon","PowerShot S3 IS" },
+ { 9219600,3152,2340,36,12, 4, 0, 8,0x94,0,2,"Canon","PowerShot A620" },
+ { 9243240,3152,2346,12, 7,44,13, 8,0x49,0,2,"Canon","PowerShot A470" },
+ { 10341600,3336,2480, 6, 5,32, 3, 8,0x94,0,2,"Canon","PowerShot A720 IS" },
+ { 10383120,3344,2484,12, 6,44, 6, 8,0x94,0,2,"Canon","PowerShot A630" },
+ { 12945240,3736,2772,12, 6,52, 6, 8,0x94,0,2,"Canon","PowerShot A640" },
+ { 15636240,4104,3048,48,12,24,12, 8,0x94,0,2,"Canon","PowerShot A650" },
+ { 15467760,3720,2772, 6,12,30, 0, 8,0x94,0,2,"Canon","PowerShot SX110 IS" },
+ { 15534576,3728,2778,12, 9,44, 9, 8,0x94,0,2,"Canon","PowerShot SX120 IS" },
+ { 18653760,4080,3048,24,12,24,12, 8,0x94,0,2,"Canon","PowerShot SX20 IS" },
+ { 19131120,4168,3060,92,16, 4, 1, 8,0x94,0,2,"Canon","PowerShot SX220 HS" },
+ { 21936096,4464,3276,25,10,73,12, 8,0x16,0,2,"Canon","PowerShot SX30 IS" },
+ { 24724224,4704,3504, 8,16,56, 8, 8,0x94,0,2,"Canon","PowerShot A3300 IS" },
+ { 30858240,5248,3920, 8,16,56,16, 8,0x94,0,2,"Canon","IXUS 160" }, { 1976352,1632,1211, 0, 2, 0, 1, 0,0x94,0,1,"Casio","QV-2000UX" },
{ 3217760,2080,1547, 0, 0,10, 1, 0,0x94,0,1,"Casio","QV-3*00EX" },
{ 6218368,2585,1924, 0, 0, 9, 0, 0,0x94,0,1,"Casio","QV-5700" },
{ 7816704,2867,2181, 0, 0,34,36, 0,0x16,0,1,"Casio","EX-Z60" },
@@ -8753,12 +8966,13 @@ void CLASS identify()
{ 44390468,4080,5440, 0, 0, 0, 0,33,0x61,0,0,"Sinar","",68 },
{ 1409024,1376,1024, 0, 0, 1, 0, 0,0x49,0,0,"Sony","XCD-SX910CR" },
{ 2818048,1376,1024, 0, 0, 1, 0,97,0x49,0,0,"Sony","XCD-SX910CR" },
+ { 17496000,4320,3240, 0, 0, 0,0,224,0x94,0,0,"Xiro","Xplorer V" },
};
static const char *corp[] =
{ "AgfaPhoto", "Canon", "Casio", "Epson", "Fujifilm",
"Mamiya", "Minolta", "Motorola", "Kodak", "Konica", "Leica",
"Nikon", "Nokia", "Olympus", "Ricoh", "Pentax", "Phase One",
- "Samsung", "Sigma", "Sinar", "Sony" };
+ "Samsung", "Sigma", "Sinar", "Sony", "YI" };
char head[32], *cp;
int hlen, flen, fsize, zero_fsize=1, i, c;
struct jhead jh;
@@ -8792,16 +9006,18 @@ void CLASS identify()
colors = 3;
for (i=0; i < 0x10000; i++) curve[i] = i;
- order = get2();
- hlen = get4();
- fseek (ifp, 0, SEEK_SET);
- fread (head, 1, 32, ifp);
- fseek (ifp, 0, SEEK_END);
- flen = fsize = ftell(ifp);
+ flen = fsize = ifp->size;
+
+ // currently fsize is of type signed int which means for files larger than 0x7fffffff byte fsize will be < 0. We need to check for large files if we change the type to unsigned int
/*RT*/ if (fsize<100000) {
is_raw = 0;
return;
}
+
+ order = get2();
+ hlen = get4();
+ fseek (ifp, 0, SEEK_SET);
+ fread (head, 1, 32, ifp);
/* RT: changed string constant */
if ((cp = (char *) memmem (head, 32, (char*)"MMMM", 4)) ||
(cp = (char *) memmem (head, 32, (char*)"IIII", 4))) {
@@ -8853,12 +9069,15 @@ void CLASS identify()
if (is_raw == 2 && shot_select)
parse_fuji (i);
}
- load_raw = &CLASS unpacked_load_raw;
fseek (ifp, 100+28*(shot_select > 0 && shot_select < is_raw), SEEK_SET);
parse_tiff (data_offset = get4());
parse_tiff (thumb_offset+12);
/*RT*/ exif_base = thumb_offset+12;
apply_tiff();
+ if (!load_raw) {
+ load_raw = &CLASS unpacked_load_raw;
+ tiff_bps = 14;
+ }
} else if (!memcmp (head,"RIFF",4)) {
fseek (ifp, 0, SEEK_SET);
parse_riff();
@@ -8920,7 +9139,7 @@ void CLASS identify()
strcpy (model,"One");
parse_redcine();
load_raw = &CLASS redcine_load_raw;
- gamma_curve (1/2.4, 12.92, 1, 4095);
+ gamma_curve (1/2.4, 12.92310, 1, 4095);
filters = 0x49494949;
} else if (!memcmp (head,"DSC-Image",9))
parse_rollei();
@@ -8957,7 +9176,8 @@ void CLASS identify()
case 8:
load_raw = &CLASS eight_bit_load_raw; break;
case 10: case 12:
- load_flags |= 128;
+ load_flags |= 512;
+ if (!strcmp(make,"Canon")) load_flags |= 256;
load_raw = &CLASS packed_load_raw; break;
case 16:
order = 0x4949 | 0x404 * (load_flags & 1);
@@ -9014,17 +9234,25 @@ void CLASS identify()
{ height = 2616; width = 3896; }
if (height == 3136 && width == 4864) /* Pentax K20D and Samsung GX20 */
{ height = 3124; width = 4688; filters = 0x16161616; }
- if (width == 4352 && (!strcmp(model,"K-r") || !strcmp(model,"K-x")))
+ if (raw_height == 2868 && (!strcmp(model,"K-r") || !strcmp(model,"K-x")))
/*RT*/ { width = 4308; filters = 0x16161616; }
- if (width >= 4960 && !strncmp(model,"K-5",3))
- { left_margin = 10; width = 4950; filters = 0x16161616; }
- if (width == 4736 && !strcmp(model,"K-7"))
+ if (raw_height == 3136 && !strcmp(model,"K-7"))
{ height = 3122; width = 4684; filters = 0x16161616; top_margin = 2; }
- if (width == 6080 && !strcmp(model,"K-3"))
- { left_margin = 4; width = 6040; }
- if (width == 7424 && !strcmp(model,"645D"))
- { height = 5502; width = 7328; filters = 0x61616161; top_margin = 29;
- left_margin = 48; }
+ if (raw_height == 3284 && !strncmp(model,"K-5",3))
+ { left_margin = 10; width = 4950; filters = 0x16161616; }
+ if (raw_height == 3300 && !strncmp(model,"K-50",4))
+ { height = 3288, width = 4952; left_margin = 0; top_margin = 12; }
+ if (raw_height == 3664 && !strncmp(model,"K-S",3))
+ { width = 5492; left_margin = 0; }
+ if (raw_height == 4032 && !strcmp(model,"K-3"))
+ { height = 4032; width = 6040; left_margin = 4; }
+ if (raw_height == 4060 && !strcmp(model,"KP"))
+ { height = 4032; width = 6032; left_margin = 52; top_margin = 28; }
+ if (raw_height == 4950 && !strcmp(model,"K-1"))
+ { height = 4932; width = 7380; left_margin = 4; top_margin = 18; }
+ if (raw_height == 5552 && !strcmp(model,"645D"))
+ { height = 5502; width = 7328; left_margin = 48; top_margin = 29;
+ filters = 0x61616161; }
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
@@ -9074,6 +9302,10 @@ void CLASS identify()
for (i=0; i < sizeof sonique / sizeof *sonique; i++)
if (unique_id == sonique[i].id)
strcpy (model, sonique[i].model);
+ for (i=0; i < sizeof panalias / sizeof *panalias; i++)
+ if (panalias[i][0] == '@') orig = panalias[i]+1;
+ else if (!strcmp(model,panalias[i]))
+ adobe_coeff ("Panasonic", orig);
if (!strcmp(make,"Nikon")) {
if (!load_raw)
load_raw = &CLASS packed_load_raw;
@@ -9160,7 +9392,7 @@ canon_a5:
colors = 4;
tiff_bps = 10;
load_raw = &CLASS packed_load_raw;
- load_flags = 40;
+ load_flags = 264;
} else if (!strcmp(model,"PowerShot Pro90 IS") ||
!strcmp(model,"PowerShot G1")) {
colors = 4;
@@ -9172,6 +9404,9 @@ canon_a5:
} else if (!strcmp(model,"EOS D2000C")) {
filters = 0x61616161;
black = curve[200];
+ } else if (!strcmp(model,"EOS 80D")) {
+ top_margin -= 2;
+ height += 2;
} else if (!strcmp(model,"D1")) {
cam_mul[0] *= 256/527.0;
cam_mul[2] *= 256/317.0;
@@ -9226,6 +9461,8 @@ canon_a5:
else width -= 8;
} else if (!strncmp(model,"D300",4)) {
width -= 32;
+ } else if (!strncmp(model,"COOLPIX B",9)) {
+ load_flags = 24;
} else if (!strncmp(model,"COOLPIX P",9) && raw_width != 4032) {
load_flags = 24;
filters = 0x94949494;
@@ -9298,8 +9535,7 @@ canon_a5:
height = 2144;
width = 2880;
flip = 6;
- } else if (load_raw != &CLASS packed_load_raw)
- maximum = (is_raw == 2 && shot_select) ? 0x2f00 : 0x3e00;
+ }
if (!strncmp(model,"X-A10",5)) {
width = raw_width = 4912;
height = raw_height = 3278;
@@ -9310,7 +9546,7 @@ canon_a5:
top_margin = (raw_height - height) >> 2 << 1;
left_margin = (raw_width - width ) >> 2 << 1;
if (width == 2848 || width == 3664) filters = 0x16161616;
- if (width == 4032 || width == 4952 || width == 6032) left_margin = 0;
+ if (width == 4032 || width == 4952 || width == 6032 || width == 8280) left_margin = 0;
if (width == 3328 && (width -= 66)) left_margin = 34;
if (width == 4936) left_margin = 4;
if (!strcmp(model,"HS50EXR") ||
@@ -9372,7 +9608,7 @@ konica_400z:
} else if (!strcmp(make,"Samsung") && raw_width == 4704) {
height -= top_margin = 8;
width -= 2 * (left_margin = 8);
- load_flags = 32;
+ load_flags = 256;
} else if (!strcmp(make,"Samsung") && raw_height == 3714) {
height -= top_margin = 18;
left_margin = raw_width - (width = 5536);
@@ -9444,6 +9680,11 @@ konica_400z:
top_margin = 4;
left_margin = 41;
filters = 0x61616161;
+ } else if (raw_width == 8384) {
+ height = 6208;
+ width = 8280;
+ top_margin = 96;
+ left_margin = 46;
} else if (raw_width == 6542) { // RT, H3D-31, H3DII-31, H4D-31
if (!strcmp(model, "H3D")) strcpy(model, "H3D-31");
if (!strcmp(model, "H4D")) strcpy(model, "H4D-31");
@@ -9586,6 +9827,8 @@ konica_400z:
thumb_width = 640;
} else if (!strcmp(model,"TG-4")) {
width -= 16;
+ } else if (!strcmp(model,"TG-5")) {
+ width -= 6;
}
} else if (!strcmp(model,"N Digital")) {
height = 2047;
@@ -9937,6 +10180,7 @@ static void decodeFPDeltaRow(Bytef * src, Bytef * dst, size_t tileWidth, size_t
}
+#ifndef __F16C__
// From DNG SDK dng_utils.h
static inline uint32_t DNG_HalfToFloat(uint16_t halfValue) {
int32_t sign = (halfValue >> 15) & 0x00000001;
@@ -9970,6 +10214,7 @@ static inline uint32_t DNG_HalfToFloat(uint16_t halfValue) {
// Assemble sign, exponent and mantissa.
return (uint32_t) ((sign << 31) | (exponent << 23) | mantissa);
}
+#endif
static inline uint32_t DNG_FP24ToFloat(const uint8_t * input) {
int32_t sign = (input [0] >> 7) & 0x01;
@@ -10006,11 +10251,32 @@ static inline uint32_t DNG_FP24ToFloat(const uint8_t * input) {
static void expandFloats(Bytef * dst, int tileWidth, int bytesps) {
if (bytesps == 2) {
- uint16_t * dst16 = (uint16_t *) dst;
- uint32_t * dst32 = (uint32_t *) dst;
+ uint16_t* const dst16 = reinterpret_cast(dst);
+#ifndef __F16C__
+ uint32_t* const dst32 = reinterpret_cast(dst);
for (int index = tileWidth - 1; index >= 0; --index) {
- dst32[index] = DNG_HalfToFloat(dst16[index]);
+ dst32[index] = DNG_HalfToFloat(dst16[index]);
}
+#else
+ float* const dst32 = reinterpret_cast(dst);
+ int index = tileWidth - 8;
+ for (; index >= 0; index -= 8) {
+ __m128i halfFloatv = _mm_loadu_si128((__m128i*)&dst16[index]);
+ STVFU(dst32[index], _mm_cvtph_ps(halfFloatv));
+ STVFU(dst32[index + 4], _mm_cvtph_ps(_mm_shuffle_epi32(halfFloatv, _MM_SHUFFLE(0,0,3,2))));
+ }
+ index += 4;
+ if(index >= 0) {
+ __m128i halfFloatv = _mm_loadu_si128((__m128i*)&dst16[index]);
+ STVFU(dst32[index], _mm_cvtph_ps(halfFloatv));
+ index--;
+ } else {
+ index += 3;
+ }
+ for (; index >= 0; --index) {
+ dst32[index] = _cvtsh_ss(dst16[index]);
+ }
+#endif
} else if (bytesps == 3) {
uint8_t * dst8 = ((uint8_t *) dst) + (tileWidth - 1) * 3;
uint32_t * dst32 = (uint32_t *) dst;
@@ -10020,29 +10286,6 @@ static void expandFloats(Bytef * dst, int tileWidth, int bytesps) {
}
}
-static void copyFloatDataToInt(float * src, ushort * dst, size_t size, float max) {
- bool negative = false, nan = false;
-
-#ifdef _OPENMP
-#pragma omp parallel for
-#endif
- for (size_t i = 0; i < size; ++i) {
- if (src[i] < 0.0f) {
- negative = true;
- src[i] = 0.0f;
- } else if (std::isnan(src[i])) {
- nan = true;
- src[i] = max;
- }
- // Copy the data to the integer buffer to build the thumbnail
- dst[i] = (ushort)src[i];
- }
- if (negative)
- fprintf(stderr, "DNG Float: Negative data found in input file\n");
- if (nan)
- fprintf(stderr, "DNG Float: NaN data found in input file\n");
-}
-
static int decompress(size_t srcLen, size_t dstLen, unsigned char *in, unsigned char *out) {
// At least in zlib 1.2.11 the uncompress function is not thread save while it is thread save in zlib 1.2.8
// This simple replacement is thread save. Used example code from https://zlib.net/zlib_how.html
@@ -10184,9 +10427,6 @@ void CLASS deflate_dng_load_raw() {
}
}
- if (ifd->sample_format == 3) { // Floating point data
- copyFloatDataToInt(float_raw_image, raw_image, raw_width*raw_height, maximum);
- }
}
/* RT: removed unused functions */
diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h
index 9edc4196b..9c6ac4aec 100644
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -60,6 +60,7 @@ public:
,RT_matrix_from_constant(0)
,RT_from_adobe_dng_converter(false)
,getbithuff(this,ifp,zero_after_ff)
+ ,nikbithuff(ifp)
{
memset(&hbd, 0, sizeof(hbd));
aber[0]=aber[1]=aber[2]=aber[3]=1;
@@ -214,6 +215,7 @@ protected:
int fcol (int row, int col);
void merror (void *ptr, const char *where);
void derror();
+inline void derror(bool condition) {if(UNLIKELY(condition)) ++data_error;}
ushort sget2 (uchar *s);
ushort get2();
unsigned sget4 (uchar *s);
@@ -252,6 +254,26 @@ private:
};
getbithuff_t getbithuff;
+class nikbithuff_t
+{
+public:
+ nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
+ void operator()() {bitbuf = vbits = 0;};
+ unsigned operator()(int nbits, ushort *huff);
+ unsigned errorCount() { return errors; }
+private:
+ inline bool derror(bool condition){
+ if (UNLIKELY(condition)) {
+ ++errors;
+ }
+ return condition;
+ }
+ unsigned bitbuf, errors;
+ int vbits;
+ IMFILE *&ifp;
+};
+nikbithuff_t nikbithuff;
+
ushort * make_decoder_ref (const uchar **source);
ushort * make_decoder (const uchar *source);
void crw_init_tables (unsigned table, ushort *huff[2]);
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 40fd8e17a..0e1c25fe9 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -301,19 +301,19 @@ void Crop::update(int todo)
float adjustr = 1.f;
- if (params.icm.working == "ProPhoto") {
+ if (params.icm.workingProfile == "ProPhoto") {
adjustr = 1.f;
- } else if (params.icm.working == "Adobe RGB") {
+ } else if (params.icm.workingProfile == "Adobe RGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "sRGB") {
+ } else if (params.icm.workingProfile == "sRGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "WideGamut") {
+ } else if (params.icm.workingProfile == "WideGamut") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Beta RGB") {
+ } else if (params.icm.workingProfile == "Beta RGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BestRGB") {
+ } else if (params.icm.workingProfile == "BestRGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BruceRGB") {
+ } else if (params.icm.workingProfile == "BruceRGB") {
adjustr = 1.f / 1.2f;
}
@@ -521,19 +521,19 @@ void Crop::update(int todo)
float adjustr = 1.f;
- if (params.icm.working == "ProPhoto") {
+ if (params.icm.workingProfile == "ProPhoto") {
adjustr = 1.f; //
- } else if (params.icm.working == "Adobe RGB") {
+ } else if (params.icm.workingProfile == "Adobe RGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "sRGB") {
+ } else if (params.icm.workingProfile == "sRGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "WideGamut") {
+ } else if (params.icm.workingProfile == "WideGamut") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Beta RGB") {
+ } else if (params.icm.workingProfile == "Beta RGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BestRGB") {
+ } else if (params.icm.workingProfile == "BestRGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BruceRGB") {
+ } else if (params.icm.workingProfile == "BruceRGB") {
adjustr = 1.f / 1.2f;
}
@@ -810,12 +810,55 @@ void Crop::update(int todo)
const int W = baseCrop->getWidth();
const int H = baseCrop->getHeight();
LabImage labcbdl(W, H);
- parent->ipf.rgb2lab(*baseCrop, labcbdl, params.icm.working);
+ parent->ipf.rgb2lab(*baseCrop, labcbdl, params.icm.workingProfile);
parent->ipf.dirpyrequalizer(&labcbdl, skip);
- parent->ipf.lab2rgb(labcbdl, *baseCrop, params.icm.working);
+ parent->ipf.lab2rgb(labcbdl, *baseCrop, params.icm.workingProfile);
}
+ if (todo & (M_AUTOEXP | M_RGBCURVE)) {
+ if (params.icm.workingTRC == "Custom") { //exec TRC IN free
+ Glib::ustring profile;
+ profile = params.icm.workingProfile;
+
+ if (profile == "sRGB" || profile == "Adobe RGB" || profile == "ProPhoto" || profile == "WideGamut" || profile == "BruceRGB" || profile == "Beta RGB" || profile == "BestRGB" || profile == "Rec2020" || profile == "ACESp0" || profile == "ACESp1") {
+
+ //first put gamma TRC to 1
+ int cw = baseCrop->getWidth();
+ int ch = baseCrop->getHeight();
+ Imagefloat* readyImg0 = NULL;
+
+ readyImg0 = parent->ipf.workingtrc(baseCrop, cw, ch, -5, params.icm.workingProfile, 2.4, 12.92310);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ baseCrop->r(row, col) = (float)readyImg0->r(row, col);
+ baseCrop->g(row, col) = (float)readyImg0->g(row, col);
+ baseCrop->b(row, col) = (float)readyImg0->b(row, col);
+ }
+ }
+
+ delete readyImg0;
+
+ //adjust gamma TRC
+ Imagefloat* readyImg = NULL;
+ readyImg = parent->ipf.workingtrc(baseCrop, cw, ch, 5, params.icm.workingProfile, params.icm.workingTRCGamma, params.icm.workingTRCSlope);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ baseCrop->r(row, col) = (float)readyImg->r(row, col);
+ baseCrop->g(row, col) = (float)readyImg->g(row, col);
+ baseCrop->b(row, col) = (float)readyImg->b(row, col);
+ }
+ }
+
+ delete readyImg;
+ }
+ }
+ }
+
if (todo & M_RGBCURVE) {
double rrm, ggm, bbm;
DCPProfile::ApplyState as;
diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc
index f94f6bad6..c0d0c2a2b 100644
--- a/rtengine/demosaic_algos.cc
+++ b/rtengine/demosaic_algos.cc
@@ -37,6 +37,7 @@
#include "sleef.c"
#include "opthelper.h"
#include "median.h"
+#define BENCHMARK
#include "StopWatch.h"
#ifdef _OPENMP
#include
@@ -46,11 +47,12 @@ using namespace std;
namespace rtengine
{
+
+extern const Settings* settings;
+
#undef ABS
-#undef DIST
#define ABS(a) ((a)<0?-(a):(a))
-#define DIST(a,b) (ABS(a-b))
#define CLIREF(x) LIM(x,-200000.0f,200000.0f) // avoid overflow : do not act directly on image[] or pix[]
#define x1125(a) (a + xdivf(a, 3))
#define x0875(a) (a - xdivf(a, 3))
@@ -58,243 +60,6 @@ namespace rtengine
#define x00625(a) xdivf(a, 4)
#define x0125(a) xdivf(a, 3)
-extern const Settings* settings;
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void RawImageSource::eahd_demosaic ()
-{
- if (plistener) {
- plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::EAHD)));
- plistener->setProgress (0.0);
- }
-
- // prepare cache and constants for cielab conversion
- //TODO: revisit after conversion to D50 illuminant
- lc00 = (0.412453 * imatrices.rgb_cam[0][0] + 0.357580 * imatrices.rgb_cam[0][1] + 0.180423 * imatrices.rgb_cam[0][2]) ;// / 0.950456;
- lc01 = (0.412453 * imatrices.rgb_cam[1][0] + 0.357580 * imatrices.rgb_cam[1][1] + 0.180423 * imatrices.rgb_cam[1][2]) ;// / 0.950456;
- lc02 = (0.412453 * imatrices.rgb_cam[2][0] + 0.357580 * imatrices.rgb_cam[2][1] + 0.180423 * imatrices.rgb_cam[2][2]) ;// / 0.950456;
-
- lc10 = 0.212671 * imatrices.rgb_cam[0][0] + 0.715160 * imatrices.rgb_cam[0][1] + 0.072169 * imatrices.rgb_cam[0][2];
- lc11 = 0.212671 * imatrices.rgb_cam[1][0] + 0.715160 * imatrices.rgb_cam[1][1] + 0.072169 * imatrices.rgb_cam[1][2];
- lc12 = 0.212671 * imatrices.rgb_cam[2][0] + 0.715160 * imatrices.rgb_cam[2][1] + 0.072169 * imatrices.rgb_cam[2][2];
-
- lc20 = (0.019334 * imatrices.rgb_cam[0][0] + 0.119193 * imatrices.rgb_cam[0][1] + 0.950227 * imatrices.rgb_cam[0][2]) ;// / 1.088754;
- lc21 = (0.019334 * imatrices.rgb_cam[1][0] + 0.119193 * imatrices.rgb_cam[1][1] + 0.950227 * imatrices.rgb_cam[1][2]) ;// / 1.088754;
- lc22 = (0.019334 * imatrices.rgb_cam[2][0] + 0.119193 * imatrices.rgb_cam[2][1] + 0.950227 * imatrices.rgb_cam[2][2]) ;// / 1.088754;
-
- int maxindex = 3 * 65536; //2*65536 3 = avoid crash 3/2013 J.Desmis
- cache = new double[maxindex];
- threshold = (int)(0.008856 * MAXVALD);
-
- for (int i = 0; i < maxindex; i++) {
- cache[i] = std::cbrt(double(i) / MAXVALD);
- }
-
- // end of cielab preparation
-
- JaggedArray
- rh (W, 3), gh (W, 4), bh (W, 3),
- rv (W, 3), gv (W, 4), bv (W, 3),
- lLh (W, 3), lah (W, 3), lbh (W, 3),
- lLv (W, 3), lav (W, 3), lbv (W, 3),
- homh (W, 3), homv (W, 3);
-
- // interpolate first two lines
- interpolate_row_g (gh[0], gv[0], 0);
- interpolate_row_g (gh[1], gv[1], 1);
- interpolate_row_g (gh[2], gv[2], 2);
- interpolate_row_rb (rh[0], bh[0], nullptr, gh[0], gh[1], 0);
- interpolate_row_rb (rv[0], bv[0], nullptr, gv[0], gv[1], 0);
- interpolate_row_rb (rh[1], bh[1], gh[0], gh[1], gh[2], 1);
- interpolate_row_rb (rv[1], bv[1], gv[0], gv[1], gv[2], 1);
-
- convert_to_cielab_row (rh[0], gh[0], bh[0], lLh[0], lah[0], lbh[0]);
- convert_to_cielab_row (rv[0], gv[0], bv[0], lLv[0], lav[0], lbv[0]);
- convert_to_cielab_row (rh[1], gh[1], bh[1], lLh[1], lah[1], lbh[1]);
- convert_to_cielab_row (rv[1], gv[1], bv[1], lLv[1], lav[1], lbv[1]);
-
- for (int j = 0; j < W; j++) {
- homh[0][j] = 0;
- homv[0][j] = 0;
- homh[1][j] = 0;
- homv[1][j] = 0;
- }
-
- int dLmaph[9];
- int dLmapv[9];
- int dCamaph[9];
- int dCamapv[9];
- int dCbmaph[9];
- int dCbmapv[9];
-
- for (int i = 1; i < H - 1; i++) {
- int ix = i % 3;
- int imx = (i - 1) % 3;
- int ipx = (i + 1) % 3;
-
- if (i < H - 2) {
- interpolate_row_g (gh[(i + 2) % 4], gv[(i + 2) % 4], i + 2);
- interpolate_row_rb (rh[(i + 1) % 3], bh[(i + 1) % 3], gh[i % 4], gh[(i + 1) % 4], gh[(i + 2) % 4], i + 1);
- interpolate_row_rb (rv[(i + 1) % 3], bv[(i + 1) % 3], gv[i % 4], gv[(i + 1) % 4], gv[(i + 2) % 4], i + 1);
- } else {
- interpolate_row_rb (rh[(i + 1) % 3], bh[(i + 1) % 3], gh[i % 4], gh[(i + 1) % 4], nullptr, i + 1);
- interpolate_row_rb (rv[(i + 1) % 3], bv[(i + 1) % 3], gv[i % 4], gv[(i + 1) % 4], nullptr, i + 1);
- }
-
- convert_to_cielab_row (rh[(i + 1) % 3], gh[(i + 1) % 4], bh[(i + 1) % 3], lLh[(i + 1) % 3], lah[(i + 1) % 3], lbh[(i + 1) % 3]);
- convert_to_cielab_row (rv[(i + 1) % 3], gv[(i + 1) % 4], bv[(i + 1) % 3], lLv[(i + 1) % 3], lav[(i + 1) % 3], lbv[(i + 1) % 3]);
-
- for (int j = 0; j < W; j++) {
- homh[ipx][j] = 0;
- homv[ipx][j] = 0;
- }
-
- int sh, sv, idx;
-
- for (int j = 1; j < W - 1; j++) {
- int dmi = 0;
-
- for (int x = -1; x <= 1; x++) {
- idx = (i + x) % 3;
-
- for (int y = -1; y <= 1; y++) {
- // compute distance in a, b, and L
- if (dmi < 4) {
- sh = homh[idx][j + y];
- sv = homv[idx][j + y];
-
- if (sh > sv) { // fixate horizontal pixel
- dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
- dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
- dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
- dLmapv[dmi] = DIST(lLv[ix][j], lLh[idx][j + y]);
- dCamapv[dmi] = DIST(lav[ix][j], lah[idx][j + y]);
- dCbmapv[dmi] = DIST(lbv[ix][j], lbh[idx][j + y]);
- } else if (sh < sv) {
- dLmaph[dmi] = DIST(lLh[ix][j], lLv[idx][j + y]);
- dCamaph[dmi] = DIST(lah[ix][j], lav[idx][j + y]);
- dCbmaph[dmi] = DIST(lbh[ix][j], lbv[idx][j + y]);
- dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
- dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
- dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
- } else {
- dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
- dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
- dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
- dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
- dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
- dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
- }
- } else {
- dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
- dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
- dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
- dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
- dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
- dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
- }
-
- dmi++;
- }
- }
-
- // compute eL & eC
- int eL = min(max(dLmaph[3], dLmaph[5]), max(dLmapv[1], dLmapv[7]));
- int eCa = min(max(dCamaph[3], dCamaph[5]), max(dCamapv[1], dCamapv[7]));
- int eCb = min(max(dCbmaph[3], dCbmaph[5]), max(dCbmapv[1], dCbmapv[7]));
-
- int wh = 0;
-
- for (int dmi = 0; dmi < 9; dmi++)
- if (dLmaph[dmi] <= eL && dCamaph[dmi] <= eCa && dCbmaph[dmi] <= eCb) {
- wh++;
- }
-
- int wv = 0;
-
- for (int dmi = 0; dmi < 9; dmi++)
- if (dLmapv[dmi] <= eL && dCamapv[dmi] <= eCa && dCbmapv[dmi] <= eCb) {
- wv++;
- }
-
- homh[imx][j - 1] += wh;
- homh[imx][j] += wh;
- homh[imx][j + 1] += wh;
- homh[ix][j - 1] += wh;
- homh[ix][j] += wh;
- homh[ix][j + 1] += wh;
- homh[ipx][j - 1] += wh;
- homh[ipx][j] += wh;
- homh[ipx][j + 1] += wh;
-
- homv[imx][j - 1] += wv;
- homv[imx][j] += wv;
- homv[imx][j + 1] += wv;
- homv[ix][j - 1] += wv;
- homv[ix][j] += wv;
- homv[ix][j + 1] += wv;
- homv[ipx][j - 1] += wv;
- homv[ipx][j] += wv;
- homv[ipx][j + 1] += wv;
- }
-
-//}
- // finalize image
- int hc, vc;
-
- for (int j = 0; j < W; j++) {
- if (ri->ISGREEN(i - 1, j)) {
- green[i - 1][j] = rawData[i - 1][j];
- } else {
- hc = homh[imx][j];
- vc = homv[imx][j];
-
- if (hc > vc) {
- green[i - 1][j] = gh[(i - 1) % 4][j];
- } else if (hc < vc) {
- green[i - 1][j] = gv[(i - 1) % 4][j];
- } else {
- green[i - 1][j] = (gh[(i - 1) % 4][j] + gv[(i - 1) % 4][j]) / 2;
- }
- }
- }
-
- if (!(i % 20) && plistener) {
- plistener->setProgress ((double)i / (H - 2));
- }
- }
-
- // finish H-2th and H-1th row, homogenity value is still valailable
- int hc, vc;
-
- for (int i = H - 1; i < H + 1; i++)
- for (int j = 0; j < W; j++) {
- hc = homh[(i - 1) % 3][j];
- vc = homv[(i - 1) % 3][j];
-
- if (hc > vc) {
- green[i - 1][j] = gh[(i - 1) % 4][j];
- } else if (hc < vc) {
- green[i - 1][j] = gv[(i - 1) % 4][j];
- } else {
- green[i - 1][j] = (gh[(i - 1) % 4][j] + gv[(i - 1) % 4][j]) / 2;
- }
- }
-
- // Interpolate R and B
- for (int i = 0; i < H; i++) {
- if (i == 0) {
- interpolate_row_rb_mul_pp (rawData, red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
- } else if (i == H - 1) {
- interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
- } else {
- interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
- }
- }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
void RawImageSource::hphd_vertical (float** hpmap, int col_from, int col_to)
{
float* temp = new float[max(W, H)];
@@ -553,6 +318,8 @@ void RawImageSource::hphd_demosaic ()
}
}
+ border_interpolate2(W, H, 4, rawData, red, green, blue);
+
if (plistener) {
plistener->setProgress (1.0);
}
@@ -682,7 +449,8 @@ void RawImageSource::ppg_demosaic()
void RawImageSource::border_interpolate(unsigned int border, float (*image)[4], unsigned int start, unsigned int end)
{
- unsigned row, col, y, x, f, sum[8];
+ unsigned row, col, y, x, f;
+ float sum[8];
unsigned int width = W, height = H;
unsigned int colors = 3;
@@ -714,7 +482,7 @@ void RawImageSource::border_interpolate(unsigned int border, float (*image)[4],
}
}
-void RawImageSource::border_interpolate2( int winw, int winh, int lborders)
+void RawImageSource::border_interpolate2( int winw, int winh, int lborders, const array2D &rawData, array2D &red, array2D &green, array2D &blue)
{
int bord = lborders;
int width = winw;
@@ -1182,7 +950,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D &r
// apply low pass filter on differential colors
#ifdef _OPENMP
- #pragma omp for
+ #pragma omp for
#endif
for (int rr = 4; rr < rr1 - 4; rr++)
@@ -1408,7 +1176,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D &r
// interpolate R/B at B/R location
#ifdef _OPENMP
- #pragma omp for
+ #pragma omp for
#endif
for (int rr = 1; rr < rr1 - 1; rr++)
@@ -1657,7 +1425,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
chr[2] = hdif;
chr[3] = vdif;
- border_interpolate2(winw, winh, 7);
+ border_interpolate2(winw, winh, 7, rawData, red, green, blue);
if (plistener) {
plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));
@@ -2047,7 +1815,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
vdif = (float (*)) calloc(width * height / 2, sizeof * vdif);
hdif = (float (*)) calloc(width * height / 2, sizeof * hdif);
- border_interpolate2(winw, winh, 7);
+ border_interpolate2(winw, winh, 7, rawData, red, green, blue);
if (plistener) {
plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));
@@ -2289,217 +2057,6 @@ void RawImageSource::igv_interpolate(int winw, int winh)
}
#endif
-
-/*
- Adaptive Homogeneity-Directed interpolation is based on
- the work of Keigo Hirakawa, Thomas Parks, and Paul Lee.
- */
-#define TS 256 /* Tile Size */
-#define FORC(cnt) for (c=0; c < cnt; c++)
-#define FORC3 FORC(3)
-
-void RawImageSource::ahd_demosaic()
-{
- int i, j, k, top, left, row, col, tr, tc, c, d, val, hm[2];
- float (*pix)[4], (*rix)[3];
- static const int dir[4] = { -1, 1, -TS, TS };
- float ldiff[2][4], abdiff[2][4], leps, abeps;
- float xyz[3], xyz_cam[3][4];
- float* cbrt;
- float (*rgb)[TS][TS][3];
- float (*lab)[TS][TS][3];
- float (*lix)[3];
- char (*homo)[TS][TS], *buffer;
- double r;
-
- int width = W, height = H;
- float (*image)[4];
- unsigned int colors = 3;
-
- const double xyz_rgb[3][3] = { /* XYZ from RGB */
- { 0.412453, 0.357580, 0.180423 },
- { 0.212671, 0.715160, 0.072169 },
- { 0.019334, 0.119193, 0.950227 }
- };
-
- const float d65_white[3] = { 0.950456, 1, 1.088754 };
-
- if (plistener) {
- plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD)));
- plistener->setProgress (0.0);
- }
-
- image = (float (*)[4]) calloc (H * W, sizeof * image);
-
- for (int ii = 0; ii < H; ii++)
- for (int jj = 0; jj < W; jj++) {
- image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj];
- }
-
- cbrt = (float (*)) calloc (0x10000, sizeof * cbrt);
-
- for (i = 0; i < 0x10000; i++) {
- r = (double)i / 65535.0;
- cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0;
- }
-
- for (i = 0; i < 3; i++)
- for (unsigned int j = 0; j < colors; j++)
- for (xyz_cam[i][j] = k = 0; k < 3; k++) {
- xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i];
- }
-
- border_interpolate(5, image);
- buffer = (char *) malloc (13 * TS * TS * sizeof(float)); /* 1664 kB */
- //merror (buffer, "ahd_interpolate()");
- rgb = (float(*)[TS][TS][3]) buffer;
- lab = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float));
- homo = (char (*)[TS][TS]) (buffer + 12 * TS * TS * sizeof(float));
-
- // helper variables for progress indication
- int n_tiles = ((height - 7 + (TS - 7)) / (TS - 6)) * ((width - 7 + (TS - 7)) / (TS - 6));
- int tile = 0;
-
- for (top = 2; top < height - 5; top += TS - 6)
- for (left = 2; left < width - 5; left += TS - 6) {
- /* Interpolate green horizontally and vertically: */
- for (row = top; row < top + TS && row < height - 2; row++) {
- col = left + (FC(row, left) & 1);
-
- for (c = FC(row, col); col < left + TS && col < width - 2; col += 2) {
- pix = image + (row * width + col);
- val = 0.25 * ((pix[-1][1] + pix[0][c] + pix[1][1]) * 2
- - pix[-2][c] - pix[2][c]) ;
- rgb[0][row - top][col - left][1] = median(static_cast(val), pix[-1][1], pix[1][1]);
- val = 0.25 * ((pix[-width][1] + pix[0][c] + pix[width][1]) * 2
- - pix[-2 * width][c] - pix[2 * width][c]) ;
- rgb[1][row - top][col - left][1] = median(static_cast(val), pix[-width][1], pix[width][1]);
- }
- }
-
- /* Interpolate red and blue, and convert to CIELab: */
- for (d = 0; d < 2; d++)
- for (row = top + 1; row < top + TS - 1 && row < height - 3; row++)
- for (col = left + 1; col < left + TS - 1 && col < width - 3; col++) {
- pix = image + (row * width + col);
- rix = &rgb[d][row - top][col - left];
- lix = &lab[d][row - top][col - left];
-
- if ((c = 2 - FC(row, col)) == 1) {
- c = FC(row + 1, col);
- val = pix[0][1] + (0.5 * ( pix[-1][2 - c] + pix[1][2 - c]
- - rix[-1][1] - rix[1][1] ) );
- rix[0][2 - c] = CLIP(val);
- val = pix[0][1] + (0.5 * ( pix[-width][c] + pix[width][c]
- - rix[-TS][1] - rix[TS][1] ) );
- } else
- val = rix[0][1] + (0.25 * ( pix[-width - 1][c] + pix[-width + 1][c]
- + pix[+width - 1][c] + pix[+width + 1][c]
- - rix[-TS - 1][1] - rix[-TS + 1][1]
- - rix[+TS - 1][1] - rix[+TS + 1][1]) );
-
- rix[0][c] = CLIP(val);
- c = FC(row, col);
- rix[0][c] = pix[0][c];
- xyz[0] = xyz[1] = xyz[2] = 0.0;
- FORCC {
- xyz[0] += xyz_cam[0][c] * rix[0][c];
- xyz[1] += xyz_cam[1][c] * rix[0][c];
- xyz[2] += xyz_cam[2][c] * rix[0][c];
- }
-
- xyz[0] = CurveFactory::flinterp(cbrt, xyz[0]);
- xyz[1] = CurveFactory::flinterp(cbrt, xyz[1]);
- xyz[2] = CurveFactory::flinterp(cbrt, xyz[2]);
-
- //xyz[0] = xyz[0] > 0.008856 ? pow(xyz[0]/65535,1/3.0) : 7.787*xyz[0] + 16/116.0;
- //xyz[1] = xyz[1] > 0.008856 ? pow(xyz[1]/65535,1/3.0) : 7.787*xyz[1] + 16/116.0;
- //xyz[2] = xyz[2] > 0.008856 ? pow(xyz[2]/65535,1/3.0) : 7.787*xyz[2] + 16/116.0;
-
- lix[0][0] = (116 * xyz[1] - 16);
- lix[0][1] = 500 * (xyz[0] - xyz[1]);
- lix[0][2] = 200 * (xyz[1] - xyz[2]);
- }
-
- /* Build homogeneity maps from the CIELab images: */
- memset (homo, 0, 2 * TS * TS);
-
- for (row = top + 2; row < top + TS - 2 && row < height - 4; row++) {
- tr = row - top;
-
- for (col = left + 2; col < left + TS - 2 && col < width - 4; col++) {
- tc = col - left;
-
- for (d = 0; d < 2; d++) {
- lix = &lab[d][tr][tc];
-
- for (i = 0; i < 4; i++) {
- ldiff[d][i] = ABS(lix[0][0] - lix[dir[i]][0]);
- abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1])
- + SQR(lix[0][2] - lix[dir[i]][2]);
- }
- }
-
- leps = min(max(ldiff[0][0], ldiff[0][1]),
- max(ldiff[1][2], ldiff[1][3]));
- abeps = min(max(abdiff[0][0], abdiff[0][1]),
- max(abdiff[1][2], abdiff[1][3]));
-
- for (d = 0; d < 2; d++)
- for (i = 0; i < 4; i++)
- if (ldiff[d][i] <= leps && abdiff[d][i] <= abeps) {
- homo[d][tr][tc]++;
- }
- }
- }
-
- /* Combine the most homogenous pixels for the final result: */
- for (row = top + 3; row < top + TS - 3 && row < height - 5; row++) {
- tr = row - top;
-
- for (col = left + 3; col < left + TS - 3 && col < width - 5; col++) {
- tc = col - left;
-
- for (d = 0; d < 2; d++)
- for (hm[d] = 0, i = tr - 1; i <= tr + 1; i++)
- for (j = tc - 1; j <= tc + 1; j++) {
- hm[d] += homo[d][i][j];
- }
-
- if (hm[0] != hm[1]) {
- FORC3 image[row * width + col][c] = rgb[hm[1] > hm[0]][tr][tc][c];
- } else
- FORC3 image[row * width + col][c] =
- 0.5 * (rgb[0][tr][tc][c] + rgb[1][tr][tc][c]) ;
- }
- }
-
- tile++;
-
- if(plistener) {
- plistener->setProgress((double)tile / n_tiles);
- }
- }
-
- if(plistener) {
- plistener->setProgress (1.0);
- }
-
- free (buffer);
-
- for (int i = 0; i < H; i++) {
- for (int j = 0; j < W; j++) {
- red[i][j] = image[i * W + j][0];
- green[i][j] = image[i * W + j][1];
- blue[i][j] = image[i * W + j][2];
- }
- }
-
- free (image);
- free (cbrt);
-}
-#undef TS
-
void RawImageSource::nodemosaic(bool bw)
{
red(W, H);
diff --git a/rtengine/diagonalcurves.cc b/rtengine/diagonalcurves.cc
index a3b00b165..f478ba719 100644
--- a/rtengine/diagonalcurves.cc
+++ b/rtengine/diagonalcurves.cc
@@ -86,7 +86,8 @@ DiagonalCurve::DiagonalCurve (const std::vector& p, int poly_pn)
if (!identity) {
if (kind == DCT_Spline && N > 2) {
- spline_cubic_set ();
+ //spline_cubic_set ();
+ catmull_rom_set();
} else if (kind == DCT_NURBS && N > 2) {
NURBS_set ();
fillHash();
@@ -270,6 +271,164 @@ void DiagonalCurve::NURBS_set ()
fillDyByDx();
}
+
+/*****************************************************************************
+ * Catmull Rom Spline
+ * (https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline)
+ *****************************************************************************/
+
+namespace {
+
+inline double pow2(double x)
+{
+ return x*x;
+}
+
+
+inline double catmull_rom_tj(double ti,
+ double xi, double yi,
+ double xj, double yj)
+{
+ // see https://github.com/Beep6581/RawTherapee/pull/4701#issuecomment-414054187
+ static constexpr double alpha = 0.375;
+ return pow(sqrt(pow2(xj-xi) + pow2(yj-yi)), alpha) + ti;
+}
+
+
+inline void catmull_rom_spline(int n_points,
+ double p0_x, double p0_y,
+ double p1_x, double p1_y,
+ double p2_x, double p2_y,
+ double p3_x, double p3_y,
+ std::vector &res_x,
+ std::vector &res_y)
+{
+ res_x.reserve(n_points);
+ res_y.reserve(n_points);
+
+ double t0 = 0;
+ double t1 = catmull_rom_tj(t0, p0_x, p0_y, p1_x, p1_y);
+ double t2 = catmull_rom_tj(t1, p1_x, p1_y, p2_x, p2_y);
+ double t3 = catmull_rom_tj(t2, p2_x, p2_y, p3_x, p3_y);
+
+ double space = (t2-t1) / n_points;
+
+ double t;
+ int i;
+ double c, d, A1_x, A1_y, A2_x, A2_y, A3_x, A3_y;
+ double B1_x, B1_y, B2_x, B2_y, C_x, C_y;
+
+ res_x.push_back(p1_x);
+ res_y.push_back(p1_y);
+
+ // special case, a segment at 0 or 1 is computed exactly
+ if (p1_y == p2_y && (p1_y == 0 || p1_y == 1)) {
+ for (i = 1; i < n_points-1; ++i) {
+ t = p1_x + space * i;
+ res_x.push_back(t);
+ res_y.push_back(p1_y);
+ }
+ } else {
+ for (i = 1; i < n_points-1; ++i) {
+ t = t1 + space * i;
+
+ c = (t1 - t)/(t1 - t0);
+ d = (t - t0)/(t1 - t0);
+ A1_x = c * p0_x + d * p1_x;
+ A1_y = c * p0_y + d * p1_y;
+
+ c = (t2 - t)/(t2 - t1);
+ d = (t - t1)/(t2 - t1);
+ A2_x = c * p1_x + d * p2_x;
+ A2_y = c * p1_y + d * p2_y;
+
+ c = (t3 - t)/(t3 - t2);
+ d = (t - t2)/(t3 - t2);
+ A3_x = c * p2_x + d * p3_x;
+ A3_y = c * p2_y + d * p3_y;
+
+ c = (t2 - t)/(t2 - t0);
+ d = (t - t0)/(t2 - t0);
+ B1_x = c * A1_x + d * A2_x;
+ B1_y = c * A1_y + d * A2_y;
+
+ c = (t3 - t)/(t3 - t1);
+ d = (t - t1)/(t3 - t1);
+ B2_x = c * A2_x + d * A3_x;
+ B2_y = c * A2_y + d * A3_y;
+
+ c = (t2 - t)/(t2 - t1);
+ d = (t - t1)/(t2 - t1);
+ C_x = c * B1_x + d * B2_x;
+ C_y = c * B1_y + d * B2_y;
+
+ res_x.push_back(C_x);
+ res_y.push_back(C_y);
+ }
+ }
+
+ res_x.push_back(p2_x);
+ res_y.push_back(p2_y);
+}
+
+
+inline void catmull_rom_reflect(double px, double py, double cx, double cy,
+ double &rx, double &ry)
+{
+#if 0
+ double dx = px - cx;
+ double dy = py - cy;
+ rx = cx - dx;
+ ry = cy - dy;
+#else
+ // see https://github.com/Beep6581/RawTherapee/pull/4701#issuecomment-414054187
+ static constexpr double epsilon = 1e-5;
+ double dx = px - cx;
+ double dy = py - cy;
+ rx = cx - dx * 0.01;
+ ry = dx > epsilon ? (dy / dx) * (rx - cx) + cy : cy;
+#endif
+}
+
+
+void catmull_rom_chain(int n_points, int n_cp, double *x, double *y,
+ std::vector &res_x, std::vector &res_y)
+{
+ double x_first, y_first;
+ double x_last, y_last;
+ catmull_rom_reflect(x[1], y[1], x[0], y[0], x_first, y_first);
+ catmull_rom_reflect(x[n_cp-2], y[n_cp-2], x[n_cp-1], y[n_cp-1], x_last, y_last);
+
+ int segments = n_cp - 1;
+
+ res_x.reserve(n_points);
+ res_y.reserve(n_points);
+
+ for (int i = 0; i < segments; ++i) {
+ int n = max(int(n_points * (x[i+1] - x[i]) + 0.5), 2);
+ catmull_rom_spline(
+ n, i == 0 ? x_first : x[i-1], i == 0 ? y_first : y[i-1],
+ x[i], y[i], x[i+1], y[i+1],
+ i == segments-1 ? x_last : x[i+2],
+ i == segments-1 ? y_last : y[i+2],
+ res_x, res_y);
+ }
+}
+
+} // namespace
+
+
+void DiagonalCurve::catmull_rom_set()
+{
+ int n_points = max(ppn * 65, 65000);
+ poly_x.clear();
+ poly_y.clear();
+ catmull_rom_chain(n_points, N, x, y, poly_x, poly_y);
+}
+
+/*****************************************************************************/
+
+
double DiagonalCurve::getVal (double t) const
{
@@ -300,7 +459,8 @@ double DiagonalCurve::getVal (double t) const
}
case DCT_Linear :
- case DCT_Spline : {
+ // case DCT_Spline :
+ {
// values under and over the first and last point
if (t > x[N - 1]) {
return y[N - 1];
@@ -324,20 +484,33 @@ double DiagonalCurve::getVal (double t) const
double h = x[k_hi] - x[k_lo];
// linear
- if (kind == DCT_Linear) {
+ // if (kind == DCT_Linear) {
return y[k_lo] + (t - x[k_lo]) * ( y[k_hi] - y[k_lo] ) / h;
- }
- // spline curve
- else { // if (kind==Spline) {
- double a = (x[k_hi] - t) / h;
- double b = (t - x[k_lo]) / h;
- double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666;
- return CLIPD(r);
- }
+ // }
+ // // spline curve
+ // else { // if (kind==Spline) {
+ // double a = (x[k_hi] - t) / h;
+ // double b = (t - x[k_lo]) / h;
+ // double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666;
+ // return CLIPD(r);
+ // }
break;
}
+ case DCT_Spline: {
+ auto it = std::lower_bound(poly_x.begin(), poly_x.end(), t);
+ if (it == poly_x.end()) {
+ return poly_y.back();
+ }
+ auto d = it - poly_x.begin();
+ if (it+1 < poly_x.end() && t - *it > *(it+1) - t) {
+ ++d;
+ }
+ return LIM01(*(poly_y.begin() + d));
+ break;
+ }
+
case DCT_NURBS : {
// get the hash table entry by rounding the value (previously multiplied by "hashSize")
unsigned short int i = (unsigned short int)(t * hashSize);
diff --git a/rtengine/dual_demosaic_RT.cc b/rtengine/dual_demosaic_RT.cc
new file mode 100644
index 000000000..6e92fd1e2
--- /dev/null
+++ b/rtengine/dual_demosaic_RT.cc
@@ -0,0 +1,144 @@
+////////////////////////////////////////////////////////////////
+//
+// combine demosaic algorithms
+//
+//
+// copyright (c) 2018 Ingo Weyrich
+//
+// blends output of two demosaicers based on contrast
+//
+//
+// dual_demosaic_RT.cc is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+////////////////////////////////////////////////////////////////
+
+#include "jaggedarray.h"
+#include "rtengine.h"
+#include "rawimagesource.h"
+#include "rt_math.h"
+//#define BENCHMARK
+#include "StopWatch.h"
+#include "rt_algo.h"
+
+using namespace std;
+
+namespace rtengine
+{
+
+void RawImageSource::dual_demosaic_RT(bool isBayer, const RAWParams &raw, int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue, double &contrast, bool autoContrast, int autoX, int autoY)
+{
+ BENCHFUN
+
+ if (contrast == 0.0 && !autoContrast) {
+ // contrast == 0.0 means only first demosaicer will be used
+ if(isBayer) {
+ if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) ) {
+ amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
+ } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4) ) {
+ dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
+ } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4) ) {
+ rcd_demosaic();
+ }
+ } else {
+ if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) ) {
+ xtrans_interpolate (3, true);
+ } else {
+ xtrans_interpolate (1, false);
+ }
+ }
+
+ return;
+ }
+
+ array2D redTmp(winw, winh);
+ array2D greenTmp(winw, winh);
+ array2D blueTmp(winw, winh);
+ array2D L(winw, winh);
+
+ if (isBayer) {
+ vng4_demosaic(rawData, redTmp, greenTmp, blueTmp);
+
+ if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) || raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
+ amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
+ } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4) ) {
+ dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
+ } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4) ) {
+ rcd_demosaic();
+ }
+ } else {
+ if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) ) {
+ xtrans_interpolate (3, true);
+ } else {
+ xtrans_interpolate (1, false);
+ }
+ fast_xtrans_interpolate(rawData, redTmp, greenTmp, blueTmp);
+ }
+
+ const float xyz_rgb[3][3] = { // XYZ from RGB
+ { 0.412453, 0.357580, 0.180423 },
+ { 0.212671, 0.715160, 0.072169 },
+ { 0.019334, 0.119193, 0.950227 }
+ };
+
+ if (autoContrast && autoX >= 0 && autoY >= 0) {
+ constexpr int rectSize = 40;
+ const int autoWidth = min(rectSize, winw - autoX);
+ const int autoHeight = min(rectSize, winh - autoY);
+ if (std::min(autoWidth, autoHeight) > 20) {
+ array2D autoL(autoWidth, autoHeight);
+ for(int i = 0; i < autoHeight; ++i) {
+ Color::RGB2L(red[i + autoY] + autoX, green[i + autoY] + autoX, blue[i + autoY] + autoX, autoL[i], xyz_rgb, autoWidth);
+ }
+ // calculate contrast based blend factors to use vng4 in regions with low contrast
+ JaggedArray blend(autoWidth - 2, autoHeight - 2);
+ int c = calcContrastThreshold(autoL, blend, autoWidth, autoHeight);
+ if(c < 100) {
+ contrast = c; // alternative : contrast = c - 1
+ }
+ }
+ }
+
+ #pragma omp parallel
+ {
+ #pragma omp for
+ for(int i = 0; i < winh; ++i) {
+ Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, winw);
+ }
+ }
+ // calculate contrast based blend factors to use vng4 in regions with low contrast
+ JaggedArray blend(winw, winh);
+ buildBlendMask(L, blend, winw, winh, contrast / 100.f);
+
+ // the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
+ #pragma omp parallel for
+ for(int i = 0; i < winh; ++i) {
+ for(int j = 0; j < winw; ++j) {
+ red[i][j] = intp(blend[i][j], red[i][j], redTmp[i][j]);
+ }
+ }
+ #pragma omp parallel for
+ for(int i = 0; i < winh; ++i) {
+ for(int j = 0; j < winw; ++j) {
+ green[i][j] = intp(blend[i][j], green[i][j], greenTmp[i][j]);
+ }
+ }
+ #pragma omp parallel for
+ for(int i = 0; i < winh; ++i) {
+ for(int j = 0; j < winw; ++j) {
+ blue[i][j] = intp(blend[i][j], blue[i][j], blueTmp[i][j]);
+ }
+ }
+
+}
+}
diff --git a/rtengine/eahd_demosaic.cc b/rtengine/eahd_demosaic.cc
new file mode 100644
index 000000000..aef016386
--- /dev/null
+++ b/rtengine/eahd_demosaic.cc
@@ -0,0 +1,446 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2018 Gabor Horvath and other RawTherapee contributors
+ * Split out to own compilation unit and made speedup 2018 Ingo Weyrich (heckflosse67@gmx.de)
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#include
+
+#include "color.h"
+#include "rawimagesource.h"
+#include "rawimagesource_i.h"
+#include "jaggedarray.h"
+#include "rawimage.h"
+#include "iccmatrices.h"
+#include "rt_math.h"
+#include "../rtgui/multilangmgr.h"
+#include "procparams.h"
+//#define BENCHMARK
+#include "StopWatch.h"
+
+using namespace std;
+
+namespace rtengine
+{
+
+
+inline void RawImageSource::interpolate_row_g (float* agh, float* agv, int i)
+{
+
+ for (int j = 0; j < W; j++) {
+ if (ri->ISGREEN(i, j)) {
+ agh[j] = rawData[i][j];
+ agv[j] = rawData[i][j];
+ } else {
+ int gh = 0;
+ int gv = 0;
+
+ if (j > 1 && j < W - 2) {
+ gh = (-rawData[i][j - 2] + 2 * rawData[i][j - 1] + 2 * rawData[i][j] + 2 * rawData[i][j + 1] - rawData[i][j + 2]) / 4;
+ int maxgh = max(rawData[i][j - 1], rawData[i][j + 1]);
+ int mingh = min(rawData[i][j - 1], rawData[i][j + 1]);
+
+ if (gh > maxgh) {
+ gh = maxgh;
+ } else if (gh < mingh) {
+ gh = mingh;
+ }
+ } else if (j == 0) {
+ gh = rawData[i][1];
+ } else if (j == 1) {
+ gh = (rawData[i][0] + rawData[i][2]) / 2;
+ } else if (j == W - 1) {
+ gh = rawData[i][W - 2];
+ } else if (j == W - 2) {
+ gh = (rawData[i][W - 1] + rawData[i][W - 3]) / 2;
+ }
+
+ if (i > 1 && i < H - 2) {
+ gv = (-rawData[i - 2][j] + 2 * rawData[i - 1][j] + 2 * rawData[i][j] + 2 * rawData[i + 1][j] - rawData[i + 2][j]) / 4;
+ int maxgv = max(rawData[i - 1][j], rawData[i + 1][j]);
+ int mingv = min(rawData[i - 1][j], rawData[i + 1][j]);
+
+ if (gv > maxgv) {
+ gv = maxgv;
+ } else if (gv < mingv) {
+ gv = mingv;
+ }
+ } else if (i == 0) {
+ gv = rawData[1][j];
+ } else if (i == 1) {
+ gv = (rawData[0][j] + rawData[2][j]) / 2;
+ } else if (i == H - 1) {
+ gv = rawData[H - 2][j];
+ } else if (i == H - 2) {
+ gv = (rawData[H - 1][j] + rawData[H - 3][j]) / 2;
+ }
+
+ agh[j] = gh;
+ agv[j] = gv;
+ }
+ }
+}
+
+inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg, float* cg, float* ng, int i)
+{
+ const auto getPg = [pg](int index) {
+ return
+ pg
+ ? pg[index]
+ : 0.f;
+ };
+
+ const auto getNg = [ng](int index) {
+ return
+ ng
+ ? ng[index]
+ : 0.f;
+ };
+
+ float *nonGreen1 = ar;
+ float *nonGreen2 = ab;
+
+ if ((ri->ISBLUE(i, 0) || ri->ISBLUE(i, 1))) {
+ std::swap(nonGreen1, nonGreen2);
+ }
+ int j = FC(i, 0) & 1;
+ if (j) {
+ // linear R-G interp. horizontally
+ float val1;
+
+ val1 = cg[0] + rawData[i][1] - cg[1];
+
+ nonGreen1[0] = CLIP(val1);
+ // linear B-G interp. vertically
+ float val2;
+
+ if (i == 0) {
+ val2 = getNg(0) + rawData[1][0] - cg[0];
+ } else if (i == H - 1) {
+ val2 = getPg(0) + rawData[H - 2][0] - cg[0];
+ } else {
+ val2 = cg[0] + (rawData[i - 1][0] - getPg(0) + rawData[i + 1][0] - getNg(0)) / 2;
+ }
+
+ nonGreen2[0] = val2;
+ }
+ // RGRGR or GRGRGR line
+ for (; j < W - 1; j += 2) {
+ // nonGreen of row is simple
+ nonGreen1[j] = rawData[i][j];
+ // non green of next row: cross interpolation
+ float nonGreen = 0.f;
+ int n = 0;
+
+ if (i > 0) {
+ if (j > 0) {
+ nonGreen += rawData[i - 1][j - 1] - getPg(j - 1);
+ n++;
+ }
+ nonGreen += rawData[i - 1][j + 1] - getPg(j + 1);
+ n++;
+ }
+
+ if (i < H - 1) {
+ if (j > 0) {
+ nonGreen += rawData[i + 1][j - 1] - getNg(j - 1);
+ n++;
+ }
+ nonGreen += rawData[i + 1][j + 1] - getNg(j + 1);
+ n++;
+ }
+
+ nonGreen2[j] = cg[j] + nonGreen / n;
+
+ // linear R-G interp. horizontally
+ float val1;
+
+ if (j == W - 2) {
+ val1 = cg[W - 1] + rawData[i][W - 2] - cg[W - 2];
+ } else {
+ val1 = cg[j + 1] + (rawData[i][j] - cg[j] + rawData[i][j + 2] - cg[j + 2]) / 2;
+ }
+
+ nonGreen1[j + 1] = CLIP(val1);
+ // linear B-G interp. vertically
+ float val2;
+
+ if (i == 0) {
+ val2 = getNg(j + 1) + rawData[1][j + 1] - cg[j + 1];
+ } else if (i == H - 1) {
+ val2 = getPg(j + 1) + rawData[H - 2][j + 1] - cg[j + 1];
+ } else {
+ val2 = cg[j + 1] + (rawData[i - 1][j + 1] - getPg(j + 1) + rawData[i + 1][j + 1] - getNg(j + 1)) / 2;
+ }
+
+ nonGreen2[j + 1] = val2;
+ }
+
+ if(j == W - 1) {
+ // nonGreen of row is simple
+ nonGreen1[j] = rawData[i][j];
+ // non green of next row: cross interpolation
+ float nonGreen = 0.f;
+ int n = 0;
+
+ if (i > 0) {
+ nonGreen += rawData[i - 1][j - 1] - getPg(j - 1);
+ n++;
+ }
+
+ if (i < H - 1) {
+ nonGreen += rawData[i + 1][j - 1] - getNg(j - 1);
+ n++;
+ }
+
+ nonGreen2[j] = cg[j] + nonGreen / n;
+ }
+}
+
+#define DIST(a,b) (std::fabs(a-b))
+
+void RawImageSource::eahd_demosaic ()
+{
+ BENCHFUN
+ if (plistener) {
+ plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::EAHD)));
+ plistener->setProgress (0.0);
+ }
+
+ // prepare constants for cielab conversion
+ //TODO: revisit after conversion to D50 illuminant
+ const float lc00 = (0.412453 * imatrices.rgb_cam[0][0] + 0.357580 * imatrices.rgb_cam[0][1] + 0.180423 * imatrices.rgb_cam[0][2]) ;// / 0.950456;
+ const float lc01 = (0.412453 * imatrices.rgb_cam[1][0] + 0.357580 * imatrices.rgb_cam[1][1] + 0.180423 * imatrices.rgb_cam[1][2]) ;// / 0.950456;
+ const float lc02 = (0.412453 * imatrices.rgb_cam[2][0] + 0.357580 * imatrices.rgb_cam[2][1] + 0.180423 * imatrices.rgb_cam[2][2]) ;// / 0.950456;
+
+ const float lc10 = 0.212671 * imatrices.rgb_cam[0][0] + 0.715160 * imatrices.rgb_cam[0][1] + 0.072169 * imatrices.rgb_cam[0][2];
+ const float lc11 = 0.212671 * imatrices.rgb_cam[1][0] + 0.715160 * imatrices.rgb_cam[1][1] + 0.072169 * imatrices.rgb_cam[1][2];
+ const float lc12 = 0.212671 * imatrices.rgb_cam[2][0] + 0.715160 * imatrices.rgb_cam[2][1] + 0.072169 * imatrices.rgb_cam[2][2];
+
+ const float lc20 = (0.019334 * imatrices.rgb_cam[0][0] + 0.119193 * imatrices.rgb_cam[0][1] + 0.950227 * imatrices.rgb_cam[0][2]) ;// / 1.088754;
+ const float lc21 = (0.019334 * imatrices.rgb_cam[1][0] + 0.119193 * imatrices.rgb_cam[1][1] + 0.950227 * imatrices.rgb_cam[1][2]) ;// / 1.088754;
+ const float lc22 = (0.019334 * imatrices.rgb_cam[2][0] + 0.119193 * imatrices.rgb_cam[2][1] + 0.950227 * imatrices.rgb_cam[2][2]) ;// / 1.088754;
+
+ const float wp[3][3] = {{lc00, lc01, lc02}, {lc10, lc11, lc12}, {lc20, lc21, lc22}};
+
+ // end of cielab preparation
+
+ JaggedArray
+ rh (W, 3), gh (W, 4), bh (W, 3),
+ rv (W, 3), gv (W, 4), bv (W, 3),
+ lLh (W, 3), lah (W, 3), lbh (W, 3),
+ lLv (W, 3), lav (W, 3), lbv (W, 3);
+ JaggedArray homh (W, 3), homv (W, 3);
+
+ // interpolate first two lines
+ interpolate_row_g (gh[0], gv[0], 0);
+ interpolate_row_g (gh[1], gv[1], 1);
+ interpolate_row_g (gh[2], gv[2], 2);
+ interpolate_row_rb (rh[0], bh[0], nullptr, gh[0], gh[1], 0);
+ interpolate_row_rb (rv[0], bv[0], nullptr, gv[0], gv[1], 0);
+ interpolate_row_rb (rh[1], bh[1], gh[0], gh[1], gh[2], 1);
+ interpolate_row_rb (rv[1], bv[1], gv[0], gv[1], gv[2], 1);
+
+ Color::RGB2Lab(rh[0], gh[0], bh[0], lLh[0], lah[0], lbh[0], wp, W);
+ Color::RGB2Lab(rv[0], gv[0], bv[0], lLv[0], lav[0], lbv[0], wp, W);
+ Color::RGB2Lab(rh[1], gh[1], bh[1], lLh[1], lah[1], lbh[1], wp, W);
+ Color::RGB2Lab(rv[1], gv[1], bv[1], lLv[1], lav[1], lbv[1], wp, W);
+
+ for (int j = 0; j < W; j++) {
+ homh[0][j] = 0;
+ homv[0][j] = 0;
+ homh[1][j] = 0;
+ homv[1][j] = 0;
+ }
+
+ float dLmaph[9];
+ float dLmapv[9];
+ float dCamaph[9];
+ float dCamapv[9];
+ float dCbmaph[9];
+ float dCbmapv[9];
+
+ for (int i = 1; i < H - 1; i++) {
+ int mod[3] = {(i-1) % 3, i % 3, (i+1) %3};
+ int ix = i % 3;
+ int imx = (i - 1) % 3;
+ int ipx = (i + 1) % 3;
+
+ if (i < H - 2) {
+ interpolate_row_g (gh[(i + 2) % 4], gv[(i + 2) % 4], i + 2);
+ interpolate_row_rb (rh[(i + 1) % 3], bh[(i + 1) % 3], gh[i % 4], gh[(i + 1) % 4], gh[(i + 2) % 4], i + 1);
+ interpolate_row_rb (rv[(i + 1) % 3], bv[(i + 1) % 3], gv[i % 4], gv[(i + 1) % 4], gv[(i + 2) % 4], i + 1);
+ } else {
+ interpolate_row_rb (rh[(i + 1) % 3], bh[(i + 1) % 3], gh[i % 4], gh[(i + 1) % 4], nullptr, i + 1);
+ interpolate_row_rb (rv[(i + 1) % 3], bv[(i + 1) % 3], gv[i % 4], gv[(i + 1) % 4], nullptr, i + 1);
+ }
+
+ Color::RGB2Lab(rh[(i + 1) % 3], gh[(i + 1) % 4], bh[(i + 1) % 3], lLh[(i + 1) % 3], lah[(i + 1) % 3], lbh[(i + 1) % 3], wp, W);
+ Color::RGB2Lab(rv[(i + 1) % 3], gv[(i + 1) % 4], bv[(i + 1) % 3], lLv[(i + 1) % 3], lav[(i + 1) % 3], lbv[(i + 1) % 3], wp, W);
+
+ for (int j = 0; j < W; j++) {
+ homh[ipx][j] = 0;
+ homv[ipx][j] = 0;
+ }
+
+ for (int j = 1; j < W - 1; j++) {
+ int dmi = 0;
+ for (int x = -1; x <= 0; x++) {
+ int idx = mod[x + 1];
+
+ for (int y = -1; y <= 1; y++) {
+ // compute distance in a, b, and L
+ if (dmi < 4) {
+ int sh = homh[idx][j + y];
+ int sv = homv[idx][j + y];
+
+ if (sh > sv) { // fixate horizontal pixel
+ dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
+ dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
+ dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
+ dLmapv[dmi] = DIST(lLv[ix][j], lLh[idx][j + y]);
+ dCamapv[dmi] = DIST(lav[ix][j], lah[idx][j + y]);
+ dCbmapv[dmi] = DIST(lbv[ix][j], lbh[idx][j + y]);
+ } else if (sh < sv) {
+ dLmaph[dmi] = DIST(lLh[ix][j], lLv[idx][j + y]);
+ dCamaph[dmi] = DIST(lah[ix][j], lav[idx][j + y]);
+ dCbmaph[dmi] = DIST(lbh[ix][j], lbv[idx][j + y]);
+ dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
+ dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
+ dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
+ } else {
+ dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
+ dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
+ dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
+ dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
+ dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
+ dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
+ }
+ } else {
+ dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
+ dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
+ dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
+ dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
+ dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
+ dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
+ }
+
+ dmi++;
+ }
+ }
+ int idx = mod[2];
+
+ for (int y = -1; y <= 1; y++) {
+ // compute distance in a, b, and L
+ dLmaph[dmi] = DIST(lLh[ix][j], lLh[idx][j + y]);
+ dCamaph[dmi] = DIST(lah[ix][j], lah[idx][j + y]);
+ dCbmaph[dmi] = DIST(lbh[ix][j], lbh[idx][j + y]);
+ dLmapv[dmi] = DIST(lLv[ix][j], lLv[idx][j + y]);
+ dCamapv[dmi] = DIST(lav[ix][j], lav[idx][j + y]);
+ dCbmapv[dmi] = DIST(lbv[ix][j], lbv[idx][j + y]);
+ dmi++;
+ }
+
+ // compute eL & eC
+ float eL = min(max(dLmaph[3], dLmaph[5]), max(dLmapv[1], dLmapv[7]));
+ float eCa = min(max(dCamaph[3], dCamaph[5]), max(dCamapv[1], dCamapv[7]));
+ float eCb = min(max(dCbmaph[3], dCbmaph[5]), max(dCbmapv[1], dCbmapv[7]));
+
+ int wh = 0;
+
+ for (int dmi = 0; dmi < 9; dmi++) {
+ wh += (dLmaph[dmi] <= eL) * (dCamaph[dmi] <= eCa) * (dCbmaph[dmi] <= eCb);
+ }
+
+ homh[imx][j - 1] += wh;
+ homh[imx][j] += wh;
+ homh[imx][j + 1] += wh;
+ homh[ix][j - 1] += wh;
+ homh[ix][j] += wh;
+ homh[ix][j + 1] += wh;
+ homh[ipx][j - 1] += wh;
+ homh[ipx][j] += wh;
+ homh[ipx][j + 1] += wh;
+
+ int wv = 0;
+
+ for (int dmi = 0; dmi < 9; dmi++) {
+ wv += (dLmapv[dmi] <= eL) * (dCamapv[dmi] <= eCa) * (dCbmapv[dmi] <= eCb);
+ }
+
+ homv[imx][j - 1] += wv;
+ homv[imx][j] += wv;
+ homv[imx][j + 1] += wv;
+ homv[ix][j - 1] += wv;
+ homv[ix][j] += wv;
+ homv[ix][j + 1] += wv;
+ homv[ipx][j - 1] += wv;
+ homv[ipx][j] += wv;
+ homv[ipx][j + 1] += wv;
+ }
+
+ // finalize image
+ for (int j = 0; j < W; j++) {
+ if (ri->ISGREEN(i - 1, j)) {
+ green[i - 1][j] = rawData[i - 1][j];
+ } else {
+ int hc = homh[imx][j];
+ int vc = homv[imx][j];
+
+ if (hc > vc) {
+ green[i - 1][j] = gh[(i - 1) % 4][j];
+ } else if (hc < vc) {
+ green[i - 1][j] = gv[(i - 1) % 4][j];
+ } else {
+ green[i - 1][j] = (gh[(i - 1) % 4][j] + gv[(i - 1) % 4][j]) / 2;
+ }
+ }
+ }
+
+ if (!(i % 20) && plistener) {
+ plistener->setProgress ((double)i / (H - 2));
+ }
+ }
+
+ // finish H-2th and H-1th row, homogenity value is still valailable
+ for (int i = H - 1; i < H + 1; i++)
+ for (int j = 0; j < W; j++) {
+ int hc = homh[(i - 1) % 3][j];
+ int vc = homv[(i - 1) % 3][j];
+
+ if (hc > vc) {
+ green[i - 1][j] = gh[(i - 1) % 4][j];
+ } else if (hc < vc) {
+ green[i - 1][j] = gv[(i - 1) % 4][j];
+ } else {
+ green[i - 1][j] = (gh[(i - 1) % 4][j] + gv[(i - 1) % 4][j]) / 2;
+ }
+ }
+
+ // Interpolate R and B
+ #pragma omp parallel for
+ for (int i = 0; i < H; i++) {
+ if (i == 0) {
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ } else if (i == H - 1) {
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
+ } else {
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ }
+ }
+}
+
+}
\ No newline at end of file
diff --git a/rtengine/gamutwarning.cc b/rtengine/gamutwarning.cc
index 87be430b2..84b4b3c08 100644
--- a/rtengine/gamutwarning.cc
+++ b/rtengine/gamutwarning.cc
@@ -34,7 +34,7 @@ GamutWarning::GamutWarning(cmsHPROFILE iprof, cmsHPROFILE gamutprof, RenderingIn
softproof2ref(nullptr)
{
if (cmsIsMatrixShaper(gamutprof) && !cmsIsCLUT(gamutprof, intent, LCMS_USED_AS_OUTPUT)) {
- cmsHPROFILE aces = ICCStore::getInstance()->getProfile("ACES");
+ cmsHPROFILE aces = ICCStore::getInstance()->getProfile("RTv4_ACES-AP0");
if (aces) {
lab2ref = cmsCreateTransform(iprof, TYPE_Lab_FLT, aces, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE);
lab2softproof = cmsCreateTransform(iprof, TYPE_Lab_FLT, gamutprof, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE);
diff --git a/rtengine/gauss.cc b/rtengine/gauss.cc
index caa5e28b5..513932517 100644
--- a/rtengine/gauss.cc
+++ b/rtengine/gauss.cc
@@ -1020,14 +1020,14 @@ template void gaussVerticaldiv (T** src, T** dst, T** divBuffer, const
}
for (int k = 0; k < numcols; k++) {
- dst[H - 1][i + k] = rtengine::max(divBuffer[H - 1][i + k] / (temp2[H - 1][k] = temp2Hm1[k]), 0.f);
- dst[H - 2][i + k] = rtengine::max(divBuffer[H - 2][i + k] / (temp2[H - 2][k] = B * temp2[H - 2][k] + b1 * temp2[H - 1][k] + b2 * temp2H[k] + b3 * temp2Hp1[k]), 0.f);
- dst[H - 3][i + k] = rtengine::max(divBuffer[H - 3][i + k] / (temp2[H - 3][k] = B * temp2[H - 3][k] + b1 * temp2[H - 2][k] + b2 * temp2[H - 1][k] + b3 * temp2H[k]), 0.f);
+ dst[H - 1][i + k] = rtengine::max(divBuffer[H - 1][i + k] / (temp2[H - 1][k] = temp2Hm1[k]), 0.0);
+ dst[H - 2][i + k] = rtengine::max(divBuffer[H - 2][i + k] / (temp2[H - 2][k] = B * temp2[H - 2][k] + b1 * temp2[H - 1][k] + b2 * temp2H[k] + b3 * temp2Hp1[k]), 0.0);
+ dst[H - 3][i + k] = rtengine::max(divBuffer[H - 3][i + k] / (temp2[H - 3][k] = B * temp2[H - 3][k] + b1 * temp2[H - 2][k] + b2 * temp2[H - 1][k] + b3 * temp2H[k]), 0.0);
}
for (int j = H - 4; j >= 0; j--) {
for (int k = 0; k < numcols; k++) {
- dst[j][i + k] = rtengine::max(divBuffer[j][i + k] / (temp2[j][k] = B * temp2[j][k] + b1 * temp2[j + 1][k] + b2 * temp2[j + 2][k] + b3 * temp2[j + 3][k]), 0.f);
+ dst[j][i + k] = rtengine::max(divBuffer[j][i + k] / (temp2[j][k] = B * temp2[j][k] + b1 * temp2[j + 1][k] + b2 * temp2[j + 2][k] + b3 * temp2[j + 3][k]), 0.0);
}
}
}
@@ -1050,12 +1050,12 @@ template void gaussVerticaldiv (T** src, T** dst, T** divBuffer, const
double temp2H = src[H - 1][i] + M[1][0] * (temp2[H - 1][0] - src[H - 1][i]) + M[1][1] * (temp2[H - 2][0] - src[H - 1][i]) + M[1][2] * (temp2[H - 3][0] - src[H - 1][i]);
double temp2Hp1 = src[H - 1][i] + M[2][0] * (temp2[H - 1][0] - src[H - 1][i]) + M[2][1] * (temp2[H - 2][0] - src[H - 1][i]) + M[2][2] * (temp2[H - 3][0] - src[H - 1][i]);
- dst[H - 1][i] = rtengine::max(divBuffer[H - 1][i] / (temp2[H - 1][0] = temp2Hm1), 0.f);
- dst[H - 2][i] = rtengine::max(divBuffer[H - 2][i] / (temp2[H - 2][0] = B * temp2[H - 2][0] + b1 * temp2[H - 1][0] + b2 * temp2H + b3 * temp2Hp1), 0.f);
- dst[H - 3][i] = rtengine::max(divBuffer[H - 3][i] / (temp2[H - 3][0] = B * temp2[H - 3][0] + b1 * temp2[H - 2][0] + b2 * temp2[H - 1][0] + b3 * temp2H), 0.f);
+ dst[H - 1][i] = rtengine::max(divBuffer[H - 1][i] / (temp2[H - 1][0] = temp2Hm1), 0.0);
+ dst[H - 2][i] = rtengine::max(divBuffer[H - 2][i] / (temp2[H - 2][0] = B * temp2[H - 2][0] + b1 * temp2[H - 1][0] + b2 * temp2H + b3 * temp2Hp1), 0.0);
+ dst[H - 3][i] = rtengine::max(divBuffer[H - 3][i] / (temp2[H - 3][0] = B * temp2[H - 3][0] + b1 * temp2[H - 2][0] + b2 * temp2[H - 1][0] + b3 * temp2H), 0.0);
for (int j = H - 4; j >= 0; j--) {
- dst[j][i] = rtengine::max(divBuffer[j][i] / (temp2[j][0] = B * temp2[j][0] + b1 * temp2[j + 1][0] + b2 * temp2[j + 2][0] + b3 * temp2[j + 3][0]), 0.f);
+ dst[j][i] = rtengine::max(divBuffer[j][i] / (temp2[j][0] = B * temp2[j][0] + b1 * temp2[j + 1][0] + b2 * temp2[j + 2][0] + b3 * temp2[j + 3][0]), 0.0);
}
}
}
diff --git a/rtengine/hilite_recon.cc b/rtengine/hilite_recon.cc
index a1f5b5e4a..b8ad23e70 100644
--- a/rtengine/hilite_recon.cc
+++ b/rtengine/hilite_recon.cc
@@ -28,8 +28,6 @@
#include "rawimagesource.h"
#include "rt_math.h"
#include "opthelper.h"
-#include "gauss.h"
-
namespace rtengine
{
@@ -414,8 +412,6 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
constexpr float itrans[ColorCount][ColorCount] =
{ { 1.f, 0.8660254f, -0.5f }, { 1.f, -0.8660254f, -0.5f }, { 1.f, 0.f, 1.f } };
- std::unique_ptr recovered_partial;
-
if(settings->verbose)
for(int c = 0; c < 3; c++) {
printf("chmax[%d] : %f\tclmax[%d] : %f\tratio[%d] : %f\n", c, chmax[c], c, clmax[c], c, chmax[c] / clmax[c]);
@@ -570,7 +566,7 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
//blur highlight data
boxblur2(hilite_full[3], hilite_full4, temp, height, width, 1);
- //temp.free(); // free temporary buffer
+ temp.free(); // free temporary buffer
if(plistener) {
progress += 0.05;
@@ -1109,34 +1105,29 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
if (pixel[0] > max_f[0] && pixel[1] > max_f[1] && pixel[2] > max_f[2]) {
//all channels clipped
float Y = (0.299 * clipfix[0] + 0.587 * clipfix[1] + 0.114 * clipfix[2]);
+
float factor = whitept / Y;
- red[i][j] = CLIP(clipfix[0] * factor);
- green[i][j] = CLIP(clipfix[1] * factor);
- blue[i][j] = CLIP(clipfix[2] * factor);
-
+ red[i][j] = clipfix[0] * factor;
+ green[i][j] = clipfix[1] * factor;
+ blue[i][j] = clipfix[2] * factor;
} else {//some channels clipped
float notclipped[3] = {pixel[0] <= max_f[0] ? 1.f : 0.f, pixel[1] <= max_f[1] ? 1.f : 0.f, pixel[2] <= max_f[2] ? 1.f : 0.f};
if (notclipped[0] == 0.f) { //red clipped
- red[i][j] = CLIP((clipfix[0] * ((notclipped[1] * pixel[1] + notclipped[2] * pixel[2]) /
+ red[i][j] = max(red[i][j], (clipfix[0] * ((notclipped[1] * pixel[1] + notclipped[2] * pixel[2]) /
(notclipped[1] * clipfix[1] + notclipped[2] * clipfix[2] + epsilon))));
}
if (notclipped[1] == 0.f) { //green clipped
- green[i][j] = CLIP((clipfix[1] * ((notclipped[2] * pixel[2] + notclipped[0] * pixel[0]) /
+ green[i][j] = max(green[i][j], (clipfix[1] * ((notclipped[2] * pixel[2] + notclipped[0] * pixel[0]) /
(notclipped[2] * clipfix[2] + notclipped[0] * clipfix[0] + epsilon))));
}
if (notclipped[2] == 0.f) { //blue clipped
- blue[i][j] = CLIP((clipfix[2] * ((notclipped[0] * pixel[0] + notclipped[1] * pixel[1]) /
+ blue[i][j] = max(blue[i][j], (clipfix[2] * ((notclipped[0] * pixel[0] + notclipped[1] * pixel[1]) /
(notclipped[0] * clipfix[0] + notclipped[1] * clipfix[1] + epsilon))));
}
-
- if (!recovered_partial) {
- recovered_partial.reset(new PixelsMap(width, height));
- }
- recovered_partial->set(j, i);
- }
+ }
Y = (0.299 * red[i][j] + 0.587 * green[i][j] + 0.114 * blue[i][j]);
@@ -1150,33 +1141,6 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
}
}
- {
- for (int c = 0; c < 3; ++c) {
- float **color = c == 0 ? red : c == 1 ? green : blue;
-
- if (recovered_partial) {
-#ifdef _OPENMP
- #pragma omp parallel
-#endif
- gaussianBlur(color, temp, width, height, 1.5f);
-
-#ifdef _OPENMP
- #pragma omp parallel for
-#endif
- for (int i = 0; i < height; ++i) {
- for (int j = 0; j < width; ++j) {
- int skip = recovered_partial->skipIfZero(j, i);
- if (skip) {
- j += skip-1;
- } else if (recovered_partial->get(j, i)) {
- color[i][j] = temp[i][j];
- }
- }
- }
- }
- }
- }
-
if(plistener) {
plistener->setProgress(1.00);
}
diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc
index 0faa8c357..b2fe436fd 100644
--- a/rtengine/histmatching.cc
+++ b/rtengine/histmatching.cc
@@ -26,6 +26,7 @@
#include "iccstore.h"
#include "../rtgui/mydiagonalcurve.h"
#include "improcfun.h"
+//#define BENCHMARK
#include "StopWatch.h"
#include
@@ -51,7 +52,7 @@ CdfInfo getCdf(const IImage8 &img)
for (int y = 0; y < img.getHeight(); ++y) {
for (int x = 0; x < img.getWidth(); ++x) {
- int lum = LIM(0, int(Color::rgbLuminance(float(img.r(y, x)), float(img.g(y, x)), float(img.b(y, x)))), 255);
+ int lum = LIM(int(Color::rgbLuminance(float(img.r(y, x)), float(img.g(y, x)), float(img.b(y, x)))), 0, 255);
++ret.cdf[lum];
}
}
@@ -96,11 +97,59 @@ int findMatch(int val, const std::vector &cdf, int j)
}
+class CubicSplineCurve: public DiagonalCurve {
+public:
+ CubicSplineCurve(const std::vector &points):
+ DiagonalCurve({DCT_Linear})
+ {
+ N = points.size() / 2;
+ x = new double[N];
+ y = new double[N];
+
+ for (int i = 0; i < N; ++i) {
+ x[i] = points[2*i];
+ y[i] = points[2*i+1];
+ }
+ kind = DCT_Spline;
+ spline_cubic_set();
+ }
+
+ double getVal(double t) const
+ {
+ // values under and over the first and last point
+ if (t > x[N - 1]) {
+ return y[N - 1];
+ } else if (t < x[0]) {
+ return y[0];
+ }
+
+ // do a binary search for the right interval:
+ unsigned int k_lo = 0, k_hi = N - 1;
+
+ while (k_hi > 1 + k_lo) {
+ unsigned int k = (k_hi + k_lo) / 2;
+
+ if (x[k] > t) {
+ k_hi = k;
+ } else {
+ k_lo = k;
+ }
+ }
+
+ double h = x[k_hi] - x[k_lo];
+
+ double a = (x[k_hi] - t) / h;
+ double b = (t - x[k_lo]) / h;
+ double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666;
+ return LIM01(r);
+ }
+};
+
+
void mappingToCurve(const std::vector &mapping, std::vector &curve)
{
curve.clear();
- const int npoints = 8;
int idx = 15;
for (; idx < int(mapping.size()); ++idx) {
if (mapping[idx] >= idx) {
@@ -114,12 +163,12 @@ void mappingToCurve(const std::vector &mapping, std::vector &curve)
}
}
}
- int step = std::max(int(mapping.size())/npoints, 1);
auto coord = [](int v) -> double { return double(v)/255.0; };
auto doit =
- [&](int start, int stop, int step, bool addstart) -> void
+ [&](int start, int stop, int step, bool addstart, int maxdelta=0) -> void
{
+ if (!maxdelta) maxdelta = step * 2;
int prev = start;
if (addstart && mapping[start] >= 0) {
curve.push_back(coord(start));
@@ -132,7 +181,7 @@ void mappingToCurve(const std::vector &mapping, std::vector &curve)
}
bool change = i > 0 && v != mapping[i-1];
int diff = i - prev;
- if ((change && std::abs(diff - step) <= 1) || diff > step * 2) {
+ if ((change && std::abs(diff - step) <= 1) || diff > maxdelta) {
curve.push_back(coord(i));
curve.push_back(coord(v));
prev = i;
@@ -147,22 +196,42 @@ void mappingToCurve(const std::vector &mapping, std::vector &curve)
while (start < idx && (mapping[start] < 0 || start < idx / 2)) {
++start;
}
+
+ const int npoints = 8;
+ int step = std::max(int(mapping.size())/npoints, 1);
+ int end = mapping.size();
+ if (idx <= end / 3) {
+ doit(start, idx, idx / 2, true);
+ step = (end - idx) / 4;
+ doit(idx, end, step, false, step);
+ } else {
+ doit(start, idx, idx > step ? step : idx / 2, true);
+ doit(idx, end, step, idx - step > step / 2 && std::abs(curve[curve.size()-2] - coord(idx)) > 0.01);
+ }
- doit(start, idx, idx > step ? step : idx / 2, true);
- doit(idx, int(mapping.size()), step, idx - step > step / 2 && std::abs(curve[curve.size()-2] - coord(idx)) > 0.01);
-
- if (curve.size() > 2 && (1 - curve[curve.size()-2] <= step / (256.0 * 3))) {
+ if (curve.size() > 2 && (1 - curve[curve.size()-2] <= coord(step) / 3)) {
curve.pop_back();
curve.pop_back();
}
-
+
curve.push_back(1.0);
curve.push_back(1.0);
if (curve.size() < 4) {
curve = { DCT_Linear }; // not enough points, fall back to linear
} else {
- curve.insert(curve.begin(), DCT_Spline);
+ CubicSplineCurve c(curve);
+ double gap = 0.05;
+ double x = 0.0;
+ curve = { DCT_Spline };
+ while (x < 1.0) {
+ curve.push_back(x);
+ curve.push_back(c.getVal(x));
+ x += gap;
+ gap *= 1.4;
+ }
+ curve.push_back(1.0);
+ curve.push_back(c.getVal(1.0));
}
}
@@ -180,7 +249,7 @@ void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, st
const auto same_profile =
[](const ColorManagementParams &a, const ColorManagementParams &b) -> bool
{
- return (a.input == b.input
+ return (a.inputProfile == b.inputProfile
&& a.toneCurve == b.toneCurve
&& a.applyLookTable == b.applyLookTable
&& a.applyBaselineExposureOffset == b.applyBaselineExposureOffset
@@ -200,6 +269,9 @@ void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, st
int fw, fh;
getFullSize(fw, fh, TR_NONE);
+ if (getRotateDegree() == 90 || getRotateDegree() == 270) {
+ std::swap(fw, fh);
+ }
int skip = 3;
if (settings->verbose) {
@@ -210,9 +282,7 @@ void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, st
neutral.icm = cp;
neutral.raw.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST);
neutral.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
- neutral.icm.output = "sRGB";
- neutral.icm.gamma = "default";
- neutral.icm.freegamma = false;
+ neutral.icm.outputProfile = ColorManagementParams::NoICMString;
std::unique_ptr source;
{
diff --git a/rtengine/iccmatrices.h b/rtengine/iccmatrices.h
index a6fd8d9e6..29426c62d 100644
--- a/rtengine/iccmatrices.h
+++ b/rtengine/iccmatrices.h
@@ -32,6 +32,19 @@ constexpr double d50_d65[3][3] = {
{ -0.0092345, 0.0150436, 0.7521316}
};
+//J.Desmis 04 2018
+constexpr double d50_d60[3][3] = {
+ { 1.034368, 0.016908, -0.037658},
+ {0.021752, 0.992183, -0.012785},
+ { -0.006971, 0.011377, 0.812150}
+};
+
+constexpr double d60_d50[3][3] = {
+ { 0.96743198, -0.01699717, 0.044590689},
+ {-0.02109893, 1.008067172, 0.014890785},
+ {0.008598998, -0.01426777, 1.231474467}
+};
+
// Color space conversion to/from XYZ; color spaces adapted to D65
constexpr double xyz_sRGBd65[3][3] = {
{0.4124564, 0.3575761, 0.1804375},
@@ -66,6 +79,31 @@ constexpr double xyz_sRGB[3][3] = {
{0.0139322, 0.0971045, 0.7141733}
};
+constexpr double xyz_ACESp0[3][3] = {
+ {0.9908526, 0.0122334, -0.0388654},
+ {0.3618807, 0.72255045 , -0.0843859},
+ {-0.0027093, 0.0082323, 0.8196880}
+};
+
+constexpr double ACESp0_xyz[3][3] = {
+ {1.01583320, -0.01772807, 0.04634052},
+ {-0.50781231, 1.39131494 , 0.11915641},
+ {0.00845768, -0.01403193, 1.21893277}
+};
+
+constexpr double xyz_ACESp1[3][3] = {
+ {0.689697, 0.149944, 0.124559},
+ {0.284448, 0.671758 , 0.043794},
+ {-0.006043, 0.009998, 0.820945}
+};
+
+constexpr double ACESp1_xyz[3][3] = {
+ {1.5932624, -0.352316, -0.222945},
+ {-0.6759496, 1.639286 , 0.01511026},
+ {0.0199602, -0.0225577, 1.2162833}
+};
+
+
constexpr double sRGB_xyz[3][3] = {
{3.1338561, -1.6168667, -0.4906146},
{ -0.9787684, 1.9161415, 0.0334540},
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index eeb9ef1c4..4d490c0a0 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -36,9 +36,10 @@
#include "../rtgui/options.h"
#include "../rtgui/threadutils.h"
+#include "lcms2_plugin.h"
#include "cJSON.h"
-
+#define inkc_constant 0x696E6B43
namespace rtengine
{
@@ -157,6 +158,7 @@ bool loadProfile(
if (profileContents) {
profileContents->emplace(name, content);
}
+
return true;
}
}
@@ -196,12 +198,11 @@ cmsHPROFILE createXYZProfile()
return rtengine::ICCStore::createFromMatrix(mat, false, "XYZ");
}
-const double(*wprofiles[])[3] = {xyz_sRGB, xyz_adobe, xyz_prophoto, xyz_widegamut, xyz_bruce, xyz_beta, xyz_best, xyz_rec2020};
-const double(*iwprofiles[])[3] = {sRGB_xyz, adobe_xyz, prophoto_xyz, widegamut_xyz, bruce_xyz, beta_xyz, best_xyz, rec2020_xyz};
-const char* wpnames[] = {"sRGB", "Adobe RGB", "ProPhoto", "WideGamut", "BruceRGB", "Beta RGB", "BestRGB", "Rec2020"};
-const char* wpgamma[] = {"default", "BT709_g2.2_s4.5", "sRGB_g2.4_s12.92", "linear_g1.0", "standard_g2.2", "standard_g1.8", "High_g1.3_s3.35", "Low_g2.6_s6.9"}; //gamma free
+const double(*wprofiles[])[3] = {xyz_sRGB, xyz_adobe, xyz_prophoto, xyz_widegamut, xyz_bruce, xyz_beta, xyz_best, xyz_rec2020, xyz_ACESp0, xyz_ACESp1};//
+const double(*iwprofiles[])[3] = {sRGB_xyz, adobe_xyz, prophoto_xyz, widegamut_xyz, bruce_xyz, beta_xyz, best_xyz, rec2020_xyz, ACESp0_xyz, ACESp1_xyz};//
+const char* wpnames[] = {"sRGB", "Adobe RGB", "ProPhoto", "WideGamut", "BruceRGB", "Beta RGB", "BestRGB", "Rec2020", "ACESp0", "ACESp1"};//
//default = gamma inside profile
-//BT709 g=2.22 s=4.5 sRGB g=2.4 s=12.92
+//BT709 g=2.22 s=4.5 sRGB g=2.4 s=12.92310
//linear g=1.0
//std22 g=2.2 std18 g=1.8
// high g=1.3 s=3.35 for high dynamic images
@@ -221,7 +222,8 @@ rtengine::ProfileContent::ProfileContent(const Glib::ustring& fileName)
fseek(f, 0, SEEK_END);
long length = ftell(f);
- if(length > 0) {
+
+ if (length > 0) {
char* d = new char[length + 1];
fseek(f, 0, SEEK_SET);
length = fread(d, 1, length, f);
@@ -231,6 +233,7 @@ rtengine::ProfileContent::ProfileContent(const Glib::ustring& fileName)
} else {
data.clear();
}
+
fclose(f);
}
@@ -255,8 +258,8 @@ cmsHPROFILE rtengine::ProfileContent::toProfile() const
return
!data.empty()
- ? cmsOpenProfileFromMem(data.c_str(), data.size())
- : nullptr;
+ ? cmsOpenProfileFromMem(data.c_str(), data.size())
+ : nullptr;
}
const std::string& rtengine::ProfileContent::getData() const
@@ -291,20 +294,23 @@ public:
cmsCloseProfile(p.second);
}
}
+
// for (auto &p : wProfilesGamma) {
// if (p.second) {
// cmsCloseProfile(p.second);
// }
// }
for (auto &p : fileProfiles) {
- if(p.second) {
+ if (p.second) {
cmsCloseProfile(p.second);
}
}
- if(srgb) {
+
+ if (srgb) {
cmsCloseProfile(srgb);
}
- if(xyz) {
+
+ if (xyz) {
cmsCloseProfile(xyz);
}
}
@@ -322,6 +328,7 @@ public:
userICCDir = usrICCDir;
fileProfiles.clear();
fileProfileContents.clear();
+
if (loadAll) {
loadProfiles(profilesDir, &fileProfiles, &fileProfileContents, nullptr, false);
loadProfiles(userICCDir, &fileProfiles, &fileProfileContents, nullptr, false);
@@ -332,6 +339,7 @@ public:
stdProfilesDir = Glib::build_filename(rtICCDir, "input");
fileStdProfiles.clear();
fileStdProfilesFileNames.clear();
+
if (loadAll) {
loadProfiles(stdProfilesDir, nullptr, nullptr, &fileStdProfilesFileNames, true);
Glib::ustring user_input_icc_dir = Glib::build_filename(options.rtdir, "iccprofiles", "input");
@@ -342,7 +350,7 @@ public:
loadWorkingSpaces(rtICCDir);
loadWorkingSpaces(userICCDir);
-
+
// initialize the alarm colours for lcms gamut checking -- we use bright green
cmsUInt16Number cms_alarm_codes[cmsMAXCHANNELS] = { 0, 65535, 65535 };
cmsSetAlarmCodes(cms_alarm_codes);
@@ -354,8 +362,8 @@ public:
return
r != wProfiles.end()
- ? r->second
- : wProfiles.find("sRGB")->second;
+ ? r->second
+ : wProfiles.find("sRGB")->second;
}
// cmsHPROFILE workingSpaceGamma(const Glib::ustring& name) const
@@ -375,8 +383,8 @@ public:
return
r != wMatrices.end()
- ? r->second
- : wMatrices.find("sRGB")->second;
+ ? r->second
+ : wMatrices.find("sRGB")->second;
}
TMatrix workingSpaceInverseMatrix(const Glib::ustring& name) const
@@ -386,8 +394,8 @@ public:
return
r != iwMatrices.end()
- ? r->second
- : iwMatrices.find("sRGB")->second;
+ ? r->second
+ : iwMatrices.find("sRGB")->second;
}
bool outputProfileExist(const Glib::ustring& name) const
@@ -421,7 +429,9 @@ public:
if (!loadProfile(name, profilesDir, &fileProfiles, &fileProfileContents)) {
loadProfile(name, userICCDir, &fileProfiles, &fileProfileContents);
}
+
const ProfileMap::const_iterator r = fileProfiles.find(name);
+
if (r != fileProfiles.end()) {
return r->second;
}
@@ -446,7 +456,9 @@ public:
if (!loadProfile(name, profilesDir, &fileProfiles, &fileProfileContents)) {
loadProfile(name, userICCDir, &fileProfiles, &fileProfileContents);
}
+
const ProfileMap::const_iterator r = fileProfiles.find(name);
+
if (r != fileProfiles.end()) {
return r->second;
}
@@ -481,8 +493,8 @@ public:
return
r != fileProfileContents.end()
- ? r->second
- : ProfileContent();
+ ? r->second
+ : ProfileContent();
}
cmsHPROFILE getXYZProfile() const
@@ -503,22 +515,22 @@ public:
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
- || cmsGetDeviceClass(profile.second) == cmsSigInputClass
- || cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
- && cmsGetColorSpace(profile.second) == cmsSigRgbData
- )
+ (
+ 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
+ || cmsGetDeviceClass(profile.second) == cmsSigInputClass
+ || cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
+ && cmsGetColorSpace(profile.second) == cmsSigRgbData
+ )
) {
res.push_back(profile.first);
}
@@ -601,7 +613,7 @@ public:
for (const auto &p : wProfiles) {
res.push_back(p.first);
}
-
+
return res;
}
@@ -619,11 +631,13 @@ private:
CMatrix toMatrix() const
{
CMatrix ret;
+
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
ret[i][j] = matrix[i][j];
}
}
+
return ret;
}
@@ -640,22 +654,28 @@ private:
bool computeWorkingSpaceMatrix(const Glib::ustring &path, const Glib::ustring &filename, PMatrix &out)
{
Glib::ustring fullpath = filename;
+
if (!Glib::path_is_absolute(fullpath)) {
fullpath = Glib::build_filename(path, filename);
}
+
ProfileContent content(fullpath);
cmsHPROFILE prof = content.toProfile();
+
if (!prof) {
return false;
}
+
if (cmsGetColorSpace(prof) != cmsSigRgbData) {
cmsCloseProfile(prof);
return false;
}
+
if (!cmsIsMatrixShaper(prof)) {
cmsCloseProfile(prof);
return false;
}
+
cmsCIEXYZ *red = static_cast(cmsReadTag(prof, cmsSigRedMatrixColumnTag));
cmsCIEXYZ *green = static_cast(cmsReadTag(prof, cmsSigGreenMatrixColumnTag));
cmsCIEXYZ *blue = static_cast(cmsReadTag(prof, cmsSigBlueMatrixColumnTag));
@@ -670,13 +690,18 @@ private:
CVector({ red->Y, green->Y, blue->Y }),
CVector({ red->Z, green->Z, blue->Z })
};
-
+ m[1][0] = red->Y;
+ m[1][1] = green->Y;
+ m[1][2] = blue->Y;
+ m[2][0] = red->Z;
+ m[2][1] = green->Z;
+ m[2][2] = blue->Z;
out.set(m);
-
+
cmsCloseProfile(prof);
return true;
}
-
+
bool loadWorkingSpaces(const Glib::ustring &path)
{
Glib::ustring fileName = Glib::build_filename(path, "workingspaces.json");
@@ -685,29 +710,32 @@ private:
if (settings->verbose) {
std::cout << "trying to load extra working spaces from " << fileName << std::flush;
}
-
+
if (!f) {
if (settings->verbose) {
std::cout << " FAIL" << std::endl;
}
+
return false;
}
fseek(f, 0, SEEK_END);
long length = ftell(f);
+
if (length <= 0) {
if (settings->verbose) {
std::cout << " FAIL" << std::endl;
}
+
fclose(f);
return false;
}
-
+
char *buf = new char[length + 1];
fseek(f, 0, SEEK_SET);
length = fread(buf, 1, length, f);
buf[length] = 0;
-
+
fclose(f);
cJSON_Minify(buf);
@@ -717,21 +745,23 @@ private:
if (settings->verbose) {
std::cout << " FAIL" << std::endl;
}
+
return false;
}
delete[] buf;
cJSON *js = cJSON_GetObjectItem(root, "working_spaces");
+
if (!js) {
goto parse_error;
}
-
+
for (js = js->child; js != nullptr; js = js->next) {
cJSON *ji = cJSON_GetObjectItem(js, "name");
std::unique_ptr m(new PMatrix);
std::string name;
-
+
if (!ji || ji->type != cJSON_String) {
goto parse_error;
}
@@ -743,19 +773,22 @@ private:
}
bool found_matrix = false;
-
+
ji = cJSON_GetObjectItem(js, "matrix");
+
if (ji) {
if (ji->type != cJSON_Array) {
goto parse_error;
}
ji = ji->child;
+
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j, ji = ji->next) {
if (!ji || ji->type != cJSON_Number) {
goto parse_error;
}
+
m->matrix[i][j] = ji->valuedouble;
}
}
@@ -763,12 +796,15 @@ private:
if (ji) {
goto parse_error;
}
+
found_matrix = true;
} else {
ji = cJSON_GetObjectItem(js, "file");
+
if (!ji || ji->type != cJSON_String) {
goto parse_error;
}
+
found_matrix = computeWorkingSpaceMatrix(path, ji->valuestring, *m);
}
@@ -776,6 +812,7 @@ private:
if (settings->verbose) {
std::cout << "Could not find suitable matrix for working space: " << name << std::endl;
}
+
continue;
}
@@ -783,10 +820,12 @@ private:
TMatrix w = pMatrices.back()->matrix;
CMatrix b = {};
+
if (!rtengine::invertMatrix(pMatrices.back()->toMatrix(), b)) {
if (settings->verbose) {
std::cout << "Matrix for working space: " << name << " is not invertible, skipping" << std::endl;
}
+
pMatrices.pop_back();
} else {
wMatrices[name] = w;
@@ -798,29 +837,36 @@ private:
if (settings->verbose) {
std::cout << "Added working space: " << name << std::endl;
std::cout << " matrix: [";
+
for (int i = 0; i < 3; ++i) {
std::cout << " [";
+
for (int j = 0; j < 3; ++j) {
std::cout << " " << w[i][j];
}
+
std::cout << "]";
}
+
std::cout << " ]" << std::endl;
}
}
}
cJSON_Delete(root);
+
if (settings->verbose) {
std::cout << " OK" << std::endl;
}
+
return true;
- parse_error:
+parse_error:
+
if (settings->verbose) {
std::cout << " ERROR in parsing " << fileName << std::endl;
}
-
+
cJSON_Delete(root);
return false;
}
@@ -983,88 +1029,6 @@ std::vector rtengine::ICCStore::getWorkingProfiles()
return implementation->getWorkingProfiles();
}
-std::vector rtengine::ICCStore::getGamma()
-{
-
- std::vector res;
-
- for (unsigned int i = 0; i < sizeof(wpgamma) / sizeof(wpgamma[0]); i++) {
- res.push_back(wpgamma[i]);
- }
-
- return res;
-}
-
-void rtengine::ICCStore::getGammaArray(const procparams::ColorManagementParams &icm, GammaValues &ga)
-{
- const double eps = 0.000000001; // not divide by zero
- if (!icm.freegamma) {//if Free gamma not selected
- // gamma : ga[0],ga[1],ga[2],ga[3],ga[4],ga[5] by calcul
- if(icm.gamma == "BT709_g2.2_s4.5") {
- ga[0] = 2.22; //BT709 2.2 4.5 - my preferred as D.Coffin
- ga[1] = 0.909995;
- ga[2] = 0.090005;
- ga[3] = 0.222222;
- ga[4] = 0.081071;
- } else if (icm.gamma == "sRGB_g2.4_s12.92") {
- ga[0] = 2.40; //sRGB 2.4 12.92 - RT default as Lightroom
- ga[1] = 0.947858;
- ga[2] = 0.052142;
- ga[3] = 0.077399;
- ga[4] = 0.039293;
- } else if (icm.gamma == "High_g1.3_s3.35") {
- ga[0] = 1.3 ; //for high dynamic images
- ga[1] = 0.998279;
- ga[2] = 0.001721;
- ga[3] = 0.298507;
- ga[4] = 0.005746;
- } else if (icm.gamma == "Low_g2.6_s6.9") {
- ga[0] = 2.6 ; //gamma 2.6 variable : for low contrast images
- ga[1] = 0.891161;
- ga[2] = 0.108839;
- ga[3] = 0.144928;
- ga[4] = 0.076332;
- } else if (icm.gamma == "standard_g2.2") {
- ga[0] = 2.2; //gamma=2.2(as gamma of Adobe, Widegamut...)
- ga[1] = 1.;
- ga[2] = 0.;
- ga[3] = 1. / eps;
- ga[4] = 0.;
- } else if (icm.gamma == "standard_g1.8") {
- ga[0] = 1.8; //gamma=1.8(as gamma of Prophoto)
- ga[1] = 1.;
- ga[2] = 0.;
- ga[3] = 1. / eps;
- ga[4] = 0.;
- } else /* if (icm.gamma == "linear_g1.0") */ {
- ga[0] = 1.0; //gamma=1 linear : for high dynamic images(cf : D.Coffin...)
- ga[1] = 1.;
- ga[2] = 0.;
- ga[3] = 1. / eps;
- ga[4] = 0.;
- }
- ga[5] = 0.0;
- ga[6] = 0.0;
- } else { //free gamma selected
- GammaValues g_a; //gamma parameters
- double pwr = 1.0 / icm.gampos;
- double ts = icm.slpos;
- double slope = icm.slpos == 0 ? eps : icm.slpos;
-
- int mode = 0;
- Color::calcGamma(pwr, ts, mode, g_a); // call to calcGamma with selected gamma and slope : return parameters for LCMS2
- ga[4] = g_a[3] * ts;
- //printf("g_a.gamma0=%f g_a.gamma1=%f g_a.gamma2=%f g_a.gamma3=%f g_a.gamma4=%f\n", g_a.gamma0,g_a.gamma1,g_a.gamma2,g_a.gamma3,g_a.gamma4);
- ga[0] = icm.gampos;
- ga[1] = 1. /(1.0 + g_a[4]);
- ga[2] = g_a[4] /(1.0 + g_a[4]);
- ga[3] = 1. / slope;
- ga[5] = 0.0;
- ga[6] = 0.0;
- //printf("ga[0]=%f ga[1]=%f ga[2]=%f ga[3]=%f ga[4]=%f\n", ga[0],ga[1],ga[2],ga[3],ga[4]);
- }
-}
-
// WARNING: the caller must lock lcmsMutex
cmsHPROFILE rtengine::ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
{
@@ -1096,7 +1060,7 @@ cmsHPROFILE rtengine::ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
const uint32_t gamma = 0x239;
int gamma_size = 14;
- int data_size =(gamma_size + 3) & ~3;
+ int data_size = (gamma_size + 3) & ~3;
for (uint32_t i = 0; i < tag_count; i++) {
memcpy(&tags[i], p, 12);
@@ -1109,7 +1073,7 @@ cmsHPROFILE rtengine::ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
tags[i].sig != 0x67545243 && // gTRC
tags[i].sig != 0x72545243 && // rTRC
tags[i].sig != 0x6B545243) { // kTRC
- data_size +=(tags[i].size + 3) & ~3;
+ data_size += (tags[i].size + 3) & ~3;
}
}
@@ -1140,7 +1104,7 @@ cmsHPROFILE rtengine::ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
memcpy(&nd[offset + 12], &gm, 2);
}
- offset +=(gamma_size + 3) & ~3;
+ offset += (gamma_size + 3) & ~3;
}
tag.offset = htonl(gamma_offset);
@@ -1149,7 +1113,7 @@ cmsHPROFILE rtengine::ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
tag.offset = htonl(offset);
tag.size = htonl(tags[i].size);
memcpy(&nd[offset], &data[tags[i].offset], tags[i].size);
- offset +=(tags[i].size + 3) & ~3;
+ offset += (tags[i].size + 3) & ~3;
}
memcpy(&nd[128 + 4 + i * 12], &tag, 12);
@@ -1191,7 +1155,7 @@ cmsHPROFILE rtengine::ICCStore::createFromMatrix(const double matrix[3][3], bool
pcurve[2] = 1;
// pcurve[3] = 0x1f00000;// pcurve for gamma BT709 : g=2.22 s=4.5
// normalize gamma in RT, default(Emil's choice = sRGB)
- pcurve[3] = 0x2390000;//pcurve for gamma sRGB : g:2.4 s=12.92
+ pcurve[3] = 0x2390000;//pcurve for gamma sRGB : g:2.4 s=12.92310
} else {
// lcms2 up to 2.4 has a bug with linear gamma causing precision loss(banding)
@@ -1214,9 +1178,9 @@ cmsHPROFILE rtengine::ICCStore::createFromMatrix(const double matrix[3][3], bool
// 0x74657874 : text
// 0x64657363 : description tag
for (unsigned int i = 0; i < pbody[0]; i++) {
- oprof[oprof[0] / 4] = i ?(i > 1 ? 0x58595a20 : 0x64657363) : 0x74657874;
+ oprof[oprof[0] / 4] = i ? (i > 1 ? 0x58595a20 : 0x64657363) : 0x74657874;
pbody[i * 3 + 2] = oprof[0];
- oprof[0] +=(pbody[i * 3 + 3] + 3) & -4;
+ oprof[0] += (pbody[i * 3 + 3] + 3) & -4;
}
memcpy(oprof + 32, pbody, sizeof(pbody));
@@ -1255,232 +1219,3 @@ cmsHPROFILE rtengine::ICCStore::createFromMatrix(const double matrix[3][3], bool
delete [] oprof;
return p;
}
-
-cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManagementParams &icm, GammaValues &ga)
-{
- float p[6]; //primaries
- ga[6] = 0.0;
-
- enum class ColorTemp {
- D50 = 5003, // for Widegamut, Prophoto Best, Beta -> D50
- D65 = 6504 // for sRGB, AdobeRGB, Bruce Rec2020 -> D65
- };
- ColorTemp temp = ColorTemp::D50;
-
- //primaries for 7 working profiles ==> output profiles
- // eventually to adapt primaries if RT used special profiles !
- if (icm.output == "WideGamut") {
- p[0] = 0.7350; //Widegamut primaries
- p[1] = 0.2650;
- p[2] = 0.1150;
- p[3] = 0.8260;
- p[4] = 0.1570;
- p[5] = 0.0180;
- } else if (icm.output == "Adobe RGB") {
- p[0] = 0.6400; //Adobe primaries
- p[1] = 0.3300;
- p[2] = 0.2100;
- p[3] = 0.7100;
- p[4] = 0.1500;
- p[5] = 0.0600;
- temp = ColorTemp::D65;
- } else if (icm.output == "sRGB") {
- p[0] = 0.6400; // sRGB primaries
- p[1] = 0.3300;
- p[2] = 0.3000;
- p[3] = 0.6000;
- p[4] = 0.1500;
- p[5] = 0.0600;
- temp = ColorTemp::D65;
- } else if (icm.output == "BruceRGB") {
- p[0] = 0.6400; // Bruce primaries
- p[1] = 0.3300;
- p[2] = 0.2800;
- p[3] = 0.6500;
- p[4] = 0.1500;
- p[5] = 0.0600;
- temp = ColorTemp::D65;
- } else if (icm.output == "Beta RGB") {
- p[0] = 0.6888; // Beta primaries
- p[1] = 0.3112;
- p[2] = 0.1986;
- p[3] = 0.7551;
- p[4] = 0.1265;
- p[5] = 0.0352;
- } else if (icm.output == "BestRGB") {
- p[0] = 0.7347; // Best primaries
- p[1] = 0.2653;
- p[2] = 0.2150;
- p[3] = 0.7750;
- p[4] = 0.1300;
- p[5] = 0.0350;
- } else if (icm.output == "Rec2020") {
- p[0] = 0.7080; // Rec2020 primaries
- p[1] = 0.2920;
- p[2] = 0.1700;
- p[3] = 0.7970;
- p[4] = 0.1310;
- p[5] = 0.0460;
- temp = ColorTemp::D65;
- } else {
- p[0] = 0.7347; //ProPhoto and default primaries
- p[1] = 0.2653;
- p[2] = 0.1596;
- p[3] = 0.8404;
- p[4] = 0.0366;
- p[5] = 0.0001;
- }
-
- cmsCIExyY xyD;
- cmsCIExyYTRIPLE Primaries = {
- {p[0], p[1], 1.0}, // red
- {p[2], p[3], 1.0}, // green
- {p[4], p[5], 1.0} // blue
- };
- cmsToneCurve* GammaTRC[3];
-
- // 7 parameters for smoother curves
- cmsFloat64Number Parameters[7] = { ga[0], ga[1], ga[2], ga[3], ga[4], ga[5], ga[6] } ;
-
- //lcmsMutex->lock(); Mutex acquired by the caller
- cmsWhitePointFromTemp(&xyD,(double)temp);
- GammaTRC[0] = GammaTRC[1] = GammaTRC[2] = cmsBuildParametricToneCurve(nullptr, 5, Parameters); //5 = smoother than 4
- cmsHPROFILE oprofdef = cmsCreateRGBProfile(&xyD, &Primaries, GammaTRC); //oprofdef become Outputprofile
- cmsFreeToneCurve(GammaTRC[0]);
- //lcmsMutex->unlock();
-
- return oprofdef;
-}
-
-// WARNING: the caller must lock lcmsMutex
-cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams::ColorManagementParams &icm, GammaValues &ga)
-{
- bool pro = false;
- Glib::ustring outProfile;
- cmsHPROFILE outputProfile = nullptr;
-
- if (icm.freegamma && icm.gampos < 1.35) {
- pro = true; //select profil with gammaTRC modified :
- } else if (icm.gamma == "linear_g1.0" ||(icm.gamma == "High_g1.3_s3.35")) {
- pro = true; //pro=0 RT_sRGB || Prophoto
- }
-
- // Check that output profiles exist, otherwise use LCMS2
- // Use the icc/icm profiles associated to possible working profiles, set in "options"
- if (icm.working == "ProPhoto" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.prophoto) && !pro) {
- outProfile = options.rtSettings.prophoto;
- } else if (icm.working == "Adobe RGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.adobe) ) {
- outProfile = options.rtSettings.adobe;
- } else if (icm.working == "WideGamut" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.widegamut) ) {
- outProfile = options.rtSettings.widegamut;
- } else if (icm.working == "Beta RGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.beta) ) {
- outProfile = options.rtSettings.beta;
- } else if (icm.working == "BestRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.best) ) {
- outProfile = options.rtSettings.best;
- } else if (icm.working == "BruceRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.bruce) ) {
- outProfile = options.rtSettings.bruce;
- } else if (icm.working == "sRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.srgb) && !pro) {
- outProfile = options.rtSettings.srgb;
- } else if (icm.working == "sRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.srgb10) && pro) {
- outProfile = options.rtSettings.srgb10;
- } else if (icm.working == "ProPhoto" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.prophoto10) && pro) {
- outProfile = options.rtSettings.prophoto10;
- } else if (icm.working == "Rec2020" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.rec2020) ) {
- outProfile = options.rtSettings.rec2020;
- } else {
- // Should not occurs
- if (settings->verbose) {
- printf("\"%s\": unknown working profile! - use LCMS2 substitution\n", icm.working.c_str() );
- }
-
- return nullptr;
- }
-
- //begin adaptation rTRC gTRC bTRC
- //"outputProfile" profile has the same characteristics than RGB values, but TRC are adapted... for applying profile
- if (settings->verbose) {
- printf("Output Gamma - profile: \"%s\"\n", outProfile.c_str() ); //c_str()
- }
-
- outputProfile = ICCStore::getInstance()->getProfile(outProfile); //get output profile
-
- if (outputProfile == nullptr) {
-
- if (settings->verbose) {
- printf("\"%s\" ICC output profile not found!\n", outProfile.c_str());
- }
- return nullptr;
- }
-
- // 7 parameters for smoother curves
- cmsFloat64Number Parameters[7] = { ga[0], ga[1], ga[2], ga[3], ga[4], ga[5], ga[6] };
-
- //change desc Tag , to "free gamma", or "BT709", etc.
- cmsMLU *mlu;
- cmsContext ContextID = cmsGetProfileContextID(outputProfile); // create context to modify some TAGs
- mlu = cmsMLUalloc(ContextID, 1);
-
- // instruction with //ICC are used to generate ICC profile
- if (mlu == nullptr) {
- printf("Description error\n");
- } else {
-
- // Description TAG : selection of gamma and Primaries
- if (!icm.freegamma) {
- std::wstring gammaStr;
-
- if(icm.gamma == "High_g1.3_s3.35") {
- gammaStr = std::wstring(L"GammaTRC: High g=1.3 s=3.35");
- } else if (icm.gamma == "Low_g2.6_s6.9") {
- gammaStr = std::wstring(L"GammaTRC: Low g=2.6 s=6.9");
- } else if (icm.gamma == "sRGB_g2.4_s12.92") {
- gammaStr = std::wstring(L"GammaTRC: sRGB g=2.4 s=12.92");
- } else if (icm.gamma == "BT709_g2.2_s4.5") {
- gammaStr = std::wstring(L"GammaTRC: BT709 g=2.2 s=4.5");
- } else if (icm.gamma == "linear_g1.0") {
- gammaStr = std::wstring(L"GammaTRC: Linear g=1.0");
- } else if (icm.gamma == "standard_g2.2") {
- gammaStr = std::wstring(L"GammaTRC: g=2.2");
- } else if (icm.gamma == "standard_g1.8") {
- gammaStr = std::wstring(L"GammaTRC: g=1.8");
- }
-
- cmsMLUsetWide(mlu, "en", "US", gammaStr.c_str());
- } else {
- // create description with gamma + slope + primaries
- std::wostringstream gammaWs;
- gammaWs.precision(2);
- gammaWs << "Manual GammaTRC: g=" <<(float)icm.gampos << " s=" <<(float)icm.slpos;
-
- cmsMLUsetWide(mlu, "en", "US", gammaWs.str().c_str());
- }
-
- cmsWriteTag(outputProfile, cmsSigProfileDescriptionTag, mlu);//desc changed
-
- /*
- cmsMLUsetWide(mlu, "en", "US", L"General Public License - AdobeRGB compatible");//adapt to profil
- cmsWriteTag(outputProfile, cmsSigCopyrightTag, mlu);
-
- cmsMLUsetWide(mlu, "en", "US", L"RawTherapee");
- cmsWriteTag(outputProfile, cmsSigDeviceMfgDescTag, mlu);
-
- cmsMLUsetWide(mlu, "en", "US", L"RTMedium"); //adapt to profil
- cmsWriteTag(outputProfile, cmsSigDeviceModelDescTag, mlu);
-
- */
-
- cmsMLUfree(mlu);
- }
-
- // Calculate output profile's rTRC gTRC bTRC
- cmsToneCurve* GammaTRC = cmsBuildParametricToneCurve(nullptr, 5, Parameters);
- cmsWriteTag(outputProfile, cmsSigRedTRCTag,(void*)GammaTRC );
- cmsWriteTag(outputProfile, cmsSigGreenTRCTag,(void*)GammaTRC );
- cmsWriteTag(outputProfile, cmsSigBlueTRCTag,(void*)GammaTRC );
-
- if (GammaTRC) {
- cmsFreeToneCurve(GammaTRC);
- }
-
- return outputProfile;
-}
diff --git a/rtengine/iccstore.h b/rtengine/iccstore.h
index c23ecd112..6b57fd072 100644
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@@ -96,13 +96,9 @@ public:
std::uint8_t getProofIntents(const Glib::ustring& name) const;
/*static*/ std::vector getWorkingProfiles();
- static std::vector getGamma();
- static void getGammaArray(const procparams::ColorManagementParams& icm, GammaValues& ga);
static cmsHPROFILE makeStdGammaProfile(cmsHPROFILE iprof);
static cmsHPROFILE createFromMatrix(const double matrix[3][3], bool gamma = false, const Glib::ustring& name = Glib::ustring());
- static cmsHPROFILE createGammaProfile(const procparams::ColorManagementParams& icm, GammaValues& ga);
- static cmsHPROFILE createCustomGammaOutputProfile(const procparams::ColorManagementParams& icm, GammaValues& ga);
private:
class Implementation;
diff --git a/rtengine/icons.cc b/rtengine/icons.cc
index aa3b67cbf..ccc5ebd09 100644
--- a/rtengine/icons.cc
+++ b/rtengine/icons.cc
@@ -108,10 +108,7 @@ void setPaths ()
imagePaths.clear ();
- imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark"));
- imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "actions"));
- imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "devices"));
- imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "places"));
+ imagePaths.push_back (Glib::build_filename(argv0, "images", "dark"));
// The images folder is the second fallback solution.
imagePaths.push_back (Glib::build_filename(argv0, "images"));
diff --git a/rtengine/iimage.h b/rtengine/iimage.h
index d09f46a3a..af2969581 100644
--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@@ -587,6 +587,14 @@ public:
}
}
+ void fill (T value) {
+ for (int i = 0; i < height; i++) {
+ for (int j = 0; j < width; j++) {
+ v(i, j) = value;
+ }
+ }
+ }
+
};
@@ -1765,8 +1773,9 @@ public:
/** @brief Saves the image to file in a tif format.
* @param fname is the name of the file
* @param bps can be 8 or 16 depending on the bits per pixels the output file will have
+ * @param isFloat is true for saving float images. Will be ignored by file format not supporting float data
@return the error code, 0 if none */
- virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false) = 0;
+ virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, float isFloat = false, bool uncompressed = false) = 0;
/** @brief Sets the progress listener if you want to follow the progress of the image saving operations (optional).
* @param pl is the pointer to the class implementing the ProgressListener interface */
virtual void setSaveProgressListener (ProgressListener* pl) = 0;
diff --git a/rtengine/image16.cc b/rtengine/image16.cc
index 68dd4bb40..c014d1c06 100644
--- a/rtengine/image16.cc
+++ b/rtengine/image16.cc
@@ -25,7 +25,7 @@
namespace
{
-void getScanline8 (const uint16_t *red, const uint16_t *green, const uint16_t *blue, int width, unsigned char* buffer)
+void getScanline8(const uint16_t *red, const uint16_t *green, const uint16_t *blue, int width, unsigned char* buffer)
{
for (int i = 0, ix = 0; i < width; i++) {
buffer[ix++] = rtengine::uint16ToUint8Rounded(red[i]);
@@ -34,7 +34,7 @@ void getScanline8 (const uint16_t *red, const uint16_t *green, const uint16_t *b
}
}
-void getScanline16 (const uint16_t *red, const uint16_t *green, const uint16_t *blue, int width, unsigned short* buffer)
+void getScanline16(const uint16_t *red, const uint16_t *green, const uint16_t *blue, int width, unsigned short* buffer)
{
for (int i = 0, ix = 0; i < width; i++) {
buffer[ix++] = red[i];
@@ -47,20 +47,20 @@ void getScanline16 (const uint16_t *red, const uint16_t *green, const uint16_t *
using namespace rtengine;
-Image16::Image16 ()
+Image16::Image16()
{
}
-Image16::Image16 (int w, int h)
+Image16::Image16(int w, int h)
{
- allocate (w, h);
+ allocate(w, h);
}
-Image16::~Image16 ()
+Image16::~Image16()
{
}
-void Image16::getScanline (int row, unsigned char* buffer, int bps)
+void Image16::getScanline(int row, unsigned char* buffer, int bps, bool isFloat)
{
if (data == nullptr) {
@@ -68,31 +68,24 @@ void Image16::getScanline (int row, unsigned char* buffer, int bps)
}
if (bps == 16) {
- getScanline16 (r(row), g(row), b(row), width, (unsigned short*)buffer);
+ getScanline16(r(row), g(row), b(row), width, (unsigned short*)buffer);
} else if (bps == 8) {
- getScanline8 (r(row), g(row), b(row), width, buffer);
+ getScanline8(r(row), g(row), b(row), width, buffer);
}
}
-/*
- * void Image16::setScanline (int row, unsigned char* buffer, int bps, int minValue[3], int maxValue[3]);
- * has not been implemented yet, because as of now, this method is called for IIOSF_FLOATxx sample format only
- */
-void Image16::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue)
+void Image16::setScanline(int row, unsigned char* buffer, int bps, unsigned int numSamples)
{
if (data == nullptr) {
return;
}
- // For optimization purpose, we're assuming that this class never has to provide min/max bounds
- assert(!minValue);
-
switch (sampleFormat) {
case (IIOSF_UNSIGNED_CHAR): {
int ix = 0;
- if(numSamples == 1) {
+ if (numSamples == 1) {
for (int i = 0; i < width; ++i) {
r(row, i) = g(row, i) = b(row, i) = static_cast(buffer[ix++]) * 257;
}
@@ -103,6 +96,7 @@ void Image16::setScanline (int row, unsigned char* buffer, int bps, unsigned int
b(row, i) = static_cast(buffer[ix++]) * 257;
}
}
+
break;
}
@@ -130,22 +124,23 @@ void Image16::setScanline (int row, unsigned char* buffer, int bps, unsigned int
*/
}
-Image16* Image16::copy ()
+Image16* Image16::copy()
{
- Image16* cp = new Image16 (width, height);
+ Image16* cp = new Image16(width, height);
copyData(cp);
return cp;
}
-void Image16::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, procparams::ToneCurveParams hrp)
+void Image16::getStdImage(ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, procparams::ToneCurveParams hrp)
{
// compute channel multipliers
float rm = 1.f, gm = 1.f, bm = 1.f;
+
if (ctemp.getTemp() >= 0) {
double drm, dgm, dbm;
- ctemp.getMultipliers (drm, dgm, dbm);
+ ctemp.getMultipliers(drm, dgm, dbm);
rm = drm;
gm = dgm;
bm = dbm;
@@ -161,7 +156,7 @@ void Image16::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Preview
int sx1, sy1, sx2, sy2;
- transform (pp, tran, sx1, sy1, sx2, sy2);
+ transform(pp, tran, sx1, sy1, sx2, sy2);
int imwidth = image->getWidth(); // Destination image
int imheight = image->getHeight(); // Destination image
@@ -271,25 +266,22 @@ void Image16::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Preview
}
}
- if (mtran == TR_NONE)
+ if (mtran == TR_NONE)
for (int dst_x = 0, src_x = sx1; dst_x < imwidth; dst_x++, src_x += skip) {
image->r(iy, dst_x) = lineR[dst_x];
image->g(iy, dst_x) = lineG[dst_x];
image->b(iy, dst_x) = lineB[dst_x];
- }
- else if (mtran == TR_R180)
+ } else if (mtran == TR_R180)
for (int dst_x = 0; dst_x < imwidth; dst_x++) {
image->r(imheight - 1 - iy, imwidth - 1 - dst_x) = lineR[dst_x];
image->g(imheight - 1 - iy, imwidth - 1 - dst_x) = lineG[dst_x];
image->b(imheight - 1 - iy, imwidth - 1 - dst_x) = lineB[dst_x];
- }
- else if (mtran == TR_R90)
+ } else if (mtran == TR_R90)
for (int dst_x = 0, src_x = sx1; dst_x < imwidth; dst_x++, src_x += skip) {
image->r(dst_x, imheight - 1 - iy) = lineR[dst_x];
image->g(dst_x, imheight - 1 - iy) = lineG[dst_x];
image->b(dst_x, imheight - 1 - iy) = lineB[dst_x];
- }
- else if (mtran == TR_R270)
+ } else if (mtran == TR_R270)
for (int dst_x = 0, src_x = sx1; dst_x < imwidth; dst_x++, src_x += skip) {
image->r(imwidth - 1 - dst_x, iy) = lineR[dst_x];
image->g(imwidth - 1 - dst_x, iy) = lineG[dst_x];
@@ -334,6 +326,48 @@ Image16::tofloat()
return imgfloat;
}
+// Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
+void Image16::ExecCMSTransform(cmsHTRANSFORM hTransform)
+{
+ //cmsDoTransform(hTransform, data, data, planestride);
+
+ // LittleCMS cannot parallelize planar setups -- Hombre: LCMS2.4 can! But it we use this new feature, memory allocation have to be modified too
+ // so build temporary buffers to allow multi processor execution
+#ifdef _OPENMP
+ #pragma omp parallel
+#endif
+ {
+ AlignedBuffer buffer(width * 3);
+
+#ifdef _OPENMP
+ #pragma omp for schedule(static)
+#endif
+
+ for (int y = 0; y < height; y++)
+ {
+ unsigned short *p = buffer.data, *pR = r(y), *pG = g(y), *pB = b(y);
+
+ for (int x = 0; x < width; x++) {
+ *(p++) = *(pR++);
+ *(p++) = *(pG++);
+ *(p++) = *(pB++);
+ }
+
+ cmsDoTransform(hTransform, buffer.data, buffer.data, width);
+
+ p = buffer.data;
+ pR = r(y);
+ pG = g(y);
+ pB = b(y);
+
+ for (int x = 0; x < width; x++) {
+ *(pR++) = *(p++);
+ *(pG++) = *(p++);
+ *(pB++) = *(p++);
+ }
+ } // End of parallelization
+ }
+}
// // Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
// void Image16::ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy)
diff --git a/rtengine/image16.h b/rtengine/image16.h
index af5642638..1c5504bd9 100644
--- a/rtengine/image16.h
+++ b/rtengine/image16.h
@@ -36,65 +36,66 @@ class Image16 : public IImage16, public ImageIO
public:
- Image16 ();
- Image16 (int width, int height);
- ~Image16 ();
+ Image16();
+ Image16(int width, int height);
+ ~Image16();
- Image16* copy ();
+ Image16* copy();
Image8* to8();
Imagefloat* tofloat();
- virtual void getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, procparams::ToneCurveParams hrp);
+ virtual void getStdImage(ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, procparams::ToneCurveParams hrp);
- virtual const char* getType () const
+ virtual const char* getType() const
{
return sImage16;
}
- virtual int getBPS ()
+ virtual int getBPS()
{
return 8 * sizeof(unsigned short);
}
- virtual void getScanline (int row, unsigned char* buffer, int bps);
- virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue = nullptr, float *maxValue = nullptr);
+ virtual void getScanline(int row, unsigned char* buffer, int bps, bool isFloat = false);
+ virtual void setScanline(int row, unsigned char* buffer, int bps, unsigned int numSamples);
// functions inherited from IImage16:
- virtual MyMutex& getMutex ()
+ virtual MyMutex& getMutex()
{
- return mutex ();
+ return mutex();
}
- virtual cmsHPROFILE getProfile ()
+ virtual cmsHPROFILE getProfile()
{
- return getEmbeddedProfile ();
+ return getEmbeddedProfile();
}
- virtual int getBitsPerPixel ()
+ virtual int getBitsPerPixel()
{
return 8 * sizeof(unsigned short);
}
- virtual int saveToFile (Glib::ustring fname)
+ virtual int saveToFile(Glib::ustring fname)
{
- return save (fname);
+ return save(fname);
}
- virtual int saveAsPNG (Glib::ustring fname, int bps = -1)
+ virtual int saveAsPNG(Glib::ustring fname, int bps = -1)
{
- return savePNG (fname, bps);
+ return savePNG(fname, bps);
}
- virtual int saveAsJPEG (Glib::ustring fname, int quality = 100, int subSamp = 3)
+ virtual int saveAsJPEG(Glib::ustring fname, int quality = 100, int subSamp = 3)
{
- return saveJPEG (fname, quality, subSamp);
+ return saveJPEG(fname, quality, subSamp);
}
- virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false)
+ virtual int saveAsTIFF(Glib::ustring fname, int bps = -1, float isFloat = false, bool uncompressed = false)
{
- return saveTIFF (fname, bps, uncompressed);
+ return saveTIFF(fname, bps, isFloat, uncompressed);
}
- virtual void setSaveProgressListener (ProgressListener* pl)
+ virtual void setSaveProgressListener(ProgressListener* pl)
{
- setProgressListener (pl);
+ setProgressListener(pl);
}
- virtual void free ()
+ virtual void free()
{
delete this;
}
+ void ExecCMSTransform(cmsHTRANSFORM hTransform);
/* void ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy); */
};
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index 69066f2dd..ab7393100 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -37,7 +37,7 @@ Image8::~Image8 ()
{
}
-void Image8::getScanline (int row, unsigned char* buffer, int bps)
+void Image8::getScanline (int row, unsigned char* buffer, int bps, bool isFloat)
{
if (data == nullptr) {
@@ -55,16 +55,13 @@ void Image8::getScanline (int row, unsigned char* buffer, int bps)
}
}
-void Image8::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue)
+void Image8::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples)
{
if (data == nullptr) {
return;
}
- // For optimization purpose, we're assuming that this class never have to provide min/max bound
- assert(!minValue);
-
switch (sampleFormat) {
case (IIOSF_UNSIGNED_CHAR):
if(numSamples == 1) {
diff --git a/rtengine/image8.h b/rtengine/image8.h
index eafaa2d46..59d13c298 100644
--- a/rtengine/image8.h
+++ b/rtengine/image8.h
@@ -50,8 +50,8 @@ public:
{
return 8 * sizeof(unsigned char);
}
- virtual void getScanline (int row, unsigned char* buffer, int bps);
- virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue = nullptr, float *maxValue = nullptr);
+ virtual void getScanline (int row, unsigned char* buffer, int bps, bool isFloat = false);
+ virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples);
// functions inherited from IImage*:
virtual MyMutex& getMutex ()
@@ -78,9 +78,9 @@ public:
{
return saveJPEG (fname, quality, subSamp);
}
- virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false)
+ virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, float isFloat = false, bool uncompressed = false)
{
- return saveTIFF (fname, bps, uncompressed);
+ return saveTIFF (fname, bps, isFloat, uncompressed);
}
virtual void setSaveProgressListener (ProgressListener* pl)
{
diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc
index e79678194..2cf73204d 100644
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -44,7 +44,7 @@ Imagefloat::~Imagefloat ()
}
// Call this method to handle floating points input values of different size
-void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue)
+void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples)
{
if (data == nullptr) {
@@ -55,45 +55,27 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned
// DNG_HalfToFloat and DNG_FP24ToFloat from dcraw.cc can be used to manually convert
// from 16 and 24 bits to 32 bits float respectively
switch (sampleFormat) {
- case (IIOSF_FLOAT16):
- case (IIOSF_FLOAT24):
+ case (IIOSF_FLOAT16): {
+ int ix = 0;
+ uint16_t* sbuffer = (uint16_t*) buffer;
+
+ for (int i = 0; i < width; i++) {
+ r(row, i) = 65535.f * DNG_HalfToFloat(sbuffer[ix++]);
+ g(row, i) = 65535.f * DNG_HalfToFloat(sbuffer[ix++]);
+ b(row, i) = 65535.f * DNG_HalfToFloat(sbuffer[ix++]);
+ }
+
+ break;
+ }
+ //case (IIOSF_FLOAT24):
case (IIOSF_FLOAT32): {
int ix = 0;
float* sbuffer = (float*) buffer;
for (int i = 0; i < width; i++) {
- r(row, i) = 65535.f * sbuffer[ix];
-
- if (minValue) {
- if (sbuffer[ix] < minValue[0]) {
- minValue[0] = sbuffer[ix];
- } else if (sbuffer[ix] > maxValue[0]) {
- maxValue[0] = sbuffer[ix];
- }
- }
- ++ix;
-
- g(row, i) = 65535.f * sbuffer[ix];
-
- if (minValue) {
- if (sbuffer[ix] < minValue[1]) {
- minValue[1] = sbuffer[ix];
- } else if (sbuffer[ix] > maxValue[1]) {
- maxValue[1] = sbuffer[ix];
- }
- }
- ++ix;
-
- b(row, i) = 65535.f * sbuffer[ix];
-
- if (minValue) {
- if (sbuffer[ix] < minValue[2]) {
- minValue[2] = sbuffer[ix];
- } else if (sbuffer[ix] > maxValue[2]) {
- maxValue[2] = sbuffer[ix];
- }
- }
- ++ix;
+ r(row, i) = 65535.f * sbuffer[ix++];
+ g(row, i) = 65535.f * sbuffer[ix++];
+ b(row, i) = 65535.f * sbuffer[ix++];
}
break;
@@ -112,34 +94,8 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned
// TODO: we may have to handle other color space than sRGB!
Color::xyz2srgb(xyzvalues[0], xyzvalues[1], xyzvalues[2], rgbvalues[0], rgbvalues[1], rgbvalues[2]);
r(row, i) = rgbvalues[0];
-
- if (minValue) {
- if (rgbvalues[0] < minValue[0]) {
- minValue[0] = rgbvalues[0];
- } else if (rgbvalues[0] > maxValue[0]) {
- maxValue[0] = rgbvalues[0];
- }
- }
-
g(row, i) = rgbvalues[1];
-
- if (minValue) {
- if (rgbvalues[1] < minValue[1]) {
- minValue[1] = rgbvalues[1];
- } else if (rgbvalues[1] > maxValue[1]) {
- maxValue[1] = rgbvalues[1];
- }
- }
-
b(row, i) = rgbvalues[2];
-
- if (minValue) {
- if (rgbvalues[2] < minValue[2]) {
- minValue[2] = rgbvalues[2];
- } else if (rgbvalues[2] > maxValue[2]) {
- maxValue[2] = rgbvalues[2];
- }
- }
}
break;
@@ -154,22 +110,32 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned
namespace rtengine { extern void filmlike_clip(float *r, float *g, float *b); }
-void Imagefloat::getScanline (int row, unsigned char* buffer, int bps)
+void Imagefloat::getScanline (int row, unsigned char* buffer, int bps, bool isFloat)
{
if (data == nullptr) {
return;
}
- if (bps == 32) {
- int ix = 0;
- float* sbuffer = (float*) buffer;
-
- // agriggio -- assume the image is normalized to [0, 65535]
- for (int i = 0; i < width; i++) {
- sbuffer[ix++] = r(row, i) / 65535.f;
- sbuffer[ix++] = g(row, i) / 65535.f;
- sbuffer[ix++] = b(row, i) / 65535.f;
+ if (isFloat) {
+ if (bps == 32) {
+ int ix = 0;
+ float* sbuffer = (float*) buffer;
+ // agriggio -- assume the image is normalized to [0, 65535]
+ for (int i = 0; i < width; i++) {
+ sbuffer[ix++] = r(row, i) / 65535.f;
+ sbuffer[ix++] = g(row, i) / 65535.f;
+ sbuffer[ix++] = b(row, i) / 65535.f;
+ }
+ } else if (bps == 16) {
+ int ix = 0;
+ uint16_t* sbuffer = (uint16_t*) buffer;
+ // agriggio -- assume the image is normalized to [0, 65535]
+ for (int i = 0; i < width; i++) {
+ sbuffer[ix++] = DNG_FloatToHalf(r(row, i) / 65535.f);
+ sbuffer[ix++] = DNG_FloatToHalf(g(row, i) / 65535.f);
+ sbuffer[ix++] = DNG_FloatToHalf(b(row, i) / 65535.f);
+ }
}
} else {
unsigned short *sbuffer = (unsigned short *)buffer;
@@ -467,7 +433,7 @@ void Imagefloat::calcCroppedHistogram(const ProcParams ¶ms, float scale, LUT
hist.clear();
// Set up factors to calc the lightness
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.workingProfile);
float facRed = wprof[1][0];
float facGreen = wprof[1][1];
@@ -508,6 +474,52 @@ void Imagefloat::calcCroppedHistogram(const ProcParams ¶ms, float scale, LUT
}
+// Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
+void Imagefloat::ExecCMSTransform2(cmsHTRANSFORM hTransform)
+{
+
+ // LittleCMS cannot parallelize planar setups -- Hombre: LCMS2.4 can! But it we use this new feature, memory allocation
+ // have to be modified too to build temporary buffers that allow multi processor execution
+#ifdef _OPENMP
+ #pragma omp parallel
+#endif
+ {
+ AlignedBuffer pBuf(width * 3);
+
+#ifdef _OPENMP
+ #pragma omp for schedule(static)
+#endif
+
+ for (int y = 0; y < height; y++)
+ {
+ float *p = pBuf.data, *pR = r(y), *pG = g(y), *pB = b(y);
+
+ for (int x = 0; x < width; x++) {
+ *(p++) = *(pR++)/ 65535.f;
+ *(p++) = *(pG++)/ 65535.f;
+ *(p++) = *(pB++)/ 65535.f;
+
+ }
+
+ cmsDoTransform (hTransform, pBuf.data, pBuf.data, width);
+
+ p = pBuf.data;
+ pR = r(y);
+ pG = g(y);
+ pB = b(y);
+
+ for (int x = 0; x < width; x++) {
+ *(pR++) = *(p++);
+ *(pG++) = *(p++);
+ *(pB++) = *(p++);
+ }
+ } // End of parallelization
+ }
+}
+
+
+
+
// Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
void Imagefloat::ExecCMSTransform(cmsHTRANSFORM hTransform)
{
@@ -532,6 +544,7 @@ void Imagefloat::ExecCMSTransform(cmsHTRANSFORM hTransform)
*(p++) = *(pR++);
*(p++) = *(pG++);
*(p++) = *(pB++);
+
}
cmsDoTransform (hTransform, pBuf.data, pBuf.data, width);
diff --git a/rtengine/imagefloat.h b/rtengine/imagefloat.h
index 5246a2f6e..65c291775 100644
--- a/rtengine/imagefloat.h
+++ b/rtengine/imagefloat.h
@@ -59,8 +59,8 @@ public:
{
return 8 * sizeof(float);
}
- virtual void getScanline (int row, unsigned char* buffer, int bps);
- virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue = nullptr, float *maxValue = nullptr);
+ virtual void getScanline (int row, unsigned char* buffer, int bps, bool isFloat = false);
+ virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples);
// functions inherited from IImagefloat:
virtual MyMutex& getMutex ()
@@ -87,9 +87,9 @@ public:
{
return saveJPEG (fname, quality, subSamp);
}
- virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false)
+ virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, float isFloat = false, bool uncompressed = false)
{
- return saveTIFF (fname, bps, uncompressed);
+ return saveTIFF (fname, bps, isFloat, uncompressed);
}
virtual void setSaveProgressListener (ProgressListener* pl)
{
@@ -100,10 +100,127 @@ public:
delete this;
}
+ inline uint16_t DNG_FloatToHalf(float f)
+ {
+ union {
+ float f;
+ uint32_t i;
+ } tmp;
+
+ tmp.f = f;
+ int32_t sign = (tmp.i >> 16) & 0x00008000;
+ int32_t exponent = ((tmp.i >> 23) & 0x000000ff) - (127 - 15);
+ int32_t mantissa = tmp.i & 0x007fffff;
+ if (exponent <= 0) {
+ if (exponent < -10) {
+ return (uint16_t)sign;
+ }
+ mantissa = (mantissa | 0x00800000) >> (1 - exponent);
+ if (mantissa & 0x00001000)
+ mantissa += 0x00002000;
+ return (uint16_t)(sign | (mantissa >> 13));
+ } else if (exponent == 0xff - (127 - 15)) {
+ if (mantissa == 0) {
+ return (uint16_t)(sign | 0x7c00);
+ } else {
+ return (uint16_t)(sign | 0x7c00 | (mantissa >> 13));
+ }
+ }
+ if (mantissa & 0x00001000) {
+ mantissa += 0x00002000;
+ if (mantissa & 0x00800000) {
+ mantissa = 0; // overflow in significand,
+ exponent += 1; // adjust exponent
+ }
+ }
+ if (exponent > 30) {
+ return (uint16_t)(sign | 0x7c00); // infinity with the same sign as f.
+ }
+ return (uint16_t)(sign | (exponent << 10) | (mantissa >> 13));
+ }
+
+ // From DNG SDK dng_utils.h
+ inline float DNG_HalfToFloat(uint16_t halfValue)
+ {
+ union {
+ float f;
+ uint32_t i;
+ } tmp;
+
+ int32_t sign = (halfValue >> 15) & 0x00000001;
+ int32_t exponent = (halfValue >> 10) & 0x0000001f;
+ int32_t mantissa = halfValue & 0x000003ff;
+ if (exponent == 0) {
+ if (mantissa == 0) {
+ // Plus or minus zero
+ tmp.i = (uint32_t) (sign << 31);
+ return tmp.f;
+ } else {
+ // Denormalized number -- renormalize it
+ while (!(mantissa & 0x00000400)) {
+ mantissa <<= 1;
+ exponent -= 1;
+ }
+ exponent += 1;
+ mantissa &= ~0x00000400;
+ }
+ } else if (exponent == 31) {
+ if (mantissa == 0) {
+ // Positive or negative infinity, convert to maximum (16 bit) values.
+ tmp.i = (uint32_t)((sign << 31) | ((0x1eL + 127 - 15) << 23) | (0x3ffL << 13));
+ return tmp.f;
+ } else {
+ // Nan -- Just set to zero.
+ return 0;
+ }
+ }
+ // Normalized number
+ exponent += (127 - 15);
+ mantissa <<= 13;
+ // Assemble sign, exponent and mantissa.
+ tmp.i = (uint32_t) ((sign << 31) | (exponent << 23) | mantissa);
+ return tmp.f;
+ }
+
+ inline uint32_t DNG_FP24ToFloat(const uint8_t * input)
+ {
+ int32_t sign = (input [0] >> 7) & 0x01;
+ int32_t exponent = (input [0] ) & 0x7F;
+ int32_t mantissa = (((int32_t) input [1]) << 8) | input[2];
+ if (exponent == 0) {
+ if (mantissa == 0) {
+ // Plus or minus zero
+ return (uint32_t) (sign << 31);
+ } else {
+ // Denormalized number -- renormalize it
+ while (!(mantissa & 0x00010000)) {
+ mantissa <<= 1;
+ exponent -= 1;
+ }
+ exponent += 1;
+ mantissa &= ~0x00010000;
+ }
+ } else if (exponent == 127) {
+ if (mantissa == 0) {
+ // Positive or negative infinity, convert to maximum (24 bit) values.
+ return (uint32_t) ((sign << 31) | ((0x7eL + 128 - 64) << 23) | (0xffffL << 7));
+ } else {
+ // Nan -- Just set to zero.
+ return 0;
+ }
+ }
+ // Normalized number
+ exponent += (128 - 64);
+ mantissa <<= 7;
+ // Assemble sign, exponent and mantissa.
+ return (uint32_t) ((sign << 31) | (exponent << 23) | mantissa);
+ }
+
virtual void normalizeFloat(float srcMinVal, float srcMaxVal);
void normalizeFloatTo1();
void normalizeFloatTo65535();
void calcCroppedHistogram(const ProcParams ¶ms, float scale, LUTu & hist);
+ void ExecCMSTransform2(cmsHTRANSFORM hTransform);
void ExecCMSTransform(cmsHTRANSFORM hTransform);
void ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy);
diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc
index 6c70869ec..08922e436 100644
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -1027,6 +1027,9 @@ int ImageIO::savePNG (Glib::ustring fname, volatile int bps)
if (bps < 0) {
bps = getBPS ();
}
+ if (bps > 16) {
+ bps = 16;
+ }
png_set_IHDR(png, info, width, height, bps, PNG_COLOR_TYPE_RGB,
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_BASE);
@@ -1298,13 +1301,12 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp)
return IMIO_SUCCESS;
}
-int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed)
+int ImageIO::saveTIFF (Glib::ustring fname, int bps, float isFloat, bool uncompressed)
{
if (getWidth() < 1 || getHeight() < 1) {
return IMIO_HEADERERROR;
}
- //TODO: Handling 32 bits floating point output images!
bool writeOk = true;
int width = getWidth ();
int height = getHeight ();
@@ -1456,26 +1458,36 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed)
TIFFSetField (out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
TIFFSetField (out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
TIFFSetField (out, TIFFTAG_COMPRESSION, uncompressed ? COMPRESSION_NONE : COMPRESSION_ADOBE_DEFLATE);
- TIFFSetField (out, TIFFTAG_SAMPLEFORMAT, bps == 32 ? SAMPLEFORMAT_IEEEFP : SAMPLEFORMAT_UINT);
+ TIFFSetField (out, TIFFTAG_SAMPLEFORMAT, (bps == 16 || bps == 32) && isFloat ? SAMPLEFORMAT_IEEEFP : SAMPLEFORMAT_UINT);
if (!uncompressed) {
- TIFFSetField (out, TIFFTAG_PREDICTOR, bps == 32 ? PREDICTOR_FLOATINGPOINT : PREDICTOR_HORIZONTAL);
+ TIFFSetField (out, TIFFTAG_PREDICTOR, (bps == 16 || bps == 32) && isFloat ? PREDICTOR_FLOATINGPOINT : PREDICTOR_HORIZONTAL);
}
if (profileData) {
TIFFSetField (out, TIFFTAG_ICCPROFILE, profileLength, profileData);
}
for (int row = 0; row < height; row++) {
- getScanline (row, linebuffer, bps);
+ getScanline (row, linebuffer, bps, isFloat);
- if(needsReverse && !uncompressed && bps == 32) {
- for(int i = 0; i < lineWidth; i += 4) {
- char temp = linebuffer[i];
- linebuffer[i] = linebuffer[i + 3];
- linebuffer[i + 3] = temp;
- temp = linebuffer[i + 1];
- linebuffer[i + 1] = linebuffer[i + 2];
- linebuffer[i + 2] = temp;
+ if (bps == 16) {
+ if(needsReverse && !uncompressed && isFloat) {
+ for(int i = 0; i < lineWidth; i += 2) {
+ char temp = linebuffer[i];
+ linebuffer[i] = linebuffer[i + 1];
+ linebuffer[i + 1] = temp;
+ }
+ }
+ } else if (bps == 32) {
+ if(needsReverse && !uncompressed) {
+ for(int i = 0; i < lineWidth; i += 4) {
+ char temp = linebuffer[i];
+ linebuffer[i] = linebuffer[i + 3];
+ linebuffer[i + 3] = temp;
+ temp = linebuffer[i + 1];
+ linebuffer[i + 1] = linebuffer[i + 2];
+ linebuffer[i + 2] = temp;
+ }
}
}
diff --git a/rtengine/imageio.h b/rtengine/imageio.h
index 294a3d476..cbf245291 100644
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@@ -112,8 +112,8 @@ public:
}
virtual int getBPS () = 0;
- virtual void getScanline (int row, unsigned char* buffer, int bps) {}
- virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples = 3, float minValue[3] = nullptr, float maxValue[3] = nullptr) {}
+ virtual void getScanline (int row, unsigned char* buffer, int bps, bool isFloat = false) {}
+ virtual void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples = 3) {}
virtual bool readImage (Glib::ustring &fname, FILE *fh)
{
@@ -138,7 +138,7 @@ public:
int savePNG (Glib::ustring fname, volatile int bps = -1);
int saveJPEG (Glib::ustring fname, int quality = 100, int subSamp = 3);
- int saveTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false);
+ int saveTIFF (Glib::ustring fname, int bps = -1, float isFloat = false, bool uncompressed = false);
cmsHPROFILE getEmbeddedProfile ()
{
diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h
index c0565a4a3..e01f22b16 100644
--- a/rtengine/imagesource.h
+++ b/rtengine/imagesource.h
@@ -68,7 +68,7 @@ public:
virtual ~ImageSource () {}
virtual int load (const Glib::ustring &fname) = 0;
virtual void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) {};
- virtual void demosaic (const RAWParams &raw) {};
+ virtual void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) {};
virtual void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI) {};
virtual void retinexPrepareCurves (const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI) {};
virtual void retinexPrepareBuffers (const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D &conversionBuffer, LUTu &lhist16RETI) {};
@@ -80,6 +80,7 @@ public:
virtual bool isRGBSourceModified () const = 0; // tracks whether cached rgb output of demosaic has been modified
+ virtual void setBorder (unsigned int border) {}
virtual void setCurrentFrame (unsigned int frameNum) = 0;
virtual int getFrameCount () = 0;
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index cba4174a4..63e932eca 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -29,6 +29,11 @@
#include
#include "iccstore.h"
+#include
+#include
+#include
+#include "color.h"
+
#ifdef _OPENMP
#include
#endif
@@ -96,7 +101,7 @@ ImProcCoordinator::ImProcCoordinator()
fw(0), fh(0), tr(0),
fullw(1), fullh(1),
pW(-1), pH(-1),
- plistener(nullptr), awbListener(nullptr), imageListener(nullptr), aeListener(nullptr), acListener(nullptr), abwListener(nullptr), actListener(nullptr), adnListener(nullptr), awavListener(nullptr), dehaListener(nullptr), frameCountListener(nullptr), imageTypeListener(nullptr), hListener(nullptr),
+ plistener(nullptr), imageListener(nullptr), aeListener(nullptr), acListener(nullptr), abwListener(nullptr), awbListener(nullptr), frameCountListener(nullptr), imageTypeListener(nullptr), actListener(nullptr), adnListener(nullptr), awavListener(nullptr), dehaListener(nullptr), hListener(nullptr),
resultValid(false), lastOutputProfile("BADFOOD"), lastOutputIntent(RI__COUNT), lastOutputBPC(false), thread(nullptr), changeSinceLast(0), updaterRunning(false), destroying(false), utili(false), autili(false),
butili(false), ccutili(false), cclutili(false), clcutili(false), opautili(false), wavcontlutili(false),
locallutili(false), localcutili(false), localskutili(false), localexutili(false), LHutili(false), HHutili(false),
@@ -258,8 +263,17 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
printf("Demosaic X-Trans image with using method: %s\n", rp.xtranssensor.method.c_str());
}
}
+ if(imgsrc->getSensorType() == ST_BAYER) {
+ if(params.raw.bayersensor.method != RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
+ imgsrc->setBorder(params.raw.bayersensor.border);
+ } else {
+ imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
+ }
+ }
+ bool autoContrast = false;
+ double contrastThreshold = 0.f;
+ imgsrc->demosaic(rp, autoContrast, contrastThreshold); //enabled demosaic
- imgsrc->demosaic(rp); //enabled demosaic
// if a demosaic happened we should also call getimage later, so we need to set the M_INIT flag
todo |= M_INIT;
@@ -340,6 +354,30 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
awbListener->WBChanged(params.wb.temperature, params.wb.green);
}
+ /*
+ GammaValues g_a;
+ double pwr = 1.0 / params.icm.gampos;
+ double ts = params.icm.slpos;
+
+
+ int mode = 0;
+ Color::calcGamma(pwr, ts, mode, g_a); // call to calcGamma with selected gamma and slope
+ printf("ga[0]=%f ga[1]=%f ga[2]=%f ga[3]=%f ga[4]=%f\n", g_a[0],g_a[1],g_a[2],g_a[3],g_a[4]);
+
+ Glib::ustring datal;
+ datal = "lutsrgb.txt";
+ ofstream fou(datal, ios::out | ios::trunc);
+
+ for(int i=0; i < 212; i++) {
+ //printf("igamma2=%i\n", (int) 65535.f*Color::igamma2(i/212.0));
+ float gam = Color::igamma2(i/211.0);
+ int lutga = nearbyint(65535.f* gam);
+ // fou << 65535*(int)Color::igamma2(i/212.0) << endl;
+ fou << i << " " << lutga << endl;
+
+ }
+ fou.close();
+ */
int tr = getCoarseBitMask(params.coarse);
imgsrc->getFullSize(fw, fh, tr);
@@ -438,9 +476,9 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
const int W = oprevi->getWidth();
const int H = oprevi->getHeight();
LabImage labcbdl(W, H);
- ipf.rgb2lab(*oprevi, labcbdl, params.icm.working);
+ ipf.rgb2lab(*oprevi, labcbdl, params.icm.workingProfile);
ipf.dirpyrequalizer(&labcbdl, scale);
- ipf.lab2rgb(labcbdl, *oprevi, params.icm.working);
+ ipf.lab2rgb(labcbdl, *oprevi, params.icm.workingProfile);
}
readyphase++;
@@ -462,7 +500,9 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
}
if (params.toneCurve.histmatching) {
- imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
+ if (!params.toneCurve.fromHistMatching) {
+ imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
+ }
if (params.toneCurve.autoexp) {
params.toneCurve.expcomp = 0.0;
@@ -474,6 +514,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
params.toneCurve.brightness = 0;
params.toneCurve.contrast = 0;
params.toneCurve.black = 0;
+ params.toneCurve.fromHistMatching = true;
if (aeListener) {
aeListener->autoMatchedToneCurveChanged(params.toneCurve.curveMode, params.toneCurve.curve);
@@ -483,6 +524,48 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
progress("Exposure curve & CIELAB conversion...", 100 * readyphase / numofphases);
+ if (todo & (M_AUTOEXP | M_RGBCURVE)) {
+ if (params.icm.workingTRC == "Custom") { //exec TRC IN free
+ Glib::ustring profile;
+ profile = params.icm.workingProfile;
+
+ if (profile == "sRGB" || profile == "Adobe RGB" || profile == "ProPhoto" || profile == "WideGamut" || profile == "BruceRGB" || profile == "Beta RGB" || profile == "BestRGB" || profile == "Rec2020" || profile == "ACESp0" || profile == "ACESp1") {
+ int cw = oprevi->getWidth();
+ int ch = oprevi->getHeight();
+ // put gamma TRC to 1
+ Imagefloat* readyImg0 = NULL;
+ readyImg0 = ipf.workingtrc(oprevi, cw, ch, -5, params.icm.workingProfile, 2.4, 12.92310);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ oprevi->r(row, col) = (float)readyImg0->r(row, col);
+ oprevi->g(row, col) = (float)readyImg0->g(row, col);
+ oprevi->b(row, col) = (float)readyImg0->b(row, col);
+ }
+ }
+
+ delete readyImg0;
+ //adjust TRC
+ Imagefloat* readyImg = NULL;
+ readyImg = ipf.workingtrc(oprevi, cw, ch, 5, params.icm.workingProfile, params.icm.workingTRCGamma, params.icm.workingTRCSlope);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ oprevi->r(row, col) = (float)readyImg->r(row, col);
+ oprevi->g(row, col) = (float)readyImg->g(row, col);
+ oprevi->b(row, col) = (float)readyImg->b(row, col);
+ }
+ }
+
+ delete readyImg;
+
+ }
+ }
+ }
+
+
if ((todo & M_RGBCURVE) || (todo & M_CROP)) {
// if (hListener) oprevi->calcCroppedHistogram(params, scale, histCropped);
@@ -501,7 +584,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
opautili = false;
if (params.colorToning.enabled) {
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params.icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params.icm.workingProfile);
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
@@ -614,6 +697,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
lhist16(32768);
if (todo & (M_LUMACURVE | M_CROP)) {
+ LUTu lhist16(32768);
lhist16.clear();
#ifdef _OPENMP
const int numThreads = min(max(pW * pH / (int)lhist16.getSize(), 1), omp_get_max_threads());
@@ -933,8 +1017,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
}
// Update the monitor color transform if necessary
- if ((todo & M_MONITOR) || (lastOutputProfile != params.icm.output) || lastOutputIntent != params.icm.outputIntent || lastOutputBPC != params.icm.outputBPC) {
- lastOutputProfile = params.icm.output;
+ if ((todo & M_MONITOR) || (lastOutputProfile != params.icm.outputProfile) || lastOutputIntent != params.icm.outputIntent || lastOutputBPC != params.icm.outputBPC) {
+ lastOutputProfile = params.icm.outputProfile;
lastOutputIntent = params.icm.outputIntent;
lastOutputBPC = params.icm.outputBPC;
ipf.updateColorProfiles(monitorProfile, monitorIntent, softProof, gamutCheck);
@@ -1194,7 +1278,7 @@ bool ImProcCoordinator::getAutoWB(double& temp, double& green, double equal, dou
}
}
-void ImProcCoordinator::getCamWB(double & temp, double & green)
+void ImProcCoordinator::getCamWB(double& temp, double& green)
{
if (imgsrc) {
@@ -1203,7 +1287,7 @@ void ImProcCoordinator::getCamWB(double & temp, double & green)
}
}
-void ImProcCoordinator::getSpotWB(int x, int y, int rect, double & temp, double & tgreen)
+void ImProcCoordinator::getSpotWB(int x, int y, int rect, double& temp, double& tgreen)
{
ColorTemp ret;
@@ -1270,13 +1354,13 @@ void ImProcCoordinator::getAutoCrop(double ratio, int &x, int &y, int &w, int &h
y = (fullh - h) / 2;
}
-void ImProcCoordinator::setMonitorProfile(const Glib::ustring & profile, RenderingIntent intent)
+void ImProcCoordinator::setMonitorProfile(const Glib::ustring& profile, RenderingIntent intent)
{
monitorProfile = profile;
monitorIntent = intent;
}
-void ImProcCoordinator::getMonitorProfile(Glib::ustring & profile, RenderingIntent & intent) const
+void ImProcCoordinator::getMonitorProfile(Glib::ustring& profile, RenderingIntent& intent) const
{
profile = monitorProfile;
intent = monitorIntent;
@@ -1288,7 +1372,7 @@ void ImProcCoordinator::setSoftProofing(bool softProof, bool gamutCheck)
this->gamutCheck = gamutCheck;
}
-void ImProcCoordinator::getSoftProofing(bool & softProof, bool & gamutCheck)
+void ImProcCoordinator::getSoftProofing(bool &softProof, bool &gamutCheck)
{
softProof = this->softProof;
gamutCheck = this->gamutCheck;
@@ -1299,7 +1383,7 @@ void ImProcCoordinator::setSharpMask(bool sharpMask)
this->sharpMask = sharpMask;
}
-void ImProcCoordinator::saveInputICCReference(const Glib::ustring & fname, bool apply_wb)
+void ImProcCoordinator::saveInputICCReference(const Glib::ustring& fname, bool apply_wb)
{
MyMutex::MyLock lock(mProcessing);
@@ -1312,10 +1396,11 @@ void ImProcCoordinator::saveInputICCReference(const Glib::ustring & fname, bool
PreviewProps pp(0, 0, fW, fH, 1);
ProcParams ppar = params;
ppar.toneCurve.hrenabled = false;
- ppar.icm.input = "(none)";
+ ppar.icm.inputProfile = "(none)";
Imagefloat* im = new Imagefloat(fW, fH);
imgsrc->preprocess(ppar.raw, ppar.lensProf, ppar.coarse);
- imgsrc->demosaic(ppar.raw);
+ double dummy = 0.0;
+ imgsrc->demosaic(ppar.raw, false, dummy);
ColorTemp currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
if (params.wb.method == "Camera") {
diff --git a/rtengine/improccoordinator.h b/rtengine/improccoordinator.h
index c299d5b43..cb04e00c9 100644
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -177,17 +177,17 @@ protected:
int pW, pH;
ProgressListener* plistener;
- AutoWBListener* awbListener;
PreviewImageListener* imageListener;
AutoExpListener* aeListener;
AutoCamListener* acListener;
AutoBWListener* abwListener;
+ AutoWBListener* awbListener;
+ FrameCountListener *frameCountListener;
+ ImageTypeListener *imageTypeListener;
AutoColorTonListener* actListener;
AutoChromaListener* adnListener;
WaveletListener* awavListener;
RetinexListener* dehaListener;
- FrameCountListener *frameCountListener;
- ImageTypeListener *imageTypeListener;
HistogramListener* hListener;
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 08072550c..53c10f2e6 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -312,7 +312,7 @@ void ImProcFunctions::updateColorProfiles(const Glib::ustring& monitorProfile, R
#if !defined(__APPLE__) // No support for monitor profiles on OS X, all data is sRGB
monitor = ICCStore::getInstance()->getProfile(monitorProfile);
#else
- monitor = ICCStore::getInstance()->getProfile("RT_sRGB");
+ monitor = ICCStore::getInstance()->getProfile (options.rtSettings.srgb);
#endif
}
@@ -342,8 +342,7 @@ void ImProcFunctions::updateColorProfiles(const Glib::ustring& monitorProfile, R
outIntent = settings->printerIntent;
} else {
- oprof = ICCStore::getInstance()->getProfile(params->icm.output);
-
+ oprof = ICCStore::getInstance()->getProfile(params->icm.outputProfile);
if (params->icm.outputBPC) {
flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
}
@@ -421,7 +420,7 @@ void ImProcFunctions::updateColorProfiles(const Glib::ustring& monitorProfile, R
void ImProcFunctions::firstAnalysis(const Imagefloat* const original, const ProcParams ¶ms, LUTu & histogram)
{
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params.icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.workingProfile);
lumimul[0] = wprof[1][0];
lumimul[1] = wprof[1][1];
@@ -986,7 +985,7 @@ void ImProcFunctions::ciecam_02float(CieImage* ncie, float adap, int pW, int pwb
//matrix for current working space
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.workingProfile);
const float wip[3][3] = {
{ (float)wiprof[0][0], (float)wiprof[0][1], (float)wiprof[0][2]},
{ (float)wiprof[1][0], (float)wiprof[1][1], (float)wiprof[1][2]},
@@ -2076,8 +2075,8 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
}
}
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params->icm.workingProfile);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.workingProfile);
float toxyz[3][3] = {
{
@@ -2186,7 +2185,7 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
hald_clut = CLUTStore::getInstance().getClut(params->filmSimulation.clutFilename);
if (hald_clut) {
- clutAndWorkingProfilesAreSame = hald_clut->getProfile() == params->icm.working;
+ clutAndWorkingProfilesAreSame = hald_clut->getProfile() == params->icm.workingProfile;
if (!clutAndWorkingProfilesAreSame) {
xyz2clut = ICCStore::getInstance()->workingSpaceInverseMatrix(hald_clut->getProfile());
@@ -2215,7 +2214,7 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
const float comp = (max(0.0, expcomp) + 1.0) * hlcompr / 100.0;
const float shoulder = ((65536.0 / max(1.0f, exp_scale)) * (hlcomprthresh / 200.0)) + 0.1;
const float hlrange = 65536.0 - shoulder;
- const bool isProPhoto = (params->icm.working == "ProPhoto");
+ const bool isProPhoto = (params->icm.workingProfile == "ProPhoto");
// extracting datas from 'params' to avoid cache flush (to be confirmed)
ToneCurveParams::TcMode curveMode = params->toneCurve.curveMode;
ToneCurveParams::TcMode curveMode2 = params->toneCurve.curveMode2;
@@ -2232,12 +2231,12 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
if (hasToneCurve1 && curveMode == ToneCurveParams::TcMode::PERCEPTUAL) {
const PerceptualToneCurve& userToneCurve = static_cast(customToneCurve1);
- userToneCurve.initApplyState(ptc1ApplyState, params->icm.working);
+ userToneCurve.initApplyState (ptc1ApplyState, params->icm.workingProfile);
}
if (hasToneCurve2 && curveMode2 == ToneCurveParams::TcMode::PERCEPTUAL) {
const PerceptualToneCurve& userToneCurve = static_cast(customToneCurve2);
- userToneCurve.initApplyState(ptc2ApplyState, params->icm.working);
+ userToneCurve.initApplyState (ptc2ApplyState, params->icm.workingProfile);
}
bool hasColorToning = params->colorToning.enabled && bool (ctOpacityCurve) && bool (ctColorCurve) && params->colorToning.method != "LabGrid";
@@ -2290,15 +2289,15 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
float Balan = float (params->colorToning.balance);
- float chMixRR = float (params->chmixer.red[0]);
- float chMixRG = float (params->chmixer.red[1]);
- float chMixRB = float (params->chmixer.red[2]);
- float chMixGR = float (params->chmixer.green[0]);
- float chMixGG = float (params->chmixer.green[1]);
- float chMixGB = float (params->chmixer.green[2]);
- float chMixBR = float (params->chmixer.blue[0]);
- float chMixBG = float (params->chmixer.blue[1]);
- float chMixBB = float (params->chmixer.blue[2]);
+ float chMixRR = float (params->chmixer.red[0])/10.f;
+ float chMixRG = float (params->chmixer.red[1])/10.f;
+ float chMixRB = float (params->chmixer.red[2])/10.f;
+ float chMixGR = float (params->chmixer.green[0])/10.f;
+ float chMixGG = float (params->chmixer.green[1])/10.f;
+ float chMixGB = float (params->chmixer.green[2])/10.f;
+ float chMixBR = float (params->chmixer.blue[0])/10.f;
+ float chMixBG = float (params->chmixer.blue[1])/10.f;
+ float chMixBB = float (params->chmixer.blue[2])/10.f;
bool blackwhite = params->blackwhite.enabled;
bool complem = params->blackwhite.enabledcc;
@@ -3230,7 +3229,8 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
}
}
-
+ softLight(rtemp, gtemp, btemp, istart, jstart, tW, tH, TS);
+
if (!blackwhite) {
if (editImgFloat || editWhatever) {
for (int i = istart, ti = 0; i < tH; i++, ti++) {
@@ -4137,24 +4137,22 @@ void ImProcFunctions::labtoning(float r, float g, float b, float &ro, float &go,
// get the opacity and tweak it to preserve saturated colors
//float l_ = Color::gamma_srgb(l*65535.f)/65535.f;
- float opacity;
- opacity = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)) * ctOpacityCurve.lutOpacityCurve[l * 500.f];
+ float opacity = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)) * ctOpacityCurve.lutOpacityCurve[l * 500.f];
float opacity2 = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity));
- //float ro, go, bo;
- float lm = l;
- float chromat, luma;
+ l *= 65535.f;
+ float chromat = 0.f, luma = 0.f;
- if (clToningcurve[lm * 65535.f] / (lm * 65535.f) < 1.f) {
- chromat = (clToningcurve[(lm) * 65535.f] / (lm * 65535.f)) - 1.f; //special effect
- } else {
- chromat = 1.f - SQR(SQR((lm * 65535.f) / clToningcurve[(lm) * 65535.f])); //apply C=f(L) acts on 'a' and 'b'
+ if (clToningcurve[l] < l) {
+ chromat = clToningcurve[l] / l - 1.f; //special effect
+ } else if (clToningcurve[l] > l) {
+ chromat = 1.f - SQR(SQR(l / clToningcurve[l])); //apply C=f(L) acts on 'a' and 'b'
}
- if (cl2Toningcurve[lm * 65535.f] / (lm * 65535.f) < 1.f) {
- luma = (cl2Toningcurve[(lm) * 65535.f] / (lm * 65535.f)) - 1.f; //special effect
- } else {
- luma = 1.f - SQR(SQR((lm * 65535.f) / (cl2Toningcurve[(lm) * 65535.f]))); //apply C2=f(L) acts only on 'b'
+ if (cl2Toningcurve[l] < l) {
+ luma = cl2Toningcurve[l] / l - 1.f; //special effect
+ } else if (cl2Toningcurve[l] > l) {
+ luma = 1.f - SQR(SQR(l / cl2Toningcurve[l])); //apply C2=f(L) acts only on 'b'
}
if (algm == 1) {
@@ -4185,22 +4183,8 @@ void ImProcFunctions::luminanceCurve(LabImage* lold, LabImage* lnew, LUTf & curv
void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW, LabImage* lold, LabImage* lnew, LUTf & acurve, LUTf & bcurve, LUTf & satcurve, LUTf & lhskcurve, LUTf & clcurve, LUTf & curve, bool utili, bool autili, bool butili, bool ccutili, bool cclutili, bool clcutili, LUTu &histCCurve, LUTu &histLCurve)
{
- if (!params->labCurve.enabled) {
- if (params->blackwhite.enabled && !params->colorToning.enabled) {
- for (int i = 0; i < lnew->H; ++i) {
- for (int j = 0; j < lnew->W; ++j) {
- lnew->a[i][j] = lnew->b[i][j] = 0.f;
- }
- }
- }
-
- return;
- }
-
int W = lold->W;
int H = lold->H;
- // lhskcurve.dump("lh_curve");
- //init Flatcurve for C=f(H)
PlanarWhateverData* editWhatever = nullptr;
EditUniqueID editID = EUID_None;
@@ -4226,6 +4210,25 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
}
}
+ if (!params->labCurve.enabled) {
+ if (editPipette && (editID == EUID_Lab_LCurve || editID == EUID_Lab_aCurve || editID == EUID_Lab_bCurve || editID == EUID_Lab_LHCurve || editID == EUID_Lab_CHCurve || editID == EUID_Lab_HHCurve || editID == EUID_Lab_CLCurve || editID == EUID_Lab_CCurve || editID == EUID_Lab_LCCurve)) {
+ // fill pipette buffer with zeros to avoid crashes
+ editWhatever->fill(0.f);
+ }
+ if (params->blackwhite.enabled && !params->colorToning.enabled) {
+ for (int i = 0; i < lnew->H; ++i) {
+ for (int j = 0; j < lnew->W; ++j) {
+ lnew->a[i][j] = lnew->b[i][j] = 0.f;
+ }
+ }
+ }
+ return;
+ }
+
+ // lhskcurve.dump("lh_curve");
+ //init Flatcurve for C=f(H)
+
+
FlatCurve* chCurve = nullptr;// curve C=f(H)
bool chutili = false;
@@ -4302,19 +4305,19 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
// if(params->labCurve.avoidclip ){
// parameter to adapt curve C=f(C) to gamut
- if (params->icm.working == "ProPhoto") {
+ if (params->icm.workingProfile == "ProPhoto") {
adjustr = 1.2f; // 1.2 instead 1.0 because it's very rare to have C>170..
- } else if (params->icm.working == "Adobe RGB") {
+ } else if (params->icm.workingProfile == "Adobe RGB") {
adjustr = 1.8f;
- } else if (params->icm.working == "sRGB") {
+ } else if (params->icm.workingProfile == "sRGB") {
adjustr = 2.0f;
- } else if (params->icm.working == "WideGamut") {
+ } else if (params->icm.workingProfile == "WideGamut") {
adjustr = 1.2f;
- } else if (params->icm.working == "Beta RGB") {
+ } else if (params->icm.workingProfile == "Beta RGB") {
adjustr = 1.4f;
- } else if (params->icm.working == "BestRGB") {
+ } else if (params->icm.workingProfile == "BestRGB") {
adjustr = 1.4f;
- } else if (params->icm.working == "BruceRGB") {
+ } else if (params->icm.workingProfile == "BruceRGB") {
adjustr = 1.8f;
}
@@ -4381,14 +4384,14 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
const bool gamutLch = settings->gamutLch;
const float amountchroma = (float) settings->amchroma;
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.workingProfile);
const double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
{wiprof[2][0], wiprof[2][1], wiprof[2][2]}
};
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params->icm.workingProfile);
const double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
@@ -5629,7 +5632,7 @@ void ImProcFunctions::getAutoExp(const LUTu &histogram, int histcompr, double cl
//now tune hlcompr to bring back rawmax to 65535
- hlcomprthresh = 33;
+ hlcomprthresh = 0;
//this is a series approximation of the actual formula for comp,
//which is a transcendental equation
float comp = (gain * ((float)whiteclip) / scale - 1.f) * 2.3f; // 2.3 instead of 2 to increase slightly comp
@@ -5910,10 +5913,11 @@ void ImProcFunctions::lab2rgb(const LabImage &src, Imagefloat &dst, const Glib::
void ImProcFunctions::colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread)
{
const float factor = ColorToningParams::LABGRID_CORR_MAX * 3.f;
- float a_scale = (params->colorToning.labgridAHigh - params->colorToning.labgridALow) / factor;
- float a_base = params->colorToning.labgridALow;
- float b_scale = (params->colorToning.labgridBHigh - params->colorToning.labgridBLow) / factor;
- float b_base = params->colorToning.labgridBLow;
+ const float scaling = ColorToningParams::LABGRID_CORR_SCALE;
+ float a_scale = (params->colorToning.labgridAHigh - params->colorToning.labgridALow) / factor / scaling;
+ float a_base = params->colorToning.labgridALow / scaling;
+ float b_scale = (params->colorToning.labgridBHigh - params->colorToning.labgridBLow) / factor / scaling;
+ float b_base = params->colorToning.labgridBLow / scaling;
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index bde24a6f8..c67a586a1 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -401,10 +401,12 @@ public:
void localContrast(LabImage *lab);
void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread);
void shadowsHighlights(LabImage *lab);
+ void softLight(float *red, float *green, float *blue, int istart, int jstart, int tW, int tH, int TS);
Image8* lab2rgb(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings = true);
- Imagefloat* lab2rgbOut(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, GammaValues *ga = nullptr);
+ Imagefloat* lab2rgbOut(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm);
// CieImage *ciec;
+ Imagefloat* workingtrc(Imagefloat* working, int cw, int ch, int mul, Glib::ustring profile, double gampos, double slpos);
bool transCoord(int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr);
bool transCoord(int W, int H, const std::vector &src, std::vector &red, std::vector &green, std::vector &blue, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr);
diff --git a/rtengine/iplab2rgb.cc b/rtengine/iplab2rgb.cc
index 4838ea1f7..c4707f16f 100644
--- a/rtengine/iplab2rgb.cc
+++ b/rtengine/iplab2rgb.cc
@@ -26,7 +26,6 @@
#include "curves.h"
#include "alignedbuffer.h"
#include "color.h"
-
namespace rtengine
{
@@ -93,7 +92,7 @@ inline void copyAndClamp(const LabImage *src, unsigned char *dst, const double r
//
// If monitorTransform, divide by 327.68 then apply monitorTransform (which can integrate soft-proofing)
// otherwise divide by 327.68, convert to xyz and apply the sRGB transform, before converting with gamma2curve
-void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image)
+void ImProcFunctions::lab2monitorRgb(LabImage* lab, Image8* image)
{
if (monitorTransform) {
@@ -111,11 +110,12 @@ void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image)
AlignedBuffer gwBuf1;
AlignedBuffer gwBuf2;
+
if (gamutWarning) {
gwBuf1.resize(3 * lab->W);
gwBuf2.resize(3 * lab->W);
}
-
+
float *buffer = pBuf.data;
float *outbuffer = mBuf.data;
@@ -160,7 +160,7 @@ void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image)
//
// If output profile used, divide by 327.68 then apply the "profile" profile (eventually with a standard gamma)
// otherwise divide by 327.68, convert to xyz and apply the RGB transform, before converting with gamma2curve
-Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings)
+Image8* ImProcFunctions::lab2rgb(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings)
{
//gamutmap(lab);
@@ -180,23 +180,25 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
ch = lab->H - cy;
}
- Image8* image = new Image8 (cw, ch);
+ Image8* image = new Image8(cw, ch);
Glib::ustring profile;
bool standard_gamma;
- if(settings->HistogramWorking && consider_histogram_settings) {
- profile = icm.working;
+ if (settings->HistogramWorking && consider_histogram_settings) {
+ profile = icm.workingProfile;
standard_gamma = true;
} else {
- profile = icm.output;
- if (icm.output.empty() || icm.output == ColorManagementParams::NoICMString) {
+ profile = icm.outputProfile;
+
+ if (icm.outputProfile.empty() || icm.outputProfile == ColorManagementParams::NoICMString) {
profile = "sRGB";
}
+
standard_gamma = false;
}
- cmsHPROFILE oprof = ICCStore::getInstance()->getProfile (profile);
+ cmsHPROFILE oprof = ICCStore::getInstance()->getProfile(profile);
if (oprof) {
cmsHPROFILE oprofG = oprof;
@@ -206,14 +208,16 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
}
cmsUInt32Number flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE;
+
if (icm.outputBPC) {
flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
}
- lcmsMutex->lock ();
+
+ lcmsMutex->lock();
cmsHPROFILE LabIProf = cmsCreateLab4Profile(nullptr);
cmsHTRANSFORM hTransform = cmsCreateTransform (LabIProf, TYPE_Lab_DBL, oprofG, TYPE_RGB_FLT, icm.outputIntent, flags); // NOCACHE is important for thread safety
cmsCloseProfile(LabIProf);
- lcmsMutex->unlock ();
+ lcmsMutex->unlock();
unsigned char *data = image->data;
@@ -256,7 +260,7 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
cmsCloseProfile(oprofG);
}
} else {
- const auto xyz_rgb = ICCStore::getInstance()->workingSpaceInverseMatrix (profile);
+ const auto xyz_rgb = ICCStore::getInstance()->workingSpaceInverseMatrix(profile);
copyAndClamp(lab, image->data, xyz_rgb, multiThread);
}
@@ -279,7 +283,7 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
* If a custom gamma profile can be created, divide by 327.68, convert to xyz and apply the custom gamma transform
* otherwise divide by 327.68, convert to xyz and apply the sRGB transform, before converting with gamma2curve
*/
-Imagefloat* ImProcFunctions::lab2rgbOut (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, GammaValues *ga)
+Imagefloat* ImProcFunctions::lab2rgbOut(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm)
{
if (cx < 0) {
@@ -298,27 +302,92 @@ Imagefloat* ImProcFunctions::lab2rgbOut (LabImage* lab, int cx, int cy, int cw,
ch = lab->H - cy;
}
- Imagefloat* image = new Imagefloat (cw, ch);
+ Imagefloat* image = new Imagefloat(cw, ch);
cmsHPROFILE oprof = nullptr;
- if (ga) {
- lcmsMutex->lock ();
- ICCStore::getInstance()->getGammaArray(icm, *ga);
- oprof = ICCStore::getInstance()->createGammaProfile(icm, *ga);
- lcmsMutex->unlock ();
- } else {
- oprof = ICCStore::getInstance()->getProfile (icm.output);
+
+ oprof = ICCStore::getInstance()->getProfile(icm.outputProfile);
+ Glib::ustring outtest = icm.outputProfile;
+ std::string fileis_RTv2 = outtest.substr(0, 4);
+ //printf("IsRTv2=%s\n", fileis_RTv2.c_str());
+ if(fileis_RTv2 == "RTv2") {//Only fot ICC v2 : read tag from desc to retrieve gamma and slope save before in generate ICC v2
+ //due to bug in LCMS in CmsToneCurve
+ //printf("icmout=%s \n",icm.output.c_str());
+ GammaValues g_b; //gamma parameters
+ const double eps = 0.000000001; // not divide by zero
+ double gammatag = 2.4;
+ double slopetag = 12.92310;
+ cmsMLU *modelDescMLU = (cmsMLU*) (cmsReadTag(oprof, cmsSigDeviceModelDescTag));
+ if (modelDescMLU) {
+ cmsUInt32Number count = cmsMLUgetWide(modelDescMLU, "en", "US", nullptr, 0); // get buffer length first
+ if (count) {
+ wchar_t *buffer = new wchar_t[count];
+ count = cmsMLUgetWide(modelDescMLU, "en", "US", buffer, count); // now put the string in the buffer
+ Glib::ustring modelDesc;
+#if __SIZEOF_WCHAR_T__ == 2
+ char* cModelDesc = g_utf16_to_utf8((unsigned short int*)buffer, -1, nullptr, nullptr, nullptr); // convert to utf-8 in a buffer allocated by glib
+ if (cModelDesc) {
+ modelDesc.assign(cModelDesc);
+ g_free(cModelDesc);
+ }
+#else
+ modelDesc = utf32_to_utf8(buffer, count);
+#endif
+ delete [] buffer;
+ if (!modelDesc.empty()) {
+ printf("dmdd=%s\n", modelDesc.c_str());
+
+ std::size_t pos = modelDesc.find("g");
+ std::size_t posmid = modelDesc.find("s");
+ std::size_t posend = modelDesc.find("!");
+ std::string strgamma = modelDesc.substr(pos + 1, (posmid - pos));
+ gammatag = std::stod(strgamma.c_str());
+ std::string strslope = modelDesc.substr(posmid + 1, (posend - posmid));
+ slopetag = std::stod(strslope.c_str());
+ // printf("gam=%f slo=%f\n", gammatag, slopetag);
+ }
+ } else {
+ printf("Error: lab2rgbOut / String length is null!\n");
+ }
+ } else {
+ printf("Error: lab2rgbOut / cmsReadTag/cmsSigDeviceModelDescTag failed!\n");
+ }
+
+ double pwr = 1.0 / gammatag;
+ double ts = slopetag;
+ double slope = slopetag == 0 ? eps : slopetag;
+
+ int mode = 0;
+ Color::calcGamma(pwr, ts, mode, g_b); // call to calcGamma with selected gamma and slope : return parameters for LCMS2
+ cmsFloat64Number gammaParams[7]; //gamma parameters
+ gammaParams[4] = g_b[3] * ts;
+ gammaParams[0] = gammatag;
+ gammaParams[1] = 1. / (1.0 + g_b[4]);
+ gammaParams[2] = g_b[4] / (1.0 + g_b[4]);
+ gammaParams[3] = 1. / slope;
+ gammaParams[5] = 0.0;
+ gammaParams[6] = 0.0;
+
+ cmsToneCurve* GammaTRC[3];
+
+ GammaTRC[0] = GammaTRC[1] = GammaTRC[2] = cmsBuildParametricToneCurve(nullptr, 5, gammaParams); //5 = smoother than 4
+ cmsWriteTag(oprof, cmsSigRedTRCTag, GammaTRC[0]);
+ cmsWriteTag(oprof, cmsSigGreenTRCTag, GammaTRC[1]);
+ cmsWriteTag(oprof, cmsSigBlueTRCTag, GammaTRC[2]);
+ cmsFreeToneCurve(GammaTRC[0]);
}
if (oprof) {
cmsUInt32Number flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE;
+
if (icm.outputBPC) {
flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
}
- lcmsMutex->lock ();
+
+ lcmsMutex->lock();
cmsHPROFILE iprof = cmsCreateLab4Profile(nullptr);
- cmsHTRANSFORM hTransform = cmsCreateTransform (iprof, TYPE_Lab_FLT, oprof, TYPE_RGB_FLT, icm.outputIntent, flags);
- lcmsMutex->unlock ();
+ cmsHTRANSFORM hTransform = cmsCreateTransform(iprof, TYPE_Lab_FLT, oprof, TYPE_RGB_FLT, icm.outputIntent, flags);
+ lcmsMutex->unlock();
image->ExecCMSTransform(hTransform, *lab, cx, cy);
cmsDeleteTransform(hTransform);
@@ -328,6 +397,7 @@ Imagefloat* ImProcFunctions::lab2rgbOut (LabImage* lab, int cx, int cy, int cw,
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16) if (multiThread)
#endif
+
for (int i = cy; i < cy + ch; i++) {
float R, G, B;
float* rL = lab->L[i];
@@ -358,4 +428,237 @@ Imagefloat* ImProcFunctions::lab2rgbOut (LabImage* lab, int cx, int cy, int cw,
return image;
}
+
+Imagefloat* ImProcFunctions::workingtrc(Imagefloat* working, int cw, int ch, int mul, Glib::ustring profile, double gampos, double slpos)
+{
+ TMatrix wprof;
+
+ wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
+
+ double dx = Color::D50x;
+ double dz = Color::D50z;
+ {
+ dx = dz = 1.0;
+ }
+ double toxyz[3][3] = {
+ {
+ (wprof[0][0] / dx), //I have suppressed / Color::D50x
+ (wprof[0][1] / dx),
+ (wprof[0][2] / dx)
+ }, {
+ (wprof[1][0]),
+ (wprof[1][1]),
+ (wprof[1][2])
+ }, {
+ (wprof[2][0] / dz), //I have suppressed / Color::D50z
+ (wprof[2][1] / dz),
+ (wprof[2][2] / dz)
+ }
+ };
+
+ Imagefloat* image = new Imagefloat(cw, ch);
+
+ double pwr;
+ double ts;
+ ts = slpos;
+
+ int five = mul;
+
+ pwr = 1.0 / gampos;
+
+ if (gampos < 1.0) {
+ pwr = gampos;
+ gampos = 1. / gampos;
+ five = -mul;
+ }
+
+ // int select_temp = 1; //5003K
+ const double eps = 0.000000001; // not divide by zero
+
+ enum class ColorTemp {
+ D50 = 5003, // for Widegamut, ProPhoto Best, Beta -> D50
+ D65 = 6504, // for sRGB, AdobeRGB, Bruce Rec2020 -> D65
+ D60 = 6005 // for ACES AP0 and AP1
+
+ };
+ ColorTemp temp = ColorTemp::D50;
+
+ cmsHPROFILE oprofdef;
+ float p[6]; //primaries
+
+ if (true) {
+ //primaries for 10 working profiles ==> output profiles
+ if (profile == "WideGamut") {
+ p[0] = 0.7350; //Widegamut primaries
+ p[1] = 0.2650;
+ p[2] = 0.1150;
+ p[3] = 0.8260;
+ p[4] = 0.1570;
+ p[5] = 0.0180;
+ } else if (profile == "Adobe RGB") {
+ p[0] = 0.6400; //Adobe primaries
+ p[1] = 0.3300;
+ p[2] = 0.2100;
+ p[3] = 0.7100;
+ p[4] = 0.1500;
+ p[5] = 0.0600;
+ temp = ColorTemp::D65;
+ } else if (profile == "sRGB") {
+ p[0] = 0.6400; // sRGB primaries
+ p[1] = 0.3300;
+ p[2] = 0.3000;
+ p[3] = 0.6000;
+ p[4] = 0.1500;
+ p[5] = 0.0600;
+ temp = ColorTemp::D65;
+ } else if (profile == "BruceRGB") {
+ p[0] = 0.6400; // Bruce primaries
+ p[1] = 0.3300;
+ p[2] = 0.2800;
+ p[3] = 0.6500;
+ p[4] = 0.1500;
+ p[5] = 0.0600;
+ temp = ColorTemp::D65;
+ } else if (profile == "Beta RGB") {
+ p[0] = 0.6888; // Beta primaries
+ p[1] = 0.3112;
+ p[2] = 0.1986;
+ p[3] = 0.7551;
+ p[4] = 0.1265;
+ p[5] = 0.0352;
+ } else if (profile == "BestRGB") {
+ p[0] = 0.7347; // Best primaries
+ p[1] = 0.2653;
+ p[2] = 0.2150;
+ p[3] = 0.7750;
+ p[4] = 0.1300;
+ p[5] = 0.0350;
+ } else if (profile == "Rec2020") {
+ p[0] = 0.7080; // Rec2020 primaries
+ p[1] = 0.2920;
+ p[2] = 0.1700;
+ p[3] = 0.7970;
+ p[4] = 0.1310;
+ p[5] = 0.0460;
+ temp = ColorTemp::D65;
+ } else if (profile == "ACESp0") {
+ p[0] = 0.7347; // ACES P0 primaries
+ p[1] = 0.2653;
+ p[2] = 0.0000;
+ p[3] = 1.0;
+ p[4] = 0.0001;
+ p[5] = -0.0770;
+ temp = ColorTemp::D60;
+ } else if (profile == "ACESp1") {
+ p[0] = 0.713; // ACES P1 primaries
+ p[1] = 0.293;
+ p[2] = 0.165;
+ p[3] = 0.830;
+ p[4] = 0.128;
+ p[5] = 0.044;
+ temp = ColorTemp::D60;
+ } else if (profile == "ProPhoto") {
+ p[0] = 0.7347; //ProPhoto and default primaries
+ p[1] = 0.2653;
+ p[2] = 0.1596;
+ p[3] = 0.8404;
+ p[4] = 0.0366;
+ p[5] = 0.0001;
+ } else {
+ p[0] = 0.7347; //default primaries always unused
+ p[1] = 0.2653;
+ p[2] = 0.1596;
+ p[3] = 0.8404;
+ p[4] = 0.0366;
+ p[5] = 0.0001;
+ }
+
+ if (slpos == 0) {
+ slpos = eps;
+ }
+
+ GammaValues g_a; //gamma parameters
+ int mode = 0;
+ Color::calcGamma(pwr, ts, mode, g_a); // call to calcGamma with selected gamma and slope : return parameters for LCMS2
+
+ cmsCIExyY xyD;
+
+ cmsCIExyYTRIPLE Primaries = {
+ {p[0], p[1], 1.0}, // red
+ {p[2], p[3], 1.0}, // green
+ {p[4], p[5], 1.0} // blue
+ };
+
+ cmsToneCurve* GammaTRC[3];
+ cmsFloat64Number gammaParams[7];
+ gammaParams[4] = g_a[3] * ts;
+ gammaParams[0] = gampos;
+ gammaParams[1] = 1. / (1.0 + g_a[4]);
+ gammaParams[2] = g_a[4] / (1.0 + g_a[4]);
+ gammaParams[3] = 1. / slpos;
+ gammaParams[5] = 0.0;
+ gammaParams[6] = 0.0;
+ // printf("ga0=%f ga1=%f ga2=%f ga3=%f ga4=%f\n", ga0, ga1, ga2, ga3, ga4);
+
+ // 7 parameters for smoother curves
+ cmsWhitePointFromTemp(&xyD, (double)temp);
+ if (profile == "ACESp0") {
+ xyD = {0.32168, 0.33767, 1.0};//refine white point to avoid differences
+ }
+
+ GammaTRC[0] = GammaTRC[1] = GammaTRC[2] = cmsBuildParametricToneCurve(NULL, five, gammaParams);//5 = more smoother than 4
+ oprofdef = cmsCreateRGBProfile(&xyD, &Primaries, GammaTRC);
+ cmsFreeToneCurve(GammaTRC[0]);
+ }
+
+ if (oprofdef) {
+ #pragma omp parallel for if (multiThread)
+
+ for (int i = 0; i < ch; i++) {
+ float* rr = working->r(i);
+ float* rg = working->g(i);
+ float* rb = working->b(i);
+
+ float* xa = (float*)image->r(i);
+ float* ya = (float*)image->g(i);
+ float* za = (float*)image->b(i);
+
+ for (int j = 0; j < cw; j++) {
+ float r1 = rr[j];
+ float g1 = rg[j];
+ float b1 = rb[j];
+
+ float x_ = toxyz[0][0] * r1 + toxyz[0][1] * g1 + toxyz[0][2] * b1;
+ float y_ = toxyz[1][0] * r1 + toxyz[1][1] * g1 + toxyz[1][2] * b1;
+ float z_ = toxyz[2][0] * r1 + toxyz[2][1] * g1 + toxyz[2][2] * b1;
+
+ xa[j] = ( x_) ;
+ ya[j] = ( y_);
+ za[j] = ( z_);
+
+ }
+ }
+
+ cmsUInt32Number flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE;
+
+
+ lcmsMutex->lock();
+ cmsHPROFILE iprof = ICCStore::getInstance()->getXYZProfile();
+ // cmsHTRANSFORM hTransform = cmsCreateTransform(iprof, TYPE_RGB_16, oprofdef, TYPE_RGB_16, params->icm.outputIntent, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE);
+ cmsHTRANSFORM hTransform = cmsCreateTransform(iprof, TYPE_RGB_FLT, oprofdef, TYPE_RGB_FLT, params->icm.outputIntent, flags);
+ lcmsMutex->unlock();
+
+ image->ExecCMSTransform2(hTransform);
+
+ cmsDeleteTransform(hTransform);
+ image->normalizeFloatTo65535();
+
+ }
+
+
+ return image;
+
+}
+
+
}
diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc
index bfb9c48b1..8ded508b4 100644
--- a/rtengine/iplocallab.cc
+++ b/rtengine/iplocallab.cc
@@ -1087,7 +1087,7 @@ void ImProcFunctions::vibrancelocal(int sp, int bfw, int bfh, LabImage* lab, La
const bool protectskins = params->locallab.protectskins.at(sp);
const bool avoidcolorshift = params->locallab.avoidcolorshift.at(sp);
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.workingProfile);
//inverse matrix user select
const double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
@@ -10361,19 +10361,19 @@ void ImProcFunctions::Lab_Local(int call, int maxspot, int sp, LUTf & huerefs, L
float adjustr = 1.0f;
//adapt chroma to working profile
- if (params->icm.working == "ProPhoto") {
+ if (params->icm.workingProfile == "ProPhoto") {
adjustr = 1.2f; // 1.2 instead 1.0 because it's very rare to have C>170..
- } else if (params->icm.working == "Adobe RGB") {
+ } else if (params->icm.workingProfile == "Adobe RGB") {
adjustr = 1.8f;
- } else if (params->icm.working == "sRGB") {
+ } else if (params->icm.workingProfile == "sRGB") {
adjustr = 2.0f;
- } else if (params->icm.working == "WideGamut") {
+ } else if (params->icm.workingProfile == "WideGamut") {
adjustr = 1.2f;
- } else if (params->icm.working == "Beta RGB") {
+ } else if (params->icm.workingProfile == "Beta RGB") {
adjustr = 1.4f;
- } else if (params->icm.working == "BestRGB") {
+ } else if (params->icm.workingProfile == "BestRGB") {
adjustr = 1.4f;
- } else if (params->icm.working == "BruceRGB") {
+ } else if (params->icm.workingProfile == "BruceRGB") {
adjustr = 1.8f;
}
@@ -11732,7 +11732,7 @@ void ImProcFunctions::Lab_Local(int call, int maxspot, int sp, LUTf & huerefs, L
// Gamut and Munsell control - very important do not desactivated to avoid crash
if (params->locallab.avoid.at(sp)) {
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.workingProfile);
float wip[3][3] = {
{static_cast(wiprof[0][0]), static_cast(wiprof[0][1]), static_cast(wiprof[0][2])},
{static_cast(wiprof[1][0]), static_cast(wiprof[1][1]), static_cast(wiprof[1][2])},
diff --git a/rtengine/ipresize.cc b/rtengine/ipresize.cc
index f9ff94ef9..b3275b2e4 100644
--- a/rtengine/ipresize.cc
+++ b/rtengine/ipresize.cc
@@ -373,6 +373,7 @@ float ImProcFunctions::resizeScale (const ProcParams* params, int fw, int fh, in
} else {
dScale = (double)params->resize.height / (double)refh;
}
+ dScale = (dScale > 1.0 && !params->resize.allowUpscaling) ? 1.0 : dScale;
break;
diff --git a/rtengine/ipsoftlight.cc b/rtengine/ipsoftlight.cc
new file mode 100644
index 000000000..35bf9577a
--- /dev/null
+++ b/rtengine/ipsoftlight.cc
@@ -0,0 +1,73 @@
+/* -*- C++ -*-
+ *
+ * This file is part of RawTherapee.
+ *
+ * Copyright 2018 Alberto Griggio
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+
+#ifdef _OPENMP
+#include
+#endif
+
+#include "improcfun.h"
+
+namespace rtengine {
+
+void ImProcFunctions::softLight(float *red, float *green, float *blue, int istart, int jstart, int tW, int tH, int TS)
+{
+ if (!params->softlight.enabled || !params->softlight.strength) {
+ return;
+ }
+
+ const float blend = params->softlight.strength / 100.f;
+ const float orig = 1.f - blend;
+
+ const auto apply =
+ [=](float x) -> float
+ {
+ if (!OOG(x)) {
+ float v = Color::gamma_srgb(x) / MAXVALF;
+ // Pegtop's formula from
+ // https://en.wikipedia.org/wiki/Blend_modes#Soft_Light
+ float v2 = v * v;
+ float v22 = v2 * 2.f;
+ v = v2 + v22 - v22 * v;
+ x = blend * Color::igamma_srgb(v * MAXVALF) + orig * x;
+ }
+ return x;
+ };
+
+#ifdef _OPENMP
+ #pragma omp parallel if (multiThread)
+#endif
+ {
+ int ti = 0;
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+ for (int i = istart; i < tH; i++) {
+ for (int j = jstart, tj = 0; j < tW; j++, tj++) {
+ const int idx = ti * TS + tj;
+ red[idx] = apply(red[idx]);
+ green[idx] = apply(green[idx]);
+ blue[idx] = apply(blue[idx]);
+ }
+ ++ti;
+ }
+ }
+}
+
+} // namespace rtengine
diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index ff976137e..a5ade7c53 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -327,25 +327,29 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
} else {
bool highQuality;
std::unique_ptr tmpimg;
+ Imagefloat *dest = transformed;
if (!needsCA() && scale != 1) {
highQuality = false;
} else {
highQuality = true;
// agriggio: CA correction via the lens profile has to be
- // performed before all the other transformations (except for the
- // coarse rotation/flipping). In order to not change the code too
- // much, I simply introduced a new mode
- // TRANSFORM_HIGH_QUALITY_CA, which applies *only*
- // profile-based CA correction. So, the correction in this case
- // occurs in two steps, using an intermediate temporary
- // image. There's room for optimization of course...
+ // performed before separately from the the other transformations
+ // (except for the coarse rotation/flipping). In order to not
+ // change the code too much, I simply introduced a new mode
+ // TRANSFORM_HIGH_QUALITY_CA, which applies *only* profile-based
+ // CA correction. So, the correction in this case occurs in two
+ // steps, using an intermediate temporary image. There's room for
+ // optimization of course...
if (pLCPMap && params->lensProf.useCA && pLCPMap->isCACorrectionAvailable()) {
tmpimg.reset(new Imagefloat(original->getWidth(), original->getHeight()));
- transformLCPCAOnly(original, tmpimg.get(), cx, cy, pLCPMap.get());
- original = tmpimg.get();
+ dest = tmpimg.get();
}
}
- transformGeneral(highQuality, original, transformed, cx, cy, sx, sy, oW, oH, fW, fH, pLCPMap.get());
+ transformGeneral(highQuality, original, dest, cx, cy, sx, sy, oW, oH, fW, fH, pLCPMap.get());
+
+ if (highQuality && dest != transformed) {
+ transformLCPCAOnly(dest, transformed, cx, cy, pLCPMap.get());
+ }
}
}
diff --git a/rtengine/ipvibrance.cc b/rtengine/ipvibrance.cc
index 26141423c..f7a938c33 100644
--- a/rtengine/ipvibrance.cc
+++ b/rtengine/ipvibrance.cc
@@ -162,7 +162,7 @@ void ImProcFunctions::vibrance (LabImage* lab)
const bool protectskins = params->vibrance.protectskins;
const bool avoidcolorshift = params->vibrance.avoidcolorshift;
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.workingProfile);
//inverse matrix user select
const float wip[3][3] = {
{static_cast(wiprof[0][0]), static_cast(wiprof[0][1]), static_cast(wiprof[0][2])},
diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index 20e37f871..fdb13f197 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -147,7 +147,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
// init variables to display Munsell corrections
MunsellDebugInfo* MunsDebugInfo = new MunsellDebugInfo();
#endif
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.workingProfile);
const double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc
index 174c02065..cdf4f990a 100644
--- a/rtengine/pixelshift.cc
+++ b/rtengine/pixelshift.cc
@@ -295,7 +295,7 @@ void calcFrameBrightnessFactor(unsigned int frame, uint32_t datalen, LUTu *histo
using namespace std;
using namespace rtengine;
-void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RAWParams::BayerSensor &bayerParamsIn, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection)
+void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParamsIn, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection)
{
BENCHFUN
if(numFrames != 4) { // fallback for non pixelshift files
@@ -303,7 +303,7 @@ BENCHFUN
return;
}
- RAWParams::BayerSensor bayerParams = bayerParamsIn;
+ RAWParams::BayerSensor bayerParams = rawParamsIn.bayersensor;
bool motionDetection = true;
@@ -326,7 +326,7 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
- amaze_vng4_demosaic_RT (winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.dualDemosaicContrast);
+ dual_demosaic_RT (true, rawParamsIn, winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[0]), red, green, blue);
}
@@ -338,7 +338,7 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
- amaze_vng4_demosaic_RT (winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.dualDemosaicContrast);
+ dual_demosaic_RT (true, rawParamsIn, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i]);
}
@@ -365,7 +365,9 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, rawData, red, green, blue, bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
- amaze_vng4_demosaic_RT (winw, winh, rawData, red, green, blue, bayerParams.dualDemosaicContrast);
+ RAWParams rawParamsTmp = rawParamsIn;
+ rawParamsTmp.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4);
+ dual_demosaic_RT (true, rawParamsTmp, winw, winh, rawData, red, green, blue, bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, rawData, red, green, blue);
}
diff --git a/rtengine/previewimage.cc b/rtengine/previewimage.cc
index 0b3610de2..f180469ad 100644
--- a/rtengine/previewimage.cc
+++ b/rtengine/previewimage.cc
@@ -107,13 +107,14 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
ColorTemp wb = rawImage.getWB ();
rawImage.getFullSize (fw, fh, TR_NONE);
PreviewProps pp (0, 0, fw, fh, 1);
- params.icm.input = Glib::ustring("(embedded)");
+ params.icm.inputProfile = Glib::ustring("(embedded)");
params.raw.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST);
params.raw.deadPixelFilter = false;
params.raw.ca_autocorrect = false;
params.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
rawImage.preprocess(params.raw, params.lensProf, params.coarse);
- rawImage.demosaic(params.raw);
+ double contrastThresholdDummy = 0.0;
+ rawImage.demosaic(params.raw, false, contrastThresholdDummy);
Imagefloat image(fw, fh);
rawImage.getImage (wb, TR_NONE, &image, pp, params.toneCurve, params.raw);
rtengine::Image8 output(fw, fh);
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index eef798dd1..2d2305cd1 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -317,11 +317,11 @@ ToneCurveParams::ToneCurveParams() :
method("Blend"),
expcomp(0),
curve{
- DCT_Linear
-},
+ DCT_Linear
+ },
curve2{
- DCT_Linear
-},
+ DCT_Linear
+ },
curveMode(ToneCurveParams::TcMode::STD),
curveMode2(ToneCurveParams::TcMode::STD),
brightness(0),
@@ -330,8 +330,9 @@ ToneCurveParams::ToneCurveParams() :
saturation(0),
shcompr(50),
hlcompr(0),
- hlcomprthresh(33),
+ hlcomprthresh(0),
histmatching(false),
+ fromHistMatching(false),
clampOOG(true)
{
}
@@ -356,6 +357,7 @@ bool ToneCurveParams::operator ==(const ToneCurveParams& other) const
&& hlcompr == other.hlcompr
&& hlcomprthresh == other.hlcomprthresh
&& histmatching == other.histmatching
+ && fromHistMatching == other.fromHistMatching
&& clampOOG == other.clampOOG;
}
@@ -610,6 +612,7 @@ bool LocalContrastParams::operator!=(const LocalContrastParams &other) const
const double ColorToningParams::LABGRID_CORR_MAX = 12000.f;
+const double ColorToningParams::LABGRID_CORR_SCALE = 3.f;
ColorToningParams::ColorToningParams() :
enabled(false),
@@ -1791,19 +1794,19 @@ bool VignettingParams::operator !=(const VignettingParams& other) const
ChannelMixerParams::ChannelMixerParams() :
enabled(false),
red{
- 100,
+ 1000,
0,
0
},
green{
0,
- 100,
+ 1000,
0
},
blue{
0,
0,
- 100
+ 1000
}
{
}
@@ -1923,7 +1926,8 @@ ResizeParams::ResizeParams() :
method("Lanczos"),
dataspec(3),
width(900),
- height(900)
+ height(900),
+ allowUpscaling(false)
{
}
@@ -1936,7 +1940,8 @@ bool ResizeParams::operator ==(const ResizeParams& other) const
&& method == other.method
&& dataspec == other.dataspec
&& width == other.width
- && height == other.height;
+ && height == other.height
+ && allowUpscaling == other.allowUpscaling;
}
bool ResizeParams::operator !=(const ResizeParams& other) const
@@ -1947,40 +1952,38 @@ bool ResizeParams::operator !=(const ResizeParams& other) const
const Glib::ustring ColorManagementParams::NoICMString = Glib::ustring("No ICM: sRGB output");
ColorManagementParams::ColorManagementParams() :
- input("(cameraICC)"),
+ inputProfile("(cameraICC)"),
toneCurve(false),
applyLookTable(false),
applyBaselineExposureOffset(true),
applyHueSatMap(true),
dcpIlluminant(0),
- working("ProPhoto"),
- output("RT_sRGB"),
+ workingProfile("ProPhoto"),
+ workingTRC("none"),
+ workingTRCGamma(2.4),
+ workingTRCSlope(12.92310),
+ outputProfile(options.rtSettings.srgb),
outputIntent(RI_RELATIVE),
- outputBPC(true),
- gamma("default"),
- gampos(2.22),
- slpos(4.5),
- freegamma(false)
+ outputBPC(true)
{
}
bool ColorManagementParams::operator ==(const ColorManagementParams& other) const
{
return
- input == other.input
+ inputProfile == other.inputProfile
&& toneCurve == other.toneCurve
&& applyLookTable == other.applyLookTable
&& applyBaselineExposureOffset == other.applyBaselineExposureOffset
&& applyHueSatMap == other.applyHueSatMap
&& dcpIlluminant == other.dcpIlluminant
- && working == other.working
- && output == other.output
+ && workingProfile == other.workingProfile
+ && workingTRC == other.workingTRC
+ && workingTRCGamma == other.workingTRCGamma
+ && workingTRCSlope == other.workingTRCSlope
+ && outputProfile == other.outputProfile
&& outputIntent == other.outputIntent
- && outputBPC == other.outputBPC
- && gamma == other.gamma
- && gampos == other.gampos
- && slpos == other.slpos
- && freegamma == other.freegamma;
+ && outputBPC == other.outputBPC;
}
bool ColorManagementParams::operator !=(const ColorManagementParams& other) const
@@ -2594,8 +2597,28 @@ bool FilmSimulationParams::operator !=(const FilmSimulationParams& other) const
return !(*this == other);
}
+
+SoftLightParams::SoftLightParams() :
+ enabled(false),
+ strength(30)
+{
+}
+
+bool SoftLightParams::operator ==(const SoftLightParams& other) const
+{
+ return
+ enabled == other.enabled
+ && strength == other.strength;
+}
+
+bool SoftLightParams::operator !=(const SoftLightParams& other) const
+{
+ return !(*this == other);
+}
+
RAWParams::BayerSensor::BayerSensor() :
method(getMethodString(Method::AMAZE)),
+ border(4),
imageNum(0),
ccSteps(0),
black0(0.0),
@@ -2632,6 +2655,7 @@ bool RAWParams::BayerSensor::operator ==(const BayerSensor& other) const
{
return
method == other.method
+ && border == other.border
&& imageNum == other.imageNum
&& ccSteps == other.ccSteps
&& black0 == other.black0
@@ -2690,7 +2714,9 @@ const std::vector& RAWParams::BayerSensor::getMethodStrings()
"amaze",
"amazevng4",
"rcd",
+ "rcdvng4",
"dcb",
+ "dcbvng4",
"lmmse",
"igv",
"ahd",
@@ -2758,6 +2784,7 @@ const std::vector& RAWParams::XTransSensor::getMethodStrings()
static const std::vector method_strings {
"4-pass",
"3-pass (best)",
+ "2-pass",
"1-pass (medium)",
"fast",
"mono",
@@ -2779,6 +2806,8 @@ RAWParams::RAWParams() :
ff_AutoClipControl(false),
ff_clipControl(0),
ca_autocorrect(false),
+ ca_avoidcolourshift(true),
+ caautoiterations(2),
cared(0.0),
cablue(0.0),
expos(1.0),
@@ -2803,6 +2832,8 @@ bool RAWParams::operator ==(const RAWParams& other) const
&& ff_AutoClipControl == other.ff_AutoClipControl
&& ff_clipControl == other.ff_clipControl
&& ca_autocorrect == other.ca_autocorrect
+ && ca_avoidcolourshift == other.ca_avoidcolourshift
+ && caautoiterations == other.caautoiterations
&& cared == other.cared
&& cablue == other.cablue
&& expos == other.expos
@@ -2939,6 +2970,8 @@ void ProcParams::setDefaults()
filmSimulation = FilmSimulationParams();
+ softlight = SoftLightParams();
+
raw = RAWParams();
metadata = MetaDataParams();
@@ -2986,6 +3019,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->toneCurve.hlcomprthresh, "Exposure", "HighlightComprThreshold", toneCurve.hlcomprthresh, keyFile);
saveToKeyfile(!pedited || pedited->toneCurve.shcompr, "Exposure", "ShadowCompr", toneCurve.shcompr, keyFile);
saveToKeyfile(!pedited || pedited->toneCurve.histmatching, "Exposure", "HistogramMatching", toneCurve.histmatching, keyFile);
+ saveToKeyfile(!pedited || pedited->toneCurve.fromHistMatching, "Exposure", "FromHistogramMatching", toneCurve.fromHistMatching, keyFile);
saveToKeyfile(!pedited || pedited->toneCurve.clampOOG, "Exposure", "ClampOOG", toneCurve.clampOOG, keyFile);
// Highlight recovery
@@ -3492,6 +3526,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->resize.dataspec, "Resize", "DataSpecified", resize.dataspec, keyFile);
saveToKeyfile(!pedited || pedited->resize.width, "Resize", "Width", resize.width, keyFile);
saveToKeyfile(!pedited || pedited->resize.height, "Resize", "Height", resize.height, keyFile);
+ saveToKeyfile(!pedited || pedited->resize.allowUpscaling, "Resize", "AllowUpscaling", resize.allowUpscaling, keyFile);
// Post resize sharpening
saveToKeyfile(!pedited || pedited->prsharpening.enabled, "PostResizeSharpening", "Enabled", prsharpening.enabled, keyFile);
@@ -3511,14 +3546,17 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->prsharpening.deconviter, "PostResizeSharpening", "DeconvIterations", prsharpening.deconviter, keyFile);
// Color management
- saveToKeyfile(!pedited || pedited->icm.input, "Color Management", "InputProfile", relativePathIfInside(fname, fnameAbsolute, icm.input), keyFile);
+ saveToKeyfile(!pedited || pedited->icm.inputProfile, "Color Management", "InputProfile", relativePathIfInside(fname, fnameAbsolute, icm.inputProfile), keyFile);
saveToKeyfile(!pedited || pedited->icm.toneCurve, "Color Management", "ToneCurve", icm.toneCurve, keyFile);
saveToKeyfile(!pedited || pedited->icm.applyLookTable, "Color Management", "ApplyLookTable", icm.applyLookTable, keyFile);
saveToKeyfile(!pedited || pedited->icm.applyBaselineExposureOffset, "Color Management", "ApplyBaselineExposureOffset", icm.applyBaselineExposureOffset, keyFile);
saveToKeyfile(!pedited || pedited->icm.applyHueSatMap, "Color Management", "ApplyHueSatMap", icm.applyHueSatMap, keyFile);
saveToKeyfile(!pedited || pedited->icm.dcpIlluminant, "Color Management", "DCPIlluminant", icm.dcpIlluminant, keyFile);
- saveToKeyfile(!pedited || pedited->icm.working, "Color Management", "WorkingProfile", icm.working, keyFile);
- saveToKeyfile(!pedited || pedited->icm.output, "Color Management", "OutputProfile", icm.output, keyFile);
+ saveToKeyfile(!pedited || pedited->icm.workingProfile, "Color Management", "WorkingProfile", icm.workingProfile, keyFile);
+ saveToKeyfile(!pedited || pedited->icm.workingTRC, "Color Management", "WorkingTRC", icm.workingTRC, keyFile);
+ saveToKeyfile(!pedited || pedited->icm.workingTRCGamma, "Color Management", "WorkingTRCGamma", icm.workingTRCGamma, keyFile);
+ saveToKeyfile(!pedited || pedited->icm.workingTRCSlope, "Color Management", "WorkingTRCSlope", icm.workingTRCSlope, keyFile);
+ saveToKeyfile(!pedited || pedited->icm.outputProfile, "Color Management", "OutputProfile", icm.outputProfile, keyFile);
saveToKeyfile(
!pedited || pedited->icm.outputIntent,
"Color Management",
@@ -3533,10 +3571,6 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
keyFile
);
saveToKeyfile(!pedited || pedited->icm.outputBPC, "Color Management", "OutputBPC", icm.outputBPC, keyFile);
- saveToKeyfile(!pedited || pedited->icm.gamma, "Color Management", "Gammafree", icm.gamma, keyFile);
- saveToKeyfile(!pedited || pedited->icm.freegamma, "Color Management", "Freegamma", icm.freegamma, keyFile);
- saveToKeyfile(!pedited || pedited->icm.gampos, "Color Management", "GammaValue", icm.gampos, keyFile);
- saveToKeyfile(!pedited || pedited->icm.slpos, "Color Management", "GammaSlope", icm.slpos, keyFile);
// Wavelet
saveToKeyfile(!pedited || pedited->wavelet.enabled, "Wavelet", "Enabled", wavelet.enabled, keyFile);
@@ -3658,6 +3692,10 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->hsvequalizer.scurve, "HSV Equalizer", "SCurve", hsvequalizer.scurve, keyFile);
saveToKeyfile(!pedited || pedited->hsvequalizer.vcurve, "HSV Equalizer", "VCurve", hsvequalizer.vcurve, keyFile);
+// Soft Light
+ saveToKeyfile(!pedited || pedited->softlight.enabled, "SoftLight", "Enabled", softlight.enabled, keyFile);
+ saveToKeyfile(!pedited || pedited->softlight.strength, "SoftLight", "Strength", softlight.strength, keyFile);
+
// Film simulation
saveToKeyfile(!pedited || pedited->filmSimulation.enabled, "Film Simulation", "Enabled", filmSimulation.enabled, keyFile);
saveToKeyfile(!pedited || pedited->filmSimulation.clutFilename, "Film Simulation", "ClutFilename", filmSimulation.clutFilename, keyFile);
@@ -3711,12 +3749,15 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->raw.ff_AutoClipControl, "RAW", "FlatFieldAutoClipControl", raw.ff_AutoClipControl, keyFile);
saveToKeyfile(!pedited || pedited->raw.ff_clipControl, "RAW", "FlatFieldClipControl", raw.ff_clipControl, keyFile);
saveToKeyfile(!pedited || pedited->raw.ca_autocorrect, "RAW", "CA", raw.ca_autocorrect, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.ca_avoidcolourshift, "RAW", "CAAvoidColourshift", raw.ca_avoidcolourshift, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.caautoiterations, "RAW", "CAAutoIterations", raw.caautoiterations, keyFile);
saveToKeyfile(!pedited || pedited->raw.cared, "RAW", "CARed", raw.cared, keyFile);
saveToKeyfile(!pedited || pedited->raw.cablue, "RAW", "CABlue", raw.cablue, keyFile);
saveToKeyfile(!pedited || pedited->raw.hotPixelFilter, "RAW", "HotPixelFilter", raw.hotPixelFilter, keyFile);
saveToKeyfile(!pedited || pedited->raw.deadPixelFilter, "RAW", "DeadPixelFilter", raw.deadPixelFilter, keyFile);
saveToKeyfile(!pedited || pedited->raw.hotdeadpix_thresh, "RAW", "HotDeadPixelThresh", raw.hotdeadpix_thresh, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.method, "RAW Bayer", "Method", raw.bayersensor.method, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.bayersensor.border, "RAW Bayer", "Border", raw.bayersensor.border, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.imageNum, "RAW Bayer", "ImageNum", raw.bayersensor.imageNum + 1, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.ccSteps, "RAW Bayer", "CcSteps", raw.bayersensor.ccSteps, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.exBlack0, "RAW Bayer", "PreBlack0", raw.bayersensor.black0, keyFile);
@@ -3874,6 +3915,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
}
assignFromKeyfile(keyFile, "Exposure", "HistogramMatching", pedited, toneCurve.histmatching, pedited->toneCurve.histmatching);
+ if (ppVersion < 340) {
+ toneCurve.fromHistMatching = false;
+ if (pedited) {
+ pedited->toneCurve.fromHistMatching = true;
+ }
+ } else {
+ assignFromKeyfile(keyFile, "Exposure", "FromHistogramMatching", pedited, toneCurve.fromHistMatching, pedited->toneCurve.fromHistMatching);
+ }
assignFromKeyfile(keyFile, "Exposure", "ClampOOG", pedited, toneCurve.clampOOG, pedited->toneCurve.clampOOG);
}
@@ -3903,6 +3952,13 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
memcpy(chmixer.green, gmix.data(), 3 * sizeof(int));
memcpy(chmixer.blue, bmix.data(), 3 * sizeof(int));
}
+ if (ppVersion < 338) {
+ for (int i = 0; i < 3; ++i) {
+ chmixer.red[i] *= 10;
+ chmixer.green[i] *= 10;
+ chmixer.blue[i] *= 10;
+ }
+ }
if (pedited) {
pedited->chmixer.red[0] = pedited->chmixer.red[1] = pedited->chmixer.red[2] = true;
@@ -4753,6 +4809,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Resize", "DataSpecified", pedited, resize.dataspec, pedited->resize.dataspec);
assignFromKeyfile(keyFile, "Resize", "Width", pedited, resize.width, pedited->resize.width);
assignFromKeyfile(keyFile, "Resize", "Height", pedited, resize.height, pedited->resize.height);
+ if (ppVersion >= 339) {
+ assignFromKeyfile(keyFile, "Resize", "AllowUpscaling", pedited, resize.allowUpscaling, pedited->resize.allowUpscaling);
+ } else {
+ resize.allowUpscaling = true;
+ if (pedited) {
+ pedited->resize.allowUpscaling = true;
+ }
+ }
}
if (keyFile.has_group("PostResizeSharpening")) {
@@ -4792,10 +4856,10 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
if (keyFile.has_group("Color Management")) {
if (keyFile.has_key("Color Management", "InputProfile")) {
- icm.input = expandRelativePath(fname, "file:", keyFile.get_string("Color Management", "InputProfile"));
+ icm.inputProfile = expandRelativePath(fname, "file:", keyFile.get_string("Color Management", "InputProfile"));
if (pedited) {
- pedited->icm.input = true;
+ pedited->icm.inputProfile = true;
}
}
@@ -4804,9 +4868,33 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Color Management", "ApplyBaselineExposureOffset", pedited, icm.applyBaselineExposureOffset, pedited->icm.applyBaselineExposureOffset);
assignFromKeyfile(keyFile, "Color Management", "ApplyHueSatMap", pedited, icm.applyHueSatMap, pedited->icm.applyHueSatMap);
assignFromKeyfile(keyFile, "Color Management", "DCPIlluminant", pedited, icm.dcpIlluminant, pedited->icm.dcpIlluminant);
- assignFromKeyfile(keyFile, "Color Management", "WorkingProfile", pedited, icm.working, pedited->icm.working);
- assignFromKeyfile(keyFile, "Color Management", "OutputProfile", pedited, icm.output, pedited->icm.output);
+ assignFromKeyfile(keyFile, "Color Management", "WorkingProfile", pedited, icm.workingProfile, pedited->icm.workingProfile);
+ assignFromKeyfile(keyFile, "Color Management", "WorkingTRC", pedited, icm.workingTRC, pedited->icm.workingTRC);
+ assignFromKeyfile(keyFile, "Color Management", "WorkingTRCGamma", pedited, icm.workingTRCGamma, pedited->icm.workingTRCGamma);
+ assignFromKeyfile(keyFile, "Color Management", "WorkingTRCSlope", pedited, icm.workingTRCSlope, pedited->icm.workingTRCSlope);
+ assignFromKeyfile(keyFile, "Color Management", "OutputProfile", pedited, icm.outputProfile, pedited->icm.outputProfile);
+ if (ppVersion < 341) {
+ if (icm.outputProfile == "RT_Medium_gsRGB") {
+ icm.outputProfile = "RTv4_Medium";
+ } else if (icm.outputProfile == "RT_Large_gBT709" || icm.outputProfile == "RT_Large_g10" || icm.outputProfile == "RT_Large_gsRGB") {
+ icm.outputProfile = "RTv4_Large";
+ } else if (icm.outputProfile == "WideGamutRGB") {
+ icm.outputProfile = "RTv4_Wide";
+ } else if (icm.outputProfile == "RT_sRGB_gBT709" || icm.outputProfile == "RT_sRGB_g10" || icm.outputProfile == "RT_sRGB") {
+ icm.outputProfile = "RTv4_sRGB";
+ } else if (icm.outputProfile == "BetaRGB") { // Have we ever provided this profile ? Should we convert this filename ?
+ icm.outputProfile = "RTv4_Beta";
+ } else if (icm.outputProfile == "BestRGB") { // Have we ever provided this profile ? Should we convert this filename ?
+ icm.outputProfile = "RTv4_Best";
+ } else if (icm.outputProfile == "Rec2020") {
+ icm.outputProfile = "RTv4_Rec2020";
+ } else if (icm.outputProfile == "Bruce") { // Have we ever provided this profile ? Should we convert this filename ?
+ icm.outputProfile = "RTv4_Bruce";
+ } else if (icm.outputProfile == "ACES") {
+ icm.outputProfile = "RTv4_ACES-AP0";
+ }
+ }
if (keyFile.has_key("Color Management", "OutputProfileIntent")) {
Glib::ustring intent = keyFile.get_string("Color Management", "OutputProfileIntent");
@@ -4824,12 +4912,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
pedited->icm.outputIntent = true;
}
}
-
assignFromKeyfile(keyFile, "Color Management", "OutputBPC", pedited, icm.outputBPC, pedited->icm.outputBPC);
- assignFromKeyfile(keyFile, "Color Management", "Gammafree", pedited, icm.gamma, pedited->icm.gamma);
- assignFromKeyfile(keyFile, "Color Management", "Freegamma", pedited, icm.freegamma, pedited->icm.freegamma);
- assignFromKeyfile(keyFile, "Color Management", "GammaValue", pedited, icm.gampos, pedited->icm.gampos);
- assignFromKeyfile(keyFile, "Color Management", "GammaSlope", pedited, icm.slpos, pedited->icm.slpos);
}
if (keyFile.has_group("Wavelet")) {
@@ -5136,6 +5219,11 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
}
}
+ if (keyFile.has_group("SoftLight")) {
+ assignFromKeyfile(keyFile, "SoftLight", "Enabled", pedited, softlight.enabled, pedited->softlight.enabled);
+ assignFromKeyfile(keyFile, "SoftLight", "Strength", pedited, softlight.strength, pedited->softlight.strength);
+ }
+
if (keyFile.has_group("Film Simulation")) {
assignFromKeyfile(keyFile, "Film Simulation", "Enabled", pedited, filmSimulation.enabled, pedited->filmSimulation.enabled);
assignFromKeyfile(keyFile, "Film Simulation", "ClutFilename", pedited, filmSimulation.clutFilename, pedited->filmSimulation.clutFilename);
@@ -5243,6 +5331,13 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "ColorToning", "LabGridBLow", pedited, colorToning.labgridBLow, pedited->colorToning.labgridBLow);
assignFromKeyfile(keyFile, "ColorToning", "LabGridAHigh", pedited, colorToning.labgridAHigh, pedited->colorToning.labgridAHigh);
assignFromKeyfile(keyFile, "ColorToning", "LabGridBHigh", pedited, colorToning.labgridBHigh, pedited->colorToning.labgridBHigh);
+ if (ppVersion < 337) {
+ const double scale = ColorToningParams::LABGRID_CORR_SCALE;
+ colorToning.labgridALow *= scale;
+ colorToning.labgridAHigh *= scale;
+ colorToning.labgridBLow *= scale;
+ colorToning.labgridBHigh *= scale;
+ }
}
if (keyFile.has_group("RAW")) {
@@ -5278,6 +5373,17 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
}
assignFromKeyfile(keyFile, "RAW", "CA", pedited, raw.ca_autocorrect, pedited->raw.ca_autocorrect);
+ if (ppVersion >= 342) {
+ assignFromKeyfile(keyFile, "RAW", "CAAutoIterations", pedited, raw.caautoiterations, pedited->raw.caautoiterations);
+ } else {
+ raw.caautoiterations = 1;
+ }
+
+ if (ppVersion >= 343) {
+ assignFromKeyfile(keyFile, "RAW", "CAAvoidColourshift", pedited, raw.ca_avoidcolourshift, pedited->raw.ca_avoidcolourshift);
+ } else {
+ raw.ca_avoidcolourshift = false;
+ }
assignFromKeyfile(keyFile, "RAW", "CARed", pedited, raw.cared, pedited->raw.cared);
assignFromKeyfile(keyFile, "RAW", "CABlue", pedited, raw.cablue, pedited->raw.cablue);
// For compatibility to elder pp3 versions
@@ -5312,6 +5418,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
if (keyFile.has_group("RAW Bayer")) {
assignFromKeyfile(keyFile, "RAW Bayer", "Method", pedited, raw.bayersensor.method, pedited->raw.bayersensor.method);
+ assignFromKeyfile(keyFile, "RAW Bayer", "Border", pedited, raw.bayersensor.border, pedited->raw.bayersensor.border);
if (keyFile.has_key("RAW Bayer", "ImageNum")) {
raw.bayersensor.imageNum = keyFile.get_integer("RAW Bayer", "ImageNum") - 1;
@@ -5518,6 +5625,7 @@ bool ProcParams::operator ==(const ProcParams& other) const
&& dirpyrequalizer == other.dirpyrequalizer
&& hsvequalizer == other.hsvequalizer
&& filmSimulation == other.filmSimulation
+ && softlight == other.softlight
&& rgbCurves == other.rgbCurves
&& colorToning == other.colorToning
&& metadata == other.metadata
@@ -5650,10 +5758,14 @@ void PartialProfile::set(bool v)
}
}
-void PartialProfile::applyTo(ProcParams* destParams) const
+void PartialProfile::applyTo(ProcParams* destParams, bool fromLastSave) const
{
if (destParams && pparams && pedited) {
+ bool fromHistMatching = fromLastSave && destParams->toneCurve.histmatching && pparams->toneCurve.histmatching;
pedited->combine(*destParams, *pparams, true);
+ if (!fromLastSave) {
+ destParams->toneCurve.fromHistMatching = fromHistMatching;
+ }
}
}
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 861ec9ee7..987e37e56 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -286,6 +286,7 @@ struct ToneCurveParams {
int hlcompr; // Highlight Recovery's compression
int hlcomprthresh; // Highlight Recovery's threshold
bool histmatching; // histogram matching
+ bool fromHistMatching;
bool clampOOG; // clamp out of gamut colours
ToneCurveParams();
@@ -456,6 +457,7 @@ struct ColorToningParams {
double labgridAHigh;
double labgridBHigh;
static const double LABGRID_CORR_MAX;
+ static const double LABGRID_CORR_SCALE;
ColorToningParams();
@@ -1127,6 +1129,7 @@ struct ResizeParams {
int dataspec;
int width;
int height;
+ bool allowUpscaling;
ResizeParams();
@@ -1138,22 +1141,22 @@ struct ResizeParams {
* Parameters of the color spaces used during the processing
*/
struct ColorManagementParams {
- Glib::ustring input;
- bool toneCurve;
- bool applyLookTable;
- bool applyBaselineExposureOffset;
- bool applyHueSatMap;
+ Glib::ustring inputProfile;
+ bool toneCurve;
+ bool applyLookTable;
+ bool applyBaselineExposureOffset;
+ bool applyHueSatMap;
int dcpIlluminant;
- Glib::ustring working;
- Glib::ustring output;
+
+ Glib::ustring workingProfile;
+ Glib::ustring workingTRC;
+ double workingTRCGamma;
+ double workingTRCSlope;
+
+ Glib::ustring outputProfile;
RenderingIntent outputIntent;
bool outputBPC;
- Glib::ustring gamma;
- double gampos;
- double slpos;
- bool freegamma;
-
static const Glib::ustring NoICMString;
ColorManagementParams();
@@ -1342,6 +1345,17 @@ struct FilmSimulationParams {
};
+struct SoftLightParams {
+ bool enabled;
+ int strength;
+
+ SoftLightParams();
+
+ bool operator==(const SoftLightParams &other) const;
+ bool operator!=(const SoftLightParams &other) const;
+};
+
+
/**
* Parameters for RAW demosaicing, common to all sensor type
*/
@@ -1354,7 +1368,9 @@ struct RAWParams {
AMAZE,
AMAZEVNG4,
RCD,
+ RCDVNG4,
DCB,
+ DCBVNG4,
LMMSE,
IGV,
AHD,
@@ -1380,6 +1396,7 @@ struct RAWParams {
};
Glib::ustring method;
+ int border;
int imageNum;
int ccSteps;
double black0;
@@ -1437,6 +1454,7 @@ struct RAWParams {
enum class Method {
FOUR_PASS,
THREE_PASS,
+ TWO_PASS,
ONE_PASS,
FAST,
MONO,
@@ -1480,6 +1498,8 @@ struct RAWParams {
int ff_clipControl;
bool ca_autocorrect;
+ bool ca_avoidcolourshift;
+ int caautoiterations;
double cared;
double cablue;
@@ -1547,6 +1567,7 @@ public:
DirPyrEqualizerParams dirpyrequalizer; ///< directional pyramid wavelet parameters
HSVEqualizerParams hsvequalizer; ///< hsv wavelet parameters
FilmSimulationParams filmSimulation; ///< film simulation parameters
+ SoftLightParams softlight; ///< softlight parameters
int rank; ///< Custom image quality ranking
int colorlabel; ///< Custom color label
bool inTrash; ///< Marks deleted image
@@ -1627,7 +1648,7 @@ public:
void clearGeneral();
int load(const Glib::ustring& fName);
void set(bool v);
- void applyTo(ProcParams* destParams) const ;
+ void applyTo(ProcParams* destParams, bool fromLastSaved = false) const ;
rtengine::procparams::ProcParams* pparams;
ParamsEdited* pedited;
diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h
index 63745d71c..7d654359f 100644
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -170,10 +170,22 @@ public:
{
return top_margin;
}
+
+ int get_rawwidth() const
+ {
+ return raw_width;
+ }
+
int get_FujiWidth() const
{
return fuji_width;
}
+
+ float const * get_FloatRawImage() const
+ {
+ return float_raw_image;
+ }
+
eSensorType getSensorType();
void getRgbCam(float rgbcam[3][4]);
@@ -315,6 +327,11 @@ public:
return filters == 9;
}
+ bool isFloat() const
+ {
+ return float_raw_image;
+ }
+
public:
// dcraw functions
void pre_interpolate()
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 01882fe9c..7f5826a85 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -448,17 +448,6 @@ RawImageSource::RawImageSource()
, camInitialGain(0.0)
, defGain(0.0)
, ri(nullptr)
- , lc00(0.0)
- , lc01(0.0)
- , lc02(0.0)
- , lc10(0.0)
- , lc11(0.0)
- , lc12(0.0)
- , lc20(0.0)
- , lc21(0.0)
- , lc22(0.0)
- , cache(nullptr)
- , threshold(0)
, rawData(0, 0)
, green(0, 0)
, red(0, 0)
@@ -492,10 +481,6 @@ RawImageSource::~RawImageSource()
flushRGB();
flushRawData();
- if (cache) {
- delete [] cache;
- }
-
if (camProfile) {
cmsCloseProfile(camProfile);
}
@@ -591,8 +576,8 @@ void RawImageSource::transformRect(const PreviewProps &pp, int tran, int &ssx1,
} else {
ssx1 = sx1;
ssy1 = sy1;
- width = (sx2 - sx1) / pp.getSkip() + ((sx2 - sx1) % pp.getSkip() > 0);
- height = (sy2 - sy1) / pp.getSkip() + ((sy2 - sy1) % pp.getSkip() > 0);
+ width = (sx2 + 1 - sx1) / pp.getSkip() + ((sx2 + 1 - sx1) % pp.getSkip() > 0);
+ height = (sy2 + 1 - sy1) / pp.getSkip() + ((sy2 + 1 - sy1) % pp.getSkip() > 0);
}
}
@@ -747,14 +732,11 @@ void RawImageSource::getImage(const ColorTemp &ctemp, int tran, Imagefloat* imag
for (int ix = 0; ix < imheight; ix++) {
int i = sy1 + skip * ix;
-
- if (i >= maxy - skip) {
- i = maxy - skip - 1; // avoid trouble
- }
+ i = std::min(i, maxy - skip); // avoid trouble
if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS || ri->get_colors() == 1) {
for (int j = 0, jx = sx1; j < imwidth; j++, jx += skip) {
- jx = std::min(jx, maxx - skip - 1); // avoid trouble
+ jx = std::min(jx, maxx - skip); // avoid trouble
float rtot = 0.f, gtot = 0.f, btot = 0.f;
@@ -915,17 +897,17 @@ DCPProfile *RawImageSource::getDCP(const ColorManagementParams &cmp, DCPProfile:
{
DCPProfile *dcpProf = nullptr;
cmsHPROFILE dummy;
- findInputProfile(cmp.input, nullptr, (static_cast(getMetaData()))->getCamera(), &dcpProf, dummy);
+ findInputProfile(cmp.inputProfile, nullptr, (static_cast(getMetaData()))->getCamera(), &dcpProf, dummy);
if (dcpProf == nullptr) {
if (settings->verbose) {
- printf("Can't load DCP profile '%s'!\n", cmp.input.c_str());
+ printf("Can't load DCP profile '%s'!\n", cmp.inputProfile.c_str());
}
return nullptr;
}
- dcpProf->setStep2ApplyState(cmp.working, cmp.toneCurve, cmp.applyLookTable, cmp.applyBaselineExposureOffset, as);
+ dcpProf->setStep2ApplyState(cmp.workingProfile, cmp.toneCurve, cmp.applyLookTable, cmp.applyBaselineExposureOffset, as);
return dcpProf;
}
@@ -2039,13 +2021,13 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens
if (numFrames == 4) {
double fitParams[64];
- float *buffer = CA_correct_RT(raw.ca_autocorrect, raw.cared, raw.cablue, 8.0, *rawDataFrames[0], fitParams, false, true, nullptr, false);
+ float *buffer = CA_correct_RT(raw.ca_autocorrect, raw.caautoiterations, raw.cared, raw.cablue, raw.ca_avoidcolourshift, *rawDataFrames[0], fitParams, false, true, nullptr, false);
for(int i = 1; i < 3; ++i) {
- CA_correct_RT(raw.ca_autocorrect, raw.cared, raw.cablue, 8.0, *rawDataFrames[i], fitParams, true, false, buffer, false);
+ CA_correct_RT(raw.ca_autocorrect, raw.caautoiterations, raw.cared, raw.cablue, raw.ca_avoidcolourshift, *rawDataFrames[i], fitParams, true, false, buffer, false);
}
- CA_correct_RT(raw.ca_autocorrect, raw.cared, raw.cablue, 8.0, *rawDataFrames[3], fitParams, true, false, buffer, true);
+ CA_correct_RT(raw.ca_autocorrect, raw.caautoiterations, raw.cared, raw.cablue, raw.ca_avoidcolourshift, *rawDataFrames[3], fitParams, true, false, buffer, true);
} else {
- CA_correct_RT(raw.ca_autocorrect, raw.cared, raw.cablue, 8.0, rawData, nullptr, false, false, nullptr, true);
+ CA_correct_RT(raw.ca_autocorrect, raw.caautoiterations, raw.cared, raw.cablue, raw.ca_avoidcolourshift, rawData, nullptr, false, false, nullptr, true);
}
}
@@ -2083,7 +2065,7 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-void RawImageSource::demosaic(const RAWParams &raw)
+void RawImageSource::demosaic(const RAWParams &raw, bool autoContrast, double &contrastThreshold)
{
MyTime t1, t2;
t1.set();
@@ -2097,10 +2079,17 @@ void RawImageSource::demosaic(const RAWParams &raw)
ahd_demosaic();
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZE)) {
amaze_demosaic_RT(0, 0, W, H, rawData, red, green, blue);
- } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) ) {
- amaze_vng4_demosaic_RT (W, H, rawData, red, green, blue, raw.bayersensor.dualDemosaicContrast);
+ } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4)
+ || raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4)
+ || raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4)) {
+ if (!autoContrast) {
+ double threshold = raw.bayersensor.dualDemosaicContrast;
+ dual_demosaic_RT (true, raw, W, H, rawData, red, green, blue, threshold, false);
+ } else {
+ dual_demosaic_RT (true, raw, W, H, rawData, red, green, blue, contrastThreshold, true, 0, 0);
+ }
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
- pixelshift(0, 0, W, H, raw.bayersensor, currFrame, ri->get_maker(), ri->get_model(), raw.expos);
+ pixelshift(0, 0, W, H, raw, currFrame, ri->get_maker(), ri->get_model(), raw.expos);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCB)) {
dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::EAHD)) {
@@ -2118,9 +2107,6 @@ void RawImageSource::demosaic(const RAWParams &raw)
} else {
nodemosaic(false);
}
-
- //if (raw.all_enhance) refinement_lassus();
-
} else if (ri->getSensorType() == ST_FUJI_XTRANS) {
if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST)) {
fast_xtrans_interpolate(rawData, red, green, blue);
@@ -2128,8 +2114,13 @@ void RawImageSource::demosaic(const RAWParams &raw)
xtrans_interpolate(1, false);
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::THREE_PASS)) {
xtrans_interpolate(3, true);
- } else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS)) {
- xtrans_4pass_demosaic_RT(3, true, raw.xtranssensor.dualDemosaicContrast);
+ } else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) || raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::TWO_PASS)) {
+ if (!autoContrast) {
+ double threshold = raw.xtranssensor.dualDemosaicContrast;
+ dual_demosaic_RT (false, raw, W, H, rawData, red, green, blue, threshold, false);
+ } else {
+ dual_demosaic_RT (false, raw, W, H, rawData, red, green, blue, contrastThreshold, true, 0, 0);
+ }
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::MONO)) {
nodemosaic(true);
} else {
@@ -2188,7 +2179,7 @@ void RawImageSource::retinexPrepareBuffers(const ColorManagementParams& cmp, con
int mode = 0;
Color::calcGamma(pwr, ts, mode, g_a); // call to calcGamma with selected gamma and slope
- // printf("g_a0=%f g_a1=%f g_a2=%f g_a3=%f g_a4=%f\n", g_a0,g_a1,g_a2,g_a3,g_a4);
+ // printf("g_a0=%f g_a1=%f g_a2=%f g_a3=%f g_a4=%f\n", g_a0,g_a1,g_a2,g_a3,g_a4);
double start;
double add;
@@ -2350,7 +2341,7 @@ void RawImageSource::retinexPrepareBuffers(const ColorManagementParams& cmp, con
}
} else {
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(cmp.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (cmp.workingProfile);
const float wp[3][3] = {
{static_cast(wprof[0][0]), static_cast(wprof[0][1]), static_cast(wprof[0][2])},
{static_cast(wprof[1][0]), static_cast(wprof[1][1]), static_cast(wprof[1][2])},
@@ -2626,7 +2617,7 @@ void RawImageSource::retinex(const ColorManagementParams& cmp, const RetinexPara
}
} else {
- TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(cmp.working);
+ TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (cmp.workingProfile);
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
@@ -2821,11 +2812,6 @@ void RawImageSource::retinex(const ColorManagementParams& cmp, const RetinexPara
void RawImageSource::flushRawData()
{
- if (cache) {
- delete [] cache;
- cache = nullptr;
- }
-
if (rawData) {
rawData(0, 0);
}
@@ -3982,7 +3968,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
cmsHPROFILE in;
DCPProfile *dcpProf;
- if (!findInputProfile(cmp.input, embedded, camName, &dcpProf, in)) {
+ if (!findInputProfile(cmp.inputProfile, embedded, camName, &dcpProf, in)) {
return;
}
@@ -3999,7 +3985,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
{camMatrix[2][0], camMatrix[2][1], camMatrix[2][2]}
}
};
- dcpProf->apply(im, cmp.dcpIlluminant, cmp.working, wb, pre_mul_row, cam_matrix, cmp.applyHueSatMap);
+ dcpProf->apply(im, cmp.dcpIlluminant, cmp.workingProfile, wb, pre_mul_row, cam_matrix, cmp.applyHueSatMap);
return;
}
@@ -4008,7 +3994,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
// in this case we avoid using the slllllooooooowwww lcms
// Calculate matrix for direct conversion raw>working space
- TMatrix work = ICCStore::getInstance()->workingSpaceInverseMatrix(cmp.working);
+ TMatrix work = ICCStore::getInstance()->workingSpaceInverseMatrix (cmp.workingProfile);
double mat[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
for (int i = 0; i < 3; i++)
@@ -4034,7 +4020,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
}
} else {
- bool working_space_is_prophoto = (cmp.working == "ProPhoto");
+ bool working_space_is_prophoto = (cmp.workingProfile == "ProPhoto");
// use supplied input profile
@@ -4106,7 +4092,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
// check if the working space is fully contained in prophoto
if (!working_space_is_prophoto && camera_icc_type == CAMERA_ICC_TYPE_GENERIC) {
- TMatrix toxyz = ICCStore::getInstance()->workingSpaceMatrix(cmp.working);
+ TMatrix toxyz = ICCStore::getInstance()->workingSpaceMatrix(cmp.workingProfile);
TMatrix torgb = ICCStore::getInstance()->workingSpaceInverseMatrix("ProPhoto");
float rgb[3] = {0.f, 0.f, 0.f};
for (int i = 0; i < 2 && !working_space_is_prophoto; ++i) {
@@ -4119,9 +4105,9 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
for (int j = 0; j < 2; ++j) {
if (rgb[j] < 0.f || rgb[j] > 1.f) {
working_space_is_prophoto = true;
- prophoto = ICCStore::getInstance()->workingSpace(cmp.working);
+ prophoto = ICCStore::getInstance()->workingSpace(cmp.workingProfile);
if (settings->verbose) {
- std::cout << "colorSpaceConversion_: converting directly to " << cmp.working << " instead of passing through ProPhoto" << std::endl;
+ std::cout << "colorSpaceConversion_: converting directly to " << cmp.workingProfile << " instead of passing through ProPhoto" << std::endl;
}
break;
}
@@ -4174,7 +4160,7 @@ void RawImageSource::colorSpaceConversion_(Imagefloat* im, const ColorManagement
if (!working_space_is_prophoto) {
toxyz = ICCStore::getInstance()->workingSpaceMatrix("ProPhoto");
- torgb = ICCStore::getInstance()->workingSpaceInverseMatrix(cmp.working); //sRGB .. Adobe...Wide...
+ torgb = ICCStore::getInstance()->workingSpaceInverseMatrix (cmp.workingProfile); //sRGB .. Adobe...Wide...
}
#ifdef _OPENMP
@@ -4608,7 +4594,7 @@ void RawImageSource::HLRecovery_CIELab(float* rin, float* gin, float* bin, float
float bo = min(b, maxval);
float yy = xyz_cam[1][0] * r + xyz_cam[1][1] * g + xyz_cam[1][2] * b;
float fy = (yy < 65535.0 ? Color::cachef[yy] / 327.68 : std::cbrt(yy / MAXVALD));
- // compute LCH decompostion of the clipped pixel (only color information, thus C and H will be used)
+ // compute LCH decomposition of the clipped pixel (only color information, thus C and H will be used)
float x = xyz_cam[0][0] * ro + xyz_cam[0][1] * go + xyz_cam[0][2] * bo;
float y = xyz_cam[1][0] * ro + xyz_cam[1][1] * go + xyz_cam[1][2] * bo;
float z = xyz_cam[2][0] * ro + xyz_cam[2][1] * go + xyz_cam[2][2] * bo;
@@ -4744,10 +4730,10 @@ void RawImageSource::getRAWHistogram(LUTu & histRedRaw, LUTu & histGreenRaw, LUT
histRedRaw.clear();
histGreenRaw.clear();
histBlueRaw.clear();
- const float mult[4] = { 65535.0f / ri->get_white(0),
- 65535.0f / ri->get_white(1),
- 65535.0f / ri->get_white(2),
- 65535.0f / ri->get_white(3)
+ const float mult[4] = { 255.0f / Color::gamma(ri->get_white(0) - cblacksom[0]),
+ 255.0f / Color::gamma(ri->get_white(1) - cblacksom[1]),
+ 255.0f / Color::gamma(ri->get_white(2) - cblacksom[2]),
+ 255.0f / Color::gamma(ri->get_white(3) - cblacksom[3])
};
const bool fourColours = ri->getSensorType() == ST_BAYER && ((mult[1] != mult[3] || cblacksom[1] != cblacksom[3]) || FC(0, 0) == 3 || FC(0, 1) == 3 || FC(1, 0) == 3 || FC(1, 1) == 3);
@@ -4853,23 +4839,22 @@ void RawImageSource::getRAWHistogram(LUTu & histRedRaw, LUTu & histGreenRaw, LUT
} // end of critical region
} // end of parallel region
- constexpr float gammaLimit = 32767.f * 65536.f; // Color::gamma overflows when the LUT is accessed with too large values
- for (int i = 0; i < 65536; i++) {
+ for(int i = 0; i < 65536; i++) {
int idx;
- idx = CLIP((int)Color::gamma(std::min(mult[0] * (i - (cblacksom[0]/*+black_lev[0]*/)), gammaLimit)));
- histRedRaw[idx >> 8] += hist[0][i];
+ idx = (int)std::min(255.0f, mult[0] * Color::gamma(std::max(0.0f, i - cblacksom[0])));
+ histRedRaw[idx] += hist[0][i];
if (ri->get_colors() > 1) {
- idx = CLIP((int)Color::gamma(std::min(mult[1] * (i - (cblacksom[1]/*+black_lev[1]*/)), gammaLimit)));
- histGreenRaw[idx >> 8] += hist[1][i];
+ idx = (int)std::min(255.0f, mult[1] * Color::gamma(std::max(0.0f, i - cblacksom[1])));
+ histGreenRaw[idx] += hist[1][i];
if (fourColours) {
- idx = CLIP((int)Color::gamma(std::min(mult[3] * (i - (cblacksom[3]/*+black_lev[3]*/)), gammaLimit)));
- histGreenRaw[idx >> 8] += hist[3][i];
+ idx = (int)std::min(255.0f, mult[3] * Color::gamma(std::max(0.0f, i - cblacksom[3])));
+ histGreenRaw[idx] += hist[3][i];
}
- idx = CLIP((int)Color::gamma(std::min(mult[2] * (i - (cblacksom[2]/*+black_lev[2]*/)), gammaLimit)));
- histBlueRaw[idx >> 8] += hist[2][i];
+ idx = (int)std::min(255.0f, mult[2] * Color::gamma(std::max(0.0f, i - cblacksom[2])));
+ histBlueRaw[idx] += hist[2][i];
}
}
@@ -5486,7 +5471,9 @@ void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int
ynew = H - 1 - ynew;
}
- int c = ri->getSensorType() == ST_FUJI_XTRANS ? ri->XTRANSFC(ynew, xnew) : ri->FC(ynew, xnew);
+ xnew = LIM(xnew, 0, W - 1);
+ ynew = LIM(ynew, 0, H - 1);
+ int c = ri->getSensorType() == ST_FUJI_XTRANS ? ri->XTRANSFC(ynew,xnew) : ri->FC(ynew,xnew);
int val = round(rawData[ynew][xnew] / scale_mul[c]);
if (c == 0) {
diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
index 4d9e41675..2c4ec13fe 100644
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -75,11 +75,6 @@ protected:
unsigned int currFrame = 0;
unsigned int numFrames = 0;
- // to accelerate CIELAB conversion:
- double lc00, lc01, lc02, lc10, lc11, lc12, lc20, lc21, lc22;
- double* cache;
- int threshold;
-
array2D rawData; // holds preprocessed pixel values, rowData[i][j] corresponds to the ith row and jth column
array2D *rawDataFrames[4] = {nullptr};
array2D *rawDataBuffer[3] = {nullptr};
@@ -121,7 +116,7 @@ public:
int load(const Glib::ustring &fname) { return load(fname, false); }
int load(const Glib::ustring &fname, bool firstFrameOnly);
void preprocess(const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true);
- void demosaic(const RAWParams &raw);
+ void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold);
void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI);
void retinexPrepareCurves(const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI);
void retinexPrepareBuffers(const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D &conversionBuffer, LUTu &lhist16RETI);
@@ -130,7 +125,7 @@ public:
void HLRecovery_Global(ToneCurveParams hrp);
void refinement_lassus(int PassCount);
void refinement(int PassCount);
-
+ void setBorder(unsigned int rawBorder) {border = rawBorder;}
bool isRGBSourceModified() const
{
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
@@ -244,12 +239,23 @@ protected:
inline void convert_row_to_RGB(float* r, float* g, float* b, const float* const Y, const float* const I, const float* const Q, const int W);
inline void convert_to_RGB(float &r, float &g, float &b, const float Y, const float I, const float Q);
- inline void convert_to_cielab_row(float* ar, float* ag, float* ab, float* oL, float* oa, float* ob);
- inline void interpolate_row_g(float* agh, float* agv, int i);
- inline void interpolate_row_rb(float* ar, float* ab, float* pg, float* cg, float* ng, int i);
+ inline void interpolate_row_g (float* agh, float* agv, int i);
+ inline void interpolate_row_rb (float* ar, float* ab, float* pg, float* cg, float* ng, int i);
inline void interpolate_row_rb_mul_pp (const array2D &rawData, float* ar, float* ab, float* pg, float* cg, float* ng, int i, float r_mul, float g_mul, float b_mul, int x1, int width, int skip);
- float* CA_correct_RT (const bool autoCA, const double cared, const double cablue, const double caautostrength, array2D &rawData, double *fitParamsTransfer, bool fitParamsIn, bool fitParamsOut, float * buffer, bool freeBuffer);
+ float* CA_correct_RT(
+ bool autoCA,
+ size_t autoIterations,
+ double cared,
+ double cablue,
+ bool avoidColourshift,
+ const array2D &rawData,
+ double* fitParamsTransfer,
+ bool fitParamsIn,
+ bool fitParamsOut,
+ float* buffer,
+ bool freeBuffer
+ );
void ddct8x8s(int isgn, float a[8][8]);
void processRawWhitepoint(float expos, float preser, array2D &rawData); // exposure before interpolation
@@ -272,13 +278,13 @@ protected:
void igv_interpolate(int winw, int winh);
void lmmse_interpolate_omp(int winw, int winh, array2D &rawData, array2D &red, array2D &green, array2D &blue, int iterations);
void amaze_demosaic_RT(int winx, int winy, int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue);//Emil's code for AMaZE
- void amaze_vng4_demosaic_RT(int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue, double contrast = 0.0);
+ void dual_demosaic_RT(bool isBayer, const RAWParams &raw, int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue, double &contrast, bool autoContrast = false, int autoX = -1, int autoY = -1);
void fast_demosaic();//Emil's code for fast demosaicing
void dcb_demosaic(int iterations, bool dcb_enhance);
void ahd_demosaic();
void rcd_demosaic();
void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0);
- void border_interpolate2(int winw, int winh, int lborders);
+ void border_interpolate2(int winw, int winh, int lborders, const array2D &rawData, array2D &red, array2D &green, array2D &blue);
void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border);
void fill_raw(float (*cache)[3], int x0, int y0, float** rawData);
void fill_border(float (*cache)[3], int border, int x0, int y0);
@@ -294,11 +300,10 @@ protected:
void dcb_refinement(float (*image)[3], uint8_t *map, int x0, int y0);
void dcb_color_full(float (*image)[3], int x0, int y0, float (*chroma)[2]);
void cielab(const float (*rgb)[3], float* l, float* a, float *b, const int width, const int height, const int labWidth, const float xyz_cam[3][3]);
- void xtransborder_interpolate(int border);
- void xtrans_4pass_demosaic_RT (const int passes, const bool useCieLab, double contrast);
+ void xtransborder_interpolate (int border, array2D &red, array2D &green, array2D &blue);
void xtrans_interpolate(const int passes, const bool useCieLab);
void fast_xtrans_interpolate (const array2D &rawData, array2D &red, array2D &green, array2D &blue);
- void pixelshift(int winx, int winy, int winw, int winh, const RAWParams::BayerSensor &bayerParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection);
+ void pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection);
void hflip(Imagefloat* im);
void vflip(Imagefloat* im);
void getRawValues(int x, int y, int rotate, int &R, int &G, int &B);
diff --git a/rtengine/rawimagesource_i.h b/rtengine/rawimagesource_i.h
index 91d62ecab..b24115e0a 100644
--- a/rtengine/rawimagesource_i.h
+++ b/rtengine/rawimagesource_i.h
@@ -58,224 +58,6 @@ inline void RawImageSource::convert_to_RGB (float &r, float &g, float &b, const
b = Y - 1.105f * I + 1.702f * Q;
}
-inline void RawImageSource::convert_to_cielab_row (float* ar, float* ag, float* ab, float* oL, float* oa, float* ob)
-{
-
- for (int j = 0; j < W; j++) {
- double r = ar[j];
- double g = ag[j];
- double b = ab[j];
-
- double x = lc00 * r + lc01 * g + lc02 * b;
- double y = lc10 * r + lc11 * g + lc12 * b;
- double z = lc20 * r + lc21 * g + lc22 * b;
-
- if (y > threshold) {
- oL[j] = cache[(int)y];
- } else {
- oL[j] = float(903.3 * y / MAXVALD);
- }
-
- oa[j] = float(500.0 * ((x > threshold ? cache[(int)x] : 7.787 * x / MAXVALD + 16.0 / 116.0) - (y > threshold ? cache[(int)y] : 7.787 * y / MAXVALD + 16.0 / 116.0)));
- ob[j] = float(200.0 * ((y > threshold ? cache[(int)y] : 7.787 * y / MAXVALD + 16.0 / 116.0) - (z > threshold ? cache[(int)z] : 7.787 * z / MAXVALD + 16.0 / 116.0)));
- }
-}
-
-inline void RawImageSource::interpolate_row_g (float* agh, float* agv, int i)
-{
-
- for (int j = 0; j < W; j++) {
- if (ri->ISGREEN(i, j)) {
- agh[j] = rawData[i][j];
- agv[j] = rawData[i][j];
- } else {
- int gh = 0;
- int gv = 0;
-
- if (j > 1 && j < W - 2) {
- gh = (-rawData[i][j - 2] + 2 * rawData[i][j - 1] + 2 * rawData[i][j] + 2 * rawData[i][j + 1] - rawData[i][j + 2]) / 4;
- int maxgh = max(rawData[i][j - 1], rawData[i][j + 1]);
- int mingh = min(rawData[i][j - 1], rawData[i][j + 1]);
-
- if (gh > maxgh) {
- gh = maxgh;
- } else if (gh < mingh) {
- gh = mingh;
- }
- } else if (j == 0) {
- gh = rawData[i][1];
- } else if (j == 1) {
- gh = (rawData[i][0] + rawData[i][2]) / 2;
- } else if (j == W - 1) {
- gh = rawData[i][W - 2];
- } else if (j == W - 2) {
- gh = (rawData[i][W - 1] + rawData[i][W - 3]) / 2;
- }
-
- if (i > 1 && i < H - 2) {
- gv = (-rawData[i - 2][j] + 2 * rawData[i - 1][j] + 2 * rawData[i][j] + 2 * rawData[i + 1][j] - rawData[i + 2][j]) / 4;
- int maxgv = max(rawData[i - 1][j], rawData[i + 1][j]);
- int mingv = min(rawData[i - 1][j], rawData[i + 1][j]);
-
- if (gv > maxgv) {
- gv = maxgv;
- } else if (gv < mingv) {
- gv = mingv;
- }
- } else if (i == 0) {
- gv = rawData[1][j];
- } else if (i == 1) {
- gv = (rawData[0][j] + rawData[2][j]) / 2;
- } else if (i == H - 1) {
- gv = rawData[H - 2][j];
- } else if (i == H - 2) {
- gv = (rawData[H - 1][j] + rawData[H - 3][j]) / 2;
- }
-
- agh[j] = gh;
- agv[j] = gv;
- }
- }
-}
-
-inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg, float* cg, float* ng, int i)
-{
- const auto getPg = [pg](int index) {
- return
- pg
- ? pg[index]
- : 0.f;
- };
-
- const auto getNg = [ng](int index) {
- return
- ng
- ? ng[index]
- : 0.f;
- };
-
- if ((ri->ISRED(i, 0) || ri->ISRED(i, 1))) {
- // RGRGR or GRGRGR line
- for (int j = 0; j < W; j++) {
- if (ri->ISRED(i, j)) {
- // red is simple
- ar[j] = rawData[i][j];
- // blue: cross interpolation
- int b = 0;
- int n = 0;
-
- if (i > 0 && j > 0) {
- b += rawData[i - 1][j - 1] - getPg(j - 1);
- n++;
- }
-
- if (i > 0 && j < W - 1) {
- b += rawData[i - 1][j + 1] - getPg(j + 1);
- n++;
- }
-
- if (i < H - 1 && j > 0) {
- b += rawData[i + 1][j - 1] - getNg(j - 1);
- n++;
- }
-
- if (i < H - 1 && j < W - 1) {
- b += rawData[i + 1][j + 1] - getNg(j + 1);
- n++;
- }
-
- b = cg[j] + b / std::max(1, n);
- ab[j] = b;
- } else {
- // linear R-G interp. horizontally
- int r;
-
- if (j == 0) {
- r = cg[0] + rawData[i][1] - cg[1];
- } else if (j == W - 1) {
- r = cg[W - 1] + rawData[i][W - 2] - cg[W - 2];
- } else {
- r = cg[j] + (rawData[i][j - 1] - cg[j - 1] + rawData[i][j + 1] - cg[j + 1]) / 2;
- }
-
- ar[j] = CLIP(r);
- // linear B-G interp. vertically
- int b;
-
- if (i == 0) {
- b = getNg(j) + rawData[1][j] - cg[j];
- } else if (i == H - 1) {
- b = getPg(j) + rawData[H - 2][j] - cg[j];
- } else {
- b = cg[j] + (rawData[i - 1][j] - getPg(j) + rawData[i + 1][j] - getNg(j)) / 2;
- }
-
- ab[j] = b;
- }
- }
- } else {
- // BGBGB or GBGBGB line
- for (int j = 0; j < W; j++) {
- if (ri->ISBLUE(i, j)) {
- // red is simple
- ab[j] = rawData[i][j];
- // blue: cross interpolation
- int r = 0;
- int n = 0;
-
- if (i > 0 && j > 0) {
- r += rawData[i - 1][j - 1] - getPg(j - 1);
- n++;
- }
-
- if (i > 0 && j < W - 1) {
- r += rawData[i - 1][j + 1] - getPg(j + 1);
- n++;
- }
-
- if (i < H - 1 && j > 0) {
- r += rawData[i + 1][j - 1] - getNg(j - 1);
- n++;
- }
-
- if (i < H - 1 && j < W - 1) {
- r += rawData[i + 1][j + 1] - getNg(j + 1);
- n++;
- }
-
- r = cg[j] + r / std::max(n, 1);
-
- ar[j] = r;
- } else {
- // linear B-G interp. horizontally
- int b;
-
- if (j == 0) {
- b = cg[0] + rawData[i][1] - cg[1];
- } else if (j == W - 1) {
- b = cg[W - 1] + rawData[i][W - 2] - cg[W - 2];
- } else {
- b = cg[j] + (rawData[i][j - 1] - cg[j - 1] + rawData[i][j + 1] - cg[j + 1]) / 2;
- }
-
- ab[j] = CLIP(b);
- // linear R-G interp. vertically
- int r;
-
- if (i == 0) {
- r = getNg(j) + rawData[1][j] - cg[j];
- } else if (i == H - 1) {
- r = getPg(j) + rawData[H - 2][j] - cg[j];
- } else {
- r = cg[j] + (rawData[i - 1][j] - getPg(j) + rawData[i + 1][j] - getNg(j)) / 2;
- }
-
- ar[j] = r;
- }
- }
- }
-}
-
inline void RawImageSource::interpolate_row_rb_mul_pp (const array2D &rawData, float* ar, float* ab, float* pg, float* cg, float* ng, int i, float r_mul, float g_mul, float b_mul, int x1, int width, int skip)
{
diff --git a/rtengine/rcd_demosaic.cc b/rtengine/rcd_demosaic.cc
index f131bc87e..01430a894 100644
--- a/rtengine/rcd_demosaic.cc
+++ b/rtengine/rcd_demosaic.cc
@@ -291,7 +291,7 @@ void RawImageSource::rcd_demosaic()
free(PQ_Dir);
}
- border_interpolate2(W, H, rcdBorder);
+ border_interpolate2(W, H, rcdBorder, rawData, red, green, blue);
if (plistener) {
plistener->setProgress(1);
diff --git a/rtengine/refreshmap.h b/rtengine/refreshmap.h
index 88092adfc..b9ccc2b65 100644
--- a/rtengine/refreshmap.h
+++ b/rtengine/refreshmap.h
@@ -66,7 +66,7 @@
#define DEFRINGE (M_LUMINANCE|M_COLOR)
#define DIRPYRDENOISE (M_LUMINANCE|M_COLOR)
#define DIRPYREQUALIZER (M_LUMINANCE|M_COLOR)
-#define GAMMA M_MONITOR
+#define GAMMA M_VOID //M_MONITOR
#define CROP M_CROP
#define RESIZE M_VOID
#define EXIF M_VOID
diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc
index cff145de8..c56a72a2c 100644
--- a/rtengine/rt_algo.cc
+++ b/rtengine/rt_algo.cc
@@ -1,6 +1,8 @@
/*
* This file is part of RawTherapee.
*
+ * Copyright (c) 2017-2018 Ingo Weyrich
+ *
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +22,7 @@
#include
#include
#include
-
+#include
#ifdef _OPENMP
#include
#endif
@@ -188,7 +190,9 @@ void findMinMaxPercentile(const float* data, size_t size, float minPrct, float&
maxOut += minVal;
}
-void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int W, int H, float contrastThreshold, float amount) {
+void buildBlendMask(float** luminance, float **blend, int W, int H, float contrastThreshold, float amount) {
+
+ constexpr float scale = 0.0625f / 327.68f;
if(contrastThreshold == 0.f) {
for(int j = 0; j < H; ++j) {
@@ -197,64 +201,123 @@ void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int
}
}
} else {
- constexpr float scale = 0.0625f / 327.68f;
#ifdef _OPENMP
#pragma omp parallel
#endif
- {
+ {
+#ifdef __SSE2__
+ const vfloat contrastThresholdv = F2V(contrastThreshold);
+ const vfloat scalev = F2V(scale);
+ const vfloat amountv = F2V(amount);
+#endif
+#ifdef _OPENMP
+ #pragma omp for schedule(dynamic,16)
+#endif
+
+ for(int j = 2; j < H - 2; ++j) {
+ int i = 2;
+#ifdef __SSE2__
+ for(; i < W - 5; i += 4) {
+ vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
+ SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
+
+ STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv));
+ }
+#endif
+ for(; i < W - 2; ++i) {
+
+ float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
+ rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
+
+ blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold);
+ }
+ }
+
+#ifdef _OPENMP
+ #pragma omp single
+#endif
+ {
+ // upper border
+ for(int j = 0; j < 2; ++j) {
+ for(int i = 2; i < W - 2; ++i) {
+ blend[j][i] = blend[2][i];
+ }
+ }
+ // lower border
+ for(int j = H - 2; j < H; ++j) {
+ for(int i = 2; i < W - 2; ++i) {
+ blend[j][i] = blend[H-3][i];
+ }
+ }
+ for(int j = 0; j < H; ++j) {
+ // left border
+ blend[j][0] = blend[j][1] = blend[j][2];
+ // right border
+ blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3];
+ }
+ }
+
+ // blur blend mask to smooth transitions
+ gaussianBlur(blend, blend, W, H, 2.0);
+ }
+ }
+}
+
+int calcContrastThreshold(float** luminance, float **blend, int W, int H) {
+
+ constexpr float scale = 0.0625f / 327.68f;
+
+#ifdef __SSE2__
+ const vfloat scalev = F2V(scale);
+#endif
+
+ for(int j = 2; j < H - 2; ++j) {
+ int i = 2;
+#ifdef __SSE2__
+ for(; i < W - 5; i += 4) {
+ vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
+ SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
+ STVFU(blend[j -2 ][i - 2], contrastv);
+ }
+#endif
+ for(; i < W - 2; ++i) {
+
+ float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
+ rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
+
+ blend[j -2][i- 2] = contrast;
+ }
+ }
+
+ const float limit = (W - 2) * (H - 2) / 100.f;
+
+ int c;
+ for (c = 1; c < 100; ++c) {
+ const float contrastThreshold = c / 100.f;
+ float sum = 0.f;
#ifdef __SSE2__
const vfloat contrastThresholdv = F2V(contrastThreshold);
- const vfloat scalev = F2V(scale);
- const vfloat amountv = F2V(amount);
-#endif
-#ifdef _OPENMP
- #pragma omp for schedule(dynamic,16)
+ vfloat sumv = ZEROV;
#endif
- for(int j = 2; j < H - 2; ++j) {
- int i = 2;
+ for(int j = 0; j < H - 4; ++j) {
+ int i = 0;
#ifdef __SSE2__
- for(; i < W - 5; i += 4) {
- vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
- SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
-
- STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv));
+ for(; i < W - 7; i += 4) {
+ sumv += calcBlendFactor(LVFU(blend[j][i]), contrastThresholdv);
}
#endif
- for(; i < W - 2; ++i) {
-
- float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
- rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
-
- blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold);
+ for(; i < W - 4; ++i) {
+ sum += calcBlendFactor(blend[j][i], contrastThreshold);
}
}
-#ifdef _OPENMP
- #pragma omp single
+#ifdef __SSE2__
+ sum += vhadd(sumv);
#endif
- {
- // upper border
- for(int j = 0; j < 2; ++j) {
- for(int i = 2; i < W - 2; ++i) {
- blend[j][i] = blend[2][i];
- }
- }
- // lower border
- for(int j = H - 2; j < H; ++j) {
- for(int i = 2; i < W - 2; ++i) {
- blend[j][i] = blend[H-3][i];
- }
- }
- for(int j = 0; j < H; ++j) {
- // left border
- blend[j][0] = blend[j][1] = blend[j][2];
- // right border
- blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3];
- }
+ if (sum <= limit) {
+ break;
}
- // blur blend mask to smooth transitions
- gaussianBlur(blend, blend, W, H, 2.0);
- }
}
+ return c;
}
}
diff --git a/rtengine/rt_algo.h b/rtengine/rt_algo.h
index 1aac26c3e..e20713b8f 100644
--- a/rtengine/rt_algo.h
+++ b/rtengine/rt_algo.h
@@ -1,7 +1,7 @@
/*
* This file is part of RawTherapee.
*
- * Copyright (c) 2017 Ingo Weyrich
+ * Copyright (c) 2017-2018 Ingo Weyrich
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
#pragma once
#include
-#include "jaggedarray.h"
namespace rtengine
{
void findMinMaxPercentile(const float* data, size_t size, float minPrct, float& minOut, float maxPrct, float& maxOut, bool multiThread = true);
-void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int W, int H, float contrastThreshold, float amount = 1.f);
+void buildBlendMask(float** luminance, float **blend, int W, int H, float contrastThreshold, float amount = 1.f);
+int calcContrastThreshold(float** luminance, float **blend, int W, int H);
}
diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h
index 031191bd2..576f80e54 100644
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -538,7 +538,7 @@ public:
virtual bool fastPipeline() const = 0;
};
-/** This function performs all the image processinf steps corresponding to the given ProcessingJob. It returns when it is ready, so it can be slow.
+/** This function performs all the image processing steps corresponding to the given ProcessingJob. It returns when it is ready, so it can be slow.
* The ProcessingJob passed becomes invalid, you can not use it any more.
* @param job the ProcessingJob to cancel.
* @param errorCode is the error code if an error occurred (e.g. the input image could not be loaded etc.)
@@ -558,7 +558,7 @@ public:
virtual ProcessingJob* imageReady (IImagefloat* img) = 0;
virtual void error (Glib::ustring message) = 0;
};
-/** This function performs all the image processinf steps corresponding to the given ProcessingJob. It runs in the background, thus it returns immediately,
+/** This function performs all the image processing steps corresponding to the given ProcessingJob. It runs in the background, thus it returns immediately,
* When it finishes, it calls the BatchProcessingListener with the resulting image and asks for the next job. It the listener gives a new job, it goes on
* with processing. If no new job is given, it finishes.
* The ProcessingJob passed becomes invalid, you can not use it any more.
diff --git a/rtengine/rtlensfun.cc b/rtengine/rtlensfun.cc
index 8216f0b83..792a86b61 100644
--- a/rtengine/rtlensfun.cc
+++ b/rtengine/rtlensfun.cc
@@ -33,6 +33,7 @@ extern const Settings *settings;
LFModifier::~LFModifier()
{
if (data_) {
+ MyMutex::MyLock lock(*lfModifierMutex);
data_->Destroy();
}
}
@@ -56,7 +57,7 @@ void LFModifier::correctDistortion(double &x, double &y, int cx, int cy, double
if (swap_xy_) {
std::swap(xx, yy);
}
- if (data_->ApplyGeometryDistortion(xx, yy, 1, 1, pos)) {
+ if (data_->ApplyGeometryDistortion(xx, yy, 1, 1, pos)) { // This is thread-safe
x = pos[0];
y = pos[1];
if (swap_xy_) {
@@ -95,7 +96,7 @@ void LFModifier::correctCA(double &x, double &y, int cx, int cy, int channel) co
if (swap_xy_) {
std::swap(x, y);
}
- data_->ApplySubpixelDistortion(x, y, 1, 1, pos);
+ data_->ApplySubpixelDistortion(x, y, 1, 1, pos); // This is thread-safe
x = pos[2*channel];
y = pos[2*channel+1];
if (swap_xy_) {
@@ -112,12 +113,14 @@ void LFModifier::correctCA(double &x, double &y, int cx, int cy, int channel) co
void LFModifier::processVignetteLine(int width, int y, float *line) const
{
+ MyMutex::MyLock lock(*lfModifierMutex);
data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_1(INTENSITY), 0);
}
void LFModifier::processVignetteLine3Channels(int width, int y, float *line) const
{
+ MyMutex::MyLock lock(*lfModifierMutex);
data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_3(RED, GREEN, BLUE), 0);
}
@@ -157,6 +160,7 @@ LFModifier::LFModifier(lfModifier *m, bool swap_xy, int flags):
swap_xy_(swap_xy),
flags_(flags)
{
+ lfModifierMutex = new MyMutex;
}
@@ -374,12 +378,14 @@ bool LFDatabase::LoadDirectory(const char *dirname)
LFDatabase::LFDatabase():
data_(nullptr)
{
+ lfDBMutex = new MyMutex;
}
LFDatabase::~LFDatabase()
{
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
data_->Destroy();
}
}
@@ -395,6 +401,7 @@ std::vector LFDatabase::getCameras() const
{
std::vector ret;
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
auto cams = data_->GetCameras();
while (*cams) {
ret.emplace_back();
@@ -410,6 +417,7 @@ std::vector LFDatabase::getLenses() const
{
std::vector ret;
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
auto lenses = data_->GetLenses();
while (*lenses) {
ret.emplace_back();
@@ -425,6 +433,7 @@ LFCamera LFDatabase::findCamera(const Glib::ustring &make, const Glib::ustring &
{
LFCamera ret;
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
auto found = data_->FindCamerasExt(make.c_str(), model.c_str());
if (found) {
ret.data_ = found[0];
@@ -439,6 +448,7 @@ LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) c
{
LFLens ret;
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
auto found = data_->FindLenses(camera.data_, nullptr, name.c_str());
for (size_t pos = 0; !found && pos < name.size(); ) {
// try to split the maker from the model of the lens -- we have to
@@ -476,6 +486,7 @@ std::unique_ptr LFDatabase::getModifier(const LFCamera &camera, cons
{
std::unique_ptr ret;
if (data_) {
+ MyMutex::MyLock lock(*lfDBMutex);
if (camera && lens) {
lfModifier *mod = lfModifier::Create(lens.data_, camera.getCropFactor(), width, height);
int flags = LF_MODIFY_DISTORTION | LF_MODIFY_SCALE | LF_MODIFY_TCA;
diff --git a/rtengine/rtlensfun.h b/rtengine/rtlensfun.h
index 7690ef544..f75f25d4f 100644
--- a/rtengine/rtlensfun.h
+++ b/rtengine/rtlensfun.h
@@ -57,6 +57,7 @@ private:
lfModifier *data_;
bool swap_xy_;
int flags_;
+ MyMutex *lfModifierMutex;
};
class LFCamera final
@@ -121,6 +122,7 @@ private:
LFDatabase();
bool LoadDirectory(const char *dirname);
+ MyMutex *lfDBMutex;
static LFDatabase instance_;
lfDatabase *data_;
};
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 2dd745f6c..afea47a26 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -66,7 +66,11 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
if (ri->isBayer()) {
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
-
+ const bool isFloat = ri->isFloat();
+ const int top_margin = ri->get_topmargin();
+ const int left_margin = ri->get_leftmargin();
+ const int raw_width = ri->get_rawwidth();
+ const float * const float_raw_image = ri->get_FloatRawImage();
#ifdef _OPENMP
#pragma omp parallel for if(multiThread)
#endif
@@ -76,8 +80,15 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
int col = 0;
for (; col < width - 1; col += 2) {
- float val0 = image[row * width + col][c0];
- float val1 = image[row * width + col + 1][c1];
+ float val0;
+ float val1;
+ if (isFloat) {
+ val0 = float_raw_image[(row + top_margin) * raw_width + col + left_margin];
+ val1 = float_raw_image[(row + top_margin) * raw_width + col + left_margin + 1];
+ } else {
+ val0 = image[row * width + col][c0];
+ val1 = image[row * width + col + 1][c1];
+ }
val0 -= cblack[c0];
val1 -= cblack[c1];
val0 *= scale_mul[c0];
@@ -87,7 +98,12 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
}
if (col < width) { // in case width is odd
- float val0 = image[row * width + col][c0];
+ float val0;
+ if (isFloat) {
+ val0 = float_raw_image[(row + top_margin) * raw_width + col + left_margin];
+ } else {
+ val0 = image[row * width + col][c0];
+ }
val0 -= cblack[c0];
val0 *= scale_mul[c0];
image[row * width + col][c0] = rtengine::CLIP (val0);
@@ -96,6 +112,11 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
} else if (ri->isXtrans()) {
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
+ const bool isFloat = ri->isFloat();
+ const int top_margin = ri->get_topmargin();
+ const int left_margin = ri->get_leftmargin();
+ const int raw_width = ri->get_rawwidth();
+ const float * const float_raw_image = ri->get_FloatRawImage();
#ifdef _OPENMP
#pragma omp parallel for if(multiThread)
@@ -111,7 +132,12 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
for (; col < width - 5; col += 6) {
for (int i = 0; i < 6; ++i) {
const unsigned ccol = c[i];
- float val = image[row * width + col + i][ccol];
+ float val;
+ if (isFloat) {
+ val = float_raw_image[(row + top_margin) * raw_width + col + i + left_margin];
+ } else {
+ val = image[row * width + col + i][ccol];
+ }
val -= cblack[ccol];
val *= scale_mul[ccol];
image[row * width + col + i][ccol] = rtengine::CLIP (val);
@@ -120,7 +146,12 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
for (; col < width; ++col) { // remaining columns
const unsigned ccol = ri->XTRANSFC (row, col);
- float val = image[row * width + col][ccol];
+ float val;
+ if (isFloat) {
+ val = float_raw_image[(row + top_margin) * raw_width + col + left_margin];
+ } else {
+ val = image[row * width + col][ccol];
+ }
val -= cblack[ccol];
val *= scale_mul[ccol];
image[row * width + col][ccol] = rtengine::CLIP (val);
@@ -285,11 +316,12 @@ Image8 *load_inspector_mode(const Glib::ustring &fname, RawMetaDataLocation &rml
ProcParams neutral;
neutral.raw.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST);
neutral.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
- neutral.icm.input = "(camera)";
- neutral.icm.working = "RT_sRGB";
+ neutral.icm.inputProfile = "(camera)";
+ neutral.icm.workingProfile = options.rtSettings.srgb;
src.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
- src.demosaic(neutral.raw);
+ double thresholdDummy = 0.f;
+ src.demosaic(neutral.raw, false, thresholdDummy);
PreviewProps pp(0, 0, w, h, 1);
@@ -1087,7 +1119,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
gmi = gm * defGain / mul_lum;
bmi = bm * defGain / mul_lum;
- // The RAW exposure is not reflected since it's done in preprocessing. If we only have e.g. the chached thumb,
+ // The RAW exposure is not reflected since it's done in preprocessing. If we only have e.g. the cached thumb,
// that is already preprocessed. So we simulate the effect here roughly my modifying the exposure accordingly
if (isRaw) {
rmi *= params.raw.expos;
@@ -1233,7 +1265,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
bool opautili = false;
if (params.colorToning.enabled) {
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.workingProfile);
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
@@ -1285,10 +1317,10 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
if (isRaw) {
cmsHPROFILE dummy;
- RawImageSource::findInputProfile (params.icm.input, nullptr, camName, &dcpProf, dummy);
+ RawImageSource::findInputProfile (params.icm.inputProfile, nullptr, camName, &dcpProf, dummy);
if (dcpProf) {
- dcpProf->setStep2ApplyState (params.icm.working, params.icm.toneCurve, params.icm.applyLookTable, params.icm.applyBaselineExposureOffset, as);
+ dcpProf->setStep2ApplyState (params.icm.workingProfile, params.icm.toneCurve, params.icm.applyLookTable, params.icm.applyBaselineExposureOffset, as);
}
}
diff --git a/rtengine/settings.h b/rtengine/settings.h
index 22d32d598..05aca89cf 100644
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -30,13 +30,13 @@ class Settings
public:
Glib::ustring iccDirectory; ///< The directory containing the possible output icc profiles
int viewingdevice; // white of output device (D50...D65..)
- int viewingdevicegrey; // level of grey output device
+ int viewingdevicegrey; // level of grey output device
int viewinggreySc; // level of grey Scene
- int leveldnv; // level of crop denoise
- int leveldnti; // size of tiles denoise
+ int leveldnv; // level of crop denoise
+ int leveldnti; // size of tiles denoise
int leveldnaut; // level of auto denoise
int leveldnliss; // level of auto multi zone
- int leveldnautsimpl; // STD or EXPERT
+ 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
@@ -50,21 +50,22 @@ public:
bool verbose;
Glib::ustring darkFramesPath; ///< The default directory for dark frames
Glib::ustring flatFieldsPath; ///< The default directory for flat fields
- Glib::ustring adobe; // default name of AdobeRGB1998
- Glib::ustring prophoto; // default name of Prophoto
- Glib::ustring prophoto10; // default name of Prophoto
- Glib::ustring widegamut; //default name of WidegamutRGB
- Glib::ustring beta; // default name of BetaRGB
- Glib::ustring best; // default name of BestRGB
- Glib::ustring bruce; // default name of Bruce
- Glib::ustring srgb; // default name of SRGB space profile
- Glib::ustring srgb10; // default name of SRGB space profile
- Glib::ustring rec2020; // default name of rec2020
+ Glib::ustring adobe; // filename of AdobeRGB1998 profile (default to the bundled one)
+ Glib::ustring prophoto; // filename of Prophoto profile (default to the bundled one)
+ Glib::ustring widegamut; // filename of WidegamutRGB profile (default to the bundled one)
+ Glib::ustring beta; // filename of BetaRGB profile (default to the bundled one)
+ Glib::ustring best; // filename of BestRGB profile (default to the bundled one)
+ Glib::ustring bruce; // filename of BruceRGB profile (default to the bundled one)
+ Glib::ustring srgb; // filename of sRGB profile (default to the bundled one)
+ Glib::ustring rec2020; // filename of Rec2020 profile (default to the bundled one)
+ Glib::ustring ACESp0; // filename of ACES P0 profile (default to the bundled one)
+ Glib::ustring ACESp1; // filename of ACES P1 profile (default to the bundled one)
bool gamutICC; // no longer used
bool gamutLch;
- bool HistogramWorking;
+ bool HistogramWorking; // true: histogram is display the value of the image computed in the Working profile
+ // false: histogram is display the value of the image computed in the Output profile
int amchroma;
int protectred;
double protectredh;
@@ -94,13 +95,13 @@ public:
RAW_IF_NOT_JPEG_FULLSIZE
};
ThumbnailInspectorMode thumbnail_inspector_mode;
-
+
/** Creates a new instance of Settings.
* @return a pointer to the new Settings instance. */
- static Settings* create ();
+ static Settings* create();
/** Destroys an instance of Settings.
* @param s a pointer to the Settings instance to destroy. */
- static void destroy (Settings* s);
+ static void destroy(Settings* s);
};
}
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 42f240b8d..a5b84e186 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -164,6 +164,13 @@ private:
imgsrc = ii->getImageSource();
tr = getCoarseBitMask(params.coarse);
+ if(imgsrc->getSensorType() == ST_BAYER) {
+ if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
+ imgsrc->setBorder(params.raw.bayersensor.border);
+ } else {
+ imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
+ }
+ }
imgsrc->getFullSize(fw, fh, tr);
// check the crop params
@@ -201,19 +208,20 @@ private:
ipf_p.reset(new ImProcFunctions(¶ms, true));
ImProcFunctions &ipf = * (ipf_p.get());
- pp = PreviewProps(0, 0, fw, fh, 1);
imgsrc->setCurrentFrame(params.raw.bayersensor.imageNum);
imgsrc->preprocess(params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled);
if (pl) {
pl->setProgress(0.20);
}
+ double contrastThresholdDummy;
+ imgsrc->demosaic (params.raw, false, contrastThresholdDummy);
- imgsrc->demosaic(params.raw);
if (pl) {
pl->setProgress(0.30);
}
+ pp = PreviewProps (0, 0, fw, fh, 1);
if (params.retinex.enabled) { //enabled Retinex
LUTf cdcurve(65536, 0);
@@ -372,21 +380,21 @@ private:
float multip = 1.f;
float adjustr = 1.f;
- if (params.icm.working == "ProPhoto") {
+ if (params.icm.workingProfile == "ProPhoto") {
adjustr = 1.f; //
- } else if (params.icm.working == "Adobe RGB") {
+ } else if (params.icm.workingProfile == "Adobe RGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "sRGB") {
+ } else if (params.icm.workingProfile == "sRGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "WideGamut") {
+ } else if (params.icm.workingProfile == "WideGamut") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Rec2020") {
+ } else if (params.icm.workingProfile == "Rec2020") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Beta RGB") {
+ } else if (params.icm.workingProfile == "Beta RGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BestRGB") {
+ } else if (params.icm.workingProfile == "BestRGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BruceRGB") {
+ } else if (params.icm.workingProfile == "BruceRGB") {
adjustr = 1.f / 1.2f;
}
@@ -615,21 +623,21 @@ private:
float MinRMoy = 0.f;
float MinBMoy = 0.f;
- if (params.icm.working == "ProPhoto") {
+ if (params.icm.workingProfile == "ProPhoto") {
adjustr = 1.f;
- } else if (params.icm.working == "Adobe RGB") {
+ } else if (params.icm.workingProfile == "Adobe RGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "sRGB") {
+ } else if (params.icm.workingProfile == "sRGB") {
adjustr = 1.f / 1.3f;
- } else if (params.icm.working == "WideGamut") {
+ } else if (params.icm.workingProfile == "WideGamut") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Rec2020") {
+ } else if (params.icm.workingProfile == "Rec2020") {
adjustr = 1.f / 1.1f;
- } else if (params.icm.working == "Beta RGB") {
+ } else if (params.icm.workingProfile == "Beta RGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BestRGB") {
+ } else if (params.icm.workingProfile == "BestRGB") {
adjustr = 1.f / 1.2f;
- } else if (params.icm.working == "BruceRGB") {
+ } else if (params.icm.workingProfile == "BruceRGB") {
adjustr = 1.f / 1.2f;
}
@@ -747,7 +755,9 @@ private:
}
if (params.toneCurve.histmatching) {
- imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
+ if (!params.toneCurve.fromHistMatching) {
+ imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
+ }
if (params.toneCurve.autoexp) {
params.toneCurve.expcomp = 0.0;
@@ -759,7 +769,6 @@ private:
params.toneCurve.brightness = 0;
params.toneCurve.contrast = 0;
params.toneCurve.black = 0;
-
}
// at this stage, we can flush the raw data to free up quite an important amount of memory
@@ -885,9 +894,49 @@ private:
const int W = baseImg->getWidth();
const int H = baseImg->getHeight();
LabImage labcbdl(W, H);
- ipf.rgb2lab(*baseImg, labcbdl, params.icm.working);
+ ipf.rgb2lab (*baseImg, labcbdl, params.icm.workingProfile);
ipf.dirpyrequalizer(&labcbdl, 1);
- ipf.lab2rgb(labcbdl, *baseImg, params.icm.working);
+ ipf.lab2rgb (labcbdl, *baseImg, params.icm.workingProfile);
+ }
+
+ //gamma TRC working
+ if (params.icm.workingTRC == "Custom") { //exec TRC IN free
+ Glib::ustring profile;
+ profile = params.icm.workingProfile;
+
+ if (profile == "sRGB" || profile == "Adobe RGB" || profile == "ProPhoto" || profile == "WideGamut" || profile == "BruceRGB" || profile == "Beta RGB" || profile == "BestRGB" || profile == "Rec2020" || profile == "ACESp0" || profile == "ACESp1") {
+ int cw = baseImg->getWidth();
+ int ch = baseImg->getHeight();
+ // put gamma TRC to 1
+ Imagefloat* readyImg0 = NULL;
+ readyImg0 = ipf.workingtrc(baseImg, cw, ch, -5, params.icm.workingProfile, 2.4, 12.92310);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ baseImg->r(row, col) = (float)readyImg0->r(row, col);
+ baseImg->g(row, col) = (float)readyImg0->g(row, col);
+ baseImg->b(row, col) = (float)readyImg0->b(row, col);
+ }
+ }
+
+ delete readyImg0;
+
+ //adjust TRC
+ Imagefloat* readyImg = NULL;
+ readyImg = ipf.workingtrc(baseImg, cw, ch, 5, params.icm.workingProfile, params.icm.workingTRCGamma, params.icm.workingTRCSlope);
+ #pragma omp parallel for
+
+ for (int row = 0; row < ch; row++) {
+ for (int col = 0; col < cw; col++) {
+ baseImg->r(row, col) = (float)readyImg->r(row, col);
+ baseImg->g(row, col) = (float)readyImg->g(row, col);
+ baseImg->b(row, col) = (float)readyImg->b(row, col);
+ }
+ }
+
+ delete readyImg;
+ }
}
// RGB processing
@@ -914,7 +963,7 @@ private:
bool opautili = false;
if (params.colorToning.enabled) {
- TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params.icm.working);
+ TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.workingProfile);
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
@@ -1300,7 +1349,8 @@ private:
}
if (labResize) { // resize lab data
- if (labView->W != imw || labView->H != imh) {
+ if ((labView->W != imw || labView->H != imh) &&
+ (params.resize.allowUpscaling || (labView->W >= imw && labView->H >= imh))) {
// resize image
tmplab = new LabImage(imw, imh);
ipf.Lanczos(labView, tmplab, tmpScale);
@@ -1328,29 +1378,16 @@ private:
bool useLCMS = false;
bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled && !autili && !butili ;
- if (params.icm.gamma != "default" || params.icm.freegamma) { // if select gamma output between BT709, sRGB, linear, low, high, 2.2 , 1.8
+ ///////////// Custom output gamma has been removed, the user now has to create
+ ///////////// a new output profile with the ICCProfileCreator
- GammaValues ga;
- // if(params.blackwhite.enabled) params.toneCurve.hrenabled=false;
- readyImg = ipf.lab2rgbOut(labView, cx, cy, cw, ch, params.icm, &ga);
- customGamma = true;
+ // if Default gamma mode: we use the profile selected in the "Output profile" combobox;
+ // gamma come from the selected profile, otherwise it comes from "Free gamma" tool
- //or selected Free gamma
- useLCMS = false;
+ readyImg = ipf.lab2rgbOut (labView, cx, cy, cw, ch, params.icm);
- if ((jprof = ICCStore::getInstance()->createCustomGammaOutputProfile(params.icm, ga)) == nullptr) {
- useLCMS = true;
- }
-
- } else {
- // if Default gamma mode: we use the profile selected in the "Output profile" combobox;
- // gamma come from the selected profile, otherwise it comes from "Free gamma" tool
-
- readyImg = ipf.lab2rgbOut(labView, cx, cy, cw, ch, params.icm);
-
- if (settings->verbose) {
- printf("Output profile_: \"%s\"\n", params.icm.output.c_str());
- }
+ if (settings->verbose) {
+ printf ("Output profile_: \"%s\"\n", params.icm.outputProfile.c_str());
}
delete labView;
@@ -1377,7 +1414,8 @@ private:
pl->setProgress(0.70);
}
- if (tmpScale != 1.0 && params.resize.method == "Nearest") { // resize rgb data (gamma applied)
+ if (tmpScale != 1.0 && params.resize.method == "Nearest" &&
+ (params.resize.allowUpscaling || (readyImg->getWidth() >= imw && readyImg->getHeight() >= imh))) { // resize rgb data (gamma applied)
Imagefloat* tempImage = new Imagefloat(imw, imh);
ipf.resize(readyImg, tempImage, tmpScale);
delete readyImg;
@@ -1412,21 +1450,21 @@ private:
} else {
// use the selected output profile if present, otherwise use LCMS2 profile generate by lab2rgb16 w/ gamma
- if (params.icm.output != "" && params.icm.output != ColorManagementParams::NoICMString) {
+ if (params.icm.outputProfile != "" && params.icm.outputProfile != ColorManagementParams::NoICMString) {
// if ICCStore::getInstance()->getProfile send back an object, then ICCStore::getInstance()->getContent will do too
- cmsHPROFILE jprof = ICCStore::getInstance()->getProfile(params.icm.output); //get outProfile
+ cmsHPROFILE jprof = ICCStore::getInstance()->getProfile (params.icm.outputProfile); //get outProfile
if (jprof == nullptr) {
if (settings->verbose) {
- printf("\"%s\" ICC output profile not found!\n - use LCMS2 substitution\n", params.icm.output.c_str());
+ printf ("\"%s\" ICC output profile not found!\n - use LCMS2 substitution\n", params.icm.outputProfile.c_str());
}
} else {
if (settings->verbose) {
- printf("Using \"%s\" output profile\n", params.icm.output.c_str());
+ printf ("Using \"%s\" output profile\n", params.icm.outputProfile.c_str());
}
- ProfileContent pc = ICCStore::getInstance()->getContent(params.icm.output);
+ ProfileContent pc = ICCStore::getInstance()->getContent (params.icm.outputProfile);
readyImg->setOutputProfile(pc.getData().c_str(), pc.getData().size());
}
} else {
@@ -1473,7 +1511,7 @@ private:
double scale_factor = ipf.resizeScale(¶ms, fw, fh, imw, imh);
std::unique_ptr tmplab(new LabImage(fw, fh));
- ipf.rgb2lab(*baseImg, *tmplab, params.icm.working);
+ ipf.rgb2lab (*baseImg, *tmplab, params.icm.workingProfile);
if (params.crop.enabled) {
int cx = params.crop.x;
@@ -1497,7 +1535,7 @@ private:
assert(params.resize.enabled);
// resize image
- {
+ if (params.resize.allowUpscaling || (imw <= fw && imh <= fh)) {
std::unique_ptr resized(new LabImage(imw, imh));
ipf.Lanczos(tmplab.get(), resized.get(), scale_factor);
tmplab = std::move(resized);
@@ -1510,7 +1548,7 @@ private:
delete baseImg;
baseImg = new Imagefloat(fw, fh);
- ipf.lab2rgb(*tmplab, *baseImg, params.icm.working);
+ ipf.lab2rgb (*tmplab, *baseImg, params.icm.workingProfile);
}
void adjust_procparams(double scale_factor)
diff --git a/rtengine/stdimagesource.cc b/rtengine/stdimagesource.cc
index 7fa55cfb7..c75995b25 100644
--- a/rtengine/stdimagesource.cc
+++ b/rtengine/stdimagesource.cc
@@ -220,9 +220,9 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
bool skipTransform = false;
cmsHPROFILE in = nullptr;
- cmsHPROFILE out = ICCStore::getInstance()->workingSpace (cmp.working);
+ cmsHPROFILE out = ICCStore::getInstance()->workingSpace (cmp.workingProfile);
- if (cmp.input == "(embedded)" || cmp.input == "" || cmp.input == "(camera)" || cmp.input == "(cameraICC)") {
+ if (cmp.inputProfile == "(embedded)" || cmp.inputProfile == "" || cmp.inputProfile == "(camera)" || cmp.inputProfile == "(cameraICC)") {
if (embedded) {
in = embedded;
} else {
@@ -233,8 +233,8 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
}
}
} else {
- if (cmp.input != "(none)") {
- in = ICCStore::getInstance()->getProfile (cmp.input);
+ if (cmp.inputProfile != "(none)") {
+ in = ICCStore::getInstance()->getProfile (cmp.inputProfile);
if (in == nullptr && embedded) {
in = embedded;
@@ -270,7 +270,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
cmsDeleteTransform(hTransform);
} else {
- printf("Could not convert from %s to %s\n", in == embedded ? "embedded profile" : cmp.input.data(), cmp.working.data());
+ printf("Could not convert from %s to %s\n", in == embedded ? "embedded profile" : cmp.inputProfile.data(), cmp.workingProfile.data());
}
}
}
diff --git a/rtengine/tmo_fattal02.cc b/rtengine/tmo_fattal02.cc
index c6faef2e7..359b33575 100644
--- a/rtengine/tmo_fattal02.cc
+++ b/rtengine/tmo_fattal02.cc
@@ -1092,7 +1092,7 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
constexpr float luminance_noise_floor = 65.535f;
constexpr float min_luminance = 1.f;
- TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
+ TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.workingProfile);
#ifdef _OPENMP
#pragma omp parallel for if(multiThread)
diff --git a/rtengine/utils.cc b/rtengine/utils.cc
index 4ab5bc1b8..613b67be8 100644
--- a/rtengine/utils.cc
+++ b/rtengine/utils.cc
@@ -265,3 +265,21 @@ void swab(const void* from, void* to, ssize_t n)
}
}
+
+#if __SIZEOF_WCHAR_T__ == 4
+Glib::ustring utf32_to_utf8(wchar_t* UTF32Buffer, size_t sizeOfUTF32Buffer)
+{
+ char *buffer2 = new char[sizeOfUTF32Buffer];
+ char *pBuffer2 = buffer2;
+ gchar a[6];
+ for (size_t i=0; i < sizeOfUTF32Buffer/4; ++i) {
+ gint bytesWritten = g_unichar_to_utf8((gunichar)UTF32Buffer[i], a);
+ for (gint j=0; j < bytesWritten; ++j) {
+ *(pBuffer2++) = a[j];
+ }
+ }
+ Glib::ustring modelDesc(buffer2);
+ delete [] buffer2;
+ return modelDesc;
+}
+#endif
diff --git a/rtengine/utils.h b/rtengine/utils.h
index 5730c2544..14593edae 100644
--- a/rtengine/utils.h
+++ b/rtengine/utils.h
@@ -55,3 +55,8 @@ bool hasPngExtension(const Glib::ustring& filename);
void swab(const void* from, void* to, ssize_t n);
}
+
+#if __SIZEOF_WCHAR_T__ == 4
+Glib::ustring utf32_to_utf8(wchar_t* UTF32Buffer, size_t sizeOfUTF32Buffer);
+#endif
+
diff --git a/rtengine/vng4_demosaic_RT.cc b/rtengine/vng4_demosaic_RT.cc
index d6520607e..8ed05dd09 100644
--- a/rtengine/vng4_demosaic_RT.cc
+++ b/rtengine/vng4_demosaic_RT.cc
@@ -336,6 +336,7 @@ void RawImageSource::vng4_demosaic (const array2D &rawData, array2DsetProgress (1.0);
diff --git a/rtengine/xtrans_demosaic.cc b/rtengine/xtrans_demosaic.cc
index 411388ee5..ed253749b 100644
--- a/rtengine/xtrans_demosaic.cc
+++ b/rtengine/xtrans_demosaic.cc
@@ -114,7 +114,7 @@ void RawImageSource::cielab (const float (*rgb)[3], float* l, float* a, float *b
#define fcol(row,col) xtrans[(row)%6][(col)%6]
#define isgreen(row,col) (xtrans[(row)%3][(col)%3]&1)
-void RawImageSource::xtransborder_interpolate (int border)
+void RawImageSource::xtransborder_interpolate (int border, array2D &red, array2D &green, array2D &blue)
{
const int height = H, width = W;
@@ -201,7 +201,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
// printf("%d-pass X-Trans interpolation using %s conversion...\n", passes, useCieLab ? "lab" : "yuv");
// }
- xtransborder_interpolate(6);
+ xtransborder_interpolate(6, red, green, blue);
float xyz_cam[3][3];
{
@@ -974,7 +974,7 @@ void RawImageSource::fast_xtrans_interpolate (const array2D &rawData, arr
const int height = H, width = W;
- xtransborder_interpolate (1);
+ xtransborder_interpolate (1, red, green, blue);
int xtrans[6][6];
ri->getXtransMatrix(xtrans);
@@ -1019,60 +1019,5 @@ void RawImageSource::fast_xtrans_interpolate (const array2D &rawData, arr
#undef fcol
#undef isgreen
-void RawImageSource::xtrans_4pass_demosaic_RT(int passes, bool useCieLab, double contrast)
-{
- BENCHFUN
-
- if (contrast == 0.0) {
- // contrast == 0.0 means only AMaZE will be used
- xtrans_interpolate (passes, useCieLab);
- return;
- }
-
- xtrans_interpolate (passes, useCieLab);
-
- array2D redTmp(W, H);
- array2D greenTmp(W, H);
- array2D blueTmp(W, H);
- array2D L(W, H);
-
- fast_xtrans_interpolate(rawData, redTmp, greenTmp, blueTmp);
- const float xyz_rgb[3][3] = { // XYZ from RGB
- { 0.412453, 0.357580, 0.180423 },
- { 0.212671, 0.715160, 0.072169 },
- { 0.019334, 0.119193, 0.950227 }
- };
- #pragma omp parallel
- {
- #pragma omp for
- for(int i = 0; i < H; ++i) {
- Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, W);
- }
- }
- // calculate contrast based blend factors to use vng4 in regions with low contrast
- JaggedArray blend(W, H);
- buildBlendMask(L, blend, W, H, contrast / 100.f);
-
- // the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
- #pragma omp parallel for
- for(int i = 0; i < H; ++i) {
- for(int j = 0; j < W; ++j) {
- red[i][j] = intp(blend[i][j], red[i][j], redTmp[i][j]);
- }
- }
- #pragma omp parallel for
- for(int i = 0; i < H; ++i) {
- for(int j = 0; j < W; ++j) {
- green[i][j] = intp(blend[i][j], green[i][j], greenTmp[i][j]);
- }
- }
- #pragma omp parallel for
- for(int i = 0; i < H; ++i) {
- for(int j = 0; j < W; ++j) {
- blue[i][j] = intp(blend[i][j], blue[i][j], blueTmp[i][j]);
- }
- }
-
}
-}
\ No newline at end of file
diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt
index 47a7837c8..4cd789d79 100644
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -72,6 +72,7 @@ set(NONCLISOURCEFILES
histogrampanel.cc
history.cc
hsvequalizer.cc
+ iccprofilecreator.cc
icmpanel.cc
ilabel.cc
imagearea.cc
@@ -156,6 +157,7 @@ set(NONCLISOURCEFILES
eventmapper.cc
metadatapanel.cc
labgrid.cc
+ softlight.cc
)
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
@@ -225,6 +227,10 @@ else()
)
endif()
+if(OPENMP_FOUND AND NOT APPLE)
+ set(EXTRA_LIB_RTGUI ${EXTRA_LIB_RTGUI} "atomic")
+endif()
+
# Create config.h which defines where data are stored
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h
index 15c6ba078..8cf39aa29 100644
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -50,8 +50,6 @@ enum {
ADDSET_SHARPENMICRO_UNIFORMITY,
ADDSET_VIBRANCE_PASTELS,
ADDSET_VIBRANCE_SATURATED,
- ADDSET_FREE_OUPUT_GAMMA,
- ADDSET_FREE_OUTPUT_SLOPE,
ADDSET_CAT_DEGREE,
ADDSET_CAT_ADAPTSCENE,
ADDSET_CAT_ADAPTVIEWING,
@@ -143,6 +141,7 @@ enum {
ADDSET_BAYER_PS_SIGMA,
ADDSET_BAYER_DUALDEMOZCONTRAST,
ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION,
+ ADDSET_SOFTLIGHT_STRENGTH,
ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
};
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index b66f617a4..6260314b1 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -79,7 +79,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
}
reset = Gtk::manage (new Gtk::Button ());
- reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png")));
+ reset->add (*Gtk::manage (new RTImage ("undo-small.png", "redo-small.png")));
setExpandAlignProperties(reset, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
reset->set_relief (Gtk::RELIEF_NONE);
reset->set_tooltip_markup (M("ADJUSTER_RESET_TO_DEFAULT"));
@@ -166,7 +166,7 @@ void Adjuster::addAutoButton (Glib::ustring tooltip)
{
if (!automatic) {
automatic = new Gtk::CheckButton ();
- //automatic->add (*Gtk::manage (new RTImage ("processing.png")));
+ //automatic->add (*Gtk::manage (new RTImage ("gears.png")));
automatic->set_tooltip_markup(tooltip.length() ? Glib::ustring::compose("%1\n\n%2", M("GENERAL_AUTO"), tooltip) : M("GENERAL_AUTO"));
setExpandAlignProperties(automatic, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
autoChange = automatic->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::autoToggled) );
diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc
index 2f3505a08..d3e3ef9f0 100644
--- a/rtgui/batchqueue.cc
+++ b/rtgui/batchqueue.cc
@@ -53,16 +53,16 @@ BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(nullptr), fileCa
pmenu.attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p + 1);
p++;
- pmenu.attach (*Gtk::manage(head = new MyImageMenuItem (M("FILEBROWSER_POPUPMOVEHEAD"), "toleftend.png")), 0, 1, p, p + 1);
+ pmenu.attach (*Gtk::manage(head = new MyImageMenuItem (M("FILEBROWSER_POPUPMOVEHEAD"), "goto-start-small.png")), 0, 1, p, p + 1);
p++;
- pmenu.attach (*Gtk::manage(tail = new MyImageMenuItem (M("FILEBROWSER_POPUPMOVEEND"), "torightend.png")), 0, 1, p, p + 1);
+ pmenu.attach (*Gtk::manage(tail = new MyImageMenuItem (M("FILEBROWSER_POPUPMOVEEND"), "goto-end-small.png")), 0, 1, p, p + 1);
p++;
pmenu.attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p + 1);
p++;
- pmenu.attach (*Gtk::manage(cancel = new MyImageMenuItem (M("FILEBROWSER_POPUPCANCELJOB"), "gtk-close.png")), 0, 1, p, p + 1);
+ pmenu.attach (*Gtk::manage(cancel = new MyImageMenuItem (M("FILEBROWSER_POPUPCANCELJOB"), "cancel-small.png")), 0, 1, p, p + 1);
pmenu.show_all ();
@@ -228,7 +228,7 @@ bool BatchQueue::saveBatchQueue ()
// The column's header is mandatory (the first line will be skipped when loaded)
file << "input image full path|param file full path|output image full path|file format|jpeg quality|jpeg subsampling|"
- << "png bit depth|png compression|tiff bit depth|uncompressed tiff|save output params|force format options|fast export|"
+ << "png bit depth|png compression|tiff bit depth|tiff is float|uncompressed tiff|save output params|force format options|fast export|"
<< std::endl;
// method is already running with entryLock, so no need to lock again
@@ -246,7 +246,7 @@ bool BatchQueue::saveBatchQueue ()
#endif
<< saveFormat.jpegQuality << '|' << saveFormat.jpegSubSamp << '|'
<< saveFormat.pngBits << '|'
- << saveFormat.tiffBits << '|' << saveFormat.tiffUncompressed << '|'
+ << saveFormat.tiffBits << '|' << (saveFormat.tiffFloat ? 1 : 0) << '|' << saveFormat.tiffUncompressed << '|'
<< saveFormat.saveParams << '|' << entry->forceFormatOpts << '|'
<< entry->fast_pipeline << '|'
<< std::endl;
@@ -311,6 +311,7 @@ bool BatchQueue::loadBatchQueue ()
const auto jpegSubSamp = nextIntOr (options.saveFormat.jpegSubSamp);
const auto pngBits = nextIntOr (options.saveFormat.pngBits);
const auto tiffBits = nextIntOr (options.saveFormat.tiffBits);
+ const auto tiffFloat = nextIntOr (options.saveFormat.tiffFloat);
const auto tiffUncompressed = nextIntOr (options.saveFormat.tiffUncompressed);
const auto saveParams = nextIntOr (options.saveFormat.saveParams);
const auto forceFormatOpts = nextIntOr (options.forceFormatOpts);
@@ -352,6 +353,7 @@ bool BatchQueue::loadBatchQueue ()
saveFormat.jpegSubSamp = jpegSubSamp;
saveFormat.pngBits = pngBits;
saveFormat.tiffBits = tiffBits;
+ saveFormat.tiffFloat = tiffFloat == 1;
saveFormat.tiffUncompressed = tiffUncompressed != 0;
saveFormat.saveParams = saveParams != 0;
entry->forceFormatOpts = forceFormatOpts != 0;
@@ -608,7 +610,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImagefloat* img)
int err = 0;
if (saveFormat.format == "tif") {
- err = img->saveAsTIFF (fname, saveFormat.tiffBits, saveFormat.tiffUncompressed);
+ err = img->saveAsTIFF (fname, saveFormat.tiffBits, saveFormat.tiffFloat, saveFormat.tiffUncompressed);
} else if (saveFormat.format == "png") {
err = img->saveAsPNG (fname, saveFormat.pngBits);
} else if (saveFormat.format == "jpg") {
diff --git a/rtgui/batchqueuebuttonset.cc b/rtgui/batchqueuebuttonset.cc
index fefcdf3c9..19c309791 100644
--- a/rtgui/batchqueuebuttonset.cc
+++ b/rtgui/batchqueuebuttonset.cc
@@ -31,9 +31,9 @@ BatchQueueButtonSet::BatchQueueButtonSet (BatchQueueEntry* myEntry)
{
if (!iconsLoaded) {
- cancelIcon = RTImage::createFromPng ("gtk-close.png");
- headIcon = RTImage::createFromPng ("toleftend.png");
- tailIcon = RTImage::createFromPng ("torightend.png");
+ cancelIcon = RTImage::createFromPng ("cancel-small.png");
+ headIcon = RTImage::createFromPng ("goto-start-small.png");
+ tailIcon = RTImage::createFromPng ("goto-end-small.png");
iconsLoaded = true;
}
diff --git a/rtgui/batchqueueentry.cc b/rtgui/batchqueueentry.cc
index 3092d6db4..b5383205f 100644
--- a/rtgui/batchqueueentry.cc
+++ b/rtgui/batchqueueentry.cc
@@ -55,7 +55,7 @@ BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine:
#endif
if (!iconsLoaded) {
- savedAsIcon = RTImage::createFromFile ("gtk-save.png");
+ savedAsIcon = RTImage::createFromFile ("save-small.png");
iconsLoaded = true;
}
@@ -175,9 +175,10 @@ Glib::ustring BatchQueueEntry::getToolTip (int x, int y)
tooltip += Glib::ustring::compose("\n\n%1: %2", M("BATCHQUEUE_DESTFILENAME"), outFileName);
if (forceFormatOpts) {
- tooltip += Glib::ustring::compose("\n\n%1: %2 (%3 bits)", M("SAVEDLG_FILEFORMAT"), saveFormat.format,
+ tooltip += Glib::ustring::compose("\n\n%1: %2 (%3-bits%4)", M("SAVEDLG_FILEFORMAT"), saveFormat.format,
saveFormat.format == "png" ? saveFormat.pngBits :
- saveFormat.format == "tif" ? saveFormat.tiffBits : 8);
+ saveFormat.format == "tif" ? saveFormat.tiffBits : 8,
+ saveFormat.format == "tif" && saveFormat.tiffFloat ? M("SAVEDLG_FILEFORMAT_FLOAT") : "");
if (saveFormat.format == "jpg") {
tooltip += Glib::ustring::compose("\n%1: %2\n%3: %4",
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index 6dfa9ad9c..1a9e08b94 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -87,7 +87,7 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
outdirFolderButton->signal_pressed().connect( sigc::mem_fun(*this, &BatchQueuePanel::pathFolderButtonPressed) );
outdirFolderButton->set_tooltip_markup (M("PREFERENCES_OUTDIRFOLDERHINT"));
outdirFolderButton->set_label(makeFolderLabel(options.savePathFolder));
- Gtk::Image* folderImg = Gtk::manage (new RTImage ("gtk-directory.png"));
+ Gtk::Image* folderImg = Gtk::manage (new RTImage ("folder-closed.png"));
folderImg->show ();
outdirFolderButton->set_image (*folderImg);
outdirFolder = nullptr;
@@ -151,13 +151,13 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
zoomLabel->set_use_markup (true);
zoomBox->pack_start (*zoomLabel, Gtk::PACK_SHRINK, 4);
zoomInButton = Gtk::manage (new Gtk::Button ());
- zoomInButton->set_image (*Gtk::manage (new RTImage ("gtk-zoom-in.png")));
+ zoomInButton->set_image (*Gtk::manage (new RTImage ("magnifier-plus.png")));
zoomInButton->signal_pressed().connect (sigc::mem_fun(*batchQueue, &BatchQueue::zoomIn));
zoomInButton->set_relief (Gtk::RELIEF_NONE);
zoomInButton->set_tooltip_markup (M("FILEBROWSER_ZOOMINHINT"));
zoomBox->pack_end (*zoomInButton, Gtk::PACK_SHRINK);
zoomOutButton = Gtk::manage (new Gtk::Button ());
- zoomOutButton->set_image (*Gtk::manage (new RTImage ("gtk-zoom-out.png")));
+ zoomOutButton->set_image (*Gtk::manage (new RTImage ("magnifier-minus.png")));
zoomOutButton->signal_pressed().connect (sigc::mem_fun(*batchQueue, &BatchQueue::zoomOut));
zoomOutButton->set_relief (Gtk::RELIEF_NONE);
zoomOutButton->set_tooltip_markup (M("FILEBROWSER_ZOOMOUTHINT"));
@@ -206,13 +206,13 @@ void BatchQueuePanel::updateTab (int qsize, int forceOrientation)
Gtk::Label* l;
if(!qsize ) {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing.png")), Gtk::POS_TOP, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears.png")), Gtk::POS_TOP, 1, 1);
l = Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")) );
} else if (qStartStop->get_active()) {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing-play.png")), Gtk::POS_TOP, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears-play.png")), Gtk::POS_TOP, 1, 1);
l = Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE") + " [" + Glib::ustring::format( qsize ) + "]"));
} else {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing-pause.png")), Gtk::POS_TOP, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears-pause.png")), Gtk::POS_TOP, 1, 1);
l = Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE") + " [" + Glib::ustring::format( qsize ) + "]" ));
}
@@ -226,13 +226,13 @@ void BatchQueuePanel::updateTab (int qsize, int forceOrientation)
}
} else {
if (!qsize ) {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing.png")), Gtk::POS_RIGHT, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears.png")), Gtk::POS_RIGHT, 1, 1);
grid->attach_next_to(*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE") )), Gtk::POS_RIGHT, 1, 1);
} else if (qStartStop->get_active()) {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing-play.png")), Gtk::POS_RIGHT, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears-play.png")), Gtk::POS_RIGHT, 1, 1);
grid->attach_next_to(*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE") + " [" + Glib::ustring::format( qsize ) + "]" )), Gtk::POS_RIGHT, 1, 1);
} else {
- grid->attach_next_to(*Gtk::manage (new RTImage ("processing-pause.png")), Gtk::POS_RIGHT, 1, 1);
+ grid->attach_next_to(*Gtk::manage (new RTImage ("gears-pause.png")), Gtk::POS_RIGHT, 1, 1);
grid->attach_next_to(*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE") + " [" + Glib::ustring::format( qsize ) + "]" )), Gtk::POS_RIGHT, 1, 1);
}
diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc
index 120ec852e..6d5c17753 100644
--- a/rtgui/batchtoolpanelcoord.cc
+++ b/rtgui/batchtoolpanelcoord.cc
@@ -151,7 +151,6 @@ void BatchToolPanelCoordinator::initSession ()
prsharpening->setAdjusterBehavior (false, false, false, false, false, false, false);
sharpenEdge->setAdjusterBehavior (false, false);
sharpenMicro->setAdjusterBehavior (false, false, false);
- icm->setAdjusterBehavior (false, false);
epd->setAdjusterBehavior (false, false, false, false, false);
fattal->setAdjusterBehavior (false, false, false);
@@ -201,10 +200,10 @@ void BatchToolPanelCoordinator::initSession ()
sharpenEdge->setAdjusterBehavior (options.baBehav[ADDSET_SHARPENEDGE_AMOUNT], options.baBehav[ADDSET_SHARPENEDGE_PASS]);
sharpenMicro->setAdjusterBehavior (options.baBehav[ADDSET_SHARPENMICRO_AMOUNT], options.baBehav[ADDSET_SHARPENMICRO_CONTRAST], options.baBehav[ADDSET_SHARPENMICRO_UNIFORMITY]);
- icm->setAdjusterBehavior (options.baBehav[ADDSET_FREE_OUPUT_GAMMA], options.baBehav[ADDSET_FREE_OUTPUT_SLOPE]);
// colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRPROTECT], options.baBehav[ADDSET_COLORTONING_BALANCE]);
colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]);
filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
+ softlight->setAdjusterBehavior(options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]);
retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] );
@@ -280,8 +279,6 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_CAT_CONTRAST]) { pparams.colorappearance.contrast = 0; }
if (options.baBehav[ADDSET_CAT_CONTRAST_Q]) { pparams.colorappearance.qcontrast = 0; }
if (options.baBehav[ADDSET_CAT_HUE]) { pparams.colorappearance.colorh = 0; }
- if (options.baBehav[ADDSET_FREE_OUPUT_GAMMA]) { pparams.icm.gampos = 0; }
- if (options.baBehav[ADDSET_FREE_OUTPUT_SLOPE]) { pparams.icm.slpos = 0; }
//if (options.baBehav[ADDSET_CBOOST_AMOUNT]) pparams.colorBoost.amount = 0;
//if (options.baBehav[ADDSET_CS_BLUEYELLOW]) pparams.colorShift.a = 0;
//if (options.baBehav[ADDSET_CS_GREENMAGENTA]) pparams.colorShift.b = 0;
@@ -296,6 +293,7 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_COLORTONING_BALANCE]) { pparams.colorToning.balance = 0; }
if (options.baBehav[ADDSET_COLORTONING_STRENGTH]) { pparams.colorToning.strength = 0; }
if (options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]) { pparams.filmSimulation.strength = 0; }
+ if (options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]) { pparams.softlight.strength = 0; }
if (options.baBehav[ADDSET_ROTATE_DEGREE]) { pparams.rotate.degree = 0; }
if (options.baBehav[ADDSET_RESIZE_SCALE]) { pparams.resize.scale = 0; }
if (options.baBehav[ADDSET_DIST_AMOUNT]) { pparams.distortion.amount = 0; }
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index c6f04c053..d68f5c2d3 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -28,6 +28,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
{
auto m = ProcEventMapper::getInstance();
+ EvDemosaicBorder = m->newEvent(DEMOSAIC, "HISTORY_MSG_RAW_BORDER");
EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
EvDemosaicPixelshiftDemosaicMethod = m->newEvent(DEMOSAIC, "HISTORY_MSG_PIXELSHIFT_DEMOSAIC");
@@ -45,6 +46,32 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
+
+ dualDemosaicOptions = Gtk::manage (new Gtk::VBox ());
+
+ dualDemosaicContrast = Gtk::manage(new Adjuster (M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
+ dualDemosaicContrast->setAdjusterListener (this);
+
+ if (dualDemosaicContrast->delay < options.adjusterMaxDelay) {
+ dualDemosaicContrast->delay = options.adjusterMaxDelay;
+ }
+
+ dualDemosaicContrast->show();
+ dualDemosaicOptions->pack_start(*dualDemosaicContrast);
+ pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
+
+ borderbox = Gtk::manage(new Gtk::HBox());
+ border = Gtk::manage(new Adjuster(M("TP_RAW_BORDER"), 0, 16, 1, 4));
+ border->setAdjusterListener (this);
+
+ if (border->delay < options.adjusterMaxDelay) {
+ border->delay = options.adjusterMaxDelay;
+ }
+
+ border->show();
+ borderbox->pack_start(*border);
+ pack_start(*borderbox, Gtk::PACK_SHRINK, 4);
+
imageNumberBox = Gtk::manage (new Gtk::HBox ());
imageNumberBox->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_IMAGENUM") + ": ")), Gtk::PACK_SHRINK, 4);
imageNumber = Gtk::manage (new MyComboBoxText ());
@@ -99,20 +126,6 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
lmmseOptions->pack_start(*lmmseIterations);
pack_start( *lmmseOptions, Gtk::PACK_SHRINK, 4);
- dualDemosaicOptions = Gtk::manage (new Gtk::VBox ());
-
- dualDemosaicContrast = Gtk::manage(new Adjuster (M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
- dualDemosaicContrast->setAdjusterListener (this);
-
- if (dualDemosaicContrast->delay < options.adjusterMaxDelay) {
- dualDemosaicContrast->delay = options.adjusterMaxDelay;
- }
-
- dualDemosaicContrast->show();
- dualDemosaicOptions->pack_start(*dualDemosaicContrast);
- pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
-
-
// -------------------- PixelShift ----------------------
@@ -234,6 +247,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
imageNumber->connect(imageNumber->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::imageNumberChanged) ));
pixelShiftMotionMethod->connect(pixelShiftMotionMethod->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::pixelShiftMotionMethodChanged) ));
pixelShiftDemosaicMethod->connect(pixelShiftDemosaicMethod->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::pixelShiftDemosaicMethodChanged) ));
+
}
@@ -245,6 +259,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
pixelShiftDemosaicMethod->block(true);
//allEnhconn.block (true);
+ border->setValue(pp->raw.bayersensor.border);
imageNumber->set_active(pp->raw.bayersensor.imageNum);
for (size_t i = 0; i < procparams::RAWParams::BayerSensor::getMethodStrings().size(); ++i) {
@@ -294,6 +309,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
}
if(pedited) {
+ border->setEditedState (pedited->raw.bayersensor.border ? Edited : UnEdited);
ccSteps->setEditedState (pedited->raw.bayersensor.ccSteps ? Edited : UnEdited);
dcbIterations->setEditedState ( pedited->raw.bayersensor.dcbIterations ? Edited : UnEdited);
dcbEnhance->setEdited (pedited->raw.bayersensor.dcbEnhance);
@@ -331,9 +347,11 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
}
if (!batchMode) {
- dcbOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB));
+ dcbOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB) || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCBVNG4));
lmmseOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::LMMSE));
- dualDemosaicOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::AMAZEVNG4));
+ dualDemosaicOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::AMAZEVNG4)
+ || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCBVNG4)
+ || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::RCDVNG4));
if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::PIXELSHIFT)) {
pixelShiftOptions->set_visible(pp->raw.bayersensor.pixelShiftMotionCorrectionMethod == RAWParams::BayerSensor::PSMotionCorrectionMethod::CUSTOM);
pixelShiftFrame->show();
@@ -365,7 +383,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pp->raw.bayersensor.ccSteps = ccSteps->getIntValue();
pp->raw.bayersensor.dcb_iterations = dcbIterations->getIntValue();
pp->raw.bayersensor.dcb_enhance = dcbEnhance->getLastActive ();
- //pp->raw.bayersensor.all_enhance = allEnhance->getLastActive ();
+ pp->raw.bayersensor.border = border->getIntValue();
pp->raw.bayersensor.lmmse_iterations = lmmseIterations->getIntValue();
pp->raw.bayersensor.dualDemosaicContrast = dualDemosaicContrast->getValue();
pp->raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::PSMotionCorrectionMethod)pixelShiftMotionMethod->get_active_row_number();
@@ -399,6 +417,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
if (pedited) {
+ pedited->raw.bayersensor.border = border->getEditedState ();
pedited->raw.bayersensor.ccSteps = ccSteps->getEditedState ();
pedited->raw.bayersensor.method = method->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.imageNum = imageNumber->get_active_text() != M("GENERAL_UNCHANGED");
@@ -426,6 +445,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
void BayerProcess::setAdjusterBehavior (bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd)
{
+ border->setAddMode(false);
ccSteps->setAddMode(falsecoloradd);
dcbIterations->setAddMode(iteradd);
lmmseIterations->setAddMode(iteradd);
@@ -437,6 +457,7 @@ void BayerProcess::setAdjusterBehavior (bool falsecoloradd, bool iteradd, bool d
void BayerProcess::trimValues (rtengine::procparams::ProcParams* pp)
{
+ border->trimValue(pp->raw.bayersensor.border);
ccSteps->trimValue(pp->raw.bayersensor.ccSteps);
dcbIterations->trimValue(pp->raw.bayersensor.dcb_iterations);
lmmseIterations->trimValue(pp->raw.bayersensor.lmmse_iterations);
@@ -457,6 +478,7 @@ void BayerProcess::setBatchMode(bool batchMode)
imageNumber->append (M("GENERAL_UNCHANGED"));
imageNumber->set_active_text (M("GENERAL_UNCHANGED"));
ToolPanel::setBatchMode (batchMode);
+ border->showEditedCB ();
ccSteps->showEditedCB ();
dcbIterations->showEditedCB ();
lmmseIterations->showEditedCB ();
@@ -472,6 +494,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefault( defParams->raw.bayersensor.dualDemosaicContrast);
pixelShiftEperIso->setDefault( defParams->raw.bayersensor.pixelShiftEperIso);
pixelShiftSigma->setDefault( defParams->raw.bayersensor.pixelShiftSigma);
+ border->setDefault (defParams->raw.bayersensor.border);
ccSteps->setDefault (defParams->raw.bayersensor.ccSteps);
if (pedited) {
@@ -480,6 +503,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefaultEditedState( pedited->raw.bayersensor.dualDemosaicContrast ? Edited : UnEdited);
pixelShiftEperIso->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftSigma->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftSigma ? Edited : UnEdited);
+ border->setDefaultEditedState(pedited->raw.bayersensor.border ? Edited : UnEdited);
ccSteps->setDefaultEditedState(pedited->raw.bayersensor.ccSteps ? Edited : UnEdited);
} else {
dcbIterations->setDefaultEditedState( Irrelevant );
@@ -487,6 +511,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefaultEditedState( Irrelevant );
pixelShiftEperIso->setDefaultEditedState( Irrelevant );
pixelShiftSigma->setDefaultEditedState( Irrelevant );
+ border->setDefaultEditedState(Irrelevant);
ccSteps->setDefaultEditedState(Irrelevant );
}
}
@@ -508,6 +533,8 @@ void BayerProcess::adjusterChanged (Adjuster* a, double newval)
listener->panelChanged (EvPixelShiftSigma, a->getTextValue() );
} else if (a == pixelShiftSmooth) {
listener->panelChanged (EvPixelShiftSmooth, a->getTextValue() );
+ } else if (a == border) {
+ listener->panelChanged (EvDemosaicBorder, a->getTextValue() );
}
}
}
@@ -518,7 +545,7 @@ void BayerProcess::methodChanged ()
const RAWParams::BayerSensor::Method currentMethod = RAWParams::BayerSensor::Method(currentSelection);
if (!batchMode) {
- if (currentMethod == procparams::RAWParams::BayerSensor::Method::DCB) {
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::DCB || currentMethod == procparams::RAWParams::BayerSensor::Method::DCBVNG4) {
dcbOptions->show();
} else {
dcbOptions->hide();
@@ -530,7 +557,7 @@ void BayerProcess::methodChanged ()
lmmseOptions->hide();
}
- if (currentMethod == procparams::RAWParams::BayerSensor::Method::AMAZEVNG4) {
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::AMAZEVNG4 || currentMethod == procparams::RAWParams::BayerSensor::Method::DCBVNG4 || currentMethod == procparams::RAWParams::BayerSensor::Method::RCDVNG4) {
dualDemosaicOptions->show();
} else {
dualDemosaicOptions->hide();
@@ -703,3 +730,4 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
// }
// imageNumber->block (false);
}
+
diff --git a/rtgui/bayerprocess.h b/rtgui/bayerprocess.h
index 2b3e420bc..cfd063ca9 100644
--- a/rtgui/bayerprocess.h
+++ b/rtgui/bayerprocess.h
@@ -31,7 +31,9 @@ class BayerProcess : public ToolParamBlock, public AdjusterListener, public Chec
protected:
MyComboBoxText* method;
+ Gtk::HBox* borderbox;
Gtk::HBox *imageNumberBox;
+ Adjuster* border;
MyComboBoxText* imageNumber;
Adjuster* ccSteps;
Gtk::VBox *dcbOptions;
@@ -60,6 +62,8 @@ protected:
int oldMethod;
IdleRegister idle_register;
+
+ rtengine::ProcEvent EvDemosaicBorder;
rtengine::ProcEvent EvDemosaicContrast;
rtengine::ProcEvent EvDemosaicPixelshiftDemosaicMethod;
public:
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index 507d3aee6..469094fb8 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -179,18 +179,18 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- RGB / ROYGCBPM Mixer ------------------------------
- imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-R.png"));
- imgIcon[1] = Gtk::manage (new RTImage ("Chanmixer-O.png"));
- imgIcon[2] = Gtk::manage (new RTImage ("Chanmixer-Y.png"));
- imgIcon[3] = Gtk::manage (new RTImage ("Chanmixer-G.png"));
- imgIcon[4] = Gtk::manage (new RTImage ("Chanmixer-C.png"));
- imgIcon[5] = Gtk::manage (new RTImage ("Chanmixer-B.png"));
- imgIcon[6] = Gtk::manage (new RTImage ("Chanmixer-P.png"));
- imgIcon[7] = Gtk::manage (new RTImage ("Chanmixer-M.png"));
+ imgIcon[0] = Gtk::manage (new RTImage ("circle-red-small.png"));
+ imgIcon[1] = Gtk::manage (new RTImage ("circle-orange-small.png"));
+ imgIcon[2] = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ imgIcon[3] = Gtk::manage (new RTImage ("circle-green-small.png"));
+ imgIcon[4] = Gtk::manage (new RTImage ("circle-cyan-small.png"));
+ imgIcon[5] = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ imgIcon[6] = Gtk::manage (new RTImage ("circle-purple-small.png"));
+ imgIcon[7] = Gtk::manage (new RTImage ("circle-magenta-small.png"));
- imgIcon[8] = Gtk::manage (new RTImage ("Chanmixer-Rgamma.png"));
- imgIcon[9] = Gtk::manage (new RTImage ("Chanmixer-Ggamma.png"));
- imgIcon[10] = Gtk::manage (new RTImage ("Chanmixer-Bgamma.png"));
+ imgIcon[8] = Gtk::manage (new RTImage ("circle-empty-red-small.png"));
+ imgIcon[9] = Gtk::manage (new RTImage ("circle-empty-green-small.png"));
+ imgIcon[10] = Gtk::manage (new RTImage ("circle-empty-blue-small.png"));
mixerVBox->pack_start (*Gtk::manage (new Gtk::HSeparator()));
diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc
index e303b5660..ffaa57c34 100644
--- a/rtgui/cacorrection.cc
+++ b/rtgui/cacorrection.cc
@@ -26,10 +26,10 @@ using namespace rtengine::procparams;
CACorrection::CACorrection () : FoldableToolPanel(this, "cacorrection", M("TP_CACORRECTION_LABEL"))
{
- Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png"));
- Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png"));
- Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png"));
- Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png"));
+ Gtk::Image* icaredL = Gtk::manage (new RTImage ("circle-red-cyan-small.png"));
+ Gtk::Image* icaredR = Gtk::manage (new RTImage ("circle-cyan-red-small.png"));
+ Gtk::Image* icablueL = Gtk::manage (new RTImage ("circle-blue-yellow-small.png"));
+ Gtk::Image* icablueR = Gtk::manage (new RTImage ("circle-yellow-blue-small.png"));
red = Gtk::manage (new Adjuster (M("TP_CACORRECTION_RED"), -0.005, 0.005, 0.0001, 0, icaredL, icaredR));
red->setAdjusterListener (this);
diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc
index c6c098883..1e3bb395e 100644
--- a/rtgui/chmixer.cc
+++ b/rtgui/chmixer.cc
@@ -25,23 +25,24 @@ using namespace rtengine::procparams;
ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), false, true)
{
- imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-RR.png"));
- imgIcon[1] = Gtk::manage (new RTImage ("Chanmixer-RG.png"));
- imgIcon[2] = Gtk::manage (new RTImage ("Chanmixer-RB.png"));
- imgIcon[3] = Gtk::manage (new RTImage ("Chanmixer-GR.png"));
- imgIcon[4] = Gtk::manage (new RTImage ("Chanmixer-GG.png"));
- imgIcon[5] = Gtk::manage (new RTImage ("Chanmixer-GB.png"));
- imgIcon[6] = Gtk::manage (new RTImage ("Chanmixer-BR.png"));
- imgIcon[7] = Gtk::manage (new RTImage ("Chanmixer-BG.png"));
- imgIcon[8] = Gtk::manage (new RTImage ("Chanmixer-BB.png"));
+ imgIcon[0] = Gtk::manage (new RTImage ("circle-red-small.png"));
+ imgIcon[1] = Gtk::manage (new RTImage ("circle-green-red-small.png"));
+ imgIcon[2] = Gtk::manage (new RTImage ("circle-blue-red-small.png"));
+ imgIcon[3] = Gtk::manage (new RTImage ("circle-red-green-small.png"));
+ imgIcon[4] = Gtk::manage (new RTImage ("circle-green-small.png"));
+ imgIcon[5] = Gtk::manage (new RTImage ("circle-blue-green-small.png"));
+ imgIcon[6] = Gtk::manage (new RTImage ("circle-red-blue-small.png"));
+ imgIcon[7] = Gtk::manage (new RTImage ("circle-green-blue-small.png"));
+ imgIcon[8] = Gtk::manage (new RTImage ("circle-blue-small.png"));
Gtk::Label* rlabel = Gtk::manage (new Gtk::Label ());
rlabel->set_markup (Glib::ustring("\t") + M("TP_CHMIXER_RED") + Glib::ustring(":"));
rlabel->set_alignment(Gtk::ALIGN_START);
- red[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[0]));
- red[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[1]));
- red[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[2]));
+ constexpr double RANGE = 500.0;
+ red[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[0]));
+ red[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[1]));
+ red[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[2]));
Gtk::HSeparator* rsep = Gtk::manage (new Gtk::HSeparator ());
@@ -58,9 +59,9 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
glabel->set_alignment(Gtk::ALIGN_START);
- green[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[3]));
- green[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[4]));
- green[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[5]));
+ green[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[3]));
+ green[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[4]));
+ green[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[5]));
Gtk::HSeparator* gsep = Gtk::manage (new Gtk::HSeparator ());
@@ -75,9 +76,9 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
Gtk::Label* blabel = Gtk::manage (new Gtk::Label ());
blabel->set_markup (Glib::ustring("\t") + M("TP_CHMIXER_BLUE") + Glib::ustring(":"));
blabel->set_alignment(Gtk::ALIGN_START);
- blue[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[6]));
- blue[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[7]));
- blue[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[8]));
+ blue[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[6]));
+ blue[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[7]));
+ blue[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[8]));
for (int i = 0; i < 3; i++) {
red[i]->setAdjusterListener (this);
@@ -111,9 +112,9 @@ void ChMixer::read (const ProcParams* pp, const ParamsEdited* pedited)
}
for (int i = 0; i < 3; i++) {
- red[i]->setValue (pp->chmixer.red[i]);
- green[i]->setValue (pp->chmixer.green[i]);
- blue[i]->setValue (pp->chmixer.blue[i]);
+ red[i]->setValue (pp->chmixer.red[i] / 10.0);
+ green[i]->setValue (pp->chmixer.green[i] / 10.0);
+ blue[i]->setValue (pp->chmixer.blue[i] / 10.0);
}
enableListener ();
@@ -123,9 +124,9 @@ void ChMixer::write (ProcParams* pp, ParamsEdited* pedited)
{
for (int i = 0; i < 3; i++) {
- pp->chmixer.red[i] = (int) red[i]->getValue ();
- pp->chmixer.green[i] = (int) green[i]->getValue ();
- pp->chmixer.blue[i] = (int) blue[i]->getValue ();
+ pp->chmixer.red[i] = red[i]->getValue() * 10;
+ pp->chmixer.green[i] = green[i]->getValue() * 10;
+ pp->chmixer.blue[i] = blue[i]->getValue() * 10;
}
pp->chmixer.enabled = getEnabled();
@@ -143,9 +144,9 @@ void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi
{
for (int i = 0; i < 3; i++) {
- red[i]->setDefault (defParams->chmixer.red[i]);
- green[i]->setDefault (defParams->chmixer.green[i]);
- blue[i]->setDefault (defParams->chmixer.blue[i]);
+ red[i]->setDefault (defParams->chmixer.red[i] / 10.f);
+ green[i]->setDefault (defParams->chmixer.green[i] / 10.f);
+ blue[i]->setDefault (defParams->chmixer.blue[i] / 10.f);
}
if (pedited)
@@ -167,9 +168,9 @@ void ChMixer::adjusterChanged (Adjuster* a, double newval)
if (listener && getEnabled()) {
Glib::ustring descr = Glib::ustring::compose ("R=%1,%2,%3\nG=%4,%5,%6\nB=%7,%8,%9",
- (int)red[0]->getValue(), (int)red[1]->getValue(), (int)red[2]->getValue(),
- (int)green[0]->getValue(), (int)green[1]->getValue(), (int)green[2]->getValue(),
- (int)blue[0]->getValue(), (int)blue[1]->getValue(), (int)blue[2]->getValue());
+ red[0]->getValue(), red[1]->getValue(), red[2]->getValue(),
+ green[0]->getValue(), green[1]->getValue(), green[2]->getValue(),
+ blue[0]->getValue(), blue[1]->getValue(), blue[2]->getValue());
listener->panelChanged (EvChMixer, descr);
}
}
@@ -215,8 +216,14 @@ void ChMixer::trimValues (rtengine::procparams::ProcParams* pp)
{
for (int i = 0; i < 3; i++) {
- red[i]->trimValue(pp->chmixer.red[i]);
- green[i]->trimValue(pp->chmixer.green[i]);
- blue[i]->trimValue(pp->chmixer.blue[i]);
+ double r = pp->chmixer.red[i] / 10.0;
+ double g = pp->chmixer.green[i] / 10.0;
+ double b = pp->chmixer.blue[i] / 10.0;
+ red[i]->trimValue(r);
+ green[i]->trimValue(g);
+ blue[i]->trimValue(b);
+ pp->chmixer.red[i] = r * 10;
+ pp->chmixer.green[i] = g * 10;
+ pp->chmixer.blue[i] = b * 10;
}
}
diff --git a/rtgui/coarsepanel.cc b/rtgui/coarsepanel.cc
index a201b1f7f..8f927239e 100644
--- a/rtgui/coarsepanel.cc
+++ b/rtgui/coarsepanel.cc
@@ -28,25 +28,25 @@ CoarsePanel::CoarsePanel () : ToolPanel (), oldhflip(false), oldvflip(false)
degree = 0;
degreechanged = true;
- Gtk::Image* rotateli = Gtk::manage (new RTImage ("stock-rotate-270.png"));
+ Gtk::Image* rotateli = Gtk::manage (new RTImage ("rotate-left-90.png"));
rotate_left = Gtk::manage (new Gtk::Button ());
rotate_left->add (*rotateli);
rotate_left->set_relief(Gtk::RELIEF_NONE);
pack_start (*rotate_left);
- Gtk::Image* rotateri = Gtk::manage (new RTImage ("stock-rotate-90.png"));
+ Gtk::Image* rotateri = Gtk::manage (new RTImage ("rotate-right-90.png"));
rotate_right = Gtk::manage (new Gtk::Button ());
rotate_right->add (*rotateri);
rotate_right->set_relief(Gtk::RELIEF_NONE);
pack_start (*rotate_right);
- Gtk::Image* fliphi = Gtk::manage (new RTImage ("stock-flip-horizontal.png"));
+ Gtk::Image* fliphi = Gtk::manage (new RTImage ("flip-horizontal.png"));
hflip = Gtk::manage (new Gtk::ToggleButton ());
hflip->add (*fliphi);
hflip->set_relief(Gtk::RELIEF_NONE);
pack_start (*hflip);
- Gtk::Image* flipvi = Gtk::manage (new RTImage ("stock-flip-vertical.png"));
+ Gtk::Image* flipvi = Gtk::manage (new RTImage ("flip-vertical.png"));
vflip = Gtk::manage (new Gtk::ToggleButton ());
vflip->add (*flipvi);
vflip->set_relief(Gtk::RELIEF_NONE);
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index f8dee05df..2e83d63d9 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -268,10 +268,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
wbmHBox->pack_start (*wbmodel);
p1VBox->pack_start (*wbmHBox);
- Gtk::Image* itempL = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
- Gtk::Image* itempR = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
- Gtk::Image* igreenL = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
- Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+ Gtk::Image* itempL = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* itempR = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green-small.png"));
tempsc = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider));
@@ -575,10 +575,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
p3VBox = Gtk::manage ( new Gtk::VBox());
p3VBox->set_spacing (2);
- Gtk::Image* itempL1 = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
- Gtk::Image* itempR1 = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
- Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
- Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+ Gtk::Image* itempL1 = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* itempR1 = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green-small.png"));
// adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), 0.1, 16384., 0.1, 16.));
adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), MINLA0, MAXLA0, 0.01, 16, NULL, NULL, &wbSlider2la, &wbla2Slider));
@@ -590,8 +590,8 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
adaplum->set_tooltip_markup (M ("TP_COLORAPP_ADAPTVIEWING_TOOLTIP"));
p3VBox->pack_start (*adaplum);
-// Gtk::Image* iblueredL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png"));
-// Gtk::Image* iblueredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png"));
+// Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue-small.png"));
+// Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red-small.png"));
degreeout = Gtk::manage (new Adjuster (M ("TP_COLORAPP_CIECAT_DEGREE"), 0., 100., 1., 100.));
@@ -604,10 +604,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
degreeout->set_tooltip_markup (M ("TP_COLORAPP_DEGREE_TOOLTIP"));
p3VBox->pack_start (*degreeout);
/*
- Gtk::Image* itempL1 = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
- Gtk::Image* itempR1 = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
- Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
- Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+ Gtk::Image* itempL1 = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* itempR1 = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green-small.png"));
*/
tempout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempR1, itempL1, &wbSlider2Temp, &wbTemp2Slider));
greenout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_GREEN"), MINGREEN0, MAXGREEN0, 0.001, 1.0, igreenR1, igreenL1));
@@ -669,7 +669,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
//reset button
neutral = Gtk::manage (new Gtk::Button (M ("TP_COLORAPP_NEUTRAL")));
setExpandAlignProperties (neutral, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
- RTImage *resetImg = Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"));
+ RTImage *resetImg = Gtk::manage (new RTImage ("undo-small.png", "redo-small.png"));
setExpandAlignProperties (resetImg, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
neutral->set_image (*resetImg);
neutral->set_tooltip_text (M ("TP_COLORAPP_NEUTRAL_TIP"));
diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index a7f063460..7b3fb97df 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -104,8 +104,8 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2);
//---------Chroma curve 1 --------------------
- iby = Gtk::manage (new RTImage ("Chanmixer-BY.png"));
- irg = Gtk::manage (new RTImage ("Chanmixer-RG.png"));
+ iby = Gtk::manage (new RTImage ("circle-yellow-blue-small.png"));
+ irg = Gtk::manage (new RTImage ("circle-green-red-small.png"));
clCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_CHROMAC"));
clCurveEditorG->setCurveListener (this);
@@ -146,7 +146,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
//--------------------- Reset curves -----------------------------
/* Each curve can reset to a different curve, so this button only save one click now... so we remove it.
neutralCurves = Gtk::manage (new Gtk::Button (M("TP_COLORTONING_NEUTRALCUR")));
- RTImage *resetImgc = Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"));
+ RTImage *resetImgc = Gtk::manage (new RTImage ("undo-small.png", "redo-small.png"));
neutralCurves->set_image(*resetImgc);
neutralCurves->set_tooltip_text (M("TP_COLORTONING_NEUTRALCUR_TIP"));
neutralcurvesconn = neutralCurves->signal_pressed().connect( sigc::mem_fun(*this, &ColorToning::neutralCurves_pressed) );
@@ -226,26 +226,26 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
Gtk::VBox *chanMixerMidBox = Gtk::manage (new Gtk::VBox());
Gtk::VBox *chanMixerShadowsBox = Gtk::manage (new Gtk::VBox());
- 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* icyanL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png"));
- Gtk::Image* iredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png"));
+ Gtk::Image* iblueR = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iyelL = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* imagL = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green-small.png"));
+ Gtk::Image* icyanL = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iredR = Gtk::manage (new RTImage ("circle-red-small.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* icyanLm = Gtk::manage (new RTImage ("ajd-wb-bluered1.png"));
- Gtk::Image* iredRm = Gtk::manage (new RTImage ("ajd-wb-bluered2.png"));
+ Gtk::Image* iblueRm = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iyelLm = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* imagLm = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenRm = Gtk::manage (new RTImage ("circle-green-small.png"));
+ Gtk::Image* icyanLm = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iredRm = Gtk::manage (new RTImage ("circle-red-small.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* icyanLh = Gtk::manage (new RTImage ("ajd-wb-bluered1.png"));
- Gtk::Image* iredRh = Gtk::manage (new RTImage ("ajd-wb-bluered2.png"));
+ Gtk::Image* iblueRh = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iyelLh = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+ Gtk::Image* imagLh = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+ Gtk::Image* igreenRh = Gtk::manage (new RTImage ("circle-green-small.png"));
+ Gtk::Image* icyanLh = Gtk::manage (new RTImage ("circle-blue-small.png"));
+ Gtk::Image* iredRh = Gtk::manage (new RTImage ("circle-red-small.png"));
redhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., icyanLh, iredRh ));
greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., imagLh , igreenRh));
@@ -324,7 +324,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
labgrid = Gtk::manage(new LabGrid(EvColorToningLabGridValue));
labgridBox->pack_start(*labgrid, true, true);
labgridReset = Gtk::manage(new Gtk::Button ());
- labgridReset->add (*Gtk::manage(new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png")));
+ labgridReset->add (*Gtk::manage(new RTImage ("undo-small.png", "redo-small.png")));
setExpandAlignProperties(labgridReset, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START);
labgridReset->set_relief(Gtk::RELIEF_NONE);
labgridReset->set_tooltip_markup(M("ADJUSTER_RESET_TO_DEFAULT"));
@@ -377,7 +377,7 @@ void ColorToning::neutralCurves_pressed () {
}
*/
-// Will only reset the chanel mixer
+// Will only reset the channel mixer
void ColorToning::neutral_pressed ()
{
disableListener();
diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc
index b8927dba7..cf365b3e2 100644
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -1036,7 +1036,7 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
return CSMove2D;
default:
- return CSOpenHand;
+ return CSHandOpen;
}
}
diff --git a/rtgui/coordinateadjuster.h b/rtgui/coordinateadjuster.h
index e6e16b7a2..08f2fb479 100644
--- a/rtgui/coordinateadjuster.h
+++ b/rtgui/coordinateadjuster.h
@@ -57,7 +57,7 @@ public:
/** @brief Update the position of the edited point ; will trigger events
*
* @param pos New position
- * @param chanIdx Chanel index as given in the std::vector upon instantiation
+ * @param chanIdx Channel index as given in the std::vector upon instantiation
*/
virtual void setPos(double pos, int chanIdx) = 0;
virtual void stopNumericalAdjustment() = 0;
@@ -91,7 +91,7 @@ public:
// used to update the AxisAdjuster's parameters
void updateGUI(const Axis &axis);
- // useed to update the displayed value
+ // used to update the displayed value
void setValue(double newValue);
//bool keyPressed(GdkEventKey* event);
void valueChanged();
diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index 29c64501d..7205fc3ad 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -128,7 +128,8 @@ Crop::Crop():
pack_start (*hb2, Gtk::PACK_SHRINK, 4);
selectCrop = Gtk::manage (new Gtk::Button (M("TP_CROP_SELECTCROP")));
- selectCrop->set_image (*Gtk::manage (new RTImage ("crop.png")));
+ selectCrop->get_style_context()->add_class("independent");
+ selectCrop->set_image (*Gtk::manage (new RTImage ("crop-small.png")));
pack_start (*selectCrop, Gtk::PACK_SHRINK, 2);
@@ -629,7 +630,7 @@ void Crop::ratioFixedChanged ()
void Crop::ratioChanged ()
{
if (!fixr->get_active ()) {
- fixr->set_active(true); // will ajust ratio anyway
+ fixr->set_active(true); // will adjust ratio anyway
} else {
adjustCropToRatio();
}
diff --git a/rtgui/crophandler.h b/rtgui/crophandler.h
index 17f2ca47d..305d15e2c 100644
--- a/rtgui/crophandler.h
+++ b/rtgui/crophandler.h
@@ -97,8 +97,8 @@ public:
rtengine::procparams::CropParams cropParams;
rtengine::procparams::ColorManagementParams colorParams;
- Glib::RefPtr cropPixbuf;
- Glib::RefPtr cropPixbuftrue;
+ Glib::RefPtr cropPixbuf; // image displayed on monitor, using the monitor profile (i.e. lab to monitor profile)
+ Glib::RefPtr cropPixbuftrue; // internal image in output color space for analysis (i.e. lab to either Working profile or Output profile, depending on options.rtSettings.HistogramWorking)
MyMutex cimg;
diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc
index 08ea9d0f7..69d7a98b4 100644
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -57,11 +57,11 @@ CropWindow::CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDet
titleHeight = ih;
- bZoomOut = new LWButton (RTImage::createFromPng ("gtk-zoom-out-small.png"), 0, nullptr, LWButton::Left, LWButton::Center, "Zoom Out");
- bZoomIn = new LWButton (RTImage::createFromPng ("gtk-zoom-in-small.png"), 1, nullptr, LWButton::Left, LWButton::Center, "Zoom In");
- bZoom100 = new LWButton (RTImage::createFromPng ("gtk-zoom-100-small.png"), 2, nullptr, LWButton::Left, LWButton::Center, "Zoom 100/%");
- //bZoomFit = new LWButton (RTImage::createFromPng ("gtk-zoom-fit.png"), 3, NULL, LWButton::Left, LWButton::Center, "Zoom Fit");
- bClose = new LWButton (RTImage::createFromPng ("gtk-close-small.png"), 4, nullptr, LWButton::Right, LWButton::Center, "Close");
+ bZoomOut = new LWButton (RTImage::createFromPng ("magnifier-minus-small.png"), 0, nullptr, LWButton::Left, LWButton::Center, "Zoom Out");
+ bZoomIn = new LWButton (RTImage::createFromPng ("magnifier-plus-small.png"), 1, nullptr, LWButton::Left, LWButton::Center, "Zoom In");
+ bZoom100 = new LWButton (RTImage::createFromPng ("magnifier-1to1-small.png"), 2, nullptr, LWButton::Left, LWButton::Center, "Zoom 100/%");
+ //bZoomFit = new LWButton (RTImage::createFromPng ("magnifier-fit.png"), 3, NULL, LWButton::Left, LWButton::Center, "Zoom Fit");
+ bClose = new LWButton (RTImage::createFromPng ("cancel-small.png"), 4, nullptr, LWButton::Right, LWButton::Center, "Close");
buttonSet.add (bZoomOut);
buttonSet.add (bZoomIn);
@@ -362,7 +362,7 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y)
// Add a new Color Picker
rtengine::Coord imgPos;
screenCoordToImage(x, y, imgPos.x, imgPos.y);
- LockableColorPicker *newPicker = new LockableColorPicker(this, &cropHandler.colorParams.output, &cropHandler.colorParams.working);
+ LockableColorPicker *newPicker = new LockableColorPicker(this, &cropHandler.colorParams.outputProfile, &cropHandler.colorParams.workingProfile);
colorPickers.push_back(newPicker);
hoveredPicker = newPicker;
updateHoveredPicker(&imgPos);
@@ -754,10 +754,6 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)
}
iarea->setToolHand ();
-
- if (pmhlistener) {
- pmhlistener->toggleFreeze();
- }
}
state = SNormal;
@@ -1007,23 +1003,25 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
int mx, my;
screenCoordToImage (x, y, mx, my);
- if (!onArea (CropImage, x, y) || !cropHandler.cropPixbuf) {
+ MyMutex::MyLock lock(cropHandler.cimg);
+
+ if (!onArea (CropImage, x, y) || !cropHandler.cropPixbuftrue) {
cropHandler.getFullImageSize(mx, my);
// pmlistener->pointerMoved (false, cropHandler.colorParams.working, mx, my, -1, -1, -1);
// if (pmhlistener) pmhlistener->pointerMoved (false, cropHandler.colorParams.working, mx, my, -1, -1, -1);
/* Glib::ustring outputProfile;
outputProfile =cropHandler.colorParams.output ;
printf("Using \"%s\" output\n", outputProfile.c_str());
- if(outputProfile=="RT_sRGB") printf("OK SRGB2");
+ if(outputProfile==options.rtSettings.srgb) printf("OK SRGB2");
*/
- pmlistener->pointerMoved (false, cropHandler.colorParams.output, cropHandler.colorParams.working, mx, my, -1, -1, -1);
+ pmlistener->pointerMoved (false, cropHandler.colorParams.outputProfile, cropHandler.colorParams.workingProfile, mx, my, -1, -1, -1);
if (pmhlistener) {
- pmhlistener->pointerMoved (false, cropHandler.colorParams.output, cropHandler.colorParams.working, mx, my, -1, -1, -1);
+ pmhlistener->pointerMoved (false, cropHandler.colorParams.outputProfile, cropHandler.colorParams.workingProfile, mx, my, -1, -1, -1);
}
} else {
- /*MyMutex::MyLock lock(cropHandler.cimg);
+ /*
int vx = x - xpos - imgX;
int vy = y - ypos - imgY;
@@ -1033,7 +1031,6 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
*/
- cropHandler.cimg.lock ();
int vx = x - xpos - imgX;
int vy = y - ypos - imgY;
@@ -1045,34 +1042,35 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
// guint8* pix = cropHandler.cropPixbuf->get_pixels() + vy*cropHandler.cropPixbuf->get_rowstride() + vx*3;
// if (vx < cropHandler.cropPixbuf->get_width() && vy < cropHandler.cropPixbuf->get_height())
// pmlistener->pointerMoved (true, mx, my, pix[0], pix[1], pix[2]);
- int imwidth = cropHandler.cropPixbuf->get_width();
- int imheight = cropHandler.cropPixbuf->get_height();
- guint8* pix = cropHandler.cropPixbuftrue->get_pixels() + vy * cropHandler.cropPixbuf->get_rowstride() + vx * 3;
+ int imwidth = cropHandler.cropPixbuftrue->get_width();
+ int imheight = cropHandler.cropPixbuftrue->get_height();
+ guint8* pix = cropHandler.cropPixbuftrue->get_pixels() + vy * cropHandler.cropPixbuftrue->get_rowstride() + vx * 3;
int rval = pix[0];
int gval = pix[1];
int bval = pix[2];
+ bool isRaw = false;
if (vx < imwidth && vy < imheight) {
rtengine::StagedImageProcessor* ipc = iarea->getImProcCoordinator();
if(ipc) {
procparams::ProcParams params;
ipc->getParams(¶ms);
- if(params.raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::NONE) || params.raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::NONE)) {
+ isRaw = params.raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::NONE) || params.raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::NONE);
+ if(isRaw) {
ImageSource *isrc = static_cast(ipc->getInitialImage());
isrc->getRawValues(mx, my, params.coarse.rotate, rval, gval, bval);
}
}
- // pmlistener->pointerMoved (true, cropHandler.colorParams.working, mx, my, pix[0], pix[1], pix[2]);
- pmlistener->pointerMoved (true, cropHandler.colorParams.output, cropHandler.colorParams.working, mx, my, rval, gval, bval);
- if (pmhlistener)
- // pmhlistener->pointerMoved (true, cropHandler.colorParams.working, mx, my, pix[0], pix[1], pix[2]);
- {
- pmhlistener->pointerMoved (true, cropHandler.colorParams.output, cropHandler.colorParams.working, mx, my, pix[0], pix[1], pix[2]);
+ // Updates the Navigator
+ // TODO: possible double color conversion if rval, gval, bval come from cropHandler.cropPixbuftrue ? see issue #4583
+ pmlistener->pointerMoved (true, cropHandler.colorParams.outputProfile, cropHandler.colorParams.workingProfile, mx, my, rval, gval, bval, isRaw);
+
+ if (pmhlistener) {
+ // Updates the HistogramRGBArea
+ pmhlistener->pointerMoved (true, cropHandler.colorParams.outputProfile, cropHandler.colorParams.workingProfile, mx, my, rval, gval, bval);
}
}
-
- cropHandler.cimg.unlock ();
}
}
}
@@ -1251,7 +1249,7 @@ void CropWindow::updateCursor (int x, int y)
if (onArea (CropObserved, x, y)) {
newType = CSMove;
} else {
- newType = CSOpenHand;
+ newType = CSCrosshair;
}
} else if (tm == TMSpotWB) {
newType = CSSpotWB;
@@ -1284,7 +1282,7 @@ void CropWindow::updateCursor (int x, int y)
} else if (state == SCropMove || state == SCropWinMove || state == SObservedMove) {
newType = CSMove;
} else if (state == SHandMove || state == SCropImgMove) {
- newType = CSClosedHand;
+ newType = CSHandClosed;
} else if (state == SResizeW1 || state == SResizeW2) {
newType = CSResizeWidth;
} else if (state == SResizeH1 || state == SResizeH2) {
@@ -1379,7 +1377,7 @@ void CropWindow::expose (Cairo::RefPtr cr)
break;
}
}
- bool useBgColor = (state == SNormal);
+ bool useBgColor = (state == SNormal || state == SDragPicker || state == SDeletePicker || state == SEditDrag1);
if (cropHandler.cropPixbuf) {
imgW = cropHandler.cropPixbuf->get_width ();
diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc
index 29d0990ff..34efbcac8 100644
--- a/rtgui/cursormanager.cc
+++ b/rtgui/cursormanager.cc
@@ -36,40 +36,45 @@ void CursorManager::init (Glib::RefPtr mainWindow)
#endif
- cResizeWidth = Gdk::Cursor::create (display, Gdk::SB_H_DOUBLE_ARROW);
- cResizeHeight = Gdk::Cursor::create (display, Gdk::SB_V_DOUBLE_ARROW);
- cResizeDiag = Gdk::Cursor::create (display, Gdk::BOTTOM_RIGHT_CORNER);
- cResizeTopLeft = Gdk::Cursor::create (display, Gdk::TOP_LEFT_CORNER);
- cResizeTopRight = Gdk::Cursor::create (display, Gdk::TOP_RIGHT_CORNER);
- cResizeBottomLeft = Gdk::Cursor::create (display, Gdk::BOTTOM_LEFT_CORNER);
- cResizeBottomRight = Gdk::Cursor::create (display, Gdk::BOTTOM_RIGHT_CORNER);
- cCropMove = Gdk::Cursor::create (display, Gdk::FLEUR);
- cCropMoving = Gdk::Cursor::create (display, Gdk::HAND2);
- cCropSelection = Gdk::Cursor::create (display, Gdk::CROSSHAIR);
- cLeftTanMove = Gdk::Cursor::create (display, Gdk::SB_LEFT_ARROW);
- cRightTanMove = Gdk::Cursor::create (display, Gdk::SB_RIGHT_ARROW);
- cAdd = Gdk::Cursor::create (display, Gdk::PLUS);
- cWait = Gdk::Cursor::create (display, Gdk::CLOCK);
+ Glib::RefPtr add = RTImage::createFromFile("crosshair-small.png");
+ Glib::RefPtr colPick = RTImage::createFromFile("color-picker-hicontrast.png");
+ Glib::RefPtr colPickAdd = RTImage::createFromFile("color-picker-add-hicontrast.png");
+ Glib::RefPtr cropDraw = RTImage::createFromFile("crop-point-hicontrast.png");
+ Glib::RefPtr crosshair = RTImage::createFromFile("crosshair-hicontrast.png");
+ Glib::RefPtr empty = RTImage::createFromFile("empty.png");
+ Glib::RefPtr handClosed = RTImage::createFromFile("hand-closed-hicontrast.png");
+ Glib::RefPtr handOpen = RTImage::createFromFile("hand-open-hicontrast.png");
+ Glib::RefPtr moveBL = RTImage::createFromFile("node-move-sw-ne-hicontrast.png");
+ Glib::RefPtr moveBR = RTImage::createFromFile("node-move-nw-se-hicontrast.png");
+ Glib::RefPtr moveL = RTImage::createFromFile("node-move-x-hicontrast.png");
+ Glib::RefPtr moveR = RTImage::createFromFile("node-move-x-hicontrast.png");
+ Glib::RefPtr moveTL = RTImage::createFromFile("node-move-nw-se-hicontrast.png");
+ Glib::RefPtr moveTR = RTImage::createFromFile("node-move-sw-ne-hicontrast.png");
+ Glib::RefPtr moveX = RTImage::createFromFile("node-move-x-hicontrast.png");
+ Glib::RefPtr moveXY = RTImage::createFromFile("node-move-xy-hicontrast.png");
+ Glib::RefPtr moveY = RTImage::createFromFile("node-move-y-hicontrast.png");
+ Glib::RefPtr