diff --git a/.travis.yml.fixme b/.travis.yml.fixme
new file mode 100644
index 000000000..0aa85f3b4
--- /dev/null
+++ b/.travis.yml.fixme
@@ -0,0 +1,44 @@
+sudo: required
+dist: trusty
+
+language: cpp
+
+compiler:
+ - gcc
+
+os:
+ - linux
+
+#branches:
+# only:
+# - master
+
+notifications:
+ irc:
+ channels:
+ - "chat.freenode.net#rawtherapee"
+ skip_join: true
+ template:
+ - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
+ email:
+ on_success: change
+ on_failure: always
+
+env:
+ global:
+ - OMP_NUM_THREADS=4
+
+before_install:
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ xenial main"
+ - sudo apt-get -qq update
+ - sudo apt-get install gcc-6 g++-6
+ - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6
+ - sudo apt-get install build-essential cmake curl git libbz2-dev libcanberra-gtk3-dev libexiv2-dev libexpat-dev libfftw3-dev libglibmm-2.4-dev libgtk-3-dev libgtkmm-3.0-dev libiptcdata0-dev libjpeg8-dev liblcms2-dev libpng12-dev libsigc++-2.0-dev libtiff5-dev zlib1g-dev
+
+before_script:
+ - mkdir build
+ - cd build
+ - cmake -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" -DWITH_LTO="OFF" -DPROC_TARGET_NUMBER="2" ..
+
+script: make
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 6aebfcf6e..0ad8438eb 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -15,6 +15,7 @@ Developement contributors, in last name alphabetical order:
Flössie
Jean-Christophe Frisch
Ilias Giarimis
+ Alberto Griggio
Steve Herrell
Philippe Hupé
Wolfgang Kuehnel
@@ -45,6 +46,7 @@ Other contributors (profiles, ideas, mockups, testing, forum activity, translati
André Gauthier
Sébastien Guyader
M. Dávid Gyurkó
+ JK Han (pinholecam)
Arturs Jekabsons
Marián Kyral
Oscar de Lama
@@ -55,6 +57,8 @@ Other contributors (profiles, ideas, mockups, testing, forum activity, translati
Wim ter Meer
Alberto Righetto
Kostia (Kildor) Romanov
+ Kalle Söderman
Johan Thor
+ Vitalis Tiknius
TooWaBoo
Colin Walker
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77c0997d7..31a04b569 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ endif ()
string (TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
# Set required C and C++ standards and check GCC version
-SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
message(FATAL_ERROR "Building RawTherapee requires using GCC version 4.9 or higher!")
diff --git a/rtdata/dcpprofiles/FUJIFILM X100S.dcp b/rtdata/dcpprofiles/FUJIFILM X100S.dcp
new file mode 100644
index 000000000..962d58469
Binary files /dev/null and b/rtdata/dcpprofiles/FUJIFILM X100S.dcp differ
diff --git a/rtdata/dcpprofiles/NIKON D300.dcp b/rtdata/dcpprofiles/NIKON D300.dcp
index 6aafdc616..008383c59 100644
Binary files a/rtdata/dcpprofiles/NIKON D300.dcp and b/rtdata/dcpprofiles/NIKON D300.dcp differ
diff --git a/rtdata/dcpprofiles/NIKON D810.dcp b/rtdata/dcpprofiles/NIKON D810.dcp
index a946c1be2..2a32a1376 100644
Binary files a/rtdata/dcpprofiles/NIKON D810.dcp and b/rtdata/dcpprofiles/NIKON D810.dcp differ
diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 5fc720cfa..df7cc515d 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -972,6 +972,15 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
@@ -1280,6 +1289,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1436,6 +1446,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
@@ -1450,6 +1461,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROGRESSBAR_NOIMAGES;No images found
!PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added
@@ -2033,6 +2045,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_WAVELET_TON;Toning
!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_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_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
!TP_WBALANCE_WATER_HEADER;UnderWater
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 64631d2b8..01dd62cdf 100644
--- a/rtdata/languages/Chinese (Simplified)
+++ b/rtdata/languages/Chinese (Simplified)
@@ -802,6 +802,15 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!CURVEEDITOR_PARAMETRIC;Parametric
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXIFFILTER_EXPOSURECOMPENSATION;Exposure compensation (EV)
@@ -1197,6 +1206,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1310,7 +1320,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELDSDIR;Flat-fields directory
!PREFERENCES_FLATFIELDSHOTS;shots
@@ -1380,7 +1390,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1398,6 +1408,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
@@ -1416,6 +1427,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PROFILEPANEL_LOADPPASTE;Parameters to load
!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_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_PROCESSING_PROFILESAVED;Processing profile saved
@@ -2041,5 +2053,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_WBALANCE_LED_LSI;LSI Lumelex 2040
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 90933541f..5d188ba67 100644
--- a/rtdata/languages/Chinese (Traditional)
+++ b/rtdata/languages/Chinese (Traditional)
@@ -458,6 +458,15 @@ TP_WBALANCE_TEMPERATURE;色溫
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -934,6 +943,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1116,7 +1126,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1190,7 +1200,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1208,6 +1218,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1231,6 +1242,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2030,6 +2042,8 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 6fa1fa8f7..4a6aa685f 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -2070,3 +2070,21 @@ ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit obrázek obrazovce\nZkratka: f
ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: +
ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
+!HISTORY_MSG_444;WB - Temp bias
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PROFILEPANEL_PDYNAMIC;Dynamic
+!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".
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 1aa0d3788..7ace0541a 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 13da1e9fc..1d1c8275e 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -33,6 +33,9 @@
#32 2016-12-29 Erweiterung/Korrekturen (TooWaBoo) RT4.2.1464
#33 2017-01-04 Erweiterung/Korrekturen/Soft-Proofing (TooWaBoo) RT4.2.1477
#34 2017-01-07 IPTC (TooWaBoo) RT4.2.1492
+#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)
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@@ -68,6 +71,15 @@ CURVEEDITOR_TOOLTIPPASTE;Kurve aus Zwischenablage einfügen
CURVEEDITOR_TOOLTIPSAVE;Kurve speichern
CURVEEDITOR_TYPE;Typ:
DIRBROWSER_FOLDERS;Ordner
+DYNPROFILEEDITOR_DELETE;Löschen
+DYNPROFILEEDITOR_EDIT;Ändern
+DYNPROFILEEDITOR_EDIT_RULE;Profilregel ändern
+DYNPROFILEEDITOR_ENTRY_TOOLTIP;Groß-/Kleinschreibung wird NICHT berücksichtigt.\nFür einen regulären Ausdruck benutzen Sie bitte\n"re:" als Prefix.
+DYNPROFILEEDITOR_MOVE_DOWN;Runter
+DYNPROFILEEDITOR_MOVE_UP;Hoch
+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_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.
@@ -707,6 +719,7 @@ HISTORY_MSG_440;(Detailebenenkontrast)\nProzessreihenfolge
HISTORY_MSG_441;(Retinex) - Einstellungen\nVerstärkung und Ausgleich\nTransmissionsverstärkung
HISTORY_MSG_442;(Retinex) - Einstellungen\nTransmission - Skalierung
HISTORY_MSG_443;(Farbmanagement)\nAusgabeprofil\nSchwarzpunkt-Kompensation
+HISTORY_MSG_444;(Weißabgleich)\nAWB-Temperatur-Korrektur
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s
HISTORY_SNAPSHOT;Schnappschuss
@@ -1080,7 +1093,7 @@ PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Öffnen eines neuen Bildes mit den Zoom- und
PREFERENCES_RGBDTL_LABEL;Maximale Anzahl Threads für Rauschreduzierung
PREFERENCES_RGBDTL_TOOLTIP;Die Rauschreduzierung benötigt mindestens 128MB RAM für ein 10 Megapixel-Bild oder 512MB für ein 40 Megapixel-Bild, und zusätzlich 128MB RAM pro Thread. Je mehr Threads parallel ablaufen, desto schneller ist die Berechnung. Bei Einstellung "0" werden so viele Threads wie möglich benutzt.
PREFERENCES_SELECTFONT;Schriftart
-PREFERENCES_SELECTFONT_COLPICKER;Schriftart für den Farbwähler
+PREFERENCES_SELECTFONT_COLPICKER;Schriftart für die Farbwähler
PREFERENCES_SELECTLANG;Sprache
PREFERENCES_SELECTTHEME;Oberflächendesign (erfordert Neustart)
PREFERENCES_SERIALIZE_TIFF_READ;TIFF-Bilder
@@ -1105,6 +1118,7 @@ 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
@@ -1133,6 +1147,7 @@ PROFILEPANEL_MODE_TIP;Ist der Button aktiviert, werden Teilprofile\nals vollstä
PROFILEPANEL_MYPROFILES;Meine Profile
PROFILEPANEL_PASTEPPASTE;Einzufügende Parameter
PROFILEPANEL_PCUSTOM;Benutzerdefiniert
+PROFILEPANEL_PDYNAMIC;Dynamisches Profil
PROFILEPANEL_PFILE;Aus Datei
PROFILEPANEL_PINTERNAL;Neutral
PROFILEPANEL_PLASTSAVED;Zuletzt gespeichert
@@ -1185,7 +1200,7 @@ 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 in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
+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.
@@ -1753,7 +1768,7 @@ TP_RETINEX_MAP_METHOD_TOOLTIP;Keine: Wendet die Maske, die mit der gaußs
TP_RETINEX_MAP_NONE;Keine
TP_RETINEX_MEDIAN;Medianfilter
TP_RETINEX_METHOD;Methode
-TP_RETINEX_METHOD_TOOLTIP;Schatten wirkt sich auf dunkle Bereiche aus.\n\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_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_NEIGHBOR;Radius
@@ -1774,7 +1789,7 @@ TP_RETINEX_TLABEL_TOOLTIP;Ergebnis der Transmissionskurve: Min, Max, Mittel und
TP_RETINEX_TRANF;Transmission
TP_RETINEX_TRANSMISSION;Transmissionskurve
TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission in Abhängigkeit der Transmission.\n\nx-Achse: Transmission negativer Werte (Min),\nMittel und positiver Werte (Max).\n\ny-Achse: Verstärkung oder Abschwächung.
-TP_RETINEX_UNIFORM;Schatten & Lichter
+TP_RETINEX_UNIFORM;Schatten / Lichter
TP_RETINEX_VARIANCE;Kontrast
TP_RETINEX_VARIANCE_TOOLTIP;Niedrige Werte erhöhen den lokalen\nKontrast und die Sättigung, können\naber zu Artefakten führen.
TP_RETINEX_VIEW;Vorschau
@@ -2054,6 +2069,8 @@ TP_WBALANCE_SOLUX41;Solux 4100K
TP_WBALANCE_SOLUX47;Solux 4700K (Vendor)
TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
TP_WBALANCE_SPOTWB;Manuell setzen
+TP_WBALANCE_TEMPBIAS;AWB-Temperatur-Korrektur
+TP_WBALANCE_TEMPBIAS_TOOLTIP;Prozentuale Korrektur der Farbtemperatur des automatischen\nWeißabgleichs in Richtung wärmer oder kälter.\nDer Korreturwert berechnet sich aus:\nAWB-Temperatur + AWB-Temperatur * AWB-Temperatur-Korrektur
TP_WBALANCE_TEMPERATURE;Farbtemperatur
TP_WBALANCE_TUNGSTEN;Glühlampe
TP_WBALANCE_WATER1;Unterwasser 1
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index bf4734453..9a4910be1 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -142,6 +142,15 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!CURVEEDITOR_TOOLTIPSAVE;Save current curve.
!CURVEEDITOR_TYPE;Type:
!DIRBROWSER_FOLDERS;Folders
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -758,6 +767,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!HISTORY_SNAPSHOT;Snapshot
@@ -1018,7 +1028,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_EXPAUT;Expert
!PREFERENCES_EXTERNALEDITOR;External Editor
!PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILEFORMAT;File format
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
@@ -1112,7 +1122,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTLANG;Select language
!PREFERENCES_SELECTTHEME;Select theme
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
@@ -1136,6 +1146,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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
@@ -1164,6 +1175,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PROFILEPANEL_MYPROFILES;My profiles
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
!PROFILEPANEL_PCUSTOM;Custom
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PFILE;From file
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_PLASTSAVED;Last Saved
@@ -2023,6 +2035,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index d5a0e16f2..6a9ab689b 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -37,6 +37,15 @@
!CURVEEDITOR_TOOLTIPSAVE;Save current curve.
!CURVEEDITOR_TYPE;Type:
!DIRBROWSER_FOLDERS;Folders
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -676,6 +685,7 @@
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!HISTORY_SNAPSHOT;Snapshot
@@ -947,7 +957,7 @@
!PREFERENCES_EXPAUT;Expert
!PREFERENCES_EXTERNALEDITOR;External Editor
!PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILEFORMAT;File format
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
@@ -1048,7 +1058,7 @@
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
!PREFERENCES_SELECTLANG;Select language
!PREFERENCES_SELECTTHEME;Select theme
@@ -1074,6 +1084,7 @@
!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
@@ -1102,6 +1113,7 @@
!PROFILEPANEL_MYPROFILES;My profiles
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
!PROFILEPANEL_PCUSTOM;Custom
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PFILE;From file
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_PLASTSAVED;Last Saved
@@ -2023,6 +2035,8 @@
!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
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index f9763dadb..170213157 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -1514,6 +1514,15 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
!FILEBROWSER_POPUPCOLORLABEL0;Label: None
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
@@ -1674,6 +1683,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1778,6 +1788,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1786,6 +1797,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2100,4 +2112,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!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_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".
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index fb1b452dc..404505e11 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 937ac0927..0a7ea0edd 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2035,3 +2035,21 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: f
ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: +
ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
+!HISTORY_MSG_444;WB - Temp bias
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PROFILEPANEL_PDYNAMIC;Dynamic
+!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".
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index f57acf41a..57ec0b394 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -449,6 +449,15 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -929,6 +938,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1113,7 +1123,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1187,7 +1197,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1205,6 +1215,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1228,6 +1239,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2028,6 +2040,8 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 0ed0c41bf..54d165be1 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 613a29301..a79d46555 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -1345,6 +1345,15 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
!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.
@@ -1547,6 +1556,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1649,6 +1659,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1657,6 +1668,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2041,4 +2053,6 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!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_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".
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 0ba1b52e4..38050e140 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1884,6 +1884,15 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!GENERAL_APPLY;Apply
!GENERAL_OPEN;Open
@@ -1925,6 +1934,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1966,7 +1976,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!PREFERENCES_PRTINTENT;Rendering intent
!PREFERENCES_PRTPROFILE;Color profile
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2071,3 +2083,5 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!TP_RETINEX_VIEW_TRAN;Transmission - Auto
!TP_RETINEX_VIEW_TRAN2;Transmission - Fixed
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
+!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".
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index bb9c63ea4..72d49e307 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index b2ae35fbe..2e3ce1f40 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -887,6 +887,15 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
@@ -1209,6 +1218,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1373,6 +1383,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
@@ -1387,6 +1398,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROGRESSBAR_NOIMAGES;No images found
!PROGRESSBAR_PROCESSING_PROFILESAVED;Processing profile saved
@@ -2036,6 +2048,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_WAVELET_TON;Toning
!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_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_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
!TP_WBALANCE_WATER_HEADER;UnderWater
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index adb37a61f..04d5bd4d5 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -1998,12 +1998,22 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!GENERAL_APPLY;Apply
!GENERAL_OPEN;Open
!HISTORY_MSG_439;Retinex - Process
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -2037,6 +2047,8 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!PREFERENCES_PRTINTENT;Rendering intent
!PREFERENCES_PRTPROFILE;Color profile
!PREFERENCES_SELECTFONT_COLPICKER;Select Color Picker's font
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen enabled:\nClick in the preview with left mouse button to add a color picker\nDrag it around while pressing the left mouse button\nDelete the color picker with a right mouse button click\nDelete all color pickers with Shift + Right mouse button click\nRight click away from any color picker to go back to the Hand tool
@@ -2058,3 +2070,5 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!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_SKAL;Scale
!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_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".
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 40ed600c9..3d93ba84d 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -449,6 +449,15 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -929,6 +938,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1113,7 +1123,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1187,7 +1197,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1205,6 +1215,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1228,6 +1239,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2028,6 +2040,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index bbe23f2fd..8aedbc0cb 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -1472,6 +1472,15 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
!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.
@@ -1631,6 +1640,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1726,6 +1736,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1734,6 +1745,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2047,3 +2059,5 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!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_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".
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index fd1205a7d..207fcd12b 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -1472,6 +1472,15 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
!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.
@@ -1631,6 +1640,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1726,6 +1736,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1734,6 +1745,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2047,3 +2059,5 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!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_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".
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 4643008f1..dee162661 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 120d17530..7f7953a35 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -1281,6 +1281,15 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!CURVEEDITOR_AXIS_OUT;O:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
@@ -1490,6 +1499,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1606,6 +1616,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1614,6 +1625,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
@@ -2043,4 +2055,6 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!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_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".
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 6797ab195..a6237816d 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -1437,6 +1437,15 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
!DIRBROWSER_FOLDERS;Folders
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
@@ -1657,6 +1666,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1772,6 +1782,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1779,6 +1790,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -2176,4 +2188,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!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_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".
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 1a86a552a..227267045 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -1437,6 +1437,15 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
!DIRBROWSER_FOLDERS;Folders
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels
@@ -1657,6 +1666,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1772,6 +1782,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_SMA;Small (250x287)
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TIMAX;High
!PREFERENCES_TINB;Number of tiles
!PREFERENCES_TISTD;Standard
@@ -1779,6 +1790,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!PROFILEPANEL_PDYNAMIC;Dynamic
!SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
!SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -2176,4 +2188,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!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_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".
!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 8e7957cf4..ca1ad5bf7 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -532,6 +532,15 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!CURVEEDITOR_MINMAXCPOINTS;Equalizer
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -993,6 +1002,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1164,7 +1174,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1250,6 +1260,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1271,6 +1282,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2037,6 +2049,8 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index d92c71c88..0994e6d44 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -451,6 +451,15 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -931,6 +940,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1115,7 +1125,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1189,7 +1199,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1207,6 +1217,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1230,6 +1241,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2029,6 +2041,8 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index d98dabc24..ceeec013e 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1895,6 +1895,15 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!CURVEEDITOR_AXIS_LEFT_TAN;LT:
!CURVEEDITOR_AXIS_RIGHT_TAN;RT:
!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node.
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!HISTORY_MSG_257;Color Toning
!HISTORY_MSG_288;Flat Field - Clip control
!HISTORY_MSG_289;Flat Field - Clip control - Auto
@@ -1918,6 +1927,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!HISTORY_MSG_425;Retinex - Log base
!HISTORY_MSG_427;Output rendering intent
!HISTORY_MSG_428;Monitor rendering intent
+!HISTORY_MSG_444;WB - Temp bias
!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
@@ -1956,6 +1966,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!PREFERENCES_PRTINTENT;Rendering intent
!PREFERENCES_PRTPROFILE;Color profile
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
+!PROFILEPANEL_PDYNAMIC;Dynamic
!TP_CBDL_METHOD;Process located
!TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Chroma opacity as a function of luminance oC=f(L)
!TP_COLORTONING_LABEL;Color Toning
@@ -2043,3 +2055,5 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!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_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_TON;Toning
+!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".
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 2e64516f1..342363700 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -450,6 +450,15 @@ TP_WBALANCE_TEMPERATURE;Isı
!CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard.
!CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
!CURVEEDITOR_TYPE;Type:
+!DYNPROFILEEDITOR_DELETE;Delete
+!DYNPROFILEEDITOR_EDIT;Edit
+!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+!DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+!DYNPROFILEEDITOR_MOVE_UP;Move Up
+!DYNPROFILEEDITOR_NEW;New
+!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+!DYNPROFILEEDITOR_PROFILE;Processing Profile
!EDITWINDOW_TITLE;Image Edit
!EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
!EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -930,6 +939,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_441;Retinex - Gain transmission
!HISTORY_MSG_442;Retinex - Scale
!HISTORY_MSG_443;Output Black Point Compensation
+!HISTORY_MSG_444;WB - Temp bias
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
!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.
@@ -1114,7 +1124,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_DIRDARKFRAMES;Dark-frames directory
!PREFERENCES_EDITORLAYOUT;Editor Layout
!PREFERENCES_EXPAUT;Expert
-!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low resolution display)
+!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
!PREFERENCES_FILMSIMULATION;Film Simulation
!PREFERENCES_FLATFIELD;Flat-Field
!PREFERENCES_FLATFIELDFOUND;Found
@@ -1188,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!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_SELECTFONT;Select global font
+!PREFERENCES_SELECTFONT;Select main font
!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
@@ -1206,6 +1216,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
!PREFERENCES_SND_TRESHOLDSECS;After seconds
!PREFERENCES_STDAUT;Standard
+!PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
!PREFERENCES_TAB_PERFORMANCE;Performance & Quality
!PREFERENCES_TAB_SOUND;Sounds
!PREFERENCES_TIMAX;High
@@ -1229,6 +1240,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!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
!PROFILEPANEL_PASTEPPASTE;Parameters to paste
+!PROFILEPANEL_PDYNAMIC;Dynamic
!PROFILEPANEL_PINTERNAL;Neutral
!PROFILEPANEL_SAVEPPASTE;Parameters to save
!PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
@@ -2028,6 +2040,8 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_WBALANCE_SOLUX41;Solux 4100K
!TP_WBALANCE_SOLUX47;Solux 4700K (vendor)
!TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery)
+!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_TUNGSTEN;Tungsten
!TP_WBALANCE_WATER1;UnderWater 1
!TP_WBALANCE_WATER2;UnderWater 2
diff --git a/rtdata/languages/default b/rtdata/languages/default
index fc5aa8881..4d3bdab5c 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -36,6 +36,15 @@ CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
CURVEEDITOR_TOOLTIPSAVE;Save current curve.
CURVEEDITOR_TYPE;Type:
DIRBROWSER_FOLDERS;Folders
+DYNPROFILEEDITOR_DELETE;Delete
+DYNPROFILEEDITOR_EDIT;Edit
+DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
+DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
+DYNPROFILEEDITOR_MOVE_DOWN;Move Down
+DYNPROFILEEDITOR_MOVE_UP;Move Up
+DYNPROFILEEDITOR_NEW;New
+DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule
+DYNPROFILEEDITOR_PROFILE;Processing Profile
EDITWINDOW_TITLE;Image Edit
EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool.
EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve.
@@ -675,6 +684,37 @@ HISTORY_MSG_440;CbDL - Method
HISTORY_MSG_441;Retinex - Gain transmission
HISTORY_MSG_442;Retinex - Scale
HISTORY_MSG_443;Output Black Point Compensation
+HISTORY_MSG_444;WB - Temp bias
+HISTORY_MSG_445;Raw Sub-Image
+HISTORY_MSG_446;EvPixelShiftMotion
+HISTORY_MSG_447;EvPixelShiftMotionCorrection
+HISTORY_MSG_448;EvPixelShiftStddevFactorGreen
+HISTORY_MSG_449;PS ISO adaption
+HISTORY_MSG_450;EvPixelShiftNreadIso
+HISTORY_MSG_451;EvPixelShiftPrnu
+HISTORY_MSG_452;PS Show motion
+HISTORY_MSG_453;PS Show mask only
+HISTORY_MSG_454;EvPixelShiftAutomatic
+HISTORY_MSG_455;EvPixelShiftNonGreenHorizontal
+HISTORY_MSG_456;EvPixelShiftNonGreenVertical
+HISTORY_MSG_457;PS Check red/blue
+HISTORY_MSG_458;EvPixelShiftStddevFactorRed
+HISTORY_MSG_459;EvPixelShiftStddevFactorBlue
+HISTORY_MSG_460;EvPixelShiftGreenAmaze
+HISTORY_MSG_461;EvPixelShiftNonGreenAmaze
+HISTORY_MSG_462;PS Check green
+HISTORY_MSG_463;EvPixelShiftRedBlueWeight
+HISTORY_MSG_464;PS Blur motion mask
+HISTORY_MSG_465;PS Blur radius
+HISTORY_MSG_466;EvPixelShiftSum
+HISTORY_MSG_467;EvPixelShiftExp0
+HISTORY_MSG_468;PS Fill holes
+HISTORY_MSG_469;PS Median
+HISTORY_MSG_470;EvPixelShiftMedian3
+HISTORY_MSG_471;PS Motion correction
+HISTORY_MSG_472;PS Smooth transitions
+HISTORY_MSG_473;PS Use lmmse
+HISTORY_MSG_474;PS Equalize
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
HISTORY_SNAPSHOT;Snapshot
@@ -865,6 +905,7 @@ PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
PARTIALPASTE_RAW_DMETHOD;Demosaic method
PARTIALPASTE_RAW_FALSECOLOR;False color suppression
+PARTIALPASTE_RAW_IMAGENUM;Sub-image
PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
PARTIALPASTE_RESIZE;Resize
PARTIALPASTE_RETINEX;Retinex
@@ -1073,6 +1114,7 @@ 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
@@ -1101,6 +1143,7 @@ PROFILEPANEL_MODE_TIP;Processing profile fill mode.\n\nButton pressed: partial p
PROFILEPANEL_MYPROFILES;My profiles
PROFILEPANEL_PASTEPPASTE;Parameters to paste
PROFILEPANEL_PCUSTOM;Custom
+PROFILEPANEL_PDYNAMIC;Dynamic
PROFILEPANEL_PFILE;From file
PROFILEPANEL_PINTERNAL;Neutral
PROFILEPANEL_PLASTSAVED;Last Saved
@@ -1648,13 +1691,60 @@ 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.
+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.\nPixelshift is for Pentax pixelshift files. It falls back to Amaze for non pixelshift files.
TP_RAW_FALSECOLOR;False color suppression steps
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_IMAGENUM;Sub-image
+TP_RAW_IMAGENUM_TOOLTIP;Some raw files might embed several sub-images (HDR, Pixel-Shift, Dual Sensitivity). Use this button to select the sub-image.\n\nThe last sub-image will be used if you select a value beyond the real sub-image count.
TP_RAW_LABEL;Demosaicing
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_PIXELSHIFTADAPTIVE;Adaptive detection
+TP_RAW_PIXELSHIFTNONGREENHORIZONTAL;Check red/blue horizontal
+TP_RAW_PIXELSHIFTNONGREENVERTICAL;Check red/blue vertical
+TP_RAW_PIXELSHIFTMEDIAN;Median
+TP_RAW_PIXELSHIFTMEDIAN3;Exclude selected frame from median
+TP_RAW_PIXELSHIFTHOLEFILL;Fill holes in motion mask
+TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;Default radius of 1.0 usually fits good for base ISO. Increase value for high ISO shots,\n5.0 is a good starting point for high ISO shots.\nWatch motion mask while changing the value.
+TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
+TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use lmmse instead of amaze for motion areas.\nUseful for High ISO images.
+TP_RAW_PIXELSHIFTLMMSE;Use lmmse for motion parts
+TP_RAW_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
+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_RAW_PIXELSHIFTEXP0;Experimental
+TP_RAW_PIXELSHIFTGREEN;Check green channel for motion
+TP_RAW_PIXELSHIFTNONGREENCROSS;Check red/blue channels for motion
+TP_RAW_PIXELSHIFTNONGREENCROSS2;Check green amaze
+TP_RAW_PIXELSHIFTNONGREENAMAZE;Check red/blue amaze
+TP_RAW_PIXELSHIFTMOTION;Motion detection level (deprecated)
+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_PIXELSHIFTHOLEFILL_TOOLTIP;Fill holes in motion mask
+TP_RAW_PIXELSHIFTBLUR_TOOLTIP;Blur motion mask
+TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with and without motion.\nSet to 0 to disable smooth transitions\nSet to 1 to get Amaze/lmmse or Median
+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_PIXELSHIFTMEDIAN3_TOOLTIP;Excludes selected frame from median.\nUseful if moving objects overlap in frame 2 and 3
+TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a mask showing the regions with motion
+TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Shows the motion mask without the image
+TP_RAW_PIXELSHIFTMOTIONCORRECTION;Green motion correction size
+TP_RAW_PIXELSHIFTMOTIONCORRECTION_TOOLTIP;1 = 2 pixels\n3 = 3x3 grid\n5 = 5x5 grid
+TP_RAW_PIXELSHIFTMOTIONMETHOD;Motion Correction
+TP_RAW_PIXELSHIFTMM_OFF;Off
+TP_RAW_PIXELSHIFTMM_AUTO;Automatic
+TP_RAW_PIXELSHIFTMM_CUSTOM;Custom
+TP_RAW_PIXELSHIFTSHOWMOTION;Show motion
+TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Show mask only
+TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
+TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
+TP_RAW_PIXELSHIFTEPERISO;ISO adaption
+TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value (0.0) should work fine for base ISO.\nIncrease the value to improve motion detection for higher ISO.\nIncrease in small steps and watch the motion mask while increasing.
+TP_RAW_PIXELSHIFTNREADISO;nRead
+TP_RAW_PIXELSHIFTPRNU;PRNU (%)
+TP_RAW_PIXELSHIFTSIGMA;Blur radius
+TP_RAW_PIXELSHIFTMASKTHRESHOLD;3x3 new threshold
+TP_RAW_PIXELSHIFTREDBLUEWEIGHT;Red&Blue weight
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
@@ -2022,6 +2112,8 @@ 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
diff --git a/rtdata/profiles/BW/BW 1.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 1.pp3
similarity index 100%
rename from rtdata/profiles/BW/BW 1.pp3
rename to rtdata/profiles/Black-and-White/Black-and-White 1.pp3
diff --git a/rtdata/profiles/BW/BW 2.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 2.pp3
similarity index 100%
rename from rtdata/profiles/BW/BW 2.pp3
rename to rtdata/profiles/Black-and-White/Black-and-White 2.pp3
diff --git a/rtdata/profiles/BW/BW 3.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 3.pp3
similarity index 100%
rename from rtdata/profiles/BW/BW 3.pp3
rename to rtdata/profiles/Black-and-White/Black-and-White 3.pp3
diff --git a/rtdata/profiles/BW/BW 4.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 4.pp3
similarity index 100%
rename from rtdata/profiles/BW/BW 4.pp3
rename to rtdata/profiles/Black-and-White/Black-and-White 4.pp3
diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css
index a672c66d8..27d2b5f13 100644
--- a/rtdata/themes/RawTherapee-GTK3-20_.css
+++ b/rtdata/themes/RawTherapee-GTK3-20_.css
@@ -50,31 +50,40 @@ window.background {
background-color: #484848;
}
-headerbar {
- box-shadow: none;
- background-color: #262626;
- padding: 0;
- margin: 0;
- border-radius: 0;
- border-style: none none solid none;
+/*** Window decoration *********************************************************/
+@define-color winHeaderbar rgb(50,50,50);
+
+:not(.popup):not(tooltip) > decoration {
+ background-color: #484848;
background-image: none;
-}
-
-/* Warning: maximized and fullscreen can be set at the same time ! */
-window.maximized > decoration, window.fullscreen > decoration {
+ border-radius: 5px 5px 0 0;
+ border: none;
padding: 0;
+ box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px #242424;
+ margin: 10px;
+}
+headerbar {
+ background-color: shade(@winHeaderbar,1.12);
+ box-shadow: inset 0 1px rgba(200,200,200,.13);
+ background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
+ border-bottom: 1px solid #242424;
+ border-radius: 5px 5px 0 0;
+ min-height: 26px;
+ padding: 1px 5px 0;
margin: 0;
}
-
-window > decoration, dialog > decoration {
- box-shadow: none;
- margin: 0px;
- border-style: none;
- border-radius: 0;
- padding: 3px;
- background-color: #262626;
+.csd #MainNotebook > header.top {
+ border-top: 1px solid #484848;
}
+/* Window state */
+.maximized > headerbar {
+ border-radius: 0;
+}
+/**/
+
+/*** End Window decoration *****************************************************/
+
dialog.background {
background-color: #484848;
}
@@ -196,6 +205,12 @@ button:hover , button.flat:hover, checkbutton:hover > check, radiobutton:hover >
button.popupbutton-arrow {
min-width: 18px;
}
+/* Save, Cancel, OK ... buttons */
+.dialog-action-area button {
+ min-height: 24px;
+ margin-top: 6px;
+}
+/**/
combobox {
min-height: 5px;
@@ -826,3 +841,15 @@ paned.vertical > separator {
#RightNotebook scrolledwindow {
padding: 4px;
}
+
+
+/* make the "partial profile" dialog a little bit more readable */
+#PartialPasteHeader {
+ margin: 1.5em 0 0 0;
+ padding: 0;
+ font-weight: bold;
+}
+
+#PartialPasteHeaderSep {
+ background-color: #D8D8D8;
+}
diff --git a/rtdata/themes/RawTherapee-GTK3-_19.css b/rtdata/themes/RawTherapee-GTK3-_19.css
index d9d61206b..8263dd857 100644
--- a/rtdata/themes/RawTherapee-GTK3-_19.css
+++ b/rtdata/themes/RawTherapee-GTK3-_19.css
@@ -487,3 +487,16 @@ GtkNotebook {
.tooltip {
padding: 0;
}
+
+
+/* make the "partial profile" dialog a little bit more readable */
+#PartialPasteHeader {
+ margin: 1.5em 0 0 0;
+ padding: 0;
+ font-weight: bold;
+ color: #363636;
+}
+
+#PartialPasteHeaderSep {
+ color: #D8D8D8;
+}
diff --git a/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css b/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
index 43d9a3035..3832f5bcd 100644
--- a/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
@@ -2,7 +2,7 @@
This file is part of RawTherapee.
Copyright (c) 2016-2017 TooWaBoo
- Version 2.42 - requires RT 5.0
+ Version 2.49 - requires RT 5.0
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -76,10 +76,10 @@
}
#ToolPanelNotebook {
- min-width: 23em;
+ min-width: 24.08334em;
}
#HistoryPanel {
- min-width: 17.83334em;
+ min-width: 18em;
}
window.background {
@@ -105,7 +105,7 @@ messagedialog {
}
tooltip {
background-color: @bg-tooltip;
- border: 1px solid @border-tooltip;
+ border: 0.08334em solid @border-tooltip;
border-radius: 0.33334em;
padding: 0;
margin: 0;
@@ -180,7 +180,7 @@ frame > border {
dialog frame > border {
padding: 0.5em;
border-radius: 0;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
background-color: transparent;
margin: 0 -0.5em;
}
@@ -241,11 +241,11 @@ textview:selected, treeview:selected {
}
#RightNotebook > stack > :nth-child(3) treeview {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
border-bottom: none;
}
-#PlacesPaned > :nth-child(1) treeview {
+#PlacesPaned > box:nth-child(1) treeview {
padding: 0.08334em 0 0.08334em 0.5em;
-gtk-icon-style: symbolic;
}
@@ -275,15 +275,15 @@ textview:selected, treeview:selected {
margin-bottom: 0.41667em;
}
-#PlacesPaned > box:nth-child(3) > :nth-child(2),
+#PlacesPaned > box:nth-child(3) > box:nth-child(2),
#PlacesPaned > box:nth-child(1) > :nth-child(1),
#HistoryPanel > border,
#Snapshots > box > :nth-child(1) {
- padding: 1px;
background-color: @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
}
-/*Corrects the space for the snapshot view of the paned separator*/
+/*Corrects the space of the snapshot view to the paned separator*/
#Snapshots {
margin-top: -0.33334em;
}
@@ -321,11 +321,11 @@ filechooser box {
}
filechooser > box > paned > box {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
filechooser placessidebar {
- padding: 0 1px;
+ padding: 0 0.08334em;
background-color: @bg-dark-grey;
}
@@ -362,7 +362,7 @@ filechooser list row:selected {
}
#HistogramArea,
#HistogramRGBArea {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
@@ -372,7 +372,7 @@ filechooser list row:selected {
margin: 0;
border-color: @bg-light-grey;
border-style: solid;
- border-width: 0 0 0 1px;
+ border-width: 0 0 0 0.08334em;
background-color: @bg-dark-grey;
background-image: none;
box-shadow: none;
@@ -385,7 +385,7 @@ filechooser list row:selected {
}
#EditorLeftPaned #fullButton,
#EditorLeftPaned #histButton {
- border-width: 0 1px 0 0;
+ border-width: 0 0.08334em 0 0;
}
/*** end ***************************************************************************************/
@@ -467,8 +467,8 @@ menu separator {
/*** PartialPaste ******************************************************************************/
#PartialPaste {
- border-bottom: 1px solid @border-color;
- border-top: 1px solid @border-color;
+ border-bottom: 0.08334em solid @border-color;
+ border-top: 0.08334em solid @border-color;
padding-top: 0.5em;
padding-bottom: 0.5em;
}
@@ -488,7 +488,8 @@ menu separator {
}
#PartialPasteHeader label {
- color: @headline-frame;
+ color: @headline-big;
+ font-weight: bold;
}
#PartialPasteHeader {
margin: 0.5em 0 0 0;
@@ -518,10 +519,10 @@ scrollbar:not(.overlay-indicator) {
background-color: rgba(0,0,0,.30);
}
scrollbar:not(.overlay-indicator).horizontal {
- border-width: 0 1px 1px 1px;
+ border-width: 0 0.08334em 0.08334em 0.08334em;
}
scrollbar:not(.overlay-indicator).vertical {
- border-width: 1px 1px 1px 0;
+ border-width: 0.08334em 0.08334em 0.08334em 0;
}
scrollbar:not(.overlay-indicator) slider {
background-color: shade(@text-color, .9);
@@ -593,7 +594,7 @@ scale slider {
margin: calc(-0.33334em - 1px);
border-radius: 0.83334em;
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
box-shadow: none;
}
scale slider:hover {
@@ -603,14 +604,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-color: @bg-dark-grey;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0.11), 0 1px rgba(242, 242, 242, 0.11);
+ border: 0.08334em solid @bg-dark-grey;
+ box-shadow: inset 0 0.08334em rgba(255, 255, 255, 0.11), 0 0.08334em rgba(242, 242, 242, 0.11);
border-radius: 0.5em;
}
scale:not(:disabled) trough highlight {
background-color: @accent-color2;
- border-color: @bg-dark-grey;
- box-shadow: inset 0 1px shade(@accent-color2, 1.3);
+ border: 0.08334em solid @bg-dark-grey;
+ box-shadow: inset 0 0.08334em shade(@accent-color2, 1.3);
border-radius: 0.5em;
}
@@ -671,7 +672,7 @@ progressbar.horizontal trough progress {
#IopsPanel progressbar.horizontal trough {
min-height: 0.5em;
background-color: @bg-scale-entry;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
margin-top: 0.25em;
}
#IopsPanel progressbar.horizontal trough progress {
@@ -770,8 +771,9 @@ dialog notebook stack {
#MainNotebook > stack {
padding: 0.41667em;
}
-#MainNotebook > stack > :nth-child(2) > :nth-child(2) {
- margin-bottom: 0.33334em;
+
+#MainNotebook > stack > :nth-child(2) > box:nth-child(3) {
+ margin-top: 0.41667em;
}
@@ -787,9 +789,18 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin-bottom: 0.33334em;
}
+#ToolPanelNotebook > header tab {
+ margin-left: 0;
+ margin-right: 0;
+ padding: 0 0.33334em;
+}
+#ToolPanelNotebook > header tab + tab {
+ margin-left: 0.33333em;
+}
+
#ToolPanelNotebook > header tab image{
min-height: 2.5em;
- min-width: calc(1.66667em + 6px);
+ min-width: 2em;
padding: 0;
margin: 0;
}
@@ -801,10 +812,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
background-color: @bg-grey;
padding: 0;
}
-#RightNotebook > stack > :nth-child(3),
-#RightNotebook > stack > :nth-child(4) {
+
+#RightNotebook > stack > :nth-child(3) > * > box,
+#RightNotebook > stack > :nth-child(4) > * > box {
padding: 0.5em;
- border: 1px solid @bg-entry-border;
+ border: 0.08334em solid @bg-entry-border;
}
#PrefNotebook header {
@@ -813,8 +825,9 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#AboutNotebook header {
margin: -0.66667em -0.66667em 0.66667em;
}
-#AboutNotebook stack > * > * > * {
- background-color: @dark-grey;
+
+#AboutNotebook stack text {
+ background-color: @bg-dark-grey;
}
/* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
@@ -873,7 +886,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0;
}
#MetaPanelNotebook .view {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
padding: 0.16667em;
margin: 0;
}
@@ -888,14 +901,19 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0;
}
+#MetaPanelNotebook combobox button {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ border-left: none;
+}
#MetaPanelNotebook combobox + button,
#MetaPanelNotebook combobox + button + button {
margin-left: 0.16667em;
min-width: 1.66667em;
}
#MetaPanelNotebook > stack > box > grid > button {
- margin-top: 1px;
- margin-bottom: 1px;
+ margin-top: 0.08334em;
+ margin-bottom: 0.08334em;
min-height: 2.16667em;
}
@@ -908,7 +926,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/*** File Browser ******************************************************************************/
#FileCatalog {
background-color: @bg-image;
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
}
#FileCatalog:selected {
background-color: @accent-color3;
@@ -949,7 +967,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
min-width: 1.66667em;
margin: 0 0 0 -1.66667em;
border-radius: 0 0.2em 0.2em 0;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
padding: 0;
}
#ToolBarPanelFileBrowser entry,
@@ -972,25 +990,17 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#BeforeAfterContainer {
background-color: @bg-grey;
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
border-radius: 0;
padding: 0;
margin: 0.41667em 0;
}
-#BeforeAfterContainer > box:nth-child(1) frame {
- background-color: @bg-image;
- border-top: 1px solid @bg-dark-grey;
- border-radius: 0;
- padding: 0;
- margin: -1px 0 0 0;
+#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;
}
-#BeforeAfterContainer > box:nth-child(2) frame {
- background-color: @bg-image;
- border-top: 1px solid @bg-dark-grey;
- border-left: 1px solid @bg-dark-grey;
- border-radius: 0;
- padding: 0;
- margin: -1px 0 0 0;
+#BeforeAfterContainer > box:nth-child(2){
+ border-left: 0.08334em solid @bg-dark-grey;
}
#BeforeAfterContainer label {
@@ -1000,8 +1010,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/* Small Lock Button */
#BeforeAfterContainer button {
min-height: 1.66667em;
- min-width: 1.66667em;
- margin: 0.25em 0 0.33334em;
+ min-width: 1.75em;
+ margin: 0.25em;
padding: 0 0 0 0.08334em;
}
/**/
@@ -1021,12 +1031,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin-right: 0;
}
-#EditorTopPanel > box > button.image-button:not(:nth-child(6)) {
+#EditorTopPanel > box:nth-child(9) > button.image-button:not(:nth-child(6)) {
min-width: 0;
padding-left: 0.33334em;
padding-right: 0.33334em;
}
-#EditorTopPanel > box > button.image-button:nth-child(6) {
+
+#EditorTopPanel > box:nth-child(9) > button.image-button:nth-child(6) {
-gtk-icon-shadow: none;
}
#EditorTopPanel > box > box > button {
@@ -1034,7 +1045,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
min-width: 0;
margin: 0 0.16667em;
padding: 0 0.16667em;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
background-color: transparent;
background-image: none;
box-shadow: none;
@@ -1042,13 +1053,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#EditorTopPanel > box > box > button:hover {
background-color: transparent;
background-image: none;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
box-shadow: none;
}
#EditorTopPanel > box > box > button:checked {
background-color: transparent;
background-image: none;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
box-shadow: none;
}
@@ -1077,19 +1088,22 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
/**/
#MyExpander .drawingarea:not(.slider) {
- border: 1px solid @bg-light-grey;
+ border: 0.08334em solid @bg-light-grey;
}
#MyExpander .slider,
#MyExpander .drawingarea:nth-child(2) {
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
background-color: @accent-color4;
- border: 1px solid rgb(15,15,15);
+ border: 0.08334em solid rgb(15,15,15);
}
#MyExpander .drawingarea:disabled {
background-color: shade(@bg-grey,.85);
border-color: @bg-dark-grey;
background-image: none;
}
+#ThresholdAdjuster {
+ margin: 0.08334em 0 0.16667em 0;
+}
#ToolPanelNotebook scrolledwindow viewport.frame {
padding: 0 0.56em;
@@ -1114,7 +1128,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/* Sub-tool (MyExpander) */
#ExpanderBox2 > box, #ExpanderBox2 > grid {
background-color: transparent;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
border-radius: 0;
margin: 0;
padding: 0.5em;
@@ -1143,13 +1157,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
border: none;
padding: 0;
margin: 0;
- box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.50), 0 0 0 1px @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.50), 0 0 0 0.08334em @bg-dark-grey;
}
menu {
background-color: @bg-dark-grey;
- border: 1px solid @accent-color;
- padding: 1px;
+ border: 0.08334em solid @accent-color;
+ padding: 0.08334em;
margin: 0;
}
menu > .top,
@@ -1159,12 +1173,12 @@ menu > .bottom:hover {
background-color: transparent;
border: none;
padding: 0.5em;
- min-height: 2em;
+ min-height: 1.5em;
}
menuitem {
padding: 0 0.33334em;
- margin: 1px;
+ margin: 0.08334em;
min-height: 2em;
}
menuitem:hover {
@@ -1187,11 +1201,11 @@ entry > window > frame {
}
entry > window > frame > border {
background-color: @bg-dark-grey;
- padding: 1px;
- border: 1px solid @accent-color;
+ padding: 0.08334em;
+ border: 0.08334em solid @accent-color;
}
.csd entry > window > frame > border {
- margin: 1px;
+ margin: 0.08334em;
}
/* end */
@@ -1203,7 +1217,7 @@ entry > window > frame > border {
}
popover.background {
background-color: @bg-dark-grey;
- border-color: @accent-color;
+ border: 0.08334em solid @accent-color;
border-radius: 0;
padding: 0;
margin: 0;
@@ -1236,9 +1250,9 @@ button {
margin: 0;
padding: 0; /* x */
border-radius: 0.2em;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
background-color: transparent;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
}
button.flat {
@@ -1250,7 +1264,7 @@ button.text-button label {
#MainNotebook > header > grid > button,
button.flat {
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
box-shadow: none;
background-image: none;
background-color: transparent;
@@ -1301,7 +1315,7 @@ scale + button.flat {
button.flat:hover,
button:hover {
border-color: @bg-button-border;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.08334em 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;
}
@@ -1313,7 +1327,7 @@ button.flat:checked,
button:active,
button:checked {
border-color: @bg-button-border;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.08);
+ box-shadow: inset 0 0.08334em 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;
}
@@ -1322,7 +1336,7 @@ button:checked {
button.Right,
button.MiddleH {
margin-left: 0.16667em;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
}
/**/
@@ -1343,13 +1357,14 @@ button.MiddleH {
}
/**/
-/* Base format for Toolbox and dialogs */
+/* Button base format for Toolbox and dialogs */
dialog button,
#MyExpander button,
#BatchQueueButtonsMainContainer button {
min-height: 1.66667em;
min-width: 0;
padding: 0 0.375em;
+ margin: 0.08334em 0;
}
combobox .combo,
dialog combobox .combo,
@@ -1364,9 +1379,10 @@ dialog combobox .combo,
#MyExpander button:not(.flat).Left,
#MyExpander button:not(.flat) + combobox,
#MyExpander combobox + button:not(.flat),
-#MyExpander combobox + combobox,
+#MyExpander combobox + combobox
+/* Crash
#MyExpander button + label,
-#MyExpander combobox + label {
+#MyExpander combobox + label */ {
margin-left: 0.16667em;
}
#MyExpander label + filechooserbutton,
@@ -1376,6 +1392,13 @@ dialog combobox .combo,
margin-left: 0.33334em;
}
+buttonbox:not(.dialog-action-area) button{
+ margin: 0.08334em 0 0.33334em 0.16667em;
+}
+#PrefNotebook buttonbox:not(.dialog-action-area) {
+ margin-right: -5px;
+}
+
/* Arrow toggle combo button */
#IopsPanel button:not(.flat).Left + button:not(.flat).Right,
#MyExpander button:not(.flat).Left + button:not(.flat).Right {
@@ -1394,13 +1417,6 @@ dialog combobox .combo,
}
/**/
-/* Add extra top and bottom space to buttons in toolbox & Preferences*/
-#PrefNotebook stack > box:nth-child(4) combobox,
-#MyExpander button.flat,
-#MyExpander button {
- margin-top: 0.08334em;
- margin-bottom: 0.08334em;
-}
/**/
#MyExpander button.text-button label {
margin: 0;/* x */
@@ -1453,8 +1469,9 @@ window .view button {
background-image: none;
box-shadow: none;
min-height: 2em;
- min-width: 1.33334em;
+ min-width: 1.33334em;
padding: 0 0.33334em;
+ margin: 0;
}
dialog .view button.text-button label,
window .view button.text-button label {
@@ -1462,25 +1479,26 @@ window .view button.text-button label {
}
window .view button {
border: none;
- border-bottom: 1px solid @border-color;
+ border-bottom: 0.08334em solid @border-color;
}
dialog .view button {
- border-color: @border-color;
+ border: 0.08334em solid @border-color;
}
-.view button:checked label,
.view button:checked,
-.view button:hover:not(:active) label,
.view button:hover:not(:active) {
- color: @headline-hl;
background-image: none;
background-color: @bg-list-hover;
}
+.view button:checked label,
+.view button:hover:not(:active) label {
+ color: @headline-hl;
+}
-dialog .view header button:not(:last-child):not(:only-child),
-window .view header button:not(:last-child):not(:only-child),
-.path-bar button:not(:last-child):not(:only-child) {
- border-right: none;
+dialog .view header button:not(:first-child):not(:only-child),
+window .view header button:not(:first-child):not(:only-child),
+.path-bar button:not(:first-child):not(:only-child) {
+ border-left: none;
}
dialog .view header button,
window .view header button,
@@ -1489,6 +1507,7 @@ window .view header button,
}
#pathbarbox button:last-child {
+ min-height: 2em;
min-width: 2em;
margin: 0;
padding: 0;
@@ -1517,10 +1536,10 @@ window .view header button,
popover button.text-button {
background-color: @bg-dark-grey;
background-image: none;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
box-shadow: none;
background-image: none;
- margin: 0;
+ margin: 0.083334em 0;
min-height: 1.66667em;
padding: 0 0.66667em;
}
@@ -1559,7 +1578,7 @@ headerbar button.titlebutton image {
headerbar button.titlebutton {
margin: 0 0 0 0.33334em;
background-image: none;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
background-color: transparent;
box-shadow: none;
min-width: 1.55em;
@@ -1582,14 +1601,14 @@ messagedialog headerbar button.titlebutton {
#MainNotebook tab #CloseButton:hover,
headerbar button.titlebutton:hover{
border-color: rgba(0,0,0,.8);
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.11);
+ box-shadow: inset 0 0.08334em 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 1px rgba(242, 242, 242, 0.15);
+ box-shadow: inset 0 0.08334em 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);
}
@@ -1597,30 +1616,27 @@ 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 1px rgba(242, 242, 242, 0.32);
+ box-shadow: inset 0 0.08334em 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 1px rgba(242, 242, 242, 0.4);
+ box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.4);
}
/**/
/*** end ***************************************************************************************/
/*** Ckeckbox & Radio **************************************************************************/
-checkbox {
- padding:0;
- margin:0;
- min-height: 2em;
-}
+checkbox,
checkbutton,
radiobutton {
padding: 0;
margin: 0;
min-height: 2em;
}
+
check,
radio {
border: calc(0.083334em + 0.18px) solid shade(@text-color, .9);
@@ -1642,14 +1658,6 @@ checkbutton label {
check {
border-radius: 0.16667em;
}
-check:checked {
- padding: 0 2px 0 0;
- min-width: calc(1.16667em - 2px);
-}
-check:indeterminate {
- min-width: 1.16667em;
- padding: 0;
-}
radio{
border-radius: 1.16667em;
@@ -1671,16 +1679,6 @@ frame > checkbutton check{
min-height: 1.4em;
margin-left: 0.5em;
}
-#PrefNotebook checkbutton {
- min-height: 1.16667em;
-}
-#PrefNotebook stack > box:nth-child(3) checkbutton,
-#PrefNotebook stack > box:nth-child(4) checkbutton {
- min-height: 2em;
-}
-#PrefNotebook radiobutton {
- min-height: 2em;
-}
#MyExpander button + checkbutton:last-child {
margin-left: 0.33334em;
@@ -1691,25 +1689,25 @@ frame > checkbutton check{
/*** Entry & Spinbutton ************************************************************************/
#MyExpander entry,
entry {
- margin: 0;
+ margin: 0.08334em 0;
padding: 0 0.33334em;
min-height: 1.66667em;
min-width: 0;
border-radius: 0.2em;
- box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242, 242, 242, 0.1);
- border: 1px 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.08334em solid @bg-entry-border;
background-color: @bg-scale-entry;
}
spinbutton {
- margin: 0;
+ margin: 0.08334em 0;
padding: 0;
min-height: 1.66667em;
min-width: 0;
border-radius: 0.2em;
background-color: @bg-scale-entry;
- border: 1px solid @bg-entry-border;
- box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242, 242, 242, 0.1);
+ 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);
}
#MyExpander spinbutton {
@@ -1720,9 +1718,9 @@ spinbutton {
border-top-left-radius: 1.83334em;
border-bottom-left-radius: 1.83334em;
background-color: shade(@bg-grey, 1.33);
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
color: @text-tbEntry;
- box-shadow: inset 1px 1px rgba(0, 0, 0, .12), 0 1px rgba(255, 255, 255, 0.12);
+ box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, .12), 0 0.08334em rgba(255, 255, 255, 0.12);
}
#MyExpander button + label + spinbutton {
margin: 0.25em 0; /* Needed for Reset & and Auto button height*/
@@ -1808,7 +1806,7 @@ entry:focus > selection {
.view entry {
background-color: @bg-dark-grey;
margin: 0 -2px;
- border: 1px solid @accent-color;
+ border: 0.08334em solid @accent-color;
box-shadow: none;
}
/* end*/
@@ -1822,14 +1820,14 @@ entry:focus > selection {
border-radius: 0.41667em 0.41667em 0 0;
border: none;
padding: 0;
- box-shadow: 0 0.25em 0.75em 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey;
+ 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;
}
headerbar {
background-color: shade(@winHeaderbar,1.12);
- box-shadow: inset 0 1px rgba(200,200,200,.13);
+ box-shadow: inset 0 0.08334em rgba(200,200,200,.13);
background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
- border-bottom: 1px solid @bg-dark-grey;
+ 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;
@@ -1851,7 +1849,7 @@ headerbar .title{
/* Window in background */
:not(.popup):not(tooltip) > decoration:backdrop {
- box-shadow: 0 0.25em 0.75em 1px rgba(0, 0, 0, 0.3), 0 0 0 1px @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.3), 0 0 0 0.08334em @bg-dark-grey;
}
headerbar:backdrop {
box-shadow: none;
@@ -1861,5 +1859,4 @@ headerbar .title:backdrop {
color: alpha(@winTitle,.60);
}
/**/
-
/*** end ***************************************************************************************/
diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css
index e1a7e84c2..1741dc352 100644
--- a/rtdata/themes/TooWaBlue-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-GTK3-20_.css
@@ -2,7 +2,7 @@
This file is part of RawTherapee.
Copyright (c) 2016-2017 TooWaBoo
- Version 2.42 - requires RT 5.0
+ Version 2.49 - requires RT 5.0
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@
@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(190,190,190);
+@define-color headline-big rgb(195,195,195);
@define-color headline-hl rgb(230,230,230);
@define-color headline-frame rgb(215,215,215);
/***********************************************************************************************/
@@ -76,10 +76,10 @@
}
#ToolPanelNotebook {
- min-width: 23em;
+ min-width: 24.08334em;
}
#HistoryPanel {
- min-width: 17.83334em;
+ min-width: 18em;
}
window.background {
@@ -105,7 +105,7 @@ messagedialog {
}
tooltip {
background-color: @bg-tooltip;
- border: 1px solid @border-tooltip;
+ border: 0.08334em solid @border-tooltip;
border-radius: 0.33334em;
padding: 0;
margin: 0;
@@ -180,7 +180,7 @@ frame > border {
dialog frame > border {
padding: 0.5em;
border-radius: 0;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
background-color: transparent;
margin: 0 -0.5em;
}
@@ -241,11 +241,11 @@ textview:selected, treeview:selected {
}
#RightNotebook > stack > :nth-child(3) treeview {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
border-bottom: none;
}
-#PlacesPaned > :nth-child(1) treeview {
+#PlacesPaned > box:nth-child(1) treeview {
padding: 0.08334em 0 0.08334em 0.5em;
-gtk-icon-style: symbolic;
}
@@ -275,15 +275,15 @@ textview:selected, treeview:selected {
margin-bottom: 0.41667em;
}
-#PlacesPaned > box:nth-child(3) > :nth-child(2),
+#PlacesPaned > box:nth-child(3) > box:nth-child(2),
#PlacesPaned > box:nth-child(1) > :nth-child(1),
#HistoryPanel > border,
#Snapshots > box > :nth-child(1) {
- padding: 1px;
background-color: @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
}
-/*Corrects the space for the snapshot view of the paned separator*/
+/*Corrects the space of the snapshot view to the paned separator*/
#Snapshots {
margin-top: -0.33334em;
}
@@ -321,11 +321,11 @@ filechooser box {
}
filechooser > box > paned > box {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
filechooser placessidebar {
- padding: 0 1px;
+ padding: 0 0.08334em;
background-color: @bg-dark-grey;
}
@@ -362,7 +362,7 @@ filechooser list row:selected {
}
#HistogramArea,
#HistogramRGBArea {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
background-color: @bg-dark-grey;
}
@@ -372,7 +372,7 @@ filechooser list row:selected {
margin: 0;
border-color: @bg-light-grey;
border-style: solid;
- border-width: 0 0 0 1px;
+ border-width: 0 0 0 0.08334em;
background-color: @bg-dark-grey;
background-image: none;
box-shadow: none;
@@ -385,7 +385,7 @@ filechooser list row:selected {
}
#EditorLeftPaned #fullButton,
#EditorLeftPaned #histButton {
- border-width: 0 1px 0 0;
+ border-width: 0 0.08334em 0 0;
}
/*** end ***************************************************************************************/
@@ -467,8 +467,8 @@ menu separator {
/*** PartialPaste ******************************************************************************/
#PartialPaste {
- border-bottom: 1px solid @border-color;
- border-top: 1px solid @border-color;
+ border-bottom: 0.08334em solid @border-color;
+ border-top: 0.08334em solid @border-color;
padding-top: 0.5em;
padding-bottom: 0.5em;
}
@@ -488,7 +488,8 @@ menu separator {
}
#PartialPasteHeader label {
- color: @headline-frame;
+ color: @headline-big;
+ font-weight: bold;
}
#PartialPasteHeader {
margin: 0.5em 0 0 0;
@@ -518,10 +519,10 @@ scrollbar:not(.overlay-indicator) {
background-color: rgba(0,0,0,.30);
}
scrollbar:not(.overlay-indicator).horizontal {
- border-width: 0 1px 1px 1px;
+ border-width: 0 0.08334em 0.08334em 0.08334em;
}
scrollbar:not(.overlay-indicator).vertical {
- border-width: 1px 1px 1px 0;
+ border-width: 0.08334em 0.08334em 0.08334em 0;
}
scrollbar:not(.overlay-indicator) slider {
background-color: shade(@text-color, .9);
@@ -593,7 +594,7 @@ scale slider {
margin: calc(-0.33334em - 1px);
border-radius: 0.83334em;
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
box-shadow: none;
}
scale slider:hover {
@@ -603,14 +604,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-color: @bg-dark-grey;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0.11), 0 1px rgba(242, 242, 242, 0.11);
+ border: 0.08334em solid @bg-dark-grey;
+ box-shadow: inset 0 0.08334em rgba(255, 255, 255, 0.11), 0 0.08334em rgba(242, 242, 242, 0.11);
border-radius: 0.5em;
}
scale:not(:disabled) trough highlight {
background-color: @accent-color2;
- border-color: @bg-dark-grey;
- box-shadow: inset 0 1px shade(@accent-color2, 1.3);
+ border: 0.08334em solid @bg-dark-grey;
+ box-shadow: inset 0 0.08334em shade(@accent-color2, 1.3);
border-radius: 0.5em;
}
@@ -671,7 +672,7 @@ progressbar.horizontal trough progress {
#IopsPanel progressbar.horizontal trough {
min-height: 0.5em;
background-color: @bg-scale-entry;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
margin-top: 0.25em;
}
#IopsPanel progressbar.horizontal trough progress {
@@ -770,8 +771,9 @@ dialog notebook stack {
#MainNotebook > stack {
padding: 0.41667em;
}
-#MainNotebook > stack > :nth-child(2) > :nth-child(2) {
- margin-bottom: 0.33334em;
+
+#MainNotebook > stack > :nth-child(2) > box:nth-child(3) {
+ margin-top: 0.41667em;
}
@@ -787,9 +789,18 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin-bottom: 0.33334em;
}
+#ToolPanelNotebook > header tab {
+ margin-left: 0;
+ margin-right: 0;
+ padding: 0 0.33334em;
+}
+#ToolPanelNotebook > header tab + tab {
+ margin-left: 0.33333em;
+}
+
#ToolPanelNotebook > header tab image{
min-height: 2.5em;
- min-width: calc(1.66667em + 6px);
+ min-width: 2em;
padding: 0;
margin: 0;
}
@@ -801,10 +812,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
background-color: @bg-grey;
padding: 0;
}
-#RightNotebook > stack > :nth-child(3),
-#RightNotebook > stack > :nth-child(4) {
+
+#RightNotebook > stack > :nth-child(3) > * > box,
+#RightNotebook > stack > :nth-child(4) > * > box {
padding: 0.5em;
- border: 1px solid @bg-entry-border;
+ border: 0.08334em solid @bg-entry-border;
}
#PrefNotebook header {
@@ -813,8 +825,9 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#AboutNotebook header {
margin: -0.66667em -0.66667em 0.66667em;
}
-#AboutNotebook stack > * > * > * {
- background-color: @dark-grey;
+
+#AboutNotebook stack text {
+ background-color: @bg-dark-grey;
}
/* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
@@ -873,7 +886,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0;
}
#MetaPanelNotebook .view {
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
padding: 0.16667em;
margin: 0;
}
@@ -888,14 +901,19 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0;
}
+#MetaPanelNotebook combobox button {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ border-left: none;
+}
#MetaPanelNotebook combobox + button,
#MetaPanelNotebook combobox + button + button {
margin-left: 0.16667em;
min-width: 1.66667em;
}
#MetaPanelNotebook > stack > box > grid > button {
- margin-top: 1px;
- margin-bottom: 1px;
+ margin-top: 0.08334em;
+ margin-bottom: 0.08334em;
min-height: 2.16667em;
}
@@ -908,7 +926,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/*** File Browser ******************************************************************************/
#FileCatalog {
background-color: @bg-image;
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
}
#FileCatalog:selected {
background-color: @accent-color3;
@@ -949,7 +967,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
min-width: 1.66667em;
margin: 0 0 0 -1.66667em;
border-radius: 0 0.2em 0.2em 0;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
padding: 0;
}
#ToolBarPanelFileBrowser entry,
@@ -972,25 +990,17 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#BeforeAfterContainer {
background-color: @bg-grey;
- border: 1px solid @bg-dark-grey;
+ border: 0.08334em solid @bg-dark-grey;
border-radius: 0;
padding: 0;
margin: 0.41667em 0;
}
-#BeforeAfterContainer > box:nth-child(1) frame {
- background-color: @bg-image;
- border-top: 1px solid @bg-dark-grey;
- border-radius: 0;
- padding: 0;
- margin: -1px 0 0 0;
+#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;
}
-#BeforeAfterContainer > box:nth-child(2) frame {
- background-color: @bg-image;
- border-top: 1px solid @bg-dark-grey;
- border-left: 1px solid @bg-dark-grey;
- border-radius: 0;
- padding: 0;
- margin: -1px 0 0 0;
+#BeforeAfterContainer > box:nth-child(2){
+ border-left: 0.08334em solid @bg-dark-grey;
}
#BeforeAfterContainer label {
@@ -1000,8 +1010,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/* Small Lock Button */
#BeforeAfterContainer button {
min-height: 1.66667em;
- min-width: 1.66667em;
- margin: 0.25em 0 0.33334em;
+ min-width: 1.75em;
+ margin: 0.25em;
padding: 0 0 0 0.08334em;
}
/**/
@@ -1021,12 +1031,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin-right: 0;
}
-#EditorTopPanel > box > button.image-button:not(:nth-child(6)) {
+#EditorTopPanel > box:nth-child(9) > button.image-button:not(:nth-child(6)) {
min-width: 0;
padding-left: 0.33334em;
padding-right: 0.33334em;
}
-#EditorTopPanel > box > button.image-button:nth-child(6) {
+
+#EditorTopPanel > box:nth-child(9) > button.image-button:nth-child(6) {
-gtk-icon-shadow: none;
}
#EditorTopPanel > box > box > button {
@@ -1034,7 +1045,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
min-width: 0;
margin: 0 0.16667em;
padding: 0 0.16667em;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
background-color: transparent;
background-image: none;
box-shadow: none;
@@ -1042,13 +1053,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#EditorTopPanel > box > box > button:hover {
background-color: transparent;
background-image: none;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
box-shadow: none;
}
#EditorTopPanel > box > box > button:checked {
background-color: transparent;
background-image: none;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
box-shadow: none;
}
@@ -1077,19 +1088,22 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
/**/
#MyExpander .drawingarea:not(.slider) {
- border: 1px solid @bg-light-grey;
+ border: 0.08334em solid @bg-light-grey;
}
#MyExpander .slider,
#MyExpander .drawingarea:nth-child(2) {
background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
background-color: @accent-color4;
- border: 1px solid rgb(15,15,15);
+ border: 0.08334em solid rgb(15,15,15);
}
#MyExpander .drawingarea:disabled {
background-color: shade(@bg-grey,.85);
border-color: @bg-dark-grey;
background-image: none;
}
+#ThresholdAdjuster {
+ margin: 0.08334em 0 0.16667em 0;
+}
#ToolPanelNotebook scrolledwindow viewport.frame {
padding: 0 0.56em;
@@ -1114,7 +1128,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
/* Sub-tool (MyExpander) */
#ExpanderBox2 > box, #ExpanderBox2 > grid {
background-color: transparent;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
border-radius: 0;
margin: 0;
padding: 0.5em;
@@ -1143,13 +1157,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
border: none;
padding: 0;
margin: 0;
- box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.50), 0 0 0 1px @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.50), 0 0 0 0.08334em @bg-dark-grey;
}
menu {
background-color: @bg-dark-grey;
- border: 1px solid @accent-color;
- padding: 1px;
+ border: 0.08334em solid @accent-color;
+ padding: 0.08334em;
margin: 0;
}
menu > .top,
@@ -1159,12 +1173,12 @@ menu > .bottom:hover {
background-color: transparent;
border: none;
padding: 0.5em;
- min-height: 2em;
+ min-height: 1.5em;
}
menuitem {
padding: 0 0.33334em;
- margin: 1px;
+ margin: 0.08334em;
min-height: 2em;
}
menuitem:hover {
@@ -1187,11 +1201,11 @@ entry > window > frame {
}
entry > window > frame > border {
background-color: @bg-dark-grey;
- padding: 1px;
- border: 1px solid @accent-color;
+ padding: 0.08334em;
+ border: 0.08334em solid @accent-color;
}
.csd entry > window > frame > border {
- margin: 1px;
+ margin: 0.08334em;
}
/* end */
@@ -1203,7 +1217,7 @@ entry > window > frame > border {
}
popover.background {
background-color: @bg-dark-grey;
- border-color: @accent-color;
+ border: 0.08334em solid @accent-color;
border-radius: 0;
padding: 0;
margin: 0;
@@ -1236,9 +1250,9 @@ button {
margin: 0;
padding: 0; /* x */
border-radius: 0.2em;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
background-color: transparent;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1);
background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3));
}
button.flat {
@@ -1250,7 +1264,7 @@ button.text-button label {
#MainNotebook > header > grid > button,
button.flat {
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
box-shadow: none;
background-image: none;
background-color: transparent;
@@ -1301,7 +1315,7 @@ scale + button.flat {
button.flat:hover,
button:hover {
border-color: @bg-button-border;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.1);
+ box-shadow: inset 0 0.08334em 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;
}
@@ -1313,7 +1327,7 @@ button.flat:checked,
button:active,
button:checked {
border-color: @bg-button-border;
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.08);
+ box-shadow: inset 0 0.08334em 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;
}
@@ -1322,7 +1336,7 @@ button:checked {
button.Right,
button.MiddleH {
margin-left: 0.16667em;
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
}
/**/
@@ -1343,13 +1357,14 @@ button.MiddleH {
}
/**/
-/* Base format for Toolbox and dialogs */
+/* Button base format for Toolbox and dialogs */
dialog button,
#MyExpander button,
#BatchQueueButtonsMainContainer button {
min-height: 1.66667em;
min-width: 0;
padding: 0 0.375em;
+ margin: 0.08334em 0;
}
combobox .combo,
dialog combobox .combo,
@@ -1364,9 +1379,10 @@ dialog combobox .combo,
#MyExpander button:not(.flat).Left,
#MyExpander button:not(.flat) + combobox,
#MyExpander combobox + button:not(.flat),
-#MyExpander combobox + combobox,
+#MyExpander combobox + combobox
+/* Crash
#MyExpander button + label,
-#MyExpander combobox + label {
+#MyExpander combobox + label */ {
margin-left: 0.16667em;
}
#MyExpander label + filechooserbutton,
@@ -1376,6 +1392,13 @@ dialog combobox .combo,
margin-left: 0.33334em;
}
+buttonbox:not(.dialog-action-area) button{
+ margin: 0.08334em 0 0.33334em 0.16667em;
+}
+#PrefNotebook buttonbox:not(.dialog-action-area) {
+ margin-right: -5px;
+}
+
/* Arrow toggle combo button */
#IopsPanel button:not(.flat).Left + button:not(.flat).Right,
#MyExpander button:not(.flat).Left + button:not(.flat).Right {
@@ -1394,13 +1417,6 @@ dialog combobox .combo,
}
/**/
-/* Add extra top and bottom space to buttons in toolbox & Preferences*/
-#PrefNotebook stack > box:nth-child(4) combobox,
-#MyExpander button.flat,
-#MyExpander button {
- margin-top: 0.08334em;
- margin-bottom: 0.08334em;
-}
/**/
#MyExpander button.text-button label {
margin: 0;/* x */
@@ -1453,8 +1469,9 @@ window .view button {
background-image: none;
box-shadow: none;
min-height: 2em;
- min-width: 1.33334em;
+ min-width: 1.33334em;
padding: 0 0.33334em;
+ margin: 0;
}
dialog .view button.text-button label,
window .view button.text-button label {
@@ -1462,25 +1479,26 @@ window .view button.text-button label {
}
window .view button {
border: none;
- border-bottom: 1px solid @border-color;
+ border-bottom: 0.08334em solid @border-color;
}
dialog .view button {
- border-color: @border-color;
+ border: 0.08334em solid @border-color;
}
-.view button:checked label,
.view button:checked,
-.view button:hover:not(:active) label,
.view button:hover:not(:active) {
- color: @headline-hl;
background-image: none;
background-color: @bg-list-hover;
}
+.view button:checked label,
+.view button:hover:not(:active) label {
+ color: @headline-hl;
+}
-dialog .view header button:not(:last-child):not(:only-child),
-window .view header button:not(:last-child):not(:only-child),
-.path-bar button:not(:last-child):not(:only-child) {
- border-right: none;
+dialog .view header button:not(:first-child):not(:only-child),
+window .view header button:not(:first-child):not(:only-child),
+.path-bar button:not(:first-child):not(:only-child) {
+ border-left: none;
}
dialog .view header button,
window .view header button,
@@ -1489,6 +1507,7 @@ window .view header button,
}
#pathbarbox button:last-child {
+ min-height: 2em;
min-width: 2em;
margin: 0;
padding: 0;
@@ -1517,10 +1536,10 @@ window .view header button,
popover button.text-button {
background-color: @bg-dark-grey;
background-image: none;
- border: 1px solid @border-color;
+ border: 0.08334em solid @border-color;
box-shadow: none;
background-image: none;
- margin: 0;
+ margin: 0.083334em 0;
min-height: 1.66667em;
padding: 0 0.66667em;
}
@@ -1559,7 +1578,7 @@ headerbar button.titlebutton image {
headerbar button.titlebutton {
margin: 0 0 0 0.33334em;
background-image: none;
- border: 1px solid transparent;
+ border: 0.08334em solid transparent;
background-color: transparent;
box-shadow: none;
min-width: 1.55em;
@@ -1582,14 +1601,14 @@ messagedialog headerbar button.titlebutton {
#MainNotebook tab #CloseButton:hover,
headerbar button.titlebutton:hover{
border-color: rgba(0,0,0,.8);
- box-shadow: inset 0 1px rgba(242, 242, 242, 0.11);
+ box-shadow: inset 0 0.08334em 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 1px rgba(242, 242, 242, 0.15);
+ box-shadow: inset 0 0.08334em 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);
}
@@ -1597,30 +1616,27 @@ 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 1px rgba(242, 242, 242, 0.32);
+ box-shadow: inset 0 0.08334em 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 1px rgba(242, 242, 242, 0.4);
+ box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.4);
}
/**/
/*** end ***************************************************************************************/
/*** Ckeckbox & Radio **************************************************************************/
-checkbox {
- padding:0;
- margin:0;
- min-height: 2em;
-}
+checkbox,
checkbutton,
radiobutton {
padding: 0;
margin: 0;
min-height: 2em;
}
+
check,
radio {
border: calc(0.083334em + 0.18px) solid shade(@text-color, .9);
@@ -1642,14 +1658,6 @@ checkbutton label {
check {
border-radius: 0.16667em;
}
-check:checked {
- padding: 0 2px 0 0;
- min-width: calc(1.16667em - 2px);
-}
-check:indeterminate {
- min-width: 1.16667em;
- padding: 0;
-}
radio{
border-radius: 1.16667em;
@@ -1671,16 +1679,6 @@ frame > checkbutton check{
min-height: 1.4em;
margin-left: 0.5em;
}
-#PrefNotebook checkbutton {
- min-height: 1.16667em;
-}
-#PrefNotebook stack > box:nth-child(3) checkbutton,
-#PrefNotebook stack > box:nth-child(4) checkbutton {
- min-height: 2em;
-}
-#PrefNotebook radiobutton {
- min-height: 2em;
-}
#MyExpander button + checkbutton:last-child {
margin-left: 0.33334em;
@@ -1691,25 +1689,25 @@ frame > checkbutton check{
/*** Entry & Spinbutton ************************************************************************/
#MyExpander entry,
entry {
- margin: 0;
+ margin: 0.08334em 0;
padding: 0 0.33334em;
min-height: 1.66667em;
min-width: 0;
border-radius: 0.2em;
- box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242, 242, 242, 0.1);
- border: 1px 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.08334em solid @bg-entry-border;
background-color: @bg-scale-entry;
}
spinbutton {
- margin: 0;
+ margin: 0.08334em 0;
padding: 0;
min-height: 1.66667em;
min-width: 0;
border-radius: 0.2em;
background-color: @bg-scale-entry;
- border: 1px solid @bg-entry-border;
- box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242, 242, 242, 0.1);
+ 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);
}
#MyExpander spinbutton {
@@ -1720,9 +1718,9 @@ spinbutton {
border-top-left-radius: 1.83334em;
border-bottom-left-radius: 1.83334em;
background-color: shade(@bg-grey, 1.33);
- border: 1px solid @bg-button-border;
+ border: 0.08334em solid @bg-button-border;
color: @text-tbEntry;
- box-shadow: inset 1px 1px rgba(0, 0, 0, .12), 0 1px rgba(255, 255, 255, 0.12);
+ box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, .12), 0 0.08334em rgba(255, 255, 255, 0.12);
}
#MyExpander button + label + spinbutton {
margin: 0.25em 0; /* Needed for Reset & and Auto button height*/
@@ -1808,7 +1806,7 @@ entry:focus > selection {
.view entry {
background-color: @bg-dark-grey;
margin: 0 -2px;
- border: 1px solid @accent-color;
+ border: 0.08334em solid @accent-color;
box-shadow: none;
}
/* end*/
@@ -1822,14 +1820,14 @@ entry:focus > selection {
border-radius: 0.41667em 0.41667em 0 0;
border: none;
padding: 0;
- box-shadow: 0 0.25em 0.75em 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey;
+ 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;
}
headerbar {
background-color: shade(@winHeaderbar,1.12);
- box-shadow: inset 0 1px rgba(200,200,200,.13);
+ box-shadow: inset 0 0.08334em rgba(200,200,200,.13);
background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
- border-bottom: 1px solid @bg-dark-grey;
+ 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;
@@ -1851,7 +1849,7 @@ headerbar .title{
/* Window in background */
:not(.popup):not(tooltip) > decoration:backdrop {
- box-shadow: 0 0.25em 0.75em 1px rgba(0, 0, 0, 0.3), 0 0 0 1px @bg-dark-grey;
+ box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.3), 0 0 0 0.08334em @bg-dark-grey;
}
headerbar:backdrop {
box-shadow: none;
@@ -1861,5 +1859,4 @@ headerbar .title:backdrop {
color: alpha(@winTitle,.60);
}
/**/
-
/*** end ***************************************************************************************/
diff --git a/rtdata/themes/TooWaBlue-GTK3-_19.css b/rtdata/themes/TooWaBlue-GTK3-_19.css
index 24442aae3..530ae3d3a 100644
--- a/rtdata/themes/TooWaBlue-GTK3-_19.css
+++ b/rtdata/themes/TooWaBlue-GTK3-_19.css
@@ -1,7 +1,7 @@
/*
This file is part of RawTherapee.
- Copyright (c) 2016 TooWaBoo (v1.19.4)
+ Copyright (c) 2016 TooWaBoo (v1.19.5)
Many thanks to the RawTherapee Developer Team for this great piece of software
RawTherapee is free software: you can redistribute it and/or modify
@@ -397,7 +397,7 @@ GtkDialog tab {
padding: 9px;
}
#ToolPanelNotebook tab {
- padding: 10px 4px 7px;
+ padding: 10px 2px 7px;
}
#MetaPanelNotebook tab {
padding: 8px 4px;
diff --git a/rtengine/CA_correct_RT.cc b/rtengine/CA_correct_RT.cc
index 7c28801ae..fc9967619 100644
--- a/rtengine/CA_correct_RT.cc
+++ b/rtengine/CA_correct_RT.cc
@@ -112,7 +112,7 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
using namespace std;
using namespace rtengine;
-void RawImageSource::CA_correct_RT(const double cared, const double cablue, const double caautostrength)
+void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const double cablue, const double caautostrength, array2D &rawData)
{
// multithreaded and partly vectorized by Ingo Weyrich
constexpr int ts = 128;
@@ -134,7 +134,6 @@ void RawImageSource::CA_correct_RT(const double cared, const double cablue, cons
plistener->setProgress (progress);
}
- const bool autoCA = (cared == 0 && cablue == 0);
// local variables
const int width = W, height = H;
//temporary array to store simple interpolation of G
@@ -695,7 +694,7 @@ void RawImageSource::CA_correct_RT(const double cared, const double cablue, cons
//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 cared and cablue are zero
+ //only executed if autoCA is true
}
// Main algorithm: Tile loop
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index 1b445a594..479534bec 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -24,6 +24,7 @@ set (RTENGINESOURCEFILES colortemp.cc curves.cc flatcurves.cc diagonalcurves.cc
klt/storeFeatures.cc klt/trackFeatures.cc klt/writeFeatures.cc
clutstore.cc
ciecam02.cc
+ pixelshift.cc
)
include_directories (BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc
index b50320631..d075ec5bc 100644
--- a/rtengine/FTblockDN.cc
+++ b/rtengine/FTblockDN.cc
@@ -495,8 +495,8 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
//printf("NL=%f \n",noisevarL);
if (useNoiseLCurve || useNoiseCCurve) {
- int hei = calclum->height;
- int wid = calclum->width;
+ int hei = calclum->getHeight();
+ int wid = calclum->getWidth();
TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
const float wpi[3][3] = {
@@ -573,7 +573,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
calclum = nullptr;
}
- const short int imheight = src->height, imwidth = src->width;
+ const short int imheight = src->getHeight(), imwidth = src->getWidth();
if (dnparams.luma != 0 || dnparams.chroma != 0 || dnparams.methodmed == "Lab" || dnparams.methodmed == "Lonly") {
// gamma transform for input data
@@ -622,13 +622,13 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
for (int i = 0; i < TS; ++i) {
float i1 = abs((i > TS / 2 ? i - TS + 1 : i));
- float vmask = (i1 < border ? SQR(sin((M_PI * i1) / (2 * border))) : 1.0f);
- float vmask2 = (i1 < 2 * border ? SQR(sin((M_PI * i1) / (2 * border))) : 1.0f);
+ float vmask = (i1 < border ? SQR(sin((rtengine::RT_PI * i1) / (2 * border))) : 1.0f);
+ float vmask2 = (i1 < 2 * border ? SQR(sin((rtengine::RT_PI * i1) / (2 * border))) : 1.0f);
for (int j = 0; j < TS; ++j) {
float j1 = abs((j > TS / 2 ? j - TS + 1 : j));
- tilemask_in[i][j] = (vmask * (j1 < border ? SQR(sin((M_PI * j1) / (2 * border))) : 1.0f)) + epsilon;
- tilemask_out[i][j] = (vmask2 * (j1 < 2 * border ? SQR(sin((M_PI * j1) / (2 * border))) : 1.0f)) + epsilon;
+ tilemask_in[i][j] = (vmask * (j1 < border ? SQR(sin((rtengine::RT_PI * j1) / (2 * border))) : 1.0f)) + epsilon;
+ tilemask_out[i][j] = (vmask2 * (j1 < 2 * border ? SQR(sin((rtengine::RT_PI * j1) / (2 * border))) : 1.0f)) + epsilon;
}
}
@@ -1512,7 +1512,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
}
for (int i = 0; i < overlap; ++i) {
- float mask = SQR(xsinf((M_PI * i) / (2 * overlap)));
+ float mask = SQR(xsinf((rtengine::RT_PI * i) / (2 * overlap)));
if (tiletop > 0) {
Vmask[i] = mask;
@@ -1717,8 +1717,8 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
#pragma omp parallel for
#endif
- for (int i = 0; i < dst->height; ++i) {
- for (int j = 0; j < dst->width; ++j) {
+ for (int i = 0; i < dst->getHeight(); ++i) {
+ for (int j = 0; j < dst->getWidth(); ++j) {
dst->r(i, j) = Color::gammatab_srgb[ dst->r(i, j) ];
dst->g(i, j) = Color::gammatab_srgb[ dst->g(i, j) ];
dst->b(i, j) = Color::gammatab_srgb[ dst->b(i, j) ];
@@ -1746,7 +1746,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
//median 3x3 in complement on RGB
if (dnparams.methodmed == "RGB" && dnparams.median) {
//printf("RGB den\n");
- int wid = dst->width, hei = dst->height;
+ int wid = dst->getWidth(), hei = dst->getHeight();
float** tm;
tm = new float*[hei];
@@ -3115,8 +3115,8 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise_info(Imagefloat * src, Imagefloat
float** lumcalc;
float** acalc;
float** bcalc;
- hei = provicalc->height;
- wid = provicalc->width;
+ hei = provicalc->getHeight();
+ wid = provicalc->getWidth();
TMatrix wprofi = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
const float wpi[3][3] = {
@@ -3165,7 +3165,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise_info(Imagefloat * src, Imagefloat
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- const int imheight = src->height, imwidth = src->width;
+ const int imheight = src->getHeight(), imwidth = src->getWidth();
bool denoiseMethodRgb = (dnparams.dmethod == "RGB");
diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc
index c5535493c..3cb0ee8de 100644
--- a/rtengine/amaze_demosaic_RT.cc
+++ b/rtengine/amaze_demosaic_RT.cc
@@ -38,7 +38,7 @@
namespace rtengine
{
-SSEFUNCTION void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh)
+SSEFUNCTION void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, array2D &rawData, array2D &red, array2D &green, array2D &blue)
{
BENCHFUN
diff --git a/rtengine/cache.h b/rtengine/cache.h
index f4c232673..ec284b2ae 100644
--- a/rtengine/cache.h
+++ b/rtengine/cache.h
@@ -19,11 +19,12 @@
#pragma once
-#include