From d604abec39dde950ceadbd61bebb9a01bf67f8ac Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 23 Nov 2018 14:36:16 +0100 Subject: [PATCH 01/30] Custom tool panel, first step --- rtdata/languages/default | 2 + rtgui/options.cc | 7 +++ rtgui/options.h | 1 + rtgui/toolpanel.h | 3 + rtgui/toolpanelcoord.cc | 116 +++++++++++++++++++++++---------------- rtgui/toolpanelcoord.h | 9 ++- 6 files changed, 90 insertions(+), 48 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index d3e40cb19..5e0a5e0cb 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -900,6 +900,8 @@ MAIN_TAB_ADVANCED;Advanced MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c +MAIN_TAB_CUSTOM;Custom +MAIN_TAB_CUSTOM_TOOLTIP;Shortcut: none MAIN_TAB_DETAIL;Detail MAIN_TAB_DETAIL_TOOLTIP;Shortcut: Alt-d MAIN_TAB_DEVELOP; Batch Edit diff --git a/rtgui/options.cc b/rtgui/options.cc index c1494a085..a388ccb3e 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -399,6 +399,7 @@ void Options::setDefaults() autoSaveTpOpen = true; //crvOpen.clear (); parseExtensions.clear(); + userTools.clear(); parseExtensionsEnabled.clear(); parsedExtensions.clear(); renameUseTemplates = false; @@ -1069,6 +1070,10 @@ void Options::readFromFile(Glib::ustring fname) } if (keyFile.has_group("GUI")) { + if (keyFile.has_key("GUI", "UserTools")) { + userTools = keyFile.get_string_list("GUI", "UserTools"); + } + if (keyFile.has_key("GUI", "WindowWidth")) { windowWidth = keyFile.get_integer("GUI", "WindowWidth"); } @@ -1967,6 +1972,8 @@ void Options::saveToFile(Glib::ustring fname) keyFile.set_string("Profiles", "CustomProfileBuilderPath", CPBPath); keyFile.set_integer("Profiles", "CustomProfileBuilderKeys", CPBKeys); + Glib::ArrayHandle pusert = userTools; + keyFile.set_string_list("GUI", "UserTools", pusert); keyFile.set_integer("GUI", "WindowWidth", windowWidth); keyFile.set_integer("GUI", "WindowHeight", windowHeight); keyFile.set_integer("GUI", "WindowX", windowX); diff --git a/rtgui/options.h b/rtgui/options.h index 47ced982d..a97c1f165 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -375,6 +375,7 @@ public: int fastexport_resize_height; bool fastexport_use_fast_pipeline; + std::vector userTools; // Dialog settings Glib::ustring lastIccDir; Glib::ustring lastDarkframeDir; diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index 39abd03fa..fbe87f5f0 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -131,6 +131,9 @@ public: this->batchMode = batchMode; } + virtual Glib::ustring getToolName () { + return toolName; + } }; class FoldableToolPanel : public ToolPanel diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index bf155b1d6..3ea638569 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -31,6 +31,7 @@ using namespace rtengine::procparams; ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr) { + userPanel = Gtk::manage (new ToolVBox ()); exposurePanel = Gtk::manage (new ToolVBox ()); detailsPanel = Gtk::manage (new ToolVBox ()); colorPanel = Gtk::manage (new ToolVBox ()); @@ -100,66 +101,70 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan // Valeurs par dfaut: // Best -> low ISO // Medium -> High ISO + userTools.resize(options.userTools.size()); - addPanel (colorPanel, whitebalance); - addPanel (exposurePanel, toneCurve); - addPanel (colorPanel, vibrance); - addPanel (colorPanel, chmixer); - addPanel (colorPanel, blackwhite); - addPanel (exposurePanel, shadowshighlights); - addPanel (detailsPanel, sharpening); - addPanel (detailsPanel, localContrast); - addPanel (detailsPanel, sharpenEdge); - addPanel (detailsPanel, sharpenMicro); - addPanel (colorPanel, hsvequalizer); - addPanel (colorPanel, filmSimulation); - addPanel (colorPanel, softlight); - addPanel (colorPanel, rgbcurves); - addPanel (colorPanel, colortoning); - addPanel (exposurePanel, epd); - addPanel (exposurePanel, fattal); - addPanel (advancedPanel, retinex); - addPanel (exposurePanel, pcvignette); - addPanel (exposurePanel, gradient); - addPanel (exposurePanel, lcurve); - addPanel (advancedPanel, colorappearance); - addPanel (detailsPanel, impulsedenoise); - addPanel (detailsPanel, dirpyrdenoise); - addPanel (detailsPanel, defringe); - addPanel (detailsPanel, dirpyrequalizer); - addPanel (detailsPanel, dehaze); - addPanel (advancedPanel, wavelet); - addPanel (transformPanel, crop); - addPanel (transformPanel, resize); + addUserPanel (colorPanel, whitebalance); + addUserPanel (exposurePanel, toneCurve); + addUserPanel (colorPanel, vibrance); + addUserPanel (colorPanel, chmixer); + addUserPanel (colorPanel, blackwhite); + addUserPanel (exposurePanel, shadowshighlights); + addUserPanel (detailsPanel, sharpening); + addUserPanel (detailsPanel, localContrast); + addUserPanel (detailsPanel, sharpenEdge); + addUserPanel (detailsPanel, sharpenMicro); + addUserPanel (colorPanel, hsvequalizer); + addUserPanel (colorPanel, filmSimulation); + addUserPanel (colorPanel, softlight); + addUserPanel (colorPanel, rgbcurves); + addUserPanel (colorPanel, colortoning); + addUserPanel (exposurePanel, epd); + addUserPanel (exposurePanel, fattal); + addUserPanel (advancedPanel, retinex); + addUserPanel (exposurePanel, pcvignette); + addUserPanel (exposurePanel, gradient); + addUserPanel (exposurePanel, lcurve); + addUserPanel (advancedPanel, colorappearance); + addUserPanel (detailsPanel, impulsedenoise); + addUserPanel (detailsPanel, dirpyrdenoise); + addUserPanel (detailsPanel, defringe); + addUserPanel (detailsPanel, dirpyrequalizer); + addUserPanel (detailsPanel, dehaze); + addUserPanel (advancedPanel, wavelet); + addUserPanel (transformPanel, crop); + addUserPanel (transformPanel, resize); addPanel (resize->getPackBox(), prsharpening, 2); - addPanel (transformPanel, lensgeom); + addUserPanel (transformPanel, lensgeom); addPanel (lensgeom->getPackBox(), rotate, 2); addPanel (lensgeom->getPackBox(), perspective, 2); addPanel (lensgeom->getPackBox(), lensProf, 2); addPanel (lensgeom->getPackBox(), distortion, 2); addPanel (lensgeom->getPackBox(), cacorrection, 2); addPanel (lensgeom->getPackBox(), vignetting, 2); - addPanel (colorPanel, icm); - addPanel (rawPanel, sensorbayer); + addUserPanel (colorPanel, icm); + addUserPanel (rawPanel, sensorbayer); addPanel (sensorbayer->getPackBox(), bayerprocess, 2); addPanel (sensorbayer->getPackBox(), bayerrawexposure, 2); addPanel (sensorbayer->getPackBox(), bayerpreprocess, 2); addPanel (sensorbayer->getPackBox(), rawcacorrection, 2); - addPanel (rawPanel, sensorxtrans); + addUserPanel (rawPanel, sensorxtrans); addPanel (sensorxtrans->getPackBox(), xtransprocess, 2); addPanel (sensorxtrans->getPackBox(), xtransrawexposure, 2); - addPanel (rawPanel, rawexposure); - addPanel (rawPanel, preprocess); - addPanel (rawPanel, darkframe); - addPanel (rawPanel, flatfield); + addUserPanel (rawPanel, rawexposure); + addUserPanel (rawPanel, preprocess); + addUserPanel (rawPanel, darkframe); + addUserPanel (rawPanel, flatfield); + for(auto it = userTools.begin(); it != userTools.end(); ++it) { + addPanel(userPanel, *it); + } toolPanels.push_back (coarse); toolPanels.push_back(metadata); toolPanelNotebook = new Gtk::Notebook (); toolPanelNotebook->set_name ("ToolPanelNotebook"); - + userPanelSW = Gtk::manage (new MyScrolledWindow ()); exposurePanelSW = Gtk::manage (new MyScrolledWindow ()); detailsPanelSW = Gtk::manage (new MyScrolledWindow ()); colorPanelSW = Gtk::manage (new MyScrolledWindow ()); @@ -169,7 +174,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan updateVScrollbars (options.hideTPVScrollbar); // load panel endings - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ()); imgPanelEnd[i] = Gtk::manage (new RTImage ("ornament1.png")); imgPanelEnd[i]->show (); @@ -177,30 +182,35 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan vbPanelEnd[i]->show_all(); } + userPanelSW->add (*userPanel); + userPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); + userPanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + exposurePanelSW->add (*exposurePanel); exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - exposurePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + exposurePanel->pack_start (*vbPanelEnd[1], Gtk::PACK_SHRINK, 4); detailsPanelSW->add (*detailsPanel); detailsPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - detailsPanel->pack_start (*vbPanelEnd[1], Gtk::PACK_SHRINK, 4); + detailsPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4); colorPanelSW->add (*colorPanel); colorPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - colorPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4); + colorPanel->pack_start (*vbPanelEnd[3], Gtk::PACK_SHRINK, 4); advancedPanelSW->add (*advancedPanel); advancedPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - advancedPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); + advancedPanel->pack_start (*vbPanelEnd[6], Gtk::PACK_SHRINK, 0); transformPanelSW->add (*transformPanel); transformPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - transformPanel->pack_start (*vbPanelEnd[3], Gtk::PACK_SHRINK, 4); + transformPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 4); rawPanelSW->add (*rawPanel); rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - rawPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 0); + rawPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); + toiU = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_CUSTOM"), M ("MAIN_TAB_CUSTOM_TOOLTIP"))); toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"))); toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"))); toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"))); @@ -209,6 +219,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"))); toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"))); + toolPanelNotebook->append_page (*userPanelSW, *toiU); toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); toolPanelNotebook->append_page (*colorPanelSW, *toiC); @@ -251,6 +262,18 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, toolPanels.push_back (panel); } +void ToolPanelCoordinator::addUserPanel (Gtk::Box* where, FoldableToolPanel* panel) +{ + auto name = panel->getToolName(); + auto it = std::find(options.userTools.begin(), options.userTools.end(), name); + if (it != options.userTools.end()) { + int index = std::distance(options.userTools.begin(), it); + userTools[index] = panel; + } else { + addPanel(where, panel); + } +} + ToolPanelCoordinator::~ToolPanelCoordinator () { idle_register.destroy(); @@ -893,6 +916,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide) { GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC; + userPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 437e4055a..76a3cdd1c 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -158,6 +158,8 @@ protected: rtengine::StagedImageProcessor* ipc; std::vector toolPanels; + std::vector userTools; + ToolVBox* userPanel; ToolVBox* exposurePanel; ToolVBox* detailsPanel; ToolVBox* colorPanel; @@ -166,6 +168,7 @@ protected: ToolVBox* advancedPanel; ToolBar* toolBar; + TextOrIcon* toiU; TextOrIcon* toiE; TextOrIcon* toiD; TextOrIcon* toiC; @@ -174,9 +177,10 @@ protected: TextOrIcon* toiM; TextOrIcon* toiW; - Gtk::Image* imgPanelEnd[6]; - Gtk::VBox* vbPanelEnd[6]; + Gtk::Image* imgPanelEnd[7]; + Gtk::VBox* vbPanelEnd[7]; + Gtk::ScrolledWindow* userPanelSW; Gtk::ScrolledWindow* exposurePanelSW; Gtk::ScrolledWindow* detailsPanelSW; Gtk::ScrolledWindow* colorPanelSW; @@ -191,6 +195,7 @@ protected: void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); void foldThemAll (GdkEventButton* event); void updateVScrollbars (bool hide); + void addUserPanel (Gtk::Box* where, FoldableToolPanel* panel); private: EditDataProvider *editDataProvider; From 0ae602bcf0a0663dd3c7e8b7c0c88041e31339b9 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 23 Nov 2018 16:00:57 +0100 Subject: [PATCH 02/30] custom tool panel. Changed naming to 'Favourites'. Added alt-h hotkey. Allow moving of subtools to Favourites --- rtdata/languages/default | 4 +- rtgui/options.cc | 10 +-- rtgui/options.h | 2 +- rtgui/toolpanelcoord.cc | 140 ++++++++++++++++++++------------------- rtgui/toolpanelcoord.h | 10 +-- 5 files changed, 85 insertions(+), 81 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 5e0a5e0cb..e38e7eb81 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -900,8 +900,8 @@ MAIN_TAB_ADVANCED;Advanced MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c -MAIN_TAB_CUSTOM;Custom -MAIN_TAB_CUSTOM_TOOLTIP;Shortcut: none +MAIN_TAB_FAVOURITES;Favourites +MAIN_TAB_FAVOURITES_TOOLTIP;Shortcut: Alt-u MAIN_TAB_DETAIL;Detail MAIN_TAB_DETAIL_TOOLTIP;Shortcut: Alt-d MAIN_TAB_DEVELOP; Batch Edit diff --git a/rtgui/options.cc b/rtgui/options.cc index a388ccb3e..9681978ca 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -399,7 +399,7 @@ void Options::setDefaults() autoSaveTpOpen = true; //crvOpen.clear (); parseExtensions.clear(); - userTools.clear(); + favourites.clear(); parseExtensionsEnabled.clear(); parsedExtensions.clear(); renameUseTemplates = false; @@ -1070,8 +1070,8 @@ void Options::readFromFile(Glib::ustring fname) } if (keyFile.has_group("GUI")) { - if (keyFile.has_key("GUI", "UserTools")) { - userTools = keyFile.get_string_list("GUI", "UserTools"); + if (keyFile.has_key("GUI", "Favourites")) { + favourites = keyFile.get_string_list("GUI", "Favourites"); } if (keyFile.has_key("GUI", "WindowWidth")) { @@ -1972,8 +1972,8 @@ void Options::saveToFile(Glib::ustring fname) keyFile.set_string("Profiles", "CustomProfileBuilderPath", CPBPath); keyFile.set_integer("Profiles", "CustomProfileBuilderKeys", CPBKeys); - Glib::ArrayHandle pusert = userTools; - keyFile.set_string_list("GUI", "UserTools", pusert); + Glib::ArrayHandle ahfavourites = favourites; + keyFile.set_string_list("GUI", "Favourites", ahfavourites); keyFile.set_integer("GUI", "WindowWidth", windowWidth); keyFile.set_integer("GUI", "WindowHeight", windowHeight); keyFile.set_integer("GUI", "WindowX", windowX); diff --git a/rtgui/options.h b/rtgui/options.h index a97c1f165..ea29e047e 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -375,7 +375,7 @@ public: int fastexport_resize_height; bool fastexport_use_fast_pipeline; - std::vector userTools; + std::vector favourites; // Dialog settings Glib::ustring lastIccDir; Glib::ustring lastDarkframeDir; diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 3ea638569..84244d7c8 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -31,7 +31,7 @@ using namespace rtengine::procparams; ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr) { - userPanel = Gtk::manage (new ToolVBox ()); + favouritePanel = Gtk::manage (new ToolVBox ()); exposurePanel = Gtk::manage (new ToolVBox ()); detailsPanel = Gtk::manage (new ToolVBox ()); colorPanel = Gtk::manage (new ToolVBox ()); @@ -101,62 +101,62 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan // Valeurs par dfaut: // Best -> low ISO // Medium -> High ISO - userTools.resize(options.userTools.size()); + favourites.resize(options.favourites.size()); - addUserPanel (colorPanel, whitebalance); - addUserPanel (exposurePanel, toneCurve); - addUserPanel (colorPanel, vibrance); - addUserPanel (colorPanel, chmixer); - addUserPanel (colorPanel, blackwhite); - addUserPanel (exposurePanel, shadowshighlights); - addUserPanel (detailsPanel, sharpening); - addUserPanel (detailsPanel, localContrast); - addUserPanel (detailsPanel, sharpenEdge); - addUserPanel (detailsPanel, sharpenMicro); - addUserPanel (colorPanel, hsvequalizer); - addUserPanel (colorPanel, filmSimulation); - addUserPanel (colorPanel, softlight); - addUserPanel (colorPanel, rgbcurves); - addUserPanel (colorPanel, colortoning); - addUserPanel (exposurePanel, epd); - addUserPanel (exposurePanel, fattal); - addUserPanel (advancedPanel, retinex); - addUserPanel (exposurePanel, pcvignette); - addUserPanel (exposurePanel, gradient); - addUserPanel (exposurePanel, lcurve); - addUserPanel (advancedPanel, colorappearance); - addUserPanel (detailsPanel, impulsedenoise); - addUserPanel (detailsPanel, dirpyrdenoise); - addUserPanel (detailsPanel, defringe); - addUserPanel (detailsPanel, dirpyrequalizer); - addUserPanel (detailsPanel, dehaze); - addUserPanel (advancedPanel, wavelet); - addUserPanel (transformPanel, crop); - addUserPanel (transformPanel, resize); - addPanel (resize->getPackBox(), prsharpening, 2); - addUserPanel (transformPanel, lensgeom); - addPanel (lensgeom->getPackBox(), rotate, 2); - addPanel (lensgeom->getPackBox(), perspective, 2); - addPanel (lensgeom->getPackBox(), lensProf, 2); - addPanel (lensgeom->getPackBox(), distortion, 2); - addPanel (lensgeom->getPackBox(), cacorrection, 2); - addPanel (lensgeom->getPackBox(), vignetting, 2); - addUserPanel (colorPanel, icm); - addUserPanel (rawPanel, sensorbayer); - addPanel (sensorbayer->getPackBox(), bayerprocess, 2); - addPanel (sensorbayer->getPackBox(), bayerrawexposure, 2); - addPanel (sensorbayer->getPackBox(), bayerpreprocess, 2); - addPanel (sensorbayer->getPackBox(), rawcacorrection, 2); - addUserPanel (rawPanel, sensorxtrans); - addPanel (sensorxtrans->getPackBox(), xtransprocess, 2); - addPanel (sensorxtrans->getPackBox(), xtransrawexposure, 2); - addUserPanel (rawPanel, rawexposure); - addUserPanel (rawPanel, preprocess); - addUserPanel (rawPanel, darkframe); - addUserPanel (rawPanel, flatfield); + addfavouritePanel (colorPanel, whitebalance); + addfavouritePanel (exposurePanel, toneCurve); + addfavouritePanel (colorPanel, vibrance); + addfavouritePanel (colorPanel, chmixer); + addfavouritePanel (colorPanel, blackwhite); + addfavouritePanel (exposurePanel, shadowshighlights); + addfavouritePanel (detailsPanel, sharpening); + addfavouritePanel (detailsPanel, localContrast); + addfavouritePanel (detailsPanel, sharpenEdge); + addfavouritePanel (detailsPanel, sharpenMicro); + addfavouritePanel (colorPanel, hsvequalizer); + addfavouritePanel (colorPanel, filmSimulation); + addfavouritePanel (colorPanel, softlight); + addfavouritePanel (colorPanel, rgbcurves); + addfavouritePanel (colorPanel, colortoning); + addfavouritePanel (exposurePanel, epd); + addfavouritePanel (exposurePanel, fattal); + addfavouritePanel (advancedPanel, retinex); + addfavouritePanel (exposurePanel, pcvignette); + addfavouritePanel (exposurePanel, gradient); + addfavouritePanel (exposurePanel, lcurve); + addfavouritePanel (advancedPanel, colorappearance); + addfavouritePanel (detailsPanel, impulsedenoise); + addfavouritePanel (detailsPanel, dirpyrdenoise); + addfavouritePanel (detailsPanel, defringe); + addfavouritePanel (detailsPanel, dirpyrequalizer); + addfavouritePanel (detailsPanel, dehaze); + addfavouritePanel (advancedPanel, wavelet); + addfavouritePanel (transformPanel, crop); + addfavouritePanel (transformPanel, resize); + addfavouritePanel (resize->getPackBox(), prsharpening, 2); + addfavouritePanel (transformPanel, lensgeom); + addfavouritePanel (lensgeom->getPackBox(), rotate, 2); + addfavouritePanel (lensgeom->getPackBox(), perspective, 2); + addfavouritePanel (lensgeom->getPackBox(), lensProf, 2); + addfavouritePanel (lensgeom->getPackBox(), distortion, 2); + addfavouritePanel (lensgeom->getPackBox(), cacorrection, 2); + addfavouritePanel (lensgeom->getPackBox(), vignetting, 2); + addfavouritePanel (colorPanel, icm); + addfavouritePanel (rawPanel, sensorbayer); + addfavouritePanel (sensorbayer->getPackBox(), bayerprocess, 2); + addfavouritePanel (sensorbayer->getPackBox(), bayerrawexposure, 2); + addfavouritePanel (sensorbayer->getPackBox(), bayerpreprocess, 2); + addfavouritePanel (sensorbayer->getPackBox(), rawcacorrection, 2); + addfavouritePanel (rawPanel, sensorxtrans); + addfavouritePanel (sensorxtrans->getPackBox(), xtransprocess, 2); + addfavouritePanel (sensorxtrans->getPackBox(), xtransrawexposure, 2); + addfavouritePanel (rawPanel, rawexposure); + addfavouritePanel (rawPanel, preprocess); + addfavouritePanel (rawPanel, darkframe); + addfavouritePanel (rawPanel, flatfield); - for(auto it = userTools.begin(); it != userTools.end(); ++it) { - addPanel(userPanel, *it); + for(auto it = favourites.begin(); it != favourites.end(); ++it) { + addPanel(favouritePanel, *it); } toolPanels.push_back (coarse); toolPanels.push_back(metadata); @@ -164,7 +164,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toolPanelNotebook = new Gtk::Notebook (); toolPanelNotebook->set_name ("ToolPanelNotebook"); - userPanelSW = Gtk::manage (new MyScrolledWindow ()); + favouritePanelSW = Gtk::manage (new MyScrolledWindow ()); exposurePanelSW = Gtk::manage (new MyScrolledWindow ()); detailsPanelSW = Gtk::manage (new MyScrolledWindow ()); colorPanelSW = Gtk::manage (new MyScrolledWindow ()); @@ -182,9 +182,9 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan vbPanelEnd[i]->show_all(); } - userPanelSW->add (*userPanel); - userPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - userPanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + favouritePanelSW->add (*favouritePanel); + favouritePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); + favouritePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); exposurePanelSW->add (*exposurePanel); exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); @@ -210,7 +210,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); rawPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); - toiU = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_CUSTOM"), M ("MAIN_TAB_CUSTOM_TOOLTIP"))); + toiF = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_FAVOURITES"), M ("MAIN_TAB_FAVOURITES_TOOLTIP"))); toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"))); toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"))); toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"))); @@ -219,7 +219,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"))); toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"))); - toolPanelNotebook->append_page (*userPanelSW, *toiU); + toolPanelNotebook->append_page (*favouritePanelSW, *toiF); toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); toolPanelNotebook->append_page (*colorPanelSW, *toiC); @@ -262,15 +262,15 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, toolPanels.push_back (panel); } -void ToolPanelCoordinator::addUserPanel (Gtk::Box* where, FoldableToolPanel* panel) +void ToolPanelCoordinator::addfavouritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level) { auto name = panel->getToolName(); - auto it = std::find(options.userTools.begin(), options.userTools.end(), name); - if (it != options.userTools.end()) { - int index = std::distance(options.userTools.begin(), it); - userTools[index] = panel; + auto it = std::find(options.favourites.begin(), options.favourites.end(), name); + if (it != options.favourites.end()) { + int index = std::distance(options.favourites.begin(), it); + favourites[index] = panel; } else { - addPanel(where, panel); + addPanel(where, panel, level); } } @@ -879,6 +879,10 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event) if (alt) { switch (event->keyval) { + case GDK_KEY_u: + toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*favouritePanelSW)); + return true; + case GDK_KEY_e: toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*exposurePanelSW)); return true; @@ -916,7 +920,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide) { GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC; - userPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); + favouritePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 76a3cdd1c..fa007b6ab 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -158,8 +158,8 @@ protected: rtengine::StagedImageProcessor* ipc; std::vector toolPanels; - std::vector userTools; - ToolVBox* userPanel; + std::vector favourites; + ToolVBox* favouritePanel; ToolVBox* exposurePanel; ToolVBox* detailsPanel; ToolVBox* colorPanel; @@ -168,7 +168,7 @@ protected: ToolVBox* advancedPanel; ToolBar* toolBar; - TextOrIcon* toiU; + TextOrIcon* toiF; TextOrIcon* toiE; TextOrIcon* toiD; TextOrIcon* toiC; @@ -180,7 +180,7 @@ protected: Gtk::Image* imgPanelEnd[7]; Gtk::VBox* vbPanelEnd[7]; - Gtk::ScrolledWindow* userPanelSW; + Gtk::ScrolledWindow* favouritePanelSW; Gtk::ScrolledWindow* exposurePanelSW; Gtk::ScrolledWindow* detailsPanelSW; Gtk::ScrolledWindow* colorPanelSW; @@ -195,7 +195,7 @@ protected: void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); void foldThemAll (GdkEventButton* event); void updateVScrollbars (bool hide); - void addUserPanel (Gtk::Box* where, FoldableToolPanel* panel); + void addfavouritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); private: EditDataProvider *editDataProvider; From 43b77679d4afcb4d57f15578c4771496e0e4d29b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 23 Nov 2018 16:48:05 +0100 Subject: [PATCH 03/30] Favourites => Favorites, #5016 --- rtdata/languages/default | 4 +- rtgui/options.cc | 10 +-- rtgui/options.h | 2 +- rtgui/toolpanelcoord.cc | 138 ++++++++++++++++++++------------------- rtgui/toolpanelcoord.h | 8 +-- 5 files changed, 82 insertions(+), 80 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index e38e7eb81..869e96178 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -900,8 +900,8 @@ MAIN_TAB_ADVANCED;Advanced MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c -MAIN_TAB_FAVOURITES;Favourites -MAIN_TAB_FAVOURITES_TOOLTIP;Shortcut: Alt-u +MAIN_TAB_FAVORITES;Favorites +MAIN_TAB_FAVORITES_TOOLTIP;Shortcut: Alt-u MAIN_TAB_DETAIL;Detail MAIN_TAB_DETAIL_TOOLTIP;Shortcut: Alt-d MAIN_TAB_DEVELOP; Batch Edit diff --git a/rtgui/options.cc b/rtgui/options.cc index 9681978ca..d1b7070de 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -399,7 +399,7 @@ void Options::setDefaults() autoSaveTpOpen = true; //crvOpen.clear (); parseExtensions.clear(); - favourites.clear(); + favorites.clear(); parseExtensionsEnabled.clear(); parsedExtensions.clear(); renameUseTemplates = false; @@ -1070,8 +1070,8 @@ void Options::readFromFile(Glib::ustring fname) } if (keyFile.has_group("GUI")) { - if (keyFile.has_key("GUI", "Favourites")) { - favourites = keyFile.get_string_list("GUI", "Favourites"); + if (keyFile.has_key("GUI", "Favorites")) { + favorites = keyFile.get_string_list("GUI", "Favorites"); } if (keyFile.has_key("GUI", "WindowWidth")) { @@ -1972,8 +1972,8 @@ void Options::saveToFile(Glib::ustring fname) keyFile.set_string("Profiles", "CustomProfileBuilderPath", CPBPath); keyFile.set_integer("Profiles", "CustomProfileBuilderKeys", CPBKeys); - Glib::ArrayHandle ahfavourites = favourites; - keyFile.set_string_list("GUI", "Favourites", ahfavourites); + Glib::ArrayHandle ahfavorites = favorites; + keyFile.set_string_list("GUI", "Favorites", ahfavorites); keyFile.set_integer("GUI", "WindowWidth", windowWidth); keyFile.set_integer("GUI", "WindowHeight", windowHeight); keyFile.set_integer("GUI", "WindowX", windowX); diff --git a/rtgui/options.h b/rtgui/options.h index ea29e047e..5001306ff 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -375,7 +375,7 @@ public: int fastexport_resize_height; bool fastexport_use_fast_pipeline; - std::vector favourites; + std::vector favorites; // Dialog settings Glib::ustring lastIccDir; Glib::ustring lastDarkframeDir; diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 84244d7c8..56c987986 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -31,7 +31,7 @@ using namespace rtengine::procparams; ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr) { - favouritePanel = Gtk::manage (new ToolVBox ()); + favoritePanel = Gtk::manage (new ToolVBox ()); exposurePanel = Gtk::manage (new ToolVBox ()); detailsPanel = Gtk::manage (new ToolVBox ()); colorPanel = Gtk::manage (new ToolVBox ()); @@ -101,62 +101,64 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan // Valeurs par dfaut: // Best -> low ISO // Medium -> High ISO - favourites.resize(options.favourites.size()); + favorites.resize(options.favorites.size(), nullptr); - addfavouritePanel (colorPanel, whitebalance); - addfavouritePanel (exposurePanel, toneCurve); - addfavouritePanel (colorPanel, vibrance); - addfavouritePanel (colorPanel, chmixer); - addfavouritePanel (colorPanel, blackwhite); - addfavouritePanel (exposurePanel, shadowshighlights); - addfavouritePanel (detailsPanel, sharpening); - addfavouritePanel (detailsPanel, localContrast); - addfavouritePanel (detailsPanel, sharpenEdge); - addfavouritePanel (detailsPanel, sharpenMicro); - addfavouritePanel (colorPanel, hsvequalizer); - addfavouritePanel (colorPanel, filmSimulation); - addfavouritePanel (colorPanel, softlight); - addfavouritePanel (colorPanel, rgbcurves); - addfavouritePanel (colorPanel, colortoning); - addfavouritePanel (exposurePanel, epd); - addfavouritePanel (exposurePanel, fattal); - addfavouritePanel (advancedPanel, retinex); - addfavouritePanel (exposurePanel, pcvignette); - addfavouritePanel (exposurePanel, gradient); - addfavouritePanel (exposurePanel, lcurve); - addfavouritePanel (advancedPanel, colorappearance); - addfavouritePanel (detailsPanel, impulsedenoise); - addfavouritePanel (detailsPanel, dirpyrdenoise); - addfavouritePanel (detailsPanel, defringe); - addfavouritePanel (detailsPanel, dirpyrequalizer); - addfavouritePanel (detailsPanel, dehaze); - addfavouritePanel (advancedPanel, wavelet); - addfavouritePanel (transformPanel, crop); - addfavouritePanel (transformPanel, resize); - addfavouritePanel (resize->getPackBox(), prsharpening, 2); - addfavouritePanel (transformPanel, lensgeom); - addfavouritePanel (lensgeom->getPackBox(), rotate, 2); - addfavouritePanel (lensgeom->getPackBox(), perspective, 2); - addfavouritePanel (lensgeom->getPackBox(), lensProf, 2); - addfavouritePanel (lensgeom->getPackBox(), distortion, 2); - addfavouritePanel (lensgeom->getPackBox(), cacorrection, 2); - addfavouritePanel (lensgeom->getPackBox(), vignetting, 2); - addfavouritePanel (colorPanel, icm); - addfavouritePanel (rawPanel, sensorbayer); - addfavouritePanel (sensorbayer->getPackBox(), bayerprocess, 2); - addfavouritePanel (sensorbayer->getPackBox(), bayerrawexposure, 2); - addfavouritePanel (sensorbayer->getPackBox(), bayerpreprocess, 2); - addfavouritePanel (sensorbayer->getPackBox(), rawcacorrection, 2); - addfavouritePanel (rawPanel, sensorxtrans); - addfavouritePanel (sensorxtrans->getPackBox(), xtransprocess, 2); - addfavouritePanel (sensorxtrans->getPackBox(), xtransrawexposure, 2); - addfavouritePanel (rawPanel, rawexposure); - addfavouritePanel (rawPanel, preprocess); - addfavouritePanel (rawPanel, darkframe); - addfavouritePanel (rawPanel, flatfield); + addfavoritePanel (colorPanel, whitebalance); + addfavoritePanel (exposurePanel, toneCurve); + addfavoritePanel (colorPanel, vibrance); + addfavoritePanel (colorPanel, chmixer); + addfavoritePanel (colorPanel, blackwhite); + addfavoritePanel (exposurePanel, shadowshighlights); + addfavoritePanel (detailsPanel, sharpening); + addfavoritePanel (detailsPanel, localContrast); + addfavoritePanel (detailsPanel, sharpenEdge); + addfavoritePanel (detailsPanel, sharpenMicro); + addfavoritePanel (colorPanel, hsvequalizer); + addfavoritePanel (colorPanel, filmSimulation); + addfavoritePanel (colorPanel, softlight); + addfavoritePanel (colorPanel, rgbcurves); + addfavoritePanel (colorPanel, colortoning); + addfavoritePanel (exposurePanel, epd); + addfavoritePanel (exposurePanel, fattal); + addfavoritePanel (advancedPanel, retinex); + addfavoritePanel (exposurePanel, pcvignette); + addfavoritePanel (exposurePanel, gradient); + addfavoritePanel (exposurePanel, lcurve); + addfavoritePanel (advancedPanel, colorappearance); + addfavoritePanel (detailsPanel, impulsedenoise); + addfavoritePanel (detailsPanel, dirpyrdenoise); + addfavoritePanel (detailsPanel, defringe); + addfavoritePanel (detailsPanel, dirpyrequalizer); + addfavoritePanel (detailsPanel, dehaze); + addfavoritePanel (advancedPanel, wavelet); + addfavoritePanel (transformPanel, crop); + addfavoritePanel (transformPanel, resize); + addfavoritePanel (resize->getPackBox(), prsharpening, 2); + addfavoritePanel (transformPanel, lensgeom); + addfavoritePanel (lensgeom->getPackBox(), rotate, 2); + addfavoritePanel (lensgeom->getPackBox(), perspective, 2); + addfavoritePanel (lensgeom->getPackBox(), lensProf, 2); + addfavoritePanel (lensgeom->getPackBox(), distortion, 2); + addfavoritePanel (lensgeom->getPackBox(), cacorrection, 2); + addfavoritePanel (lensgeom->getPackBox(), vignetting, 2); + addfavoritePanel (colorPanel, icm); + addfavoritePanel (rawPanel, sensorbayer); + addfavoritePanel (sensorbayer->getPackBox(), bayerprocess, 2); + addfavoritePanel (sensorbayer->getPackBox(), bayerrawexposure, 2); + addfavoritePanel (sensorbayer->getPackBox(), bayerpreprocess, 2); + addfavoritePanel (sensorbayer->getPackBox(), rawcacorrection, 2); + addfavoritePanel (rawPanel, sensorxtrans); + addfavoritePanel (sensorxtrans->getPackBox(), xtransprocess, 2); + addfavoritePanel (sensorxtrans->getPackBox(), xtransrawexposure, 2); + addfavoritePanel (rawPanel, rawexposure); + addfavoritePanel (rawPanel, preprocess); + addfavoritePanel (rawPanel, darkframe); + addfavoritePanel (rawPanel, flatfield); - for(auto it = favourites.begin(); it != favourites.end(); ++it) { - addPanel(favouritePanel, *it); + for(auto it = favorites.begin(); it != favorites.end(); ++it) { + if (*it) { + addPanel(favoritePanel, *it); + } } toolPanels.push_back (coarse); toolPanels.push_back(metadata); @@ -164,7 +166,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toolPanelNotebook = new Gtk::Notebook (); toolPanelNotebook->set_name ("ToolPanelNotebook"); - favouritePanelSW = Gtk::manage (new MyScrolledWindow ()); + favoritePanelSW = Gtk::manage (new MyScrolledWindow ()); exposurePanelSW = Gtk::manage (new MyScrolledWindow ()); detailsPanelSW = Gtk::manage (new MyScrolledWindow ()); colorPanelSW = Gtk::manage (new MyScrolledWindow ()); @@ -182,9 +184,9 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan vbPanelEnd[i]->show_all(); } - favouritePanelSW->add (*favouritePanel); - favouritePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - favouritePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + favoritePanelSW->add (*favoritePanel); + favoritePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); + favoritePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); exposurePanelSW->add (*exposurePanel); exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); @@ -210,7 +212,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); rawPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); - toiF = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_FAVOURITES"), M ("MAIN_TAB_FAVOURITES_TOOLTIP"))); + toiF = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_FAVORITES"), M ("MAIN_TAB_FAVORITES_TOOLTIP"))); toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"))); toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"))); toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"))); @@ -219,7 +221,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"))); toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"))); - toolPanelNotebook->append_page (*favouritePanelSW, *toiF); + toolPanelNotebook->append_page (*favoritePanelSW, *toiF); toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); toolPanelNotebook->append_page (*colorPanelSW, *toiC); @@ -262,13 +264,13 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, toolPanels.push_back (panel); } -void ToolPanelCoordinator::addfavouritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level) +void ToolPanelCoordinator::addfavoritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level) { auto name = panel->getToolName(); - auto it = std::find(options.favourites.begin(), options.favourites.end(), name); - if (it != options.favourites.end()) { - int index = std::distance(options.favourites.begin(), it); - favourites[index] = panel; + auto it = std::find(options.favorites.begin(), options.favorites.end(), name); + if (it != options.favorites.end()) { + int index = std::distance(options.favorites.begin(), it); + favorites[index] = panel; } else { addPanel(where, panel, level); } @@ -880,7 +882,7 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event) if (alt) { switch (event->keyval) { case GDK_KEY_u: - toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*favouritePanelSW)); + toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*favoritePanelSW)); return true; case GDK_KEY_e: @@ -920,7 +922,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide) { GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC; - favouritePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); + favoritePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index fa007b6ab..1ac74871a 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -158,8 +158,8 @@ protected: rtengine::StagedImageProcessor* ipc; std::vector toolPanels; - std::vector favourites; - ToolVBox* favouritePanel; + std::vector favorites; + ToolVBox* favoritePanel; ToolVBox* exposurePanel; ToolVBox* detailsPanel; ToolVBox* colorPanel; @@ -180,7 +180,7 @@ protected: Gtk::Image* imgPanelEnd[7]; Gtk::VBox* vbPanelEnd[7]; - Gtk::ScrolledWindow* favouritePanelSW; + Gtk::ScrolledWindow* favoritePanelSW; Gtk::ScrolledWindow* exposurePanelSW; Gtk::ScrolledWindow* detailsPanelSW; Gtk::ScrolledWindow* colorPanelSW; @@ -195,7 +195,7 @@ protected: void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); void foldThemAll (GdkEventButton* event); void updateVScrollbars (bool hide); - void addfavouritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); + void addfavoritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1); private: EditDataProvider *editDataProvider; From 883d967a030cafa75c3c1bf5f1736928117ac55b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 23 Nov 2018 20:49:04 +0100 Subject: [PATCH 04/30] Exclude pr-sharpening from being moved separately to favorites panel --- rtgui/toolpanelcoord.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 56c987986..709acc75a 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -133,7 +133,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan addfavoritePanel (advancedPanel, wavelet); addfavoritePanel (transformPanel, crop); addfavoritePanel (transformPanel, resize); - addfavoritePanel (resize->getPackBox(), prsharpening, 2); + addPanel (resize->getPackBox(), prsharpening, 2); addfavoritePanel (transformPanel, lensgeom); addfavoritePanel (lensgeom->getPackBox(), rotate, 2); addfavoritePanel (lensgeom->getPackBox(), perspective, 2); From e5679df6f36c0fad2a5354ce29c1b76d368dc27c Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 29 Nov 2018 14:43:45 +0100 Subject: [PATCH 05/30] Don't show empty favorite panel, #5016 --- rtgui/toolpanelcoord.cc | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 709acc75a..99dcdde8d 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -28,7 +28,7 @@ using namespace rtengine::procparams; -ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr) +ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr), favoritePanelSW(nullptr) { favoritePanel = Gtk::manage (new ToolVBox ()); @@ -155,24 +155,26 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan addfavoritePanel (rawPanel, darkframe); addfavoritePanel (rawPanel, flatfield); + int favoriteCount = 0; for(auto it = favorites.begin(); it != favorites.end(); ++it) { if (*it) { addPanel(favoritePanel, *it); + ++favoriteCount; } } + toolPanels.push_back (coarse); toolPanels.push_back(metadata); toolPanelNotebook = new Gtk::Notebook (); toolPanelNotebook->set_name ("ToolPanelNotebook"); - favoritePanelSW = Gtk::manage (new MyScrolledWindow ()); exposurePanelSW = Gtk::manage (new MyScrolledWindow ()); detailsPanelSW = Gtk::manage (new MyScrolledWindow ()); colorPanelSW = Gtk::manage (new MyScrolledWindow ()); transformPanelSW = Gtk::manage (new MyScrolledWindow ()); rawPanelSW = Gtk::manage (new MyScrolledWindow ()); - advancedPanelSW = Gtk::manage (new MyScrolledWindow ()); + advancedPanelSW = Gtk::manage (new MyScrolledWindow ()); updateVScrollbars (options.hideTPVScrollbar); // load panel endings @@ -184,9 +186,12 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan vbPanelEnd[i]->show_all(); } - favoritePanelSW->add (*favoritePanel); - favoritePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - favoritePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + if(favoriteCount > 0) { + favoritePanelSW = Gtk::manage(new MyScrolledWindow()); + favoritePanelSW->add(*favoritePanel); + favoritePanel->pack_start(*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); + favoritePanel->pack_start(*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); + } exposurePanelSW->add (*exposurePanel); exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); @@ -221,7 +226,9 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"))); toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"))); - toolPanelNotebook->append_page (*favoritePanelSW, *toiF); + if (favoritePanelSW) { + toolPanelNotebook->append_page (*favoritePanelSW, *toiF); + } toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); toolPanelNotebook->append_page (*colorPanelSW, *toiC); @@ -882,7 +889,9 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event) if (alt) { switch (event->keyval) { case GDK_KEY_u: - toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*favoritePanelSW)); + if (favoritePanelSW) { + toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*favoritePanelSW)); + } return true; case GDK_KEY_e: @@ -922,7 +931,9 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide) { GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC; - favoritePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); + if (favoritePanelSW) { + favoritePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); + } exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); From 05547d0348cd0088f5282dd60863922994063ee8 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 22:22:54 +0100 Subject: [PATCH 06/30] Preparing for release 5.5-rc1 --- RELEASE_NOTES.txt | 66 +++++++++++++++++++----- rtdata/images/non-themed/png/splash.png | Bin 78155 -> 79260 bytes rtdata/images/non-themed/rt-splash.svg | 20 +++---- 3 files changed, 64 insertions(+), 22 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index c320e61f0..5a6109eb6 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,18 +1,10 @@ -RAWTHERAPEE 5.4-dev RELEASE NOTES +RAWTHERAPEE 5.5-RC1 RELEASE NOTES -This is a development version of RawTherapee. We update the code almost daily. Every few months, once enough changes have accumulated and the code is stabilized, we make a new official release. Every code change between these releases is known as a "development" version, and this is one of them. +This is RawTherapee 5.5 Release Candidate 1, released on 2018-12-03. Start by reading the "Getting Started" article on RawPedia: http://rawpedia.rawtherapee.com/ -While we only commit tested and relatively stable code and so the development versions should be fairly stable, you should be aware that: -- Development versions only had limited testing, so there may be bugs unknown to us. -- You should report these bugs so that they get fixed for the next stable release. See - www.rawpedia.rawtherapee.com/How_to_write_useful_bug_reports -- The way new tools work in the development versions is likely to change as we tweak and tune them, so your processing profiles may produce different results when used in a future stable version. -- Bugs present in the stable versions get fixed in the development versions, and make it into the next stable version when we make a new official release. That means that in some ways the development versions can be "more stable" than the latest stable release. At the same time, new features may introduce new bugs. This is a trade-off you should be aware of. - - NEWS RELEVANT TO PHOTOGRAPHERS RawTherapee supports most raw formats, including Pentax and Sony Pixel Shift, Canon Dual-Pixel, and those from Foveon and X-Trans sensors. @@ -26,7 +18,52 @@ In order to use RawTherapee efficiently you should know that: - There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control. Make sure you familiarize yourself with them on RawPedia's "Keyboard Shortcuts" page! New features since 5.4: -- TODO. +- Filter to remove striping and banding artifacts caused by Phase Detection Auto Focus (PDAF), available for any camera which has a PDAF entry in camconst.json, currently: + - Nikon Z 6 + - Nikon Z 7 + - Sony DSC-RX1RM2 + - Sony ILCE-6000 + - Sony ILCE-6300 + - Sony ILCE-6500 + - Sony ILCE-7M3 + - Sony ILCE-7RM2 + - Sony ILCE-7RM3 + - Sony ILCE-9 +- Out-of-gamut warning compatible with ICC v2 and v4 profiles. +- Ability to specify custom working color spaces through workingspaces.json file. +- Unbounded processing - allows you to decide whether out-of-gamut colors should get clipped. +- Improved support for Canon mRaw format variants. +- New Shadows/Highlights tool (replaced previous one). +- Contrast threshold mask which divides an image into areas of high and low detail, allowing the effect of certain tools to be focused where it matters most and to mitigate the effect on areas where it would be undesirable, for example having the Sharpening tool affect only the in-focus subject without affecting the out-of-focus background. Available for: + - Sharpening + - Post-Resize Sharpening + - Microcontrast + - Demosaicing +- Dual-demosaic algorithms, making use of the new contrast threshold mask, allowing one to use a combination of demosaicing algorithms where one is best for details and the other best for plain areas. +- New color toning methods: + - Grid, allowing you to separately tone the shadows and highlights using two points on a simple color grid. + - Regions, allowing you to tone based on any number of masks. Supports functions from the American Society of Cinematographers Color Decision List (ASC CDL). +- Resizable main histogram with scaling modes: + - Linear + - Log + - Log-log +- Support for Blackmagic and Canon Magic Lantern lj92 encoded files. +- Allows you to specify how many border rows/columns to discard during demosaicing - those who shoot raw video at a standard resolution such as 1920x1080 will appreciate being able to preserve the dimensions. +- New Soft Light tool which enhances contrast and saturation by emulating the effect of blending an image with a copy of itself in "soft light" blending mode in GIMP. +- New Haze Removal tool to reduce the effects of haze or fog. +- The Resize tool allows you to specify whether you want it to upscale or only downscale. +- New icon and cursor theme. +- ICC profile generator. +- The bundled profiles have been re-generated, and now include ICC v2 and v4 variants. +- If your screen's resolution is such that not all icons fit in a toolbar, you can now scroll the toolbar using the mouse scroll-wheel. +- New tone curve type. One of the characteristics of the "Custom" cubic spline curve used in all previous versions was that editing one node could have a huge impact on what happens to the curve in relation to the other nodes. This curve was replaced by the new centripetal Catmull–Rom spline which allows you to make adjustments to one part of the curve without affecting the other segments as much. +- Allow saving both floating-point and integer type files at both 16-bit and 32-bit precision from RawTherapee GUI and CLI. +- Improves lensfun chromatic aberration correction. +- The raw chromatic aberration correction tool can now run in several iterations, and gained a feature to avoid introducing a color shift which could result from correcting chromatic aberration before demosaicing. +- Certain sliders now operate on a logarithmic scale, allowing for a meaningful response over large ranges. +- Dedicated "Reset" button in Crop tool. +- Support for new cameras, and new input color profiles. +- Speed enhancements and bug fixes, for a total of over 1300 commits. RawTherapee and other open-source projects require access to sample raw files from various camera makes and models in order to support those raw formats correctly. You can help by submitting raw files to RPU: @@ -46,7 +83,12 @@ In general: - For development builds and release-candidates use -DCACHE_NAME_SUFFIX="5-dev" Changes since 5.4: -- TODO. +- Requires libtiff >= 4.0.4. +- Requires CMake >= 2.8.8. +- Optional codesigning commands have been added to the CMakeLists.txt and macosx_bundle.sh scripts. If you wish to codesign the built packages (.app and .dmg), add your details to your CMake command flags: + -DCODESIGNID:STRING="Developer ID Application: Firstname Lastname (xxx)" + + diff --git a/rtdata/images/non-themed/png/splash.png b/rtdata/images/non-themed/png/splash.png index 14e3ddc9b10674e8dd60bee1ad5bb088019552b5..899b72270de4f73af48b883e09909aa1711e9f27 100644 GIT binary patch delta 34899 zcmXtfWmJ^k*S1QR)PNu*IWshZbT>nHH%NEq{R5;!=>|bMr8}g%ySp3ddhq|Qcdhv{ z-_AaBuD!3=Gq?etb_oC5xD3#AT)y$i^eSGNcwnF8OM3eivE6`>o{AlZN)q-?NRfy- zsFrxrHOgcmhJJAuqIiT$#^ea6*!m8TcOkC%)t*&|Te(x@~ggXPJD<%k-Qvm24U zVI_D|b<^5%Q*`pQ{oTt>wPm(kzb$$HBzdOrG%aPpcDh*ospvp^brra|X+kPg^IA=N zt4?qIom|r^CG`HS^;!HIcLeH3<@%|OHP9C$Yy^uKrBc=MJ}Pap0#;VmPQII^O(md) zlFZ7=s-vbw&jJN$zM+l=mjZHiIEAA(8tNQY$9;ts4SPsM9ftXDDzm>-X#LeNw!RK~;5tRHgvb(5W=cVFLe_R?% zwa@Kf^Uc!5dr;ny5Zw!{f5A!Sh-c#oEci7J1BTlAVe=;h83r`zMWjlF-wTqIG75CD ze*WBn`P@Ketv!=mIB8kK>2^Y#FQ2(HZ-ap50zkHhm2-6 z?=f|)Qv84bICanlO1uFFA0ze#=gv;5-Ok?lFYmv<$bj5w%kzstrc1B38!z6M$IFuP zax)WZFV;F#WAyAkneusV744w@AQcU&Q=Xm=#^I06GyY-3hU2g%4?7bF6p4hh`s#_5 z4+@GtghWxCUeA^CvtNQ^_^1BBu^`a|*0@ZPjzFxQkHd@5&A#4Jn&fema}WRb)ARv8NnQm99!S<-bv=Pm6S+iE z#h=mO>Eg%NB^jKcAg>!|uiQS7x3(oUG*QN+-e*E5O{e^Np8M3Kz@vkn_qo{2>}-{* zMasKd=7=jQYD^B%=#l%?aafkidMRl?Pi^Nk9WcHS9V2}_a z^bCD@dmpnGVuhv6vLxMsgWgorx zfk)=U!^6jg@~4j8}h1(~yU-^W!+&%XGlqoZMS985IEhEvhy?tS*;XZ#?d& zOi9`iRdaHfsB3Ylg`f@y^+SteK}4F&Ev{?_6^lkTAn(9&-%qZaVBJxyDq)rJvReWo z)$=nAn__?hpYEej!E`Z|PfjL&l~Zl%5G0p?fM9Jsm~3aOKi2y^T;Igjma&)-jXdI4 za$4G!Q|1F*nJWT=vsbe z*)RhymvUIxOVkqcr+|NUJjDfcpYLUYyoz?H@+w|g+!l63^{-Vm3VH3kN5H}D5HWF+ zP0X#FKAt?{Lg-#lr66gNyA*cst*CVU)0avpl2U;k4pa!|;!MJ{G&ZOG{VlN-j=*3n zgin;nhWC~s;YwlW=MJPke--tBCl@t!^~ESLs924fv8QK{1es6V`1m;8OG#AdRgJ2i z`$_STuIGnX8pww;2N*0%cRfNOlrkaVX6AdY9fFvZ8R=K!kebyt`}zg;jI0)sXXzup ze_#b%0)79!#~$;+0>zfyRMZ`!8O?S%+Sy;J|6F5q)SR9V&vBVHd(9+(dayW1v3-(I3iol_6p-V$H!ZT zC}OUT_V#vFY`oGhuPETXT?^2uxA$|}9We#AB&}qLyU{T)qVp`oBWmFar3zJwL>0d! z3BSd2+j(sGi|5%wqgvQLaZyXsQPv(RS!oLJwrY1@(;1>&TIrLu*4^ra@`c3wjGNQ7 zt|zqJrre*&Zo~Rs6Dj-@-|{y4OGp}$SaHV<(~tN!Xy)>AaX24KX_(sX5y30o;hai9 zS2PWX0WNj>9r^mO_GdC-;`H6E{yO*j{d_`F(wz*ilbwoQ(#RG`TzTI9$4B1POTN`kpPS|0wY4?8 z=s3%ofvG7F(tF~ysX}D}I9_o&id*Wt5{((*{ zk^=go?icol$pn*E9w93A+W(B5+xqdPV9`n6I97a{skNFoUJh$GHfbOE6~^i%+34u#%zS*qXJ>%DT04Wge$lj6UXgXspbu86upws`UIp4J>yKE$xpyoU zxy+xd>oR(ZG$46qJYL(*zL>f^)X#sjs36qWZz?lX-rQK%)}Dzsqh!1P_pHM(iy24S zHRq9|aog$Uy(`Qg)d1hRF)FzuBGh!5U5d6HqEVh!k0syd+Vh`@?p6hXJ^bcS`3H(VF^CmgSD~as4Oae{}wd%S^n_L>53b) zGN=@)`=?G4SBynk`jTLimmNR+{o?H@5$b|zkQFsmq3PFEJf9XT#J7odEv6#s7j3)K zF@$ON&1$d>C8H1jMnBLLHGFDAQbVBf&}aa1Q4A|ZK^1MyOlg5D4VF9>>&oxm@sR1( zOMl|dRnXHzHT*;=$5O#rBZ><`F3 zXFn`iZ2bZMu`-Ya6~~x>WS&QKCQHD$V$SGot!p;LvZPd^K<|$F;)>^6NJZVh3e^8A zZh^Wi>T&mw?0uq}*FM8nVDvK_6%^}iHRcn8IGqmk>|AQj4G;+;1S&Dct7Pf!dTi9< zmQb=}>lDZUQ2CR`>lGiON*C@<&VgVbPZx?g%&;Aev*u64FZl4?S|Tx2)mjW%7HC%J zM#`c}@Btmz_>zjWV$qEj=pVyF9RA8RtjbpWr+v0gU`*I{A+u}sZa?;CJvSGBfqL^$ zqmE;GxM|g)!)6{e%$n!lR1bE@HOV_m(4SLAcB}{J755vg0uR8VfG&AhzLZvRh}w$x zrV7qE6*UB^)u87tn56OA*kIg5)7R-IedO%PrI?IB3pGp^V;Xf{C4E~!H!QkTUK z0MuwM(;(ZSMI*9*Xb1USRV_b!zzD`XDJ7F$eJ%c{B=cf9{SE7UM)SIoJhUSHU)#_X z9%rcNZ+xX`Pq|u^sfFDpl}~vJp2g@xhwl}yn1|yLDsWd~;iQ&8K0arZS?jD*wHM&lO6n|mE8wDqH~c0GUN}2! zOAKY#45Mzjxz3lK;)%p=P~nWOqQ3^=ha1BfDdL4yeD*M-$^e+!mEd*4R~Q2dM4nv7 zu8W63u5BnJFjSbKjsF}CZPE3dylC#b!^1?My;*b^rr`v<;`*OM#L{KX0;u0!=mp7X zcZw&2k)=_bT2*wiD0XZ#b_HSuV>sB$AmDUS+$`gVR!zt4Ehi@b*_-b^kDD@ba=H!` z?AYY8%8Y3O@~;rS@l7p7NCS)}(Hw|b*m#GY_X$g6Exr(ylrl_OmKsNhQ=R9~U86=? zNHe^LDehrwdO2nX#AN^ZIM{c#LIElKdw=YuVc4?m`JXtuUQ`ql{=D?Vy?0|1`-X5( zs<&%fqE{$R>d)6MRZB8oT4FzmHfSO;$jb`GJp92hIPgp4nmN)LAsSHCDh;1P689vP zrgrryKVs-=5T^J@jhY$_I*!L)CHvkJ=u9y@)e3!HY&#brPMRML<&eJ^C@w$WNd+gT zrgqN3ThY(tL=}X%+XX!klQifBA|1HAC*kdT)i!Yw{Evp>5)$P_TRsZ%a+&7Ou#(xVn|!Ca}`sv~rLsX0$=dL9AdZc2N}x~;A|#s#Hc93ZXj zF2bQM`}Zq5xa`sG9W^ztngoobYOj#%Rfx%bb=Hy4$eT|Ba{2A0N9Ch7Tg2rA3!&9;qQBAyxeznJxfJ#heY$l{543 zNLx;nKvDs(OIIKjvhc{R!ghlAt1JYo7w_Qe?R#R*z5q=Aj>ku_4Bvx6-n&SFwTaw1 z78?0dHGa07>H*2n3IBFYmh zt(=P&gmr77C^DgRLa(Fs2-0|&nD$$8{l!+BjtNMuw-35R>vABe7_5#7WDpRDs_T8M zOD%Z6GJ5}bh`wsy1qG*5brYG2>_kPenM*2l9zDL}o=~AZSywGpDZnJ&8v8?3`TpH< z0Bm6h*$-J%acahJZ94l^)=roE2Ig*4>x;3UwljZ$QaH{N3Tx6Ru+JQ=0&w4bHb(6S zOM%|I0H#Ood^vuJnEE5qQa0MpjLpBCwnaV4N0OZ|_@Dc(uMn!WnJd2tX=+Mxw*4d| zK;B}kQiF>!mt4;ui+6WE&utg4oUCmY4Yg@sX`+=rdRt9L+M*@oKIUwzeB{Bd4@QnZ zK&DC0pSHI4pjsDdNmL;84w=~?>=IBcWd%Y%MFW+Vk>=E+@)$8C}Edf8dg#< zYT{vKh$rq}rY+Nrdr!8Jp2Nwuds1zGX%%DlVmp+CQf{+$zvqAR=F=M~Q6Uw%bTZ%< zH6*25AKiWz$-Y<0#|iBf7c)yqf4cHH9d`F z$+1{)=?jhg`)C_=)J4qej<$Nf2lUVFZ3hyA9L$dx*vTM~lX*NPF|YYSsLU>Z^QB7}5Aj+T`gnlD5P@JsxRHju`WQ@II4S z#J@BoIQLN&+B-i4%yKqgerPR`u3&$Il)+)7U<3?~&GU+4^=_&Z zr-)y2GY^IdIR`kG2stv-G#Cdt@8B0qg@ZfReO5aUaN7oNw^&N#nZzj)(*a(en^o$q0t`?@yMnDrNCp{L&)MO*Jal7B%d zZ+`r2*X-cWIip!rHIu^Wnw42oW14`!>+x`m%X{9Xemi9L%uDvP2d+g&n?4L!@_6h_ z7P9GzOJ$*DmAo3&CAoFUSIYi>B34qy2>%hkD z0>0~cs`Gi4^ZPQBfHw)^Req9a-R(O_*+vI0=4^G_R=PCsS$>4(KTam8B!VqSn(!>) zOtxj?I{>_xF&iqe6>KRlLwND0w7UuJ02xEsjQhfofEi0qW!d?W9XmtVzi@_#_R- z$3}gKjme3d`}$8TF1l!wKC5d!xp-g8wTi^oye&2UftM1=Iu&et?BQJl z9M~>%Awxp1F_E- zP{dvEDbn?KFlMdD76ig&xtZRCqde^b$Yp&?foNugA3wTMKfn5;gKJ|1HJ<5LHDaJB zNzspSwGf*Iw#AL-2l^*ZXC%b6JnbcxH}njD_T9czepJNkp8JoIzKL9i+V$`(O2_>C zq$FGEoY3i=8aFa(*qC9qQr5E+4|c!ahcMRe{*Foo^<2@=W5It4lic&03u-Y?8FgHV zr=)<|K}ioLCBlpS{R@lUaZv?{hWQ$uZt!0lt06gJQ9!5B>Wm=JV#VICc$(`^{S+ny zjhlH6Iz~a>3Paf%%w;B-FcWyxRBJtRQV9m@61rKXqkn4MOK@2ykx**?X`Tm7#K*T_ zOGU@HzKrrg(C3QFtV?*6&_JPb{_O%85V@NPWOR3nO|Xes$<`=|(M48pb9AJ@$A0Ws zotcI>#9RN8#DyX(M1Lf)hzsh&B`n1g5fPa>)CQQW0@-X7O4X#aT0yPlKG~EZ6z+G^ zs=fzgI(HrfB!S~i#D*34U(MEsS+N~N6xCBI-WJ>_9$mqHPR;Zr0Xsyp8GKnuE4z>2 ztOwdQq@P$9DBq|-wy|kB_0qMQT8YhJ*5_fzA#({32i1SFHqf!dfc6b(d2hMxo zC#Vw;k~%J09K)Il88K6QTPt4}XJT`v2=G7PyKhgcyI&N7xg0hy5)wWX&K`KL1&|q7 zIu6V#IrKtjj7oCntFs*ZhHPVVeL>g?ygJI(N_V7fd!n@d-r1zXgV z9eE*R3>gS>BbLH_nGkvS$qzD;J?4**?F+upi?(j)Ce%U8j4i(&j29-oqc1M^4vgM6 z*1(Q4uWRdzZ@O`P8&R3_?!#{49VYPCMbC2+U^r>sX09V?2<=3|v^RJGQBroQcq2w! zJl)-Xw|MCZJVAIzuBoZHzI5l5#_JI?tLGINn=kjzhA5uy^4vUZE%fnT>}`!~idvnn zar$$2$3@%r!RdKPvqYB5e(epg!zv(IqqRNEA%E7BTF%PhhGG>7#to~-Q7%{Ia@+#G zlHQ%U*`KyxerB6$dTb3Dvo3SopMXYK{G^;+teEkS>M91)J=TydH-OD*P?0doL|h z*<<4cuh{<|1%5*e?JtyaDEhStwAGd_bn>JJK*(qnu^nuZrWh+)GuApdQrl8!RgLWh z$1ShiE(NhES`%`jy^mpj>C{lzpH3hnUU~HMXD8MWx<33$j}qi$?DkCa3V$2T z7|=&pNE{Zlo((g9w0W18Nh5Wnh^;f;+Z z4U24-FeUt4beOiDhezP(lWD*F!7g$QiBYm0|2Zh$GigFS$mSw7Y8g7$| zdvL<~kagHavW}RM5!$BQWXUZZ7hSl90Zn&txd}i)?F#o#qv9bO5_=Pf*My?!E(()g z_jhp5+kD45!9Gp=Axxx71*Xkr=M0QirXOw_XoYJ*88|y*vtJq26y>OZL+KBpPA-d; zlNGE%9Ektn=C*f6+YqP^?;4j=fcdETQT~}-WKv>G>zDI4jq@H&p^!(o-X9yy6fRzlMs?47 zt$8*Gu1DLS3E>EK^|^j&aFhKB`>LW%g9rqU?O$$Th-jZUT@|W6-^M2;?`t8UptvYJ zx}@HaWTYB5711j+%T!4>w`&ccXW%SG{v*ePpxeG48Pa&uBV=L55=ru!IkVf_A3;nu z(WaOGF>|`Y4OW3QHGM*Sw26n#`V6zPX3gJgq{QNBDN`zB4k!b!B8a7ohu^IpNd1BB z&4Lhl*RS(fw%3lybV@aty{9l2=Ajq(1-IDH6Y;~S4B^B?2i$; z89Oo%p*%92VntMY$SFC2gQ$oxHnnK0t+?exM2Phx9cRr@x?NU0yQZdY_IPt6#g~ov z`kESQx#n|>*1My&?T)}%tVO|n0KWi~i@{yVd$)xH9JcKX)ZA+Q)Cvrcc>U;(j?&Sc zoh)KUO0y{b>Nv-|j{Y;Lu_>?jt&?L~*Sr_i|Jp>vhKhos^(CD*06avOt7D?NZTNEp zJwsOUA|6NG@84AkfllS**wj2=;o4e95at4Wu>fnKFDR2E5Gz804B+eY<6%iDA$Nex zOj$+cJ$Iz}dsbzz@2%d^6n_E{ce&I=0LWTOsnG__I$2m}Zg=|!$Ym64;j_tM@g<=U z9i6Mn8u_ZAFFFnap<5^45~l3=Snb8@S7S~OqaWbDg!DweKc^BSXZ*H_g27*!^t1BY zSQ;J$$**{dnxLs1O#rhy^-tI*qu&%I9J8+&{5fyAh1oGE_=%<`XJ|Nmy*u%Rm8tbH zQ$vF@@OP9NLmW(q8e*!cV`(VUk>7e+$-k3g>`q|Yv{*=Y7-^^iFJ+v*BPC6(HWg)4 zB3fb+uP*oJ#@CI3lG;O3;&=8!9&3D#q~2ref;a8$2Y3s&7=UYpUh`q&;?*hw{WAn@ z%=3|tox1H6^hT-bCK{1cyb6#|dggxSe526ZI3g4cv6(PuG>-8|DfLKcmbQ|~vTecR z^I>XK67drLj6=6W^&_2M@=yGaIA5iZPRH?#S{otz4*r*;(cgblf#CiJQWs)IcM~|w z%1^MdY-aX;KrUHrvR!)j`8Pds&76WY%{pAf)v<^q$Tu)1iydeK&4{F zU|PCW?lIM3F}0F5!j{@|;vF3u#Djz3uY@KWa-EK}6L{~Pp?KZY=LN%$sqS8S)Raqe zk5QNRj+ahc`6QJn^bxZBHv=~y3O<)X|LFp!?eVS@sA?@UVVyBwx8qS1zCM> zNmo38b201l!uPXLIkz^8lCV0P0900Axa$PWO3xEeC(`#F`9%69Tt7Sxsc#i!%*i2i zN;^~0pGJ4#soZ5Moh|GVT#8`Nb%N_*-FI!@5le952ujRHbU6pfy!SEP_oovJ)aXW- zMBLXw zQN|Hc7VNW{n%V}2>+e1=X6y_#%qFLMrG9n7raOdaLE?Y9pvi_6P@x?+pWmZqdJozE zHJ{Z#CH4F2y}B2a3$sAXJ6Pj6;eWdS{BqKr^fZZ=pXTnn-z>GVM*Vvnz&ZE{;s(J3 zFG`AQV5OL7oTh+RwARC{b3PGG$Bxwc#X0AZdO60Z#$jL{@K%e|w}l~?5~gqtJq}3W zZ^NM%CzY%PTo?A@*O6hw7gD0DwRXe8uRSU4pJG96rT1N{KhFmR#BIF&2gb~w4~n~N z@~QTY8NZoySPB&)v-k`1bWmiKg<%4z9s$KwA-7ItA`paGen(6WJ8An?P_7`(*AHeM z7s=p46`h63sOpDQgh0eYPuf~2YWZKuj=*^uH0ean^O<)3qfLN+;w5c zLZNv!4hRL7n-ND)Ef=B^);+u#+;E4VFJE?f`Lej;TT&ZiSad$K{6S`f{u0=deoZsq zZ*QneQZjz?w9YHqqWwCaxG}Z@#srmp+)rz83~&m?S^g*W7o%L2=}q#u1#oHmg6gdD zGj8i#WXn)L-H8y9t(

79tA~5c9Pk&419;vT^LoDI*SZH>&i@G4Cl#h|fC^es@MQ z-y!rcJf?*FS;s0Sd#&n)6$o#;pH03Wb8Ar9i-@~*+C_nV!im|AzdywzrLUcvp)ej;zz!0~VqJp^IH<(Qj}kvmBcDH-1meE4v84D^=U8CwgOvxyg8 zk9+yCgnJ)qp9N$V#^ybr8pA=MAoD6QCRF$rl=Uwc-pB6(ibDw1A5+v8f*GWZ11YALo9O^Ps;w<~$u4SRm6 zc_CHs)_7FyCcgu)rjsH}5#_(rXMMQ>y1RVHY?WoXQBVg0-MYT*C;gB;%A0H_Y5q?A zJH=aJZ;6oHC%k9k8zuc5BjgNg&~f~bETr7cmCEYd*= zIAIFL77E9L(?Y{eKz@rC(Tu3rGfa2*yc2zhbr#AreEA)CM(Xr~;{$TM-h_>xN3N%1 z{CG{r>AM_`LURT>c#Oi=GyGqu9xVcSF&chmgYe>HMR+GzPSO|^H&C&TSKD6l%ddpu z=3a$pwB-j+A03+0zf8PqVYxFRL>LhL;I82&A#B(HS}R=Zn!f_7G0sHKXHR$k_2fl3 zq5)PSR0Lpyb`wd1+sQuxMgBDE^aqL4&32Jf!-4taEWcOX;V$b`Yv-KwsnKYwxXlX& zzfT=!L6ik_NV@mlyN^5edRJlp+Le3YhJ1idZh$aNL_i8M+gU+`u14?wM-}GKJpsSj zpC|?mr+csy@~HF^vfuxctt8K;tWa2Nk*yTx8UV~dxogdBLW~ZP)^qI`&!aJE9=k^? zccZB~MdM2~XEq**+b#wfN=OVmfk-yh9K;Ak0wP2XyHcWvx5j_867N*$w-ScU4q!K^ zm2as9UK6@8Z4Rj7#>J<=7Y=PAm6(#>snvAgqA~G~#X3y7Zxw6a7?jEqzZ3P0ElLsC z#Q;+`4dwdD6q&b41wrcKi%(xB@b#e_a>cR7YU&fu)W*$%121C%ahB2??Rhx4-q%pww!hsKu7sQuH_f^YwCO5-VI0 z8U*^Kq=YU`D9W`FV`>5oSB?6n5&tPi1F$euK`YkEndq7jHYXpzNWjm=mDf=UL5IjI zQG|!lgY|WH#-3?_L$KRfaBH}Re&$iJF16MMW}8XF=CzQ_bu7w2s0k|UR&#y`s65Xn zs4g#ij%ANi$>|#TU-*SNzl_dprN#Mq!y?#urWsjO>|(#nkaX7&OF->;m=7qL`onHP zKNQQDj!?lTHLw+Z!?k$09TWFXQK6-_C2e1}PvV)dr9a~SuYiG%Mf|jzyq%QNLOux; z#Uzl^_3L*|OG+pgmm(II(MDgWK0Z%}QM^H%i;0-FD3R!chv{Rp5Jk8selZ67XGv>v z$HO@M64!ySwOR=;)owayate@*L3?2dGa0L(r0GhyJS~~j(%S{@@_C*DRvAPig9GWF>cfX8(^zH*=YD3`bMzlm0G(Hu*XJ&Jve>npf*E7uRBWj$= zCnb5J+E(pHgA``A?G{gWi)0gakMRzozDM((mn*=zY^<|LkO~t>C=xm$1Yb zy>Yv3TT<~iP`fJ5Mizm?=En}&wkM)8io;CA5)PU|l{z&A{I9#WiEVRlf|6GBM>}{d zPzy2lznw){pdEiZlM~WKNfyBGLv7$fs4PfC4$L%x{?GJ8g@rDQ37I-5zZ0twy>NJ@ z$D|FwL^ByAH~AKE)JDkjKwC8^D~X}$^Sulf#>}PB;6FBG3eZBet^ZZ4M;jqECSuoF z{zyZ&k4k5@a-bmh$oYP=!+EMKj}t+>iF`sbE!Y)O1jUw&&`0dj(+ov0@+)BOavo}` zD5^hJq1QzsK`Ywm;f~mhx{KNd>uIka-M!jy9H6!*8JXf5w6#9Hpqcn+6t~a2rX2zHphVIy@wWSaXLqXdK%BUkGh3{o-~7WGSr^jGlGKF8S)7X5UA4c^ zf%CXInu4hQ>(>~I*W?IPrCQ1Sy;%SBAP3}$X?oA)lKZc42~q1^BfkfQPY&0TDKHRAcY@o?sh__F!A*tr=`#KJ0l% z5)qKpqDJql1*K^s%n1%E*vKob;l0WgvuzSs4}NLAkfXjKv3&TJuOGtcYj8RvsHxT9 zci(=NaGdag>7wd|&GhBju&1Y(u_TsOhNaoKT_f-d<6mQ0FZbSL%XGWIsH5~|AW3^Y zUg*NAPBb)Ku<%u`(fsv{JP-zaM@jKH(SLmBgYmq{}EM^B46wh5(#>cSI%%0_+ zS^Ezr#Hp#HeuNP%O4_L?(Kdtu!g*=8SsU@O)`W5l7DPG54JHTud9<)xT|7lRp>B3% z`2|pXm{nC{+*$l;>aMbY(Jd=5NhJJ~IjIdMXkEUzjUCTWQ4%%kp}Fs0!A^-pXnp>+ zK35tb2N_Zd;s|o{{lTv&bF&4n-3$~WFQWgOQ{;JWG)Z7rt=$}TF`y&pZ9=vA4nL=pvYOhy$x#Pj~m*=L@ z&he&Z$BosKOSw~GsZg5rhD5erGZT3zl&+X{>cCjL)~bZ@eDURLU~Il6G1q5F%Q$s~ zX7ZUIv%=@Ju)I9?%@X*luJ2-09DOmtzykSvC4~U=>D3`a%LQH+f*#0E+UTv9@yiox z&8l%Fbdn#~uSBB@A^yWLo}a&nc_4^+sCK8C_r6~V)p3uS4^;ha5&Sxyl$w<)PV*LZ z2F~%OME2QRe!*Z9!m_&U{1?97V6MQd!Bs;?vd1O6F;08ROW;B^rbaaf$E|>-aZqFT z->C{tU|}3UQ;-m?VY0dmt)N(YG3mUwqFCXNVw%9LJs$Gfy|CZ4F=tyqn%TWUK;|=G z;9R8p#e(SJEk=B5;Hsx96BL>fUE$+XQ@w-paxjZ`vnsF=5{xo!5YJ>osAdf@ zCG)i<@i{LLl%t|E%`A=m+^lT0`)?t5F+{IiE*&_0M-DAxT6z*ic9ACrJHS(M^uyTo z(Qmr04C6HOx!i(kZZby6&R&!5j>$oVO#U9x^mmGT1PcjQ5)c)$hvQFB8lme^BT^5t z5ue8XbJvWorRx&DI1k?ezwR5x-?vL>8uUugAUD)a*e7aKB4I8(0p0Viu2`HpelRtm zCQ!&pL4oJsBF8J#-zR0liX&{z@grt~H=2^h-~OP1dd1f^H1l!y^akC^ay*2B|fwvFx9S8<2?LIILJt!y^q-Vzot0P(HdZwGKVQnJW4GVA_ zB1uMkYxJ^#!l)rVA}^{{LkHBXIh|!F}}}@)LSw zJD5MP6tm*_^qE22qA0eLQI!+zRDgk3WE5Pb+7ijIgjRWPMeylS++H|iK+$2fz<2MGo zhYgN>qC9)F3Tw(Q-?jgqrzCJ7w}h{u$vwFGfOscUm91We5KJqESc4)Yx z&t+13q)4dO_PsIfM`#D*tL-_^qB?S&3cs z>-{bIr0{!s3e43-(iw|IFdryBD!BM6@IO%BvmmX+wMzu=M-auSt2dT#W z%vnp9*kpvm z?u$Gl8a+5vlhV{(Mk-p782siY$8>&CoRDh!(LR}r{nQwIDxHtDLjE{K1$Gqnau4pX zPhL-tDT$ktivwO+i;Z~xA5nyH3U!Q&mA!>JsM`1GV?+(S0UI;eK#z(s)R{R%DJhpV z=>YNzDXIooL8KOA(U{grX%UsorzZs#9rW_fRq+z_%PeN{`m(-k1-S8`WG|*#*CF|X zdUg4wq4md{-uFyK5nrD$pMT6O(KeE11#im8I_$U40CW^F`J{BIP`a!)sSC{R-BdKi zSjAz8^L>rZ8ycVS#3Y2BTDzB|2ZvfJdyEBsTo?U)!K3gB+sRt0rE|OUIhZE(@s8|+@0nf4I*((flt9;}qa+%tR_ECS zN;lsuwv?tGmtZOXiiC7$H`?iiz_an~?XTF35D3|f;;|u#{zI46hm#5+i}S56{7S&h zn!I`Pl0)?s1xN4xt%o9wo%EVhQWDJwB{q}LVA9O~aQ+9J--8{|fEnqwwYU!dP>p|VUv)S>}pNSeP8S=N7a$dtix-!N7 zWckaAuW#VYU@?HLE>n4Z;tG9PjEc#EMjUB1SfJfqQptCs)jmg*f8x|`+G@CzbW_k(gx|8 zdGDXvg&D0ad)$XH-RCNx^A6S1YjrUOKLrR%$(6z z_$zV*fMf-L?tuA?mY~R(LX4UJ=|C-nIw#N{2dcu_9NTmz-y;Ga5^N2OiZZnwJ06#) zThAV_f%U3i{NA{aU<4P@Gla!cnyRsIB{Qg8@0$&!DlLK{h3gdN78^T(2h1Gtdefp7P z3q&z9;^1M6`e5Y!cM5mqbMmNxUgFPHBX^1Z8@=Qm-KW8m%jpn*Ljz=jx9{IcJnFPRbpYv#U2tSAkM?R2sx>0?}JH>VPbB>GMsYS)kd>PEAdZ(rIw$V3e^vwZ%# zL&orop%0Z16tx)D=Pf*2C&?vNM4=5+R-vDv9ZRSnimG^AI%O5`5SUDqQ&@Cs0#lJt zb;n`=c->3R1}W+*{NXyGMlmGDy%+wdlkqtk#9SV0j1qG6dNvF8ANOJ6_Y^G42`(1p zpb|#o{I-Rs8h5PvK};L3g`skV+oSh7X);`HQY=+~7avWcw3cY+MfJvuxA^%l%sE|Z zC`B0TNu2%03pBp5?1q0kk@yAJXL=t?1$xDQUk687B9esG#r88QHZ-mS^8kgYuMg3P z!X(FZGqL{uQXyLuJixYz(}dXnY^9$fLDZq$3dDgfKKiJnmDm&UcWclaF;J9!jKB2= zBvN2@-Fu%M4s+9!40N(d-{a$S)I3^l<&?Yv$-^#Ih&S>HG7Fr26Gy zNAUmKe*a|ii#b{X`(l>0KS{a{P_O$zBnbk6`#L)F{cqhF zr`6?o@0Vt*Dei}E2@o%51%&6)?YeX@pIE*4WY@<)CLQuOb zn^Sm01ymllcE6h3cty^6iMPV%gF2B1Mo*26Gq)GukX2iZk2<(zS>W-w5A>eXw4XB-fQBU533c7S52m2>8VT{&gMPDz%^8uPD}LjQN(U&|ba zq2keTpoCqE_E(a-;Zw7|zFL<3-_NeEdU4FUBp)f2gg*l}w268Tj(*J6a!NEOx15tA zje`LIkz^Q49|Nk_ivxQ()?z@!U#;2j0_z4qh(TZYny)+IpqCv3?N>q_V}T8rRK2Fu zA5HlTIQsND`7*NDITzFy1Es4Td+a_&6f)P8hq1JRjeadCg#_GC{fHUziowS1>kqMf zv3Qr7Yz&02#K!!Hn`8KQ=J&!2;)cT9vu-k9X<@wqYy}YVuGrZG7fj#$l%$C2S8i6( zQw+h3$++V-V`3an0nDso-YvO5Vh7O`1$h6JreP9lM3*s$oMVTbn}gVDR$WFDo5nEwTP4?Oo#5@scVE5bw^i8;Gq3; zVOu7-KeIpi6?{W#yE^P#{sIASghnVUZ&*e~@Bi9E1BT}7^gflJw{S^~Unxc{xx)b! z8yBFMVProR`_!HlH;G{KgcZ?kM=6=QEPW&6)>f~rF3fVOSp|lD7JP(V@EWix9z%hH zJ^Ov^^w`a1A04>Kr(N`GkvS3HkOFBV-j(i z{Mn&reX8HP6KtkNj5JJUs6Uti!ke_7z-=Oh;I>W?OL(>yB z>HJnjcR@RGrEhG;>2zSvLXEPtXAB6#tam+ApoWji)ZrYfz^`=yRym~JRy%Mxisl9^^BvK3!FZ&k z$cN)V{R6Y%-?Sj0xHx}Lqd+YCWl30HLgLd&T)i4ZdO2|pp`cc=0!w>EKwd)?a)zI$ z*qUtFq`Bjw>aDG6o;a=R@Sqm>3|PK8`o4!&C9`&>MwW;qvm7&s7L*EM>-)dhzRFLS zOJ%J{R`~R~q4k0c7=R_s&Ly|R!I^#Q#dCu`lbg~RJO{DkMKXTNbGFatqpmH&N=kl< z_+MBzw^npfb&8mEx72Hmmui+>t&0sR5SdyF@7Db2n8Mpy`MdkNviP-$@bTr&MKS}v z3$Tk(M_uAvXHm9;W^d$D9u!M*e>IkH30iF5&OU1nE2E4 z$A25m1H0sQ%4-ZtRAk-k2O6z4(5i1(-m z@&KHQ#T+qvfNERY&XV65fr?rxr~qSGrmf>@prh%rCG)ceBB!TwA1?0d|Iu{SQC+-G z7X(S^mhP19?(XhJq`PAQX^;--mXwz6ltx6lySwwZe9!xG4*UU!{p{{Dd*{x*v-6M| z$7g<)>2#m__7XU@K$JR7HP!zDcw;Fh-0SyknlfI5 zlV&E~s|I!dMIjq!ruY9XU%w*F=fA~x^n_nA+R^_M!PFYd6zTy)j*AkLMOtqzIUf?L zlZPDa3s|8Xmhizcp9(4Z2;BC>+0EK4V;|cQAGU-<^3Kjz)#>f`XZ2>>T=Z~A@-E!g zjQtA@6Yu8R?3oZmGtz7tT%b#S7`w_*ZR(9B9A=>ET#eP7han8!A{Y1vXnBl1Zl#G))WpSwuh>UhBL(@+C_ z8C5+!O>=EN-gn-wh@kvsH1`Xi*sveCwJxJfRjnBwOqBfy2bCgI zx5N%wiUE~`l`?}(r#AvKc12(){F(^_;KXbMKAsTFKm#2Hpz(gJCD@>01&M9lgGfzA z#Pg*QRMgm8oasxt1t-LNLJ*7Z;yZubXP;(CO2w7to9BqJu8RX~j?*cHJrv0k7aP#fKWmsqIa?nZ?dO*^d7uH9cbkl7cY zb^56i>M5%)cGqh1=TJqz`1i^8eo_0%*iF?p-+(Jrist)a!*FYErV- zg?-lnZ{0W&(u*a2$y;`Xbp}p4K1i4V>1j^!cV~tfJbY0*OozIfRexHPX7*a?ua4kK`*yCy(Q}h?^wes_*ymwahRX9DspEoz)%CDuQHMw-p z_*sX&u2f0LbKYxZA;Z^Bqa{M-o?agw+DP?5=y?!dfObR<7B?q-|HAAvW@iB%P!jTp zFnV;myBVa)qMhL;x3wmrEu$n&+AL$}rVfe!|sivZD#P+a4^b9#&@8j}#kEI9FEsdn5 zJ!KXU^)H3Krs@=rs`=CqX9n1JPsHi0GCbsDScKMVIEBNy)@|&7zJ4XLwu(hr@?yv2 zH^+kdYO5D+IoKbyYJgG;AC}nv#<7~B~;;g)OxG(vpH#F z)UwuuK)yC)9P*p-Hw52AMKiFT|NVP7v^P!_46WxkXRs2o;UfPIu&}cl?6&~>jk;}u zcF_rcsnq^jC$Ak_e5O$;l4NHVzifA?rFcyHo++*s_9VH^+!BXbgqzioW`6VOqX%+g z+p8a8=$yiD=_-)ex*BudnrWy-gGXbGbq4u@oD+?YbrsdYGGo3?en3`PaO z{e~%E!1O;7Xm*M~Z++|QYJ%Cz%QvSe5{7B{_*v`|ro)9=WWH0wCwv+;MTCP$Epzd0 z$%TVSnxO;!&)Wtm85~rfV{%>fpC)fM5e`1&oEcJJ}A6}k6rk+nHw^8b9Jrg?56RT$` zoSw2(93rp%6AR;hVTkhOMcU@wM1&hr(_OixT^lZq;VxEcKaj_}Ul(3-X_kSnUg8(Q zg70|;)PIX)1MZPj5e|!tzqP+v$%l7H^?_2-xR#w|eRULlh1`8hElAL;t`~E&Z z4{@h3BVP6v5;26@%7ZlzhubK%HszXil}3bHavp`8gMpoPv8N@uLqC1kYIYzr=h+Cu z&|Bxct9O&4l&zl%A2X4^h?`^Mw+!5|w$@IE%@?V6HD_CWY{&L5iH&_7HlU#Gl!h_&w}d8SqzKv8yg&xyBy(8 zrf0rrO=u5xEHm=iV%;gb#qOC8x4;%vy|aN@!;fxr;T^Zte+c6&b57J{41EWMaUJmhDst1&BRmaFr<#>csTd{sUlniz%Pt#VUUms4e( zGPQ*}-P$VriL)6L8AM~-IH|~FR&$lgA}K z;Tc>N>_y*g**Pau9*Ieyef`T-3p^d*=#-D6a_!4Xg4nrPflh@ zm9*VZjfhLf&$*gXBUb(TwVGK{lKhGznX~xBT?uLa={C<+f~*qD3UW+(6YlhNjva#P zC^oZ@{WG0!-Pb~fQO2{;#_=;QK=l0lG$&8>n;#lyty4O8e_y&Nb%5ZK8Bk|kWADcT zwW2GPUXcuXgztFvKOElGDKLpS$Y}pxg~1`26RNWZcirS(CafQ6PU%WB_ahhcw_J_K zX4|*%9)4MR*P?;0t8W!;4-%U6u%$)x)6~c{{O&0aC_dYLQt2%wXXCG(?QAHC1$4Ks zyXx1hYyxthN91oTr~q?v1|1n;?0L-h;;1s9(f||U$L#xN%k;pqHZp5cNXK5ZH}lxix&SV9|=J@MKZ~UbiMZN;5-$o^)Hs- zq_jR<_u_aaSHCNuS|N@m@z1TkN>|dREoLs9y_CrionOl>W=i`u3D-dGJuR=taV{5E z?2oE(5@nBE6Z3 zh-U~9DJozbucf|GnQcvr0w-{B7lqbFicj*$$g$!DCZ4YYeM1PWcpm;3+nMHdQ-nVg zlMP?s7bGB=>MsRksw(D#+;KK5f+ok@rO{3uYSeweUULUbxOhyQQWPvB5R zfZJM9XYkpI?(5&R&2L9etIM=!&nkjC=tWrSN*Q14)}1(0F>6jsJKqCj8SRM_Rg63} z3Gl?cG1j$L08cGd+)|vHWy~HtA)dIjj&^J2%`!a+3?#lWa~pKU0yWCLd`wt3#NridfHBu4L)J|HPDWUi?dIouE0n4y+1BaMEhY6YU%6a4U z!akJlz!##tQCKb$O_K2BLYlIVvb)59gx)jS9N&%V61Sj`YgNZT7XoY*TNd-4FX%Qi ze;94;x^a;A!{cf*eXw+ArF_zisCoV2x68%c9ru!tu}4dsgrYp?_1Pxvy7DVLxCb+t z5f*(Sfrg=?NCg){Ojzy9E24(ZUm;^$@Siia#Vi!2!s6=Vp)=UjDx8%wyTom~y%g28 zrSc_@gkPX-L&W$N1om$oXjBVt4bgJNKZ<`eE`fD+R%0G6>_oCQSGuFH7c4Zc@QKS8 zl^swvZ*2*0Peq5J1A4~f@TM&O{A&p_Bn;w#Q0B?K;c*jK zmOhlEIYI6W6|1m^AEbb;*?Rdp*d3hGB+pXT5f3k=@y@ST+Wx-G;?t3K`!|Kgt_n4q z(h`{sbKkJOp@2ju4C7@F6h#6kY4(z)lL*##m)Wi4LwKSLZuTjv+Fz*URlZP987o86 z!~-z#;=l8Cf4iwn=R-1)Rp;?VbHgewF&R1-S*w{@d#_rtB*4DUPJHLC0xuyJ_P6hs#h@;ffp0tWqCsZ^B{DlHbAHcKkxuiydl&#p?_*-wWPd|$lGU^B3Lorno#%gELP z!&5UV2r-yW`!aULy~*9{qc-mDspw|=;u))@$?FRe%$8XlP&+(SoAU@wUic!6DW*s? zzzc#&LnfIv8(q)M6DygFVb_-0YDWwjkHjOI3R6CAXO7Ea$ZzszCmbRAQCyh0(f}}6 zm<^EIsxa$ljzD3>V?ZIErcF`2F8 zR+uX*$u&mQ^3Y7JHERPysGO>2MU~(GSb|3qQ1kybh!q*0ud7M> z4|r8(87?ms$#5gs=dj*Zp-k{XHQ%Y=*>M6wgi!~CO6YOS&!xaoY=gX3M9wUU)k{Yud(4Xa^e#pEtHK)`_0d7l zK5rLbE=Y`5o3#^GAd~WA}P0d#|k?I*L~8VD^C?p3db`Dw^$55KtJxfZO$i{YUQB)~uwCZY#3e$M>hLEfG$bjPUb+xmy!A*OR_E&a_LkdQ^YH zNyc1S&!Il%ff0wdlM-B-+2nF`Ci>zgd(150i9;Z!cV&gUC_h+RAq_a-IT03?gf&gp zO;Y$Mr%{1W47IVs-=vS=SAqTci9maWuR9dq%jD2vXA*(Sfby_Slp`w%n+W&N=fcCJ5*1!N z2lbd+TS5#)X5y#RemD7AbPn0U_?OzCUdwO;bg{{%8OH7%b)H-Tv zBUk%>#n#PkPnIjRYl5<~vmv{OzyWx80^aNpdJVSgV_d6Cr?Kbl>M}C$E<3>JdN_Fu zNwRE>$El(F@k0LyQ|IWSL+5iPQEORQq)y#u$jRm9vEgL;=B)%dh`qhNwQ;`F56kw` zB`Wf1tnUL-Qm|8)gxHZS>5?~sF%%~c9onz44`+VzQS2tX5}ZlL!zA}qgc^TSw^0p< zTfmEFMUB5*;A8yGjc&yQ$504tHklATXJ4c22cU@It%`_vqpmBIJ7h*x+l7ulG9PEm z)PQZ_)z1|n^`9xoce8^8*tc>rBXPFgMK6>FGq0P%-gh|n}URYqdko@K{Q!tBRW8H^3&vs<(GOY70d_n=4}YTV4lGy+bbhQ zYjNHeCz_`vI9OLa?|a@4@iyu1E4H%j;!f=d<0d#}w79;W zz3Sy=(P6h?(cVXEA`i&R3nYG>Yd?Kk8abl}^qj|~T?ib01jyl~W|#Yw+YZ<+qt}O7 zNT}hy2#hoy7pg%5mk&|cpU5%<&iZcm{}#J!e&b^OJc?`3;Ca3Qg1^LpR^a%|<2IaR z2{jxo?{42Cw#QF<92)gt=@18f>6#_O-rDXVG6siP)y;RvflgD_vhQ29TtcqNZ zkaXx2RRn^L8>Kv7{W-^l4KVbuRT3(T)|;$Vv+Fdzh{t>=RlAl|U}~uKo6vM$W}15} zTPtA;OQ4Ba2MYZlx-(|`f-wlTvzthXF)MJz!p|l5b0v4As|-IfM!v&}?HOI~gXHcu z*gM((w|l~^(_p_WNfw{`;|I)0EzPG-+oAaOYs9a2uw!Fmek(xTUmt41wbq}fey2W} zz{|b&vJ(NP?VK=GVqQZ7I6-v5@&`MB(Hb?^J|HwU>(=ESRg_6-e9ND2m#0x^-Ow>t27C=6Y2RP}KrAXIsY zR<)(~n@EY$-dnYzAdM~-c-gj@N#Ek?H0qNX(4ZSrN8!3ZG#~k0V(~h>Qe{kZWNtJd zOA>GZS$%V5XCoXUl%vAKU~msix+wl=P@8($C_h@69VbE~$Cu`Wo9Fx+mFRg>4VAR4 znR0?0o{Z@(x8x zG#n9UMg6*jAN@TMf@V_U25$Ano#RGlK`$r3Sb-~?07b2ulX=cSc={@Dtc0JnzS919 z_giWl+IVl0H{16@CNeTId~j1fojqb_=kqxKrTjS0E&+I#WGpSI6%-VffY;{=-CuN* z`=#S9zvD=Kci3`F#xr@;)zv4LmPX~6+WVkT_=TmUV8KByJ3)wyxivNM>FFO;OEG~~ zkJFu^RKpE$(qdkFdsYMnwe$UU>fg!90MsDx!wmhdHBQWsg>y^p=#A(f70!n%mc(A@3xtMp)jE*lb!J_IkI@;>w|ww{*TA(92}6$COy!M z&0FX{+;Fj`eW?39w$X#gR0v*_HUk)$aJI0H z8xhpb7emx+{!gBCbad4WQQ);?dv3tLP3Nubc(4Y)uH1#5)&Z3H7B_mXRbMvn)_m>` zdM}^Fo2*XPpYlmhyTKMOR^Uck1Y-Deo$Xw8ph<6NygU`ut~1RWOYIeZ7LJTS_nv}n zLyg|e+;c_3QSEZh;6a}1fxFet{<B#r~x-!w?Uq>`5I)b7j9|I|2p=(K|H$!O+ z#@w$hV4rXv=vwg0DLT1ED4XC$ivNIOf&{HD9-n)(wV%Yp>}(m@{_2^6ZM#s!vY+9T zPeSQ_yJ#NTc6|ECtinq=zd&HNHD{ZxM^;3#Qz-qJ4v()jlC(xUr}ryjxAe)G39RR# zlF!_~U&%X&{iZKkeo9Jb^Ky%g4!dRLl^Y=!@lC+DZwl;u0we#U^3C8F&m3J+0}kyJ zi8>(k_>G8v@Ya19y|i;IWL7fFH?FcSs4u6IEh-K@ZLB4Cz1>I2L5y3+ob#JwE!?RI zU5^ju&oe{oH2F|Z8TejBp|Fkb!b{gVN8a~LZP#0BuI;sDr*epg5@V^e1q*I0WfMGU z%>U0HE|wk!A#(Hz(31SPtzJ)>TFMRp}TIB zyX8}&qLSZZasE%|gEGZ`^}Y9tAS(14V=xrC16?KrQf)b-EOdPDM~uc1&wbYsjV2wP z4}Uf~AJq&xuln6WGJ9Wr85exC)%>a3AM_sayPzL$agIMPIJo2I%3w4e8;C@3u1{J9 zZeYi#KM#Pye+H5Bv_;L4$)HmkoW^E(@Dv>xi6D5HHW62@QXsj%-TC@_>gAYku7j;* zFy1y^xj1jRbjW-c0HpjcvGWS!+`I2$wB0`g~r%% zXSz&Ei4I@c`QqJmtZ%pY1LSzX(N2E*rr z#1l{VmuVa}*ojmMQ+6#aEuMGlVNlhVcbl<)=jVqMxRwh~hj?}~d%^F-+xxbQVfy!{ zDvkpuV#OdWCG4PsruBj+N3iZ8eUJ4n!8$k=mX@0a5OlJ%rv1o&i?by(#`t(2ht2$&`5-1u!Piw{{SX-{ zS>Kptp>L3?l*orw!yw_P!$!JMDbLIdme6%l5?`R!auPC1I1UwFl~p1Vv-ALSXkX?B zdmqg;kdU(qAHDTX!A2`oVdB`_W5nM5nNIT1x;q%7TtNYnm(no#T?lH8%{0F6{nSFYZj#01R{H3XIsnIWVgO_akh+cfG_g zx%Ks!gHAN`m%IBiMXC#UULan$He2wY>rn!8bV!7}Ns$P*ryAc*tgNiocZFVgh#w}y zTw4uV-S>Ure|0+eZsITbUXEqDFIbIcaK(ZX@xsBC&b+vAZZ~jq`{hnM{i5*_R_b;* z!{T#e3-Ng(TLEM%1_lOR$BZp|WdA+re(oL~e^*v2tA=VTAl7KON6cAm7aJ4+sL1*C zD!oRMZ{~cNE6EWQF4`T#qEI^NYlx&tHx%di zH;E`f@3W`7D$)2?p>gj=6l048*VNdc zP!Kl%H*y6n`nw%3t4{h$%h%;c-MRY=T%Xk5l6~5NoYadYG-6S9PxEJfbPisr-K6i8 z5$p>*2U%;#hD$**C4j z%v2doh8>lGrE&YVK8}lx(`4^5qjQNYF-b;zq;<Kc=y{q(7*y3mj1gpGMlbG5rYFOYE~nwpaq+AKlyvChqf0jM2Pa)g~{FY{12| zg~~pO6`*0cLZTKn-1uR)__hrRI~SLlmX?%)0uqj)C+Qod`}y-{QfjKpD9hm4q0wvl z_DHIluI@1Sbb5l!<6Tw~Y7i(sI9~mcf^r<=m}LgJCYTXq3=9attpe)Dr69q<>#*(Z z?GLG)3xjWD_HRvr&!TFnD$SK*`eR^AGqsN6= z?N)cYwFk`#?QSOjb3|-LeYh@o>ddaGBDwiy7wVWzWsrUdz1}M=3nmUtPEYrpt@lDP ziZJGW7yCLE(^^^@0hV5G)lgYknJ0LX^R*UoBuQAYz#vpE+}Q;1qPBVpQss-ig4n5l z|N6nn^-wvoWe0#8X#D;2rv;$aL#m_f^4k zgbONMMMXsn+SLIaZv~R{sWuO@Y6(AzDg>>sv`WTW>@=D+I@i8J&u3b#emi@@iXr+E0a)G=#Il`*)JMTAebFgsb^>Q#D5`Zj7Z| zhj_Y1O4c*=J*CHffsxQEFRF%N#B}%-vQZoJ{g`T*MpXnhZfy+QS;)1Etv6(W8m55{ zhHATiR~yG5#()0&Eh=#Zi$Fd_v)a-T1svnM*LwKSe~Rs&d!(CIpxgPbluYi3p>MEO zUC*}>6oyEL!2Yf>0)rr{V3%pgn-s4~kePQ-58E2I=4v>Z?*e%p`u8EOSq&}-_iqdm zyp@*$hxzy!+y)_Y@6SIGm28<(6BGq@afKus$FhRo$8F_~WLt?YiIM_@4z zDrD3k9d!W=;YOg7mcnAvAKn*1w+p=)-|qbT1xgoE||=LR`#ZTs7b<{^PMIH{xtr^UJny`veD) zFeCko!99%TF&xOcq@1TItYsr$P#cr zq=&2h>FH_I*uicObsY_7y;Vj;ubb_S!4OpqyCN$Yg@HY4wXWJqcEsO@IK z<_#`YRJ!+za}*^c-j{3s+yEhNt^Thfl)lGivXR zQx?SH+}v*vrb^4odTJTolymTmMO{4Qv-}_SKQ4e$!C!|*4>`~a@+OuJW;_TIBz;dT z`#TWx>_Qo{5TfS-{R@^j91=ibtpgQ-DmY35hjzjSytA`)&};wJNG$gWv8ADXtb@x? z3cJ{Nr<6NUDL20`cz8iqwJzpnIr80sw?C}}@%=nlg9ZAujuGnDx$#=qlXVJ7z*gpq#}8kXFR3&4w1iKt;+OD~B-dg*-vMSJ1MQIvh- zU?<0?&iO8BLX)0IpZ1*#;k7NlGc>74Xz>8_eLwQ|gu$+p04SpUaoLSMQ}Lpma#1?_ zoQ)OmUWbXPA3u^Ic(}sD2TK4pvN6W7?FrLCJf6JEz3V&^PcERoEk;_vZeH%_7j!<2 z%=RBCHLojnUQUPn=Ndjoh75zm&y#Ith!MkR>J$vaq2CI(_GBvSHUc=Vwr>?C{%Kew z4m?kT!?Zn60KS)bSw6d?#TAJW){J&0p15D78LGp3b!uN`$u{jMp3kDEbIIIl%lFH; zO}2OHoCz>g&-5|&iKQNL^8>YDM8refn1`J&71a@vHH{oE1n(=z{i?A-JjvQ8)M<$O z=?T6x4VG)I6B1sa^@N~~WC7Tu`qj$E>T^;wP1UX?z@X8Mi-s#c)(lHyjmCHsj$v&G zqGk#RecEe{)UN5oTglzo7)SeLlbk404ueAA|mS! zo6A)P;9`)tMA|3W5rIO+GgKXivk(ZUNan}<<^bR3!N7pyj|)b=#=YBfjA6t`QQ6ro z`hHDSxFsS*;vn&9ae)>-C=%RnKsBKH*@A&zyZb9vTu=A@@ei|J>=sT34>5G|0kVPF zDW6ednI8@(rR+o~+7-2I3?68u)*Olw|%I) z;S-%Cj@rLCvg~>TYEjBU?|`*;p@-U5T;vq-8ho@LwWCc2SVw6|0X&?@iwgyLRNAfd zI7DjFl-wgTjt9=zD?wGT09q;jn45?$J*vEoz`3*yvJm^oq7jX$ib?W-HWi*7X<~p$ zh7(8KHETENj+wkIUKl~Pt#CddYU5obY5-+B>n-KbWV;_uRz~{%@-hN^wWKaL67qbg z{n5pTQte2x_`;Iv9SL&l=+xmbvd+d6yF-W;kP6PJyr6+Wpj-hA?8s)jA*GaMf_T@33{rQHl z>=e$z#1K+p!ry4f&g$636{+SbL1eArP2m_gEE_}IHMO|sEzmW2EVuh31E`-#RwGm} z;>#8f0*>O%-OZ)BZWHWB;`U_{Q}Cu(6+9X;R!)eH+!1Z+y1enfz%--SlG0QvBz#m6 zw=zKI+X=M~zE%GCo>Eix+4zbenI`l^4M+R|RUU@jd=B120Skvm6a1C<6*eSVm1J=B~ZpEuc4vwCJBSu8!s>KT!$YYJ{Mp={Z}{^{AEG{`m#T0 z+6KZ0OMd$(!GO(|%d%xQ5dCMO=?ka|eB)Z-E>ue9_vKKQW)TylDlG9x&L9(8!ZZnp zbXHr^$9hlejf`c&O*v2tPiKvMoN@~d0fG7RZI=T~_ASp{6ZqrIFUsdV0`_>>V97xf z!)GcDDF>ko)S54}?%P@28fI~)RkRw!e=VuaMJR#RSzk-CjHiV~gEf7J7-*pb2c2>} z{t>asW#ls<1^S?qW8tQtHWPWx0<>m%$UiFM#$W*w4>|Eh$8UMxB~;vk^3$OuIAjuv zSo)2LqStt-h@|gE1e3meInP8o&JBPhwQr(g0K_rh0T}N&=rT9EBi^A2Wo|yRthcf+ zaG;S1Wnw^Jot}<7X~uL>Ou?#$VS*;==k=Zt2K}ZuSKhI74x2bta50p`#GrPweHcL# z3M^a0z?wNMi_gRPX5MmFK+@+=zQmhn6@rM9AWsF7VXdZN3V_Lg021qyoSj zCC1^e0_o)Cu>+7XUuRk8ye+G%tBcEO4hP=7JE6%bD@ zbx^EpztWbL^L%8Pl$?A%KjH7*c_PP}wzcAOYVr4nf_a@zjNrqUvhwoggR=4~@;dV4 zSeTC|v=FpwQ1C}#8Dy@w(h5&NXnM^Q;<+^2{tPtnd-AnzxQ>Di5%`o_vqe{B*OI~W zUP10SC|XhJYJ$db7kyM~gM{OK%D)R@EkDC-ebQ|$(`~h2if5gQ_qDisVA9;KoFIvb zOtHGPS2*XlvTWbv&7nNXtG1I{M-Oq9u;Vf^l~N zL4Y9LX&-#3aZ;kGXe6^fI>}yz^lI|C)NT_%Jq1@kuSA*?kS5QVdE z*{6D=+rY~%u%pnar>XfP=UtjK1t?EQ$`1Y0G8zN#9sU?;Z!hB{gT1Tvzbj zM#y@PS-*2$)JZ`^Mt@iEwa}4IXL6UCV7-~LsX&E6ADDDJ%fX>whJZ%-sK1ArBJR0P z^qxW#Hzq2si9DT>Wsyo#Lte!#UJ0S>r#HNMYLpP;Vy8+^TiA*n=E@i*PsR|twkIib zm6`{JbkWJ)v!cJDgsjl3xLs8*A39Ut<_Z@Qa!e-^mba7Cj^{2W3{|$=MsW0R zmI)CQQeft`3uS*RW>Q7DVj|htZ`?F6NIHH6;584p0F{&^wsG#Sh)iv9;D)uk|1ub5 zSknqY@_bm?8nbBM`t41-2lWAwS!(nMeqk#I2NVH&Cnu+FUQ+1S=hfG-i|rAe`Y&kB zO1?>|Fl$sqv9LtD%V0Z)ow2yuj}S#k*acmLuK6!?|TcZ5`85Muc9Qm;gX zzUOX0#-u(S2xcnpoxNMBRgQ_~Z3tPE>=z&ia}i373`H)hJs zWZaw%wzFdPdG`VGhYstUF1?$8zNUX=YFdX6oZl_VzTxPqG#WLkok$~tAi|s{wy`ox z!0bebI>ExyBWA)F!F*FnI^-yY&`kC6jrC*>VQB>20v40?`=h+A+Z#r&RyjY`Zv_@Z_7xpLJdaynK0^siQX zX9WbsWL-(jpigOxmOz$vdvMYk_er6B%-6V+sEW;=0Ki zqEd*PMR?4-LD;WQni!Rk6}AX;yjxFN=#@1!H3ybGR)5ZdF2m}@q!>y(hywfjkZWME zZaS1e>3dynv<>dM3!@)qu{)k6{E93K3I^RR0|S6$OKYpnFKdllU(o#a1znQa!<_q3 zOYpz*N=m}PA{ESh(kd!w)R~U&l!TtyJMa3L0(t^2`Y@CnK}2Wux-fs9{CR)5dpRid zqC!1CGd+Cvj!?GLa+^?5Huf0{k^C1|(^_>S33V6o9sV5Yiw3cM7El7^Yi-5x) zO&0dlrBcUhO$CzbFA-OnxD!r)9_y3JgY?2uaSzkkPgvT$xl*BLIh=%1T~!Ke3Bee4 z3zNhvgTf*TD1D@i=IZ5vUm>|Q+~J`CzbF&LWd?QO4u zH({&k<>3%gyUnx4-`bomIlr|PKLBJPZ}!rgXqWSHMQ!MRZ;>#x6(GvrV5eqiXvi!i zk)>AYQws`XZ+`-JujKA{xvu)VxQN(fui)as2Ifo94f4N81ai*6ZluFwSy@?8NDEN9 zX?waD$po#Z3jO8;kf3{~MVK*MFR zIq(gX=$z**QY8YMmH*)sZq3qjQJz&~>vKsMQ~c&#sdbi^HtZFaIEWW&DNyT;YUi}C z44o|S@Vz?^C9v5Y;Pc>Etbk~o)wrHwvknT#A6^<^mlobbyu4IR3U2-mMNt;`$3`!2 zJOYKjr>!%Tk5rw{>S-}$U<4`(5QbBFU<^NXheKkXLi{V!%Mx#5Y|2gbj(rrmTYOJN zDBcFNal8MJj)-`HemKwLQC(?O70OR0M#h;*6J8qGH_II4yz8JQ?cF7!Vhl<)(`|lW z^AASAFPqs=qDxR`E-oqxdDA8HuED4NArpKqhs;%D*%8!qbO0R^ss3qDMJ_EbH#?Xv z)%RQv;bl;l77P8bf2kdhtj;=D8Zu)xEw{Qq>Bf3h)FU|cX9#{}^v9Hsac)LVP~x?- zdf~X92rt|qm<_UuH)dLSsO$w|Hd~l=20x9+nhzLIZwhN3IA1Gjwp{D%BSVc#bInq0 zZs(h;^9-~;0_ZwiyTKpAKiJzxHXb#g1>V?a!`sKm&RjUl@9k1PY0Z36^P=#&HcXS3 zYqZn!yr=aygpZlzq513|QP%6C={g=ke$`-Y?c=iNWE`qZ&Vs$UIpLu&+DY2UXkL@k zBONcu&1;T4{CvAQk;&uY39?A=NoJ{PzxfC@vlQ0@^+{mMld8UcMP6Y=1;bh{#L;47 z>|1vR_*@sedU)8NezCST1;r%>-TH8l`O;Ulz3T#-TAD$B#q*?j7vY_(hX)tf5V-Ny zK$0wb4x(?3NiU4IxA&WLw@`2OF&ON#5*GO)O_j(iWdSnSmNrm71@*V7nVA9LE!aUz zMoLKuWrF`Q+Wzu97RcnVnW+YyClD0gno91jiiO6MK(K&n{ud8Z*s+9p9kmQs{M|mX z^71Axg39u)24U7X)IO-Q?^#9I^D=*}g--Q=_+~}P$1gR_IQ|v9f=l2-cGRlyvYOlQXX!!xfkv4R)WgJtl+kuiao>`rGKl*GcUPhv@l#Z*ox%|wiH3hG?{pVH=O&l?Gp6vAXi^sZh!UGfo-##4lAQ( zu>vqn5VhdpgYFqXJ@pM>l>83Vd=J!e5T^ZZ>T)a|Z;qc%JUTbiZ7TmWd1KOjA-@Bx z76@8~UX-9ZD^07@XixZd*n6-N;p=L}-|sT#rXA3yyuXGiS^Ejw5Hk6M=`0dLQo;?E z47nl_NR%lEyw1GVLRx*?IsC@)Fnzc#X}A{M$L*Ihr_ie`F?NQ4Vj@Jz7B5_&*jA5R zj7`y+SV&k~YN8fZ^p-~HA~Yl*e!y!&pmo4o@KdE&klyX@Q{UX$HFP({Q##^>6f{*l z*?V@HA1$$%R*q$H1snhH9M+x>xcKZ$8W1}k3C!y+m(V!EB4N-qVw@n>9c)^t$`r$} z-a)+cc8%SK_PRcCQlJ6NmCmJ{Tt-iNQ6KHPwDtV(rIiJC$LM);5bFWbqGgo2aUp}c zQCC^{;@%}GM_jKM^88z~No`VQmf;74-C+ND$!z*DjqlCy*TrK ze_#o)T=>?*!VAChp=F4NL`;7nX~g%4c5ZLZSVV`wf9lh6WBg%5Rz!rGbeMe?QRUw( zBvt_+dE>f~eqp0`PM8KbQfMJqjJrCsrXF+tFv4;M$<)0xAka*6{!rU!;K~)x%2{wQ z%<_8ab|FOl{$ZLUqKiVcQ1DHjl75!$7R%#3Bb9W!2@$5eyX2iK=JWRyMPbog#Ou7_ z_|k-hz&!e*iPWZY5((#~LtrtEyQ{F$%I;(EmsE8&$AxeJ@&Y);qT1UMjciTqVm5tR zv_2w3k;c?1@lr8Y%nCy9VU5>F<<`rqe6sT$eKYPUnu z1sYD#ur_Mop)H6oU(g3HT3Mes6{ZT?bOpjv@6LnU&vMqUVe%`c# zcOiEpd|$W^(0aCB{Y1D>oFrtK8EZo;oVJguR2xBem~*H$RElsQ8f<0qmTvOKRw7+v zCP)&9!c9lkWPA0!XYc3pUX-&2rtRG$M@|^|=wDUF zNEmD=ad{f$b^J~5QQiXf-E?OP@w2($$}I=`YCV7^JfOqS1vzPH{)=B+d`E#v{g9i8 z>&8!BL;KdQ^KVM5qbw}9a^Ymm5tvq;|6MjLh0JSWn@C4N&}n2a4;}BTxJJag%E(UQ zza{X6iUEAI8BVeY+D~zDe_YaIq7Wo#72*2yoGa_rbRlV*elJRY%xZH2obx0&{>8;@ z0{P$9i`s_%7TOmRL4?<2v_LC5Q9(oA~usS)J!Q$?YrIdnnH_Uau?oM(9b_i4TedVm=Aw zG5d9CeO~CY^=xTQ(e$(ZDom4sL+rgu4xJ(|W$Rxba8RvTB`VD3)S+;^_CoOH*_uj! z8M^N!`+2A{=ruk~*r96hO1&bh)~n_2oCyY<{QN&fCd`h=_S2Wo(Pm~)X8z4GoS-(~S9ewGa2GbOv1+%`fhj6G)Ina`_@LcOgB~G>Jt70ZKGI%Sjd9qVIZSK95 z`{fK8QtCZi8&AL8Y{U|va6~e&ly%|3JrV!+UU)J4g6~WF{VL_*t+!mdL|)F-2AjEy zjY+HJPs;g|XD=uuMae48-L)`gx{^#p(YHX3m_y&LPCw#MRrp!T)lqw}IbWsl;}@j<{P-@>fQ&ox2T81vE5EvY1!*0R3wX+IFV2 zS6ynw>P7$ck6+_xo;qj483yY!1{sXXXC^1#XvvqcnffvX_GtGpVrTocVCtMXf}u0+-xq&T`u%Vs z=Nql`|Fs{lG(_>L>@lA3i|J|QhHLRJo;&o(0xkYt?*ht3CK4eATY^`tRSYa(E$8|^ zA@|I)+R`J66N&=9p5vKW_be_^A^6Oj|35)dVH*hYF0a{F$y+be^(NXJS5DC|w%mML zY?6e-?B<1k&(3|BEzYj0t`@Y!quCK``i!a1r+sl2NxaJ3Fzo`fTvMO5$^2v5T()yL zJnDhozOMz2T=lOHr-{6&{M{-RxMETK*O^w6jnAYxT%7awjHToRB?Vw=-4Ft@T6W#5 ze2xzd+t14O@1DQgGJ?V2#y4T0Uz}Hg195)_!^64E_s%C=eOR&%SXSNA2S@nt$lBg} zmUl!BdH_3*8ek#zKxRqLy`ST>nI?ElRFVYeH4jJE1)vylRCpaQ-(d+*9JpRfGiV(s hw*ZBKd|s=+_48KlydV70eJ%qKc)I$ztaD0e0sv+L^l$(G delta 33785 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 diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg index 3e419fcbf..da32012c3 100644 --- a/rtdata/images/non-themed/rt-splash.svg +++ b/rtdata/images/non-themed/rt-splash.svg @@ -15,9 +15,9 @@ viewBox="0 0 146.05 91.545836" version="1.1" id="svg783" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" - sodipodi:docname="rt_splash.svg" - inkscape:export-filename="/tmp/splash.png" + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="rt-splash.svg" + inkscape:export-filename="/home/morgan/programs/code-rawtherapee/rtdata/images/non-themed/png/splash.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> @@ -902,7 +902,7 @@ y="2.2370076" x="283.85016" id="tspan3664" - sodipodi:role="line">. 4 + sodipodi:role="line">. 5 Date: Sun, 2 Dec 2018 22:13:48 +0100 Subject: [PATCH 07/30] Update Deutsch locale --- rtdata/languages/Deutsch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index a53ab991e..09736d74f 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -73,6 +73,7 @@ #72 05.10.2018 Korrekturen (TooWaBoo) RT 5.5 #73 21.11.2018 Erweiterung (TooWaBoo) RT 5.5 #74 24.11.2018 Erweiterung (TooWaBoo) RT 5.5 +#75 02.12.2018 Erweiterung (TooWaBoo) RT 5.5 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -2409,4 +2410,4 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!GENERAL_CURRENT;Current +!GENERAL_CURRENT;Aktuell From 51b50f7347076061970a9aeb2c2a10ccee85c408 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 21:10:52 +0100 Subject: [PATCH 08/30] Updated splash images for 5.5-rc2 --- rtdata/images/non-themed/png/splash.png | Bin 79260 -> 79409 bytes rtdata/images/non-themed/rt-splash.svg | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/images/non-themed/png/splash.png b/rtdata/images/non-themed/png/splash.png index 899b72270de4f73af48b883e09909aa1711e9f27..2245423664fb9b5b40ff8e5582effe6816dab7b4 100644 GIT binary patch delta 15550 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 delta 15419 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 diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg index da32012c3..7aabe25f4 100644 --- a/rtdata/images/non-themed/rt-splash.svg +++ b/rtdata/images/non-themed/rt-splash.svg @@ -942,7 +942,7 @@ sodipodi:role="line" x="595.29559" y="49.720543" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 1 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 2 From d4ba923fff4743e7858530cdfc3ffbe480d8daa9 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 21:20:01 +0100 Subject: [PATCH 09/30] Updated RELEASE_NOTES.txt for 5.5-rc2 --- RELEASE_NOTES.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 5a6109eb6..e08a4bb75 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,10 +1,12 @@ -RAWTHERAPEE 5.5-RC1 RELEASE NOTES +RAWTHERAPEE 5.5-RC2 RELEASE NOTES -This is RawTherapee 5.5 Release Candidate 1, released on 2018-12-03. +This is RawTherapee 5.5 Release Candidate 2, released on 2018-12-11. Start by reading the "Getting Started" article on RawPedia: http://rawpedia.rawtherapee.com/ + + NEWS RELEVANT TO PHOTOGRAPHERS RawTherapee supports most raw formats, including Pentax and Sony Pixel Shift, Canon Dual-Pixel, and those from Foveon and X-Trans sensors. @@ -18,7 +20,7 @@ In order to use RawTherapee efficiently you should know that: - There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control. Make sure you familiarize yourself with them on RawPedia's "Keyboard Shortcuts" page! New features since 5.4: -- Filter to remove striping and banding artifacts caused by Phase Detection Auto Focus (PDAF), available for any camera which has a PDAF entry in camconst.json, currently: +- Filter to remove striping artifacts caused by Phase Detection Auto Focus (PDAF) as seen in Sony cameras, and to remove banding artifacts apparently caused by Nikon's too-aggressive in-camera PDAF correction. These are available for any camera which has a PDAF entry in camconst.json, currently: - Nikon Z 6 - Nikon Z 7 - Sony DSC-RX1RM2 @@ -56,7 +58,7 @@ New features since 5.4: - ICC profile generator. - The bundled profiles have been re-generated, and now include ICC v2 and v4 variants. - If your screen's resolution is such that not all icons fit in a toolbar, you can now scroll the toolbar using the mouse scroll-wheel. -- New tone curve type. One of the characteristics of the "Custom" cubic spline curve used in all previous versions was that editing one node could have a huge impact on what happens to the curve in relation to the other nodes. This curve was replaced by the new centripetal Catmull–Rom spline which allows you to make adjustments to one part of the curve without affecting the other segments as much. +- New "Flexible" tone curve type. A characteristic of the cubic spline curve (renamed from "Custom" to "Standard") is that editing one node could have a huge impact on what happens to the curve in relation to the other nodes. The new "Flexible" centripetal Catmull–Rom spline curve allows you to make adjustments to any part of the curve with little impact on the other parts. - Allow saving both floating-point and integer type files at both 16-bit and 32-bit precision from RawTherapee GUI and CLI. - Improves lensfun chromatic aberration correction. - The raw chromatic aberration correction tool can now run in several iterations, and gained a feature to avoid introducing a color shift which could result from correcting chromatic aberration before demosaicing. @@ -90,8 +92,6 @@ Changes since 5.4: - - NEWS RELEVANT TO DEVELOPERS See CONTRIBUTING.md From 71a5521b66d6ecf37a238389d34726ed53161601 Mon Sep 17 00:00:00 2001 From: Hombre Date: Thu, 13 Dec 2018 01:56:36 +0100 Subject: [PATCH 10/30] The (custom) entry was added to the combobox at each profile loading See issue #5092 --- rtgui/profilepanel.cc | 2 ++ rtgui/profilestorecombobox.cc | 8 ++++++++ rtgui/profilestorecombobox.h | 1 + 3 files changed, 11 insertions(+) diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index eb835c648..a3a0f72b7 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -167,6 +167,7 @@ Gtk::TreeIter ProfilePanel::getLastSavedRow() Gtk::TreeIter ProfilePanel::addCustomRow() { if(customPSE) { + profiles->deleteRow(customPSE); delete customPSE; customPSE = nullptr; } @@ -179,6 +180,7 @@ Gtk::TreeIter ProfilePanel::addCustomRow() Gtk::TreeIter ProfilePanel::addLastSavedRow() { if(lastSavedPSE) { + profiles->deleteRow(lastSavedPSE); delete lastSavedPSE; lastSavedPSE = nullptr; } diff --git a/rtgui/profilestorecombobox.cc b/rtgui/profilestorecombobox.cc index b4e893c1d..e7d64f28b 100644 --- a/rtgui/profilestorecombobox.cc +++ b/rtgui/profilestorecombobox.cc @@ -356,3 +356,11 @@ Gtk::TreeIter ProfileStoreComboBox::addRow (const ProfileStoreEntry *profileStor return newEntry; } +/** @brief Delete a row from the first level of the tree */ +void ProfileStoreComboBox::deleteRow (const ProfileStoreEntry *profileStoreEntry) +{ + Gtk::TreeIter entry = findRowFromEntry(profileStoreEntry); + if (entry) { + refTreeModel->erase(entry); + } +} diff --git a/rtgui/profilestorecombobox.h b/rtgui/profilestorecombobox.h index 111e767c2..9c31ad60a 100644 --- a/rtgui/profilestorecombobox.h +++ b/rtgui/profilestorecombobox.h @@ -90,6 +90,7 @@ public: bool setInternalEntry (); Gtk::TreeIter getRowFromLabel (Glib::ustring name); Gtk::TreeIter addRow (const ProfileStoreEntry *profileStoreEntry); + void deleteRow (const ProfileStoreEntry *profileStoreEntry); }; #endif From 8d7c3a6ab4a656ed47ea91f9009f6eb0083cc03e Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Thu, 13 Dec 2018 17:27:20 +0100 Subject: [PATCH 11/30] Russian translation updated by Kildor, closes #5095 --- rtdata/languages/Russian | 186 +++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index f9a1ae62e..584f10d45 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -6,7 +6,7 @@ #06 2012-07-17 Roman Milanskij #07 2014-02-12 Kostia (Kildor) Romanov #08 2018-02-10 Kostia (Kildor) Romanov -#09 2018-11-04 Kostia (Kildor) Romanov +#09 2018-12-13 Kostia (Kildor) Romanov ABOUT_TAB_BUILD;Версия ABOUT_TAB_CREDITS;Авторы @@ -40,7 +40,7 @@ CURVEEDITOR_TOOLTIPLOAD;Загрузить тоновую кривую CURVEEDITOR_TOOLTIPPASTE;Вставить кривую из буфера обмена CURVEEDITOR_TOOLTIPSAVE;Сохранить тоновую кривую CURVEEDITOR_TYPE;Тип: -DIRBROWSER_FOLDERS;Папки +DIRBROWSER_FOLDERS;Каталоги DONT_SHOW_AGAIN;Больше не показывать это сообщение. DYNPROFILEEDITOR_DELETE;Удалить DYNPROFILEEDITOR_EDIT;Редактировать @@ -112,7 +112,7 @@ FILEBROWSER_APPLYPROFILE_PARTIAL;Применить - частично FILEBROWSER_AUTODARKFRAME;Автоматический темновой кадр FILEBROWSER_AUTOFLATFIELD;Автоматическое плоское поле FILEBROWSER_BROWSEPATHBUTTONHINT;Нажмите кнопку мыши чтобы перейти к выбранному каталогу -FILEBROWSER_BROWSEPATHHINT;Введите путь для перехода.\nCtrl-O для перехода на диалог ввода текста.\nEnter / Ctrl-Enter (в обозревателе файлов) для перехода;\n\nЯрлыки путей:\n ~ - домашняя папка пользователя\n ! - папка пользователя с изображениями +FILEBROWSER_BROWSEPATHHINT;Введите путь для перехода.\nCtrl-O для перехода на диалог ввода текста.\nEnter / Ctrl-Enter (в обозревателе файлов) для перехода;\n\nЯрлыки путей:\n ~ - домашний каталог пользователя\n ! - каталог пользователя с изображениями FILEBROWSER_CACHE;Кэш FILEBROWSER_CLEARPROFILE;Удалить профиль FILEBROWSER_COLORLABEL_TOOLTIP;Color label\n\nUse dropdown menu or Shortcuts:\nShift-Ctrl-0 No Color\nShift-Ctrl-1 Red\nShift-Ctrl-2 Yellow\nShift-Ctrl-3 Green\nShift-Ctrl-4 Blue\nShift-Ctrl-5 Purple @@ -126,8 +126,8 @@ FILEBROWSER_EMPTYTRASH;Очистить корзину FILEBROWSER_EMPTYTRASHHINT;Удалить файлы из корзины без возможности восстановления FILEBROWSER_EXTPROGMENU;Открыть с помощью FILEBROWSER_FLATFIELD;Плоское поле -FILEBROWSER_MOVETODARKFDIR;Переместить в папку темновых кадров -FILEBROWSER_MOVETOFLATFIELDDIR;Переместить в папку с файлами плоских полей +FILEBROWSER_MOVETODARKFDIR;Переместить в каталог темновых кадров +FILEBROWSER_MOVETOFLATFIELDDIR;Переместить в каталог файлов плоских полей FILEBROWSER_NEW_NAME;Новое имя: FILEBROWSER_OPENDEFAULTVIEWER;Программа просмотра в Windows по умолчанию (после обработки) FILEBROWSER_PARTIALPASTEPROFILE;Частичная вставка @@ -213,6 +213,7 @@ GENERAL_AUTO;Автоматический GENERAL_BEFORE;До GENERAL_CANCEL;Отмена GENERAL_CLOSE;Закрыть +GENERAL_CURRENT;Текущий GENERAL_DISABLE;Выключить GENERAL_DISABLED;Выключено GENERAL_ENABLE;Включить @@ -497,6 +498,10 @@ HISTORY_MSG_294;Имитация плёнки: Сила HISTORY_MSG_295;Имитация плёнки: Плёнка HISTORY_MSG_298;Фильтр битых пикселей HISTORY_MSG_300;- +HISTORY_MSG_440;КпУД: Метод +HISTORY_MSG_485;Коррекция объектива +HISTORY_MSG_486;Коррекция объектива: Камера +HISTORY_MSG_487;Коррекция объектива: Объектив HISTORY_MSG_488;Компрессия динамического диапазона HISTORY_MSG_490;КДД: Величина HISTORY_MSG_491;Баланс белого @@ -521,6 +526,32 @@ HISTORY_NEWSNAPSHOT;Добавить HISTORY_NEWSNAPSHOT_TOOLTIP;Горячая клавиша: Alt-S HISTORY_SNAPSHOT;Снимок HISTORY_SNAPSHOTS;Снимки +ICCPROFCREATOR_ICCVERSION;Версия ICC: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;Default +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;BestRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Blue X +ICCPROFCREATOR_PRIM_BLUY;Blue Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Green X +ICCPROFCREATOR_PRIM_GREY;Green Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Red X +ICCPROFCREATOR_PRIM_REDY;Red Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 IPTCPANEL_CATEGORY;Категория IPTCPANEL_CITY;Город IPTCPANEL_COPYHINT;Копировать данные IPTC в буфер обмена @@ -559,7 +590,7 @@ MAIN_FRAME_FILEBROWSER_TOOLTIP;Проводник.\nГорячая клавиш MAIN_FRAME_PLACES;Закладки MAIN_FRAME_PLACES_ADD;Добавить MAIN_FRAME_PLACES_DEL;Удалить -MAIN_FRAME_RECENT;Недавние папки +MAIN_FRAME_RECENT;Недавние каталоги MAIN_MSG_ALREADYEXISTS;Файл уже существует. MAIN_MSG_CANNOTLOAD;Невозможно загрузить изображение MAIN_MSG_CANNOTSAVE;Ошибка при сохранении файла @@ -624,8 +655,8 @@ NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Ширина: %1, Высота: %2 NAVIGATOR_XY_NA;x: --, y: -- OPTIONS_BUNDLED_MISSING;Встроенный профиль "%1" не найден!\n\nВаша установка может быть повреждена.\n\nБудут использованы внутренние дефолтные значения по умолчанию. -OPTIONS_DEFIMG_MISSING;Профиль по умолчанию для не-raw снимков не найден или не установлен.\n\nПожалуйста, проверьте папку с профилями, она может отсутствовать или быть повреждена.\n\nБудет использован профиль "%1". -OPTIONS_DEFRAW_MISSING;Профиль по умолчанию для raw снимков не найден или не установлен.\n\nПожалуйста, проверьте папку с профилями, она может отсутствовать или быть повреждена.\n\nБудет использован профиль "%1". +OPTIONS_DEFIMG_MISSING;Профиль по умолчанию для не-raw снимков не найден или не установлен.\n\nПожалуйста, проверьте каталог с профилями, он может отсутствовать или быть повреждён.\n\nБудет использован профиль "%1". +OPTIONS_DEFRAW_MISSING;Профиль по умолчанию для raw снимков не найден или не установлен.\n\nПожалуйста, проверьте каталог с профилями, он может отсутствовать или быть повреждён.\n\nБудет использован профиль "%1". PARTIALPASTE_ADVANCEDGROUP;Дополнительные параметры PARTIALPASTE_BASICGROUP;Базовые настройки PARTIALPASTE_CACORRECTION;Коррекция C/A @@ -693,8 +724,15 @@ PARTIALPASTE_VIBRANCE;Красочность PARTIALPASTE_VIGNETTING;Коррекция виньетирования PARTIALPASTE_WHITEBALANCE;Баланс белого PREFERENCES_ADD;Добавить +PREFERENCES_APPEARANCE;Внешний вид +PREFERENCES_APPEARANCE_COLORPICKERFONT;Шрифт пипетки +PREFERENCES_APPEARANCE_CROPMASKCOLOR;Цвет маски обрезки +PREFERENCES_APPEARANCE_MAINFONT;Основной шрифт +PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Цвет направляющих +PREFERENCES_APPEARANCE_THEME;Тема PREFERENCES_APPLNEXTSTARTUP;нужен перезапуск PREFERENCES_AUTOMONPROFILE;Использовать профиль основного монитора ОС +PREFERENCES_AUTOSAVE_TP_OPEN;Сохранить свёрнутое/развёрнутое состояние при выходе PREFERENCES_BATCH_PROCESSING;Пакетная обработка PREFERENCES_BEHADDALL;Всё в "Добавить" PREFERENCES_BEHADDALLHINT;Выставить все параметры в режим Добавить.\nНастройки параметров в панели пакетной обработки будут дельтой к сохранённым данным @@ -702,10 +740,17 @@ PREFERENCES_BEHAVIOR;Поведение PREFERENCES_BEHSETALL;Всё в "Установить" PREFERENCES_BEHSETALLHINT;Выставить все параметры в режим Установить.\nНастройки параметров в панели пакетной обработки будут абсолютными, будут показаны используемые значения PREFERENCES_BLACKBODY;Лампа накаливания +PREFERENCES_CACHECLEAR;Очистить PREFERENCES_CACHEMAXENTRIES;Максимальное число элементов в кэше PREFERENCES_CACHEOPTS;Параметры кэширования PREFERENCES_CACHETHUMBHEIGHT;Максимальная высота эскиза PREFERENCES_CLIPPINGIND;Индикация пересветов/затемнений +PREFERENCES_CLUTSDIR;Каталог файлов HaldCLUT +PREFERENCES_CROP;Режим обрезки +PREFERENCES_CROP_GUIDES;Направляющие, отображающиеся вне режима обрезки +PREFERENCES_CROP_GUIDES_FRAME;Рамка +PREFERENCES_CROP_GUIDES_FULL;Оригинальные +PREFERENCES_CROP_GUIDES_NONE;Нет PREFERENCES_CURVEBBOXPOS;Позиция кнопок для копирования и вставки кривых PREFERENCES_CURVEBBOXPOS_ABOVE;Выше PREFERENCES_CURVEBBOXPOS_BELOW;Ниже @@ -728,6 +773,7 @@ PREFERENCES_DARKFRAMETEMPLATES;шаблонов PREFERENCES_DATEFORMAT;Формат даты PREFERENCES_DATEFORMATHINT;Вы можете использовать следующие элементы форматирования:\n%y: год\n%m: месяц\n%d: день\n\nНапример, ISO 8601 требует использовать следующий формат даты:\n%y-%m-%d PREFERENCES_DIRDARKFRAMES;Каталог размещения темновых кадров +PREFERENCES_DIRECTORIES;Каталоги PREFERENCES_DIRHOME;Домашний каталог PREFERENCES_DIRLAST;Последний каталог PREFERENCES_DIROTHER;Другой @@ -738,7 +784,7 @@ PREFERENCES_EXTERNALEDITOR;Внешний редактор PREFERENCES_FBROWSEROPTS;Настройки PREFERENCES_FILEFORMAT;Формат файлов PREFERENCES_FLATFIELDFOUND;Найдено -PREFERENCES_FLATFIELDSDIR;Папка с файлами плоских полей +PREFERENCES_FLATFIELDSDIR;Каталог файлов плоских полей PREFERENCES_FLATFIELDSHOTS;снимков PREFERENCES_FLATFIELDTEMPLATES;шаблонов PREFERENCES_FLUOF2;Лампа дневного света F2 @@ -759,6 +805,8 @@ PREFERENCES_HISTOGRAMPOSITIONLEFT;Гистограмма на левой пан PREFERENCES_HLTHRESHOLD;Порог срабатывания пересветов PREFERENCES_ICCDIR;Каталог ICC профилей PREFERENCES_IMPROCPARAMS;Профиль обработки по умолчанию +PREFERENCES_INSPECT_LABEL;Предпросмотр +PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Максимальное количество кешированных файлов PREFERENCES_INTENT_ABSOLUTE;Абсолютное колориметрическое PREFERENCES_INTENT_PERCEPTUAL;Перцепционное PREFERENCES_INTENT_RELATIVE;Относительное колориметрическое @@ -776,11 +824,12 @@ PREFERENCES_METADATA;Метаданные PREFERENCES_MONITOR;Монитор PREFERENCES_MULTITAB;Много вкладок PREFERENCES_MULTITABDUALMON;Много вкладок, на втором мониторе (если возможно) +PREFERENCES_NAVIGATIONFRAME;Навигация PREFERENCES_OUTDIR;Каталог для сохранения изображений PREFERENCES_OUTDIRFOLDER;Сохранять в каталог PREFERENCES_OUTDIRFOLDERHINT;Сохранение изображений в выбранный каталог PREFERENCES_OUTDIRTEMPLATE;Использовать шаблон -PREFERENCES_OUTDIRTEMPLATEHINT;Вы можете использовать следующие элементы форматирования:\n%f, %d1, %d2, …, %p1, %p2, …, %r, %s1, %s2, …\n\nЭлементы соответствуют различным элементам в пути к RAW-файлу, некоторым атрибутам файла или индексу в очереди пакетной обработки.\n\nНапример, если был открыт файл /home/tom/image/2006-02-09/dsc0012.nef, элементы форматирования будут выглядеть так:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2006-02-09\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\n%r заменится на рейтинг фотографии, либо '0' при пустом, либо на 'x' если фотография находится в корзине.\n\n%s1, %s2 и т.д. заменятся на индекс фотографии в очереди обработки, дополненный нулями до 1-9 символов. Индекс сбрасывается при старте и увеличивается на единицу при обработке фотографии.\nЕсли вы хотите сохранять изображения в каталоге с оригиналом, введите:\n%p1/%f\n\nЕсли вы хотите сохранять изображения в каталоге "converted" в каталоге оригинального файла, введите строку:\n%p1/converted/%f\nДля сохранения изображений в папке "/home/tom/photos/converted/2006-02-09", напишите:\n%p2/converted/%d1/%f +PREFERENCES_OUTDIRTEMPLATEHINT;Вы можете использовать следующие элементы форматирования:\n%f, %d1, %d2, …, %p1, %p2, …, %r, %s1, %s2, …\n\nЭлементы соответствуют различным элементам в пути к RAW-файлу, некоторым атрибутам файла или индексу в очереди пакетной обработки.\n\nНапример, если был открыт файл /home/tom/image/2006-02-09/dsc0012.nef, элементы форматирования будут выглядеть так:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2006-02-09\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\n%r заменится на рейтинг фотографии, либо '0' при пустом, либо на 'x' если фотография находится в корзине.\n\n%s1, %s2 и т.д. заменятся на индекс фотографии в очереди обработки, дополненный нулями до 1-9 символов. Индекс сбрасывается при старте и увеличивается на единицу при обработке фотографии.\nЕсли вы хотите сохранять изображения в каталоге с оригиналом, введите:\n%p1/%f\n\nЕсли вы хотите сохранять изображения в каталоге "converted" в каталоге оригинального файла, введите строку:\n%p1/converted/%f\nДля сохранения изображений в каталоге "/home/tom/photos/converted/2006-02-09", напишите:\n%p2/converted/%d1/%f PREFERENCES_OVERLAY_FILENAMES;Показывать информацию поверх миниатюр PREFERENCES_OVERWRITEOUTPUTFILE;Перезаписывать существующие файлы PREFERENCES_PANFACTORLABEL;Коэффициент @@ -788,6 +837,8 @@ PREFERENCES_PARSEDEXT;Расширения для предпросмотра PREFERENCES_PARSEDEXTADD;Добавить PREFERENCES_PARSEDEXTADDHINT;Введите расширение и нажмите на эту кнопку, чтобы добавить его в список PREFERENCES_PARSEDEXTDELHINT;Удаление выбранных расширений из списка +PREFERENCES_PERFORMANCE_THREADS;Потоки +PREFERENCES_PERFORMANCE_THREADS_LABEL;Максимальное количество потоков для шумоподавления и уровней вейвлетов (0 для автовыбора) PREFERENCES_PREVDEMO;Метод демозаика для превью PREFERENCES_PREVDEMO_FAST;Быстрый PREFERENCES_PREVDEMO_LABEL;Метод демозаика, используемый для превью при масштабе < 100% @@ -798,8 +849,11 @@ PREFERENCES_PROFILEPRCACHE;загружать из кэша PREFERENCES_PROFILEPRFILE;загружать из каталога с файлом PREFERENCES_PROFILESAVECACHE;Сохранять профиль обработки в кэше PREFERENCES_PROFILESAVEINPUT;Сохранять профиль обработки в одном каталоге с исходным файлом +PREFERENCES_PROFILE_NONE;Нет PREFERENCES_PROPERTY;Свойство PREFERENCES_PSPATH;Каталог установки Adobe Photoshop +PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Запоминает масштаб и позицию текущего изображения при открытии нового.\n\nЭта настройка работает только при типе редактора "Одна вкладка" и выставлении настройки "Метод демозаика, используемый для превью при масштабе < 100%" в "Как в PP3". +PREFERENCES_SAVE_TP_OPEN_NOW;Сохранить сейчас PREFERENCES_SELECTLANG;Выбрать язык PREFERENCES_SET;Установить PREFERENCES_SHOWBASICEXIF;Показывать основные данные Exif @@ -818,9 +872,15 @@ PREFERENCES_TAB_COLORMGR;Управление цветом PREFERENCES_TAB_DYNAMICPROFILE;Динамические профили PREFERENCES_TAB_GENERAL;Основное PREFERENCES_TAB_IMPROC;Обработка изображения +PREFERENCES_TAB_PERFORMANCE;Производительность PREFERENCES_TAB_SOUND;Звуки +PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Встроенное jpeg превью +PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Показывать изображение +PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Нейтрально обработанный raw-файл +PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Встроенный полноразмерный jpeg, иначе нейтральный raw PREFERENCES_TP_LABEL;Панель инструментов: PREFERENCES_TP_VSCROLLBAR;Спрятать вертикальную полосу прокрутки +PREFERENCES_TUNNELMETADATA;Копировать данные Exif/IPTC/XMP неизменённо PREFERENCES_USEBUNDLEDPROFILES;Использовать предустановленный профиль PREFERENCES_VIEW;ББ устройства вывода (монитор, проектор и т.д.) PREFERENCES_WORKFLOW;Стиль работы @@ -920,6 +980,8 @@ TP_BWMIX_MET;Метод TP_BWMIX_MET_CHANMIX;Миксер каналов TP_BWMIX_MET_DESAT;Обесцвечивание TP_BWMIX_MET_LUMEQUAL;Яркостный Эквалайзер +TP_BWMIX_MIXC;Миксер каналов +TP_BWMIX_NEUTRAL;Сбросить TP_BWMIX_RGBLABEL;К: %1%% З: %2%% С: %3%% Итог: %4%% TP_BWMIX_RGBLABEL_HINT;Итоговые значения RGB, учитывающие все настройки миксера.\nИтог показывает сумму применённых значений RGB:\n- всегда 100% в относительных режимах\n- выше (светлее) или ниже (темнее) в абсолютных режимах. TP_BWMIX_RGB_TOOLTIP;Смешивание каналов RGB. Используйте пресеты для руководства.\nУчтите что отрицательные значения могут вызвать искажения или неустойчивое поведение. @@ -1000,10 +1062,12 @@ TP_CROP_GTNONE;Нет TP_CROP_GTRULETHIRDS;Правило третей TP_CROP_GTTRIANGLE1;Золотые треугольники 1 TP_CROP_GTTRIANGLE2;Золотые треугольники 2 -TP_CROP_GUIDETYPE;Тип направляющей: +TP_CROP_GUIDETYPE;Направляющие: TP_CROP_H;Высота TP_CROP_LABEL;Кадрирование TP_CROP_PPI;PPI= +TP_CROP_RESETCROP;Сбросить +TP_CROP_SELECTCROP;Выбрать TP_CROP_W;Ширина TP_CROP_X;x TP_CROP_Y;y @@ -1144,7 +1208,7 @@ TP_ICM_DCPILLUMINANT;Источник света TP_ICM_DCPILLUMINANT_INTERPOLATED;Интерполированный TP_ICM_INPUTCAMERA;По умолчанию для камеры TP_ICM_INPUTCAMERAICC;Автоопределенный для камеры -TP_ICM_INPUTCAMERAICC_TOOLTIP;Использовать входящий цветовой профиль RawTherapee (DCP или ICC) для конкретной камеры. Эти профили более точные, чем простые матрицы. Доступны не для всех камер. Эти профили хранятся в папках /iccprofiles/input и /dcpprofiles и автоматически выбираются на основе сопоставления имени файла и названия модели камеры. +TP_ICM_INPUTCAMERAICC_TOOLTIP;Использовать входящий цветовой профиль RawTherapee (DCP или ICC) для конкретной камеры. Эти профили более точные, чем простые матрицы. Доступны не для всех камер. Эти профили хранятся в каталогах /iccprofiles/input и /dcpprofiles и автоматически выбираются на основе сопоставления имени файла и названия модели камеры. TP_ICM_INPUTCAMERA_TOOLTIP;Использовать простую цветовую матрицу из dcraw, улучшенную версию от RawTherapee (если она доступна для соотв. камеры) или встроенную в DNG. TP_ICM_INPUTCUSTOM;Пользовательский TP_ICM_INPUTCUSTOM_TOOLTIP;Выбор собственного файла профиля DCP/ICC для камеры @@ -1203,7 +1267,16 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Защита красных тонов и оттен TP_LENSGEOM_AUTOCROP;Автокадрирование TP_LENSGEOM_FILL;Автозаполнение TP_LENSGEOM_LABEL;Геометрия +TP_LENSPROFILE_CORRECTION_AUTOMATCH;Автоматически +TP_LENSPROFILE_CORRECTION_LCPFILE;Файл LCP +TP_LENSPROFILE_CORRECTION_MANUAL;Вручную TP_LENSPROFILE_LABEL;Профиль коррекции объектива +TP_LENSPROFILE_LENS_WARNING;Внимание: кроп-фактор, используемый для профилирования объектива больше чем кроп-фактор камеры. Результат может быть ошибочным. +TP_LENSPROFILE_MODE_HEADER;Выбор профиля объектива: +TP_LENSPROFILE_USE_CA;Хроматические абберации +TP_LENSPROFILE_USE_GEOMETRIC;Геометрия +TP_LENSPROFILE_USE_HEADER;Выбор искажений для коррекции: +TP_LENSPROFILE_USE_VIGNETTING;Виньетирование TP_LOCALCONTRAST_AMOUNT;Величина TP_LOCALCONTRAST_DARKNESS;Тёмные тона TP_LOCALCONTRAST_LABEL;Локальный контраст @@ -1227,15 +1300,17 @@ TP_PERSPECTIVE_LABEL;Перспектива TP_PERSPECTIVE_VERTICAL;Вертикальная TP_PFCURVE_CURVEEDITOR_CH;Цвет TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Контроль силы подавления в зависимости от цвета.\nВыше - сильней, ниже - слабей. -TP_PREPROCESS_DEADPIXFILT;Фильтр битых пикселей -TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Пытается подавить битые пиксели. +TP_PREPROCESS_DEADPIXFILT;Битых пиксели +TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Фильтр пытается подавить битые пиксели. TP_PREPROCESS_GREENEQUIL;Выравнивание зелёного -TP_PREPROCESS_HOTPIXFILT;Фильтр горячих пикселей -TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Пытается подавить горячие пиксели. +TP_PREPROCESS_HOTPIXFILT;Горячие пиксели +TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Фильтр пытается подавить горячие пиксели. TP_PREPROCESS_LABEL;Предобработка TP_PREPROCESS_LINEDENOISE;Фильтр линейного шума TP_PREPROCESS_NO_FOUND;Ничего не найдено TP_RAWCACORR_AUTO;Автоматическая коррекция +TP_RAWCACORR_AUTOIT;Подходов +TP_RAWCACORR_AVOIDCOLORSHIFT;Избегать сдвига цветов TP_RAWCACORR_CABLUE;Синий TP_RAWCACORR_CARED;Красный TP_RAWCACORR_CASTR;Сила @@ -1279,6 +1354,7 @@ TP_RAW_RCDVNG4;RCD+VNG4 TP_RAW_SENSOR_BAYER_LABEL;Сенсор с матрицей Байера TP_RAW_SENSOR_XTRANS_LABEL;Сенсор с матрицей X-Trans TP_RAW_VNG4;VNG4 +TP_RESIZE_ALLOW_UPSCALING;Разрешить увеличение TP_RESIZE_APPLIESTO;Применить к: TP_RESIZE_CROPPEDAREA;Кадрированной области TP_RESIZE_FITBOX;Ограничивающую рамку @@ -1407,6 +1483,7 @@ TP_WBALANCE_LED_CRS;CRS SP12 WWMR16 TP_WBALANCE_LED_HEADER;Светодиодный TP_WBALANCE_LED_LSI;LSI Lumelex 2040 TP_WBALANCE_METHOD;Метод +TP_WBALANCE_PICKER;Выбрать TP_WBALANCE_SHADE;Тень TP_WBALANCE_SIZE;Размер пипетки: TP_WBALANCE_SOLUX35;Solux 3500K @@ -1448,7 +1525,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. !FILECHOOSER_FILTER_PP;Processing profiles !FILECHOOSER_FILTER_SAME;Same format as current photo -!GENERAL_CURRENT;Current !GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP. !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram. !HISTORY_MSG_235;B&W - CM - Auto @@ -1635,7 +1711,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Process -!HISTORY_MSG_440;CbDL - Method !HISTORY_MSG_441;Retinex - Gain transmission !HISTORY_MSG_442;Retinex - Scale !HISTORY_MSG_443;Output black point compensation @@ -1664,9 +1739,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !HISTORY_MSG_482;CAM02 - Green scene !HISTORY_MSG_483;CAM02 - Yb scene !HISTORY_MSG_484;CAM02 - Auto Yb scene -!HISTORY_MSG_485;Lens Correction -!HISTORY_MSG_486;Lens Correction - Camera -!HISTORY_MSG_487;Lens Correction - Lens !HISTORY_MSG_489;DRC - Detail !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction @@ -1708,37 +1780,11 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description !ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: -!ICCPROFCREATOR_ILL_41;D41 -!ICCPROFCREATOR_ILL_50;D50 -!ICCPROFCREATOR_ILL_55;D55 -!ICCPROFCREATOR_ILL_60;D60 -!ICCPROFCREATOR_ILL_65;D65 -!ICCPROFCREATOR_ILL_80;D80 -!ICCPROFCREATOR_ILL_DEF;Default -!ICCPROFCREATOR_ILL_INC;StdA 2856K !ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: -!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -!ICCPROFCREATOR_PRIM_BEST;BestRGB -!ICCPROFCREATOR_PRIM_BETA;BetaRGB -!ICCPROFCREATOR_PRIM_BLUX;Blue X -!ICCPROFCREATOR_PRIM_BLUY;Blue Y -!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -!ICCPROFCREATOR_PRIM_GREX;Green X -!ICCPROFCREATOR_PRIM_GREY;Green Y -!ICCPROFCREATOR_PRIM_PROPH;Prophoto -!ICCPROFCREATOR_PRIM_REC2020;Rec2020 -!ICCPROFCREATOR_PRIM_REDX;Red X -!ICCPROFCREATOR_PRIM_REDY;Red Y -!ICCPROFCREATOR_PRIM_SRGB;sRGB !ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut -!ICCPROFCREATOR_PROF_V2;ICC v2 -!ICCPROFCREATOR_PROF_V4;ICC v4 !ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... !ICCPROFCREATOR_SLOPE;Slope !ICCPROFCREATOR_TRC_PRESET;Tone response curve: @@ -1785,29 +1831,14 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex -!PREFERENCES_APPEARANCE;Appearance -!PREFERENCES_APPEARANCE_COLORPICKERFONT;Color picker font -!PREFERENCES_APPEARANCE_CROPMASKCOLOR;Crop mask color -!PREFERENCES_APPEARANCE_MAINFONT;Main font -!PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Navigator guide color -!PREFERENCES_APPEARANCE_THEME;Theme -!PREFERENCES_AUTOSAVE_TP_OPEN;Save tool collapsed/expanded state on exit -!PREFERENCES_CACHECLEAR;Clear !PREFERENCES_CACHECLEAR_ALL;Clear all cached files: !PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles: !PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles: !PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched. !PREFERENCES_CLUTSCACHE;HaldCLUT Cache !PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs -!PREFERENCES_CLUTSDIR;HaldCLUT directory !PREFERENCES_CMMBPC;Black point compensation -!PREFERENCES_CROP;Crop Editing !PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop -!PREFERENCES_CROP_GUIDES;Guides shown when not editing the crop -!PREFERENCES_CROP_GUIDES_FRAME;Frame -!PREFERENCES_CROP_GUIDES_FULL;Original -!PREFERENCES_CROP_GUIDES_NONE;None -!PREFERENCES_DIRECTORIES;Directories !PREFERENCES_EDITORCMDLINE;Custom command line !PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Compact toolbars in File Browser !PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser @@ -1819,38 +1850,24 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator !PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator panel, otherwise the gamma-corrected output profile is used. !PREFERENCES_IMG_RELOAD_NEEDED;These changes require the image to be reloaded (or a new image to be opened) to take effect. -!PREFERENCES_INSPECT_LABEL;Inspect -!PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Maximum number of cached images !PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP;Set the maximum number of images stored in cache when hovering over them in the File Browser; systems with little RAM (2GB) should keep this value set to 1 or 2. !PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders !PREFERENCES_MONINTENT;Default rendering intent !PREFERENCES_MONPROFILE;Default color profile !PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported. -!PREFERENCES_NAVIGATIONFRAME;Navigation !PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel !PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list. !PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list. -!PREFERENCES_PERFORMANCE_THREADS;Threads -!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic) !PREFERENCES_PRINTER;Printer (Soft-Proofing) !PREFERENCES_PROFILESAVEBOTH;Save processing profile both to the cache and next to the input file !PREFERENCES_PROFILESAVELOCATION;Processing profile saving location -!PREFERENCES_PROFILE_NONE;None !PREFERENCES_PRTINTENT;Rendering intent !PREFERENCES_PRTPROFILE;Color profile !PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset -!PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Remember the zoom % and pan offset of the current image when opening a new image.\n\nThis option only works in "Single Editor Tab Mode" and when "Demosaicing method used for the preview at <100% zoom" is set to "As in PP3". -!PREFERENCES_SAVE_TP_OPEN_NOW;Save tool collapsed/expanded state now !PREFERENCES_SERIALIZE_TIFF_READ;TIFF Read Settings !PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize reading of TIFF files !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar -!PREFERENCES_TAB_PERFORMANCE;Performance -!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview -!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show -!PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering -!PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise -!PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file !PROFILEPANEL_PDYNAMIC;Dynamic !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;8-bit unsigned @@ -1865,8 +1882,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. !TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. -!TP_BWMIX_MIXC;Channel Mixer -!TP_BWMIX_NEUTRAL;Reset !TP_CBDL_AFT;After Black-and-White !TP_CBDL_BEF;Before Black-and-White !TP_CBDL_METHOD;Process located @@ -1966,8 +1981,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_COLORTONING_TWOBY;Special a* and b* !TP_COLORTONING_TWOCOLOR_TOOLTIP;Standard chroma:\nLinear response, a* = b*.\n\nSpecial chroma:\nLinear response, a* = b*, but unbound - try under the diagonal.\n\nSpecial a* and b*:\nLinear response unbound with separate curves for a* and b*. Intended for special effects.\n\nSpecial chroma 2 colors:\nMore predictable. !TP_COLORTONING_TWOSTD;Standard chroma -!TP_CROP_RESETCROP;Reset -!TP_CROP_SELECTCROP;Select !TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones !TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Try to evaluate chroma noise\nBe careful, this calculation is average, and is quite subjective ! !TP_DIRPYRDENOISE_CHROMINANCE_CURVE_TOOLTIP;Increase (multiply) the value of all chrominance sliders.\nThis curve lets you adjust the strength of chromatic noise reduction as a function of chromaticity, for instance to increase the action in areas of low saturation and to decrease it in those of high saturation. @@ -2019,15 +2032,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_ICM_WORKING_TRC_NONE;None !TP_ICM_WORKING_TRC_SLOPE;Slope !TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. -!TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically -!TP_LENSPROFILE_CORRECTION_LCPFILE;LCP file -!TP_LENSPROFILE_CORRECTION_MANUAL;Manually -!TP_LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong. -!TP_LENSPROFILE_MODE_HEADER;Select the lens profile: -!TP_LENSPROFILE_USE_CA;Chromatic aberration -!TP_LENSPROFILE_USE_GEOMETRIC;Geometric -!TP_LENSPROFILE_USE_HEADER;Select distortions to correct: -!TP_LENSPROFILE_USE_VIGNETTING;Vignetting !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal @@ -2036,9 +2040,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. -!TP_RAWCACORR_AUTOIT;Iterations !TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is checked.\nAuto-correction is conservative, meaning that it often does not correct all chromatic aberration.\nTo correct the remaining chromatic aberration, you can use up to five iterations of automatic chromatic aberration correction.\nEach iteration will reduce the remaining chromatic aberration from the last iteration at the cost of additional processing time. -!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) !TP_RAW_2PASS;1-pass+fast !TP_RAW_3PASSBEST;3-pass (Markesteijn) @@ -2081,7 +2083,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions !TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected. !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas -!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling !TP_RETINEX_CONTEDIT_HSL;HSL histogram !TP_RETINEX_CONTEDIT_LAB;L*a*b* histogram !TP_RETINEX_CONTEDIT_LH;Hue @@ -2319,6 +2320,5 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !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_PICKER;Pick !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". From 1b4113a172135e4a08054684842fcdb6d4d46515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=C3=A1n=20Kyral?= Date: Thu, 13 Dec 2018 21:15:23 +0100 Subject: [PATCH 12/30] Update Czech translation --- rtdata/languages/Czech | 513 ++++++++++++++++++++--------------------- 1 file changed, 251 insertions(+), 262 deletions(-) diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index f7b7415d0..d07a678da 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -41,12 +41,13 @@ #40 2017-12-13 updated by mkyral #41 2018-03-03 updated by mkyral #42 2018-04-28 updated by mkyral - +#43 2018-12-13 updated by mkyral ABOUT_TAB_BUILD;Verze ABOUT_TAB_CREDITS;Zásluhy ABOUT_TAB_LICENSE;Licence ABOUT_TAB_RELEASENOTES;Poznámky k vydání ABOUT_TAB_SPLASH;Úvodní obrazovka +ADJUSTER_RESET_TO_DEFAULT;Kliknutí - návrat k výchozí hodnotě.\nCtrl+kliknutí - návrat k počáteční hodnotě. BATCHQUEUE_AUTOSTART;Automatický start BATCHQUEUE_AUTOSTARTHINT;Automatické spuštění zpracování po vložení nové úlohy. BATCHQUEUE_DESTFILENAME;Cesta a název souboru @@ -55,10 +56,11 @@ BATCH_PROCESSING;Dávkové zpracování CURVEEDITOR_AXIS_IN;Vstup: CURVEEDITOR_AXIS_LEFT_TAN;LS: CURVEEDITOR_AXIS_OUT;Výstup: -CURVEEDITOR_AXIS_RIGHT_TAN;PS: +CURVEEDITOR_AXIS_RIGHT_TAN;RT: +CURVEEDITOR_CATMULLROM;Elastická CURVEEDITOR_CURVE;Křivka CURVEEDITOR_CURVES;Křivky -CURVEEDITOR_CUSTOM;Vlastní +CURVEEDITOR_CUSTOM;Běžná CURVEEDITOR_DARKS;Tmavé CURVEEDITOR_EDITPOINT_HINT;Povolit úpravu hodnoty vstupně výstupního uzlu.\n\nKliknutím pravým tlačítkem na uzel jej vyberete. \nKliknutím pravým tlačítkem do prázdného místa zrušíte výběr. CURVEEDITOR_HIGHLIGHTS;Světla @@ -82,6 +84,10 @@ DYNPROFILEEDITOR_DELETE;Smazat DYNPROFILEEDITOR_EDIT;Upravit DYNPROFILEEDITOR_EDIT_RULE;Upravit pravidlo dynamického profilu DYNPROFILEEDITOR_ENTRY_TOOLTIP;Porovnávání rozlišuje velikost písmen.\nPro vložení regulárního výrazu přidejte\nprefix "re:". +DYNPROFILEEDITOR_IMGTYPE_ANY;Jakýkoli +DYNPROFILEEDITOR_IMGTYPE_HDR;HDR +DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift +DYNPROFILEEDITOR_IMGTYPE_STD;Běžná DYNPROFILEEDITOR_MOVE_DOWN;Posunout dolů DYNPROFILEEDITOR_MOVE_UP;Posunout nahoru DYNPROFILEEDITOR_NEW;Nový @@ -154,6 +160,8 @@ FILEBROWSER_AUTOFLATFIELD;Auto Flat Field FILEBROWSER_BROWSEPATHBUTTONHINT;Klikněte pro výběr cesty. FILEBROWSER_BROWSEPATHHINT;Vložte cestu pro procházení.\n\nKlávesové zkratky:\nCtrl-o pro přepnutí do adresního řádku.\nEnter/ Ctrl-Enter pro procházení ;\nEsc pro zrušení změn.\nShift-Esc pro zrušení přepnutí.\n\nZkratky pro cesty:\n~\t- domácí složka uživatele.\n!\t- složka s obrázky uživatele. FILEBROWSER_CACHE;Mezipaměť +FILEBROWSER_CACHECLEARFROMFULL;Smazat vše včetně profilů zpracování v mezipaměti +FILEBROWSER_CACHECLEARFROMPARTIAL;Smazat všechny profily mimo těch v mezipaměti FILEBROWSER_CLEARPROFILE;Smazat FILEBROWSER_COLORLABEL_TOOLTIP;Barevný štítek.\n\nPoužijte výběr ze seznamu nebo klávesové zkratky:\nShift-Ctrl-0 Bez barvy\nShift-Ctrl-1 Červený\nShift-Ctrl-2 Žlutý\nShift-Ctrl-3 Zelený\nShift-Ctrl-4 Modrý\nShift-Ctrl-5 Nachový FILEBROWSER_COPYPROFILE;Kopírovat @@ -242,7 +250,7 @@ FILEBROWSER_UNRANK_TOOLTIP;Zrušit hodnocení.\nZkratka: Shift - 0 FILEBROWSER_ZOOMINHINT;Zvětšit velikosti náhledů.\n\nZkratky:\n+ - režim více karet editoru,\nAlt-+ - režim jedné karty editoru. FILEBROWSER_ZOOMOUTHINT;Zmenšit velikosti náhledů.\n\nZkratky:\n- - režim více karet editoru,\nAlt-- - režim jedné karty editoru. FILECHOOSER_FILTER_ANY;Všechny soubory -FILECHOOSER_FILTER_COLPROF;Barevné profily +FILECHOOSER_FILTER_COLPROF;Barevné profily (*.icc) FILECHOOSER_FILTER_CURVE;Soubory křivek FILECHOOSER_FILTER_LCP;Korekční profily objektivu FILECHOOSER_FILTER_PP;Profily zpracování @@ -256,6 +264,7 @@ GENERAL_AUTO;Automaticky GENERAL_BEFORE;Před GENERAL_CANCEL;Zrušit GENERAL_CLOSE;Zavřít +GENERAL_CURRENT;Současný GENERAL_DISABLE;Vypnout GENERAL_DISABLED;Vypnuto GENERAL_ENABLE;Zapnout @@ -268,17 +277,19 @@ GENERAL_NONE;Nic GENERAL_OK;OK GENERAL_OPEN;Otevřít GENERAL_PORTRAIT;Na výšku +GENERAL_RESET;Obnovit GENERAL_SAVE;Uložit +GENERAL_SAVE_AS;Uložit jako... GENERAL_SLIDER;Posuvník GENERAL_UNCHANGED;(Beze změny) GENERAL_WARNING;Varování GIMP_PLUGIN_INFO;Vítejte v RawTherapee doplňku pro GIMP!\nPo dokončení úprav prostě zavřete hlavní okno RawTherapee a obrázek bude automaticky načten GIMPem. HISTOGRAM_TOOLTIP_B;Skrýt/Zobrazit histogram modré. -HISTOGRAM_TOOLTIP_BAR;Skrýt/Zobrazit řádek RGB indikátoru\nKlikněte pravým tlačítkem myši na náhled pro zmrazení/uvolnění. +HISTOGRAM_TOOLTIP_BAR;Zobrazit/Skrýt řádek RGB indikátoru. HISTOGRAM_TOOLTIP_CHRO;Skrýt/Zobrazit histogram barevnosti. -HISTOGRAM_TOOLTIP_FULL;Plný (zapnuto) nebo přiblížený (vypnuto) histogram. HISTOGRAM_TOOLTIP_G;Skrýt/Zobrazit histogram zelené. HISTOGRAM_TOOLTIP_L;Skrýt/Zobrazit CIELab histogram jasu. +HISTOGRAM_TOOLTIP_MODE;Přepíná mezi lineárním, log-lineárním a log-log škálováním histogramu. HISTOGRAM_TOOLTIP_R;Skrýt/Zobrazit histogram červené. HISTOGRAM_TOOLTIP_RAW;Skrýt/Zobrazit raw histogram. HISTORY_CHANGED;Změněno @@ -469,7 +480,7 @@ HISTORY_MSG_181;CAM02 - Chroma (C) HISTORY_MSG_182;CAM02 - Automatická CAT02 HISTORY_MSG_183;CAM02 - Kontrast (J) HISTORY_MSG_184;CAM02 - Okolí scény -HISTORY_MSG_185;CAM02 - Kontrola palety +HISTORY_MSG_185;CAM02 - Kontrola gamutu HISTORY_MSG_186;CAM02 - Algoritmus HISTORY_MSG_187;CAM02 - Ochrana červ. a pleť. tónů HISTORY_MSG_188;CAM02 - Světlost (Q) @@ -518,7 +529,9 @@ HISTORY_MSG_231;ČB - Křivka 'Před' HISTORY_MSG_232;ČB - Typ křivky 'Před' HISTORY_MSG_233;ČB - Křivka 'Po' HISTORY_MSG_234;ČB - Typ křivky 'Po' +HISTORY_MSG_235;ČB - MK - Auto HISTORY_MSG_236;--nepoužito-- +HISTORY_MSG_237;ČB - MK HISTORY_MSG_238;PF - Rozptyl HISTORY_MSG_239;PF - Síla HISTORY_MSG_240;PF - Střed @@ -554,6 +567,7 @@ HISTORY_MSG_269;Barevné tónování - Světla - červená HISTORY_MSG_270;Barevné tónování - Světla - zelená HISTORY_MSG_271;Barevné tónování - Světla - modrá HISTORY_MSG_272;Barevné tónování - Vyvážení +HISTORY_MSG_273;Barevné tónování - Vyvážení barev SMH HISTORY_MSG_274;Barevné tónování - Nasycení stínů HISTORY_MSG_275;Barevné tónování - Nasycení světel HISTORY_MSG_276;Barevné tónování - Neprůhlednost @@ -568,8 +582,8 @@ HISTORY_MSG_284;Barevné tónování - Aut. ochrana nasycení HISTORY_MSG_285;Redukce šumu - Medián - Metoda HISTORY_MSG_286;Redukce šumu - Medián - Typ HISTORY_MSG_287;Redukce šumu - Medián - Průchody -HISTORY_MSG_288;Flat-Field - kontrola oříznutí -HISTORY_MSG_289;Flat-Field - kontrola oříznutí - Auto +HISTORY_MSG_288;Flat Field - Kontrola oříznutí +HISTORY_MSG_289; Flat Field - Kontrola oříznutí - Aut HISTORY_MSG_290;Úroveň černé - Červená HISTORY_MSG_291;Úroveň černé - Zelená 1 HISTORY_MSG_292;Úroveň černé - Modrá @@ -594,15 +608,15 @@ HISTORY_MSG_310;Vlnka - Zůstatek - Zaměření a ochrana tónů oblohy HISTORY_MSG_311;Vlnka - Úrovně vlnky HISTORY_MSG_312;Vlnka - Zůstatek - Práh stínů HISTORY_MSG_313;Vlnka - Barevnost - Pastel./Sat. -HISTORY_MSG_314;Vlnka - Paleta - Omezení artefaktů +HISTORY_MSG_314;Vlnka - Gamut - Omezení artefaktů HISTORY_MSG_315;Vlnka - Zůstatek - Kontrast -HISTORY_MSG_316;Vlnka - Paleta - Ochrana a zaměření pleťových tónů -HISTORY_MSG_317;Vlnka - Paleta - Odstín pleti +HISTORY_MSG_316;Vlnka - Gamut - Ochrana a zaměření pleťových tónů +HISTORY_MSG_317;Vlnka - Gamut - Odstín pleti HISTORY_MSG_318;Vlnka - Kontrast - Úrovně světel HISTORY_MSG_319;Vlnka - Kontrast - - rozsah světel HISTORY_MSG_320;Vlnka - Kontrast - Rozsah stínů HISTORY_MSG_321;Vlnka - Kontrast - Úrovně stínů -HISTORY_MSG_322;Vlnka - Paleta - Zabránit posunu barev +HISTORY_MSG_322;Vlnka - Gamut - Zabránit posunu barev HISTORY_MSG_323;Vlnka - DH - Místní kontrast HISTORY_MSG_324;Vlnka - Barevnost - Pastelové HISTORY_MSG_325;Vlnka - Barevnost - Nasycení @@ -638,7 +652,7 @@ HISTORY_MSG_354;Vlnka - DH - Vylepšení HISTORY_MSG_355;Vlnka - DH - Minimální práh HISTORY_MSG_356;Vlnka - DH - Maximální práh HISTORY_MSG_357;Vlnka - Odšumění - Propojení s DH -HISTORY_MSG_358;Vlnka - Paleta - Kontrast úrovní barevnost +HISTORY_MSG_358;Vlnka - Gamut - Kontrast úrovní barevnost HISTORY_MSG_359;Vypálené/Mrtvé - Práh HISTORY_MSG_360;TM - Gama HISTORY_MSG_361;Vlnka - Dokončení - Vyvážení barev @@ -672,6 +686,7 @@ HISTORY_MSG_388;Vlnka - Zůstatek - VB střední: zelená HISTORY_MSG_389;Vlnka - Zůstatek - VB střední: modrá HISTORY_MSG_390;Vlnka - Zůstatek - VB stíny: zelená HISTORY_MSG_391;Vlnka - Zůstatek - VB stíny: modrá +HISTORY_MSG_392;Vlnka - Zůstatek - Vyvážení barev HISTORY_MSG_393;DCP - tabulka vzhledu HISTORY_MSG_394;DCP - základní expozice HISTORY_MSG_395;DCP - základní tabulka @@ -751,24 +766,105 @@ HISTORY_MSG_484;CAT02 - Automatická Yb scény HISTORY_MSG_485;Korekce objektivu HISTORY_MSG_486;Korekce objektivu - Fotoaparát HISTORY_MSG_487;Korekce objektivu - Objektiv +HISTORY_MSG_488;Komprese dynamického rozsahu +HISTORY_MSG_489;DRC - Detail +HISTORY_MSG_490;DRC - Míra HISTORY_MSG_491;Vyvážení bílé HISTORY_MSG_492;RGB křivky HISTORY_MSG_493;L*a*b* úpravy -HISTORY_MSG_CLAMPOOG;Oříznutí barvy mimo gamut +HISTORY_MSG_CLAMPOOG;Oříznout barvy mimo gamut HISTORY_MSG_COLORTONING_LABGRID_VALUE;Barevné tónování - Korekce barev -HISTORY_MSG_HISTMATCHING;Automaticky přizpůsobená Tónová křivka +HISTORY_MSG_COLORTONING_LABREGION_AB;Barevné tónování - Korekce barev +HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;BT - Kanál +HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;BT -oblast C masky +HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;Barevné tónování - H maska +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;BT - Světlost +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;BT - L maska +HISTORY_MSG_COLORTONING_LABREGION_LIST;BT - +HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;BT - oblast masky rozostření +HISTORY_MSG_COLORTONING_LABREGION_OFFSET;BT - oblast posunu +HISTORY_MSG_COLORTONING_LABREGION_POWER;BT - oblast síly +HISTORY_MSG_COLORTONING_LABREGION_SATURATION;BT- Nasycení +HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;BT - oblast zobrazené masky +HISTORY_MSG_COLORTONING_LABREGION_SLOPE;BT - oblast sklonu +HISTORY_MSG_DEHAZE_DEPTH;Závoj - Hloubka +HISTORY_MSG_DEHAZE_ENABLED;Odstranění závoje +HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Závoj - Ukázat hloubkovou mapu +HISTORY_MSG_DEHAZE_STRENGTH;Závoj - Síla +HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dvojité demozajkování - automatický práh +HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Dvojité demozajkování - Práh kontrastu +HISTORY_MSG_HISTMATCHING;Automaticky nalezená tónová křivka +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Výstup - Základní barvy +HISTORY_MSG_ICM_OUTPUT_TEMP;Výstup - ICC-v4 světelný zdroj D +HISTORY_MSG_ICM_OUTPUT_TYPE;Výstup - Typ +HISTORY_MSG_ICM_WORKING_GAMMA;Pracovní - Gama +HISTORY_MSG_ICM_WORKING_SLOPE;Pracovní - sklon +HISTORY_MSG_ICM_WORKING_TRC_METHOD;Pracovní - Metoda TRC HISTORY_MSG_LOCALCONTRAST_AMOUNT;Místní kontrast - Míra HISTORY_MSG_LOCALCONTRAST_DARKNESS;Místní kontrast - Tmavé HISTORY_MSG_LOCALCONTRAST_ENABLED;Místní kontrast HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Místní kontrast - Světlé HISTORY_MSG_LOCALCONTRAST_RADIUS;Místní kontrast - Poloměr HISTORY_MSG_METADATA_MODE;Režim kopírování metadat +HISTORY_MSG_MICROCONTRAST_CONTRAST;Mikrokontrast - Práh kontrastu +HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Metoda demozajkování pohybu HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Směr filtru linkového rušení HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;Filtr PDAF linek +HISTORY_MSG_PRSHARPEN_CONTRAST;Doostření - Práh kontrastu +HISTORY_MSG_RAWCACORR_AUTOIT;Raw korekce CA - Iterace +HISTORY_MSG_RAWCACORR_COLORSHIFT;Raw korekce CA - Zabránit posunu barev +HISTORY_MSG_RAW_BORDER;Okraj Raw +HISTORY_MSG_RESIZE_ALLOWUPSCALING;Změna rozměrů - Povolit zvětšení +HISTORY_MSG_SHARPENING_CONTRAST;Doostření - Práh kontrastu +HISTORY_MSG_SH_COLORSPACE;S/S - Barevný prostor +HISTORY_MSG_SOFTLIGHT_ENABLED;Měkké světlo +HISTORY_MSG_SOFTLIGHT_STRENGTH;Měkká světla - Síla +HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Kotva HISTORY_NEWSNAPSHOT;Přidat HISTORY_NEWSNAPSHOT_TOOLTIP;Zkratka: Alt-s HISTORY_SNAPSHOT;Snímek HISTORY_SNAPSHOTS;Snímky +ICCPROFCREATOR_COPYRIGHT;Autorská práva: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Vrátit se k původní deklaraci práv a majitele, nastaví "RawTherapee, CC0" +ICCPROFCREATOR_CUSTOM;Vlastní +ICCPROFCREATOR_DESCRIPTION;Popis: +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Přidá hodnoty gamy a sklonu do popisu +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Ponechte prázdné pro nastavení výchozího popisu. +ICCPROFCREATOR_GAMMA;Gama +ICCPROFCREATOR_ICCVERSION;Verze ICC: +ICCPROFCREATOR_ILL;Osvětlení: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;Výchozí +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;Světelný zdroj může být nastaven pouze u ICC v4 profilů. +ICCPROFCREATOR_PRIMARIES;Základní barvy: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;BestRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Modrá X +ICCPROFCREATOR_PRIM_BLUY;Modrá Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Zelená X +ICCPROFCREATOR_PRIM_GREY;Zelená Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Červená X +ICCPROFCREATOR_PRIM_REDY;Červená Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;Vlastní základní barvy lze nastavit pouze u ICC v4 profilu. +ICCPROFCREATOR_PRIM_WIDEG;Široký gamut +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;Uložit ICC profil jako... +ICCPROFCREATOR_SLOPE;Sklon +ICCPROFCREATOR_TRC_PRESET;Tónová křivka odezvy: IPTCPANEL_CATEGORY;Kategorie IPTCPANEL_CATEGORYHINT;Identifikuje předmět obrázku dle názoru dodavatele. IPTCPANEL_CITY;Město @@ -811,14 +907,14 @@ IPTCPANEL_TITLE;Titulek IPTCPANEL_TITLEHINT;Vložte krátké, popisné a lidsky čitelné jméno obrázku. Například název souboru. IPTCPANEL_TRANSREFERENCE;Číslo úlohy IPTCPANEL_TRANSREFERENCEHINT;Zadejte číslo nebo identifikátor potřebný v pracovním postupu nebo pro sledování. -LENSPROFILE_LENS_WARNING;Varování: crop factor použitý pro profilování objektivu je větší než crop factor fotoaparátu. Výsledek může být nesprávný. MAIN_BUTTON_FULLSCREEN;Celá obrazovka +MAIN_BUTTON_ICCPROFCREATOR;Nástroj pro vytváření ICC profilu MAIN_BUTTON_NAVNEXT_TOOLTIP;Přejít k dalšímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: Shift-F4\n\nPřejít k dalšímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: F4 MAIN_BUTTON_NAVPREV_TOOLTIP;Přejít k předchozímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: Shift-F3\n\nPřejít k předchozímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: F3 MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronizovat prohlížeč souborů s editorem pro zobrazení náhledu aktuálně otevřeného obrázku a smazání filtrů v prohlížeči souborů.\nZkratka: x\n\nStejně jako výše, ale bez smazání filtrů v prohlížeči souborů:\nZkratka: y\n(Náhled otevřeného obrázku nebude zobrazen pokud je filtrován). MAIN_BUTTON_PREFERENCES;Volby MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Vložit současný obrázek do fronty zpracování.\nZkratka: Ctrl+b -MAIN_BUTTON_SAVE_TOOLTIP;Uložit současný obrázek.\nZkratka: Ctrl+s +MAIN_BUTTON_SAVE_TOOLTIP;Uloží aktuální obrázek.\nZkratka: Ctrl+s\nUloží současný profil (.pp3).\nZkratka: Ctrl+Shift+s MAIN_BUTTON_SENDTOEDITOR;Upravit obrázek v externím editoru MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Editovat současný obrázek v externím editoru.\nZkratka: Ctrl+e MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Zobrazit/skrýt všechny postranní panely.\nZkratka: m @@ -867,19 +963,20 @@ MAIN_TAB_RAW;Raw MAIN_TAB_RAW_TOOLTIP;Zkratka: Alt-r MAIN_TAB_TRANSFORM;Transformace MAIN_TAB_TRANSFORM_TOOLTIP;Zkratka: Alt-t -MAIN_TOOLTIP_BACKCOLOR0;Barva pozadí náhledu: Dle motivu\nZkratka: 9 -MAIN_TOOLTIP_BACKCOLOR1;Barva pozadí náhledu: Černá\nZkratka: 9 -MAIN_TOOLTIP_BACKCOLOR2;Barva pozadí náhledu: Bílá\nZkratka: 9 -MAIN_TOOLTIP_BACKCOLOR3;Barva pozadí náhledu: Středně šedá\nZkratka: 9 +MAIN_TOOLTIP_BACKCOLOR0;Barva pozadí náhledu: dle motivu\nZkratka: 9 +MAIN_TOOLTIP_BACKCOLOR1;Barva pozadí náhledu: černá\nZkratka: 9 +MAIN_TOOLTIP_BACKCOLOR2;Barva pozadí náhledu: bílá\nZkratka: 9 +MAIN_TOOLTIP_BACKCOLOR3;Barva pozadí náhledu: středně šedá\nZkratka: 9 MAIN_TOOLTIP_BEFOREAFTERLOCK;Zamknout / Odemknout pohled Před\n\nZamknout: ponechá pohled Před nezměněn.\nUžitečné pro posouzení výsledného efektu po použití více nástrojů.\nNavíc může být porovnání provedeno proti kterémukoli stavu v historii.\n\nOdemknout: pohled Před bude následovat pohled Poté, vždy jen o jeden krok zpět, představí vliv právě použitého nástroje. MAIN_TOOLTIP_HIDEHP;Zobrazit či schovat levý panel (obsahující historii).\nZkratka: l MAIN_TOOLTIP_INDCLIPPEDH;Zvýraznit oříznutá světla.\nZkratka: < MAIN_TOOLTIP_INDCLIPPEDS;Zvýraznit oříznuté stíny.\nZkratka: > MAIN_TOOLTIP_PREVIEWB;Náhled modrého kanálu.\nZkratka: b -MAIN_TOOLTIP_PREVIEWFOCUSMASK;Náhled Masky zaostření.\nZkratka: Shift-f\n\nVíce přesné u snímků s nízkou hloubkou ostrosti, nízkým šumem a na vyšších úrovních zvětšení.\n\nPro zlepšení přesnosti detekce u zašuměných snímků použijte menší zvětšení, mezi 10 až 30%. +MAIN_TOOLTIP_PREVIEWFOCUSMASK;Náhled masky zaostření.\nZkratka: Shift-f\n\nVíce přesné u snímků s nízkou hloubkou ostrosti, nízkým šumem a na vyšších úrovních zvětšení.\n\nPoužijte přiblížení v rozsahu 10 až 30% pro zlepšení přesnosti detekce u zašuměných snímků. MAIN_TOOLTIP_PREVIEWG;Náhled zeleného kanálu.\nZkratka: g -MAIN_TOOLTIP_PREVIEWL;Náhled Svítivost.\nZkratka: v\n\n0.299*R + 0.587*G + 0.114*B +MAIN_TOOLTIP_PREVIEWL;Náhled svítivost.\nZkratka: v\n\n0.299*R + 0.587*G + 0.114*B MAIN_TOOLTIP_PREVIEWR;Náhled červeného kanálu.\nZkratka: r +MAIN_TOOLTIP_PREVIEWSHARPMASK;Náhled masky kontrastu doostření.\nZkratka: p\n\nFunguje pouze pokud doostření zapnuto a přiblížení je >=100%. MAIN_TOOLTIP_QINFO;Stručné informace o obrázku.\nZkratka: i MAIN_TOOLTIP_SHOWHIDELP1;Zobrazit/skrýt levý panel.\nZkratka: l MAIN_TOOLTIP_SHOWHIDERP1;Zobrazit/skrýt pravý panel.\nZkratka: Alt-l @@ -917,6 +1014,7 @@ PARTIALPASTE_CROP;Ořez PARTIALPASTE_DARKFRAMEAUTOSELECT;Automatický výběr tmavých snímků PARTIALPASTE_DARKFRAMEFILE;Soubor tmavého snímku PARTIALPASTE_DEFRINGE;Odstranění lemu +PARTIALPASTE_DEHAZE;Odstranění závoje PARTIALPASTE_DETAILGROUP;Nastavení detailů PARTIALPASTE_DIALOGLABEL;Částečné vložení profilu zpracování PARTIALPASTE_DIRPYRDENOISE;Redukce šumu @@ -950,13 +1048,16 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Filtr mrtvých pixelů PARTIALPASTE_PREPROCESS_GREENEQUIL;Vyrovnání zelené PARTIALPASTE_PREPROCESS_HOTPIXFILT;Filtr vypálených pixelů PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtrovat linkové rušení +PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;Filtr PDAF linek PARTIALPASTE_PRSHARPENING;Doostření po změně velikosti PARTIALPASTE_RAWCACORR_AUTO;Automatická korekce CA +PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA zabránit posunu barev PARTIALPASTE_RAWCACORR_CAREDBLUE;CA červená a modrá PARTIALPASTE_RAWEXPOS_BLACK;Úrovně černé PARTIALPASTE_RAWEXPOS_LINEAR;Korekce bílého bodu PARTIALPASTE_RAWEXPOS_PRESER;Zachování světel PARTIALPASTE_RAWGROUP;Nastavení Raw +PARTIALPASTE_RAW_BORDER;Okraj Raw PARTIALPASTE_RAW_DCBENHANCE;Vylepšení DCB PARTIALPASTE_RAW_DCBITERATIONS;Průchody DCB PARTIALPASTE_RAW_DMETHOD;Metoda demozajkování @@ -972,13 +1073,21 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Stíny/Světla PARTIALPASTE_SHARPENEDGE;Hrany PARTIALPASTE_SHARPENING;Doostření (USM/RL) PARTIALPASTE_SHARPENMICRO;Mikrokontrast +PARTIALPASTE_SOFTLIGHT;Měkké světlo +PARTIALPASTE_TM_FATTAL;Komprese dynamického rozsahu PARTIALPASTE_VIBRANCE;Živost PARTIALPASTE_VIGNETTING;Korekce vinětace PARTIALPASTE_WHITEBALANCE;Nastavení bílé PREFERENCES_ADD;Přidat +PREFERENCES_APPEARANCE;Vzhled +PREFERENCES_APPEARANCE_COLORPICKERFONT;Písmo Průzkumníka barev +PREFERENCES_APPEARANCE_CROPMASKCOLOR;Barva masky ořezu +PREFERENCES_APPEARANCE_MAINFONT;Hlavní písmo PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Barva vodítek navigátoru +PREFERENCES_APPEARANCE_THEME;Motiv PREFERENCES_APPLNEXTSTARTUP;vyžaduje restart aplikace PREFERENCES_AUTOMONPROFILE;Použít barevný profil hlavního monitoru z operačního systému +PREFERENCES_AUTOSAVE_TP_OPEN;Uložit stav sbalení/rozbalení nástrojů při ukončení PREFERENCES_BATCH_PROCESSING;Dávkové zpracování PREFERENCES_BEHADDALL;Vše do 'Přidat' PREFERENCES_BEHADDALLHINT;Nastaví všechny parametry do módu Přidat.\nZměna parametrů v panelu dávkového zpracování se aplikuje jako rozdíl k uloženým hodnotám. @@ -986,6 +1095,11 @@ PREFERENCES_BEHAVIOR;Režim PREFERENCES_BEHSETALL;Vše do 'Nastavit' PREFERENCES_BEHSETALLHINT;Nastaví všechny parametry do módu Nastavit.\nZměna parametrů v panelu dávkového zpracování se aplikuje jako absolutní, budou zobrazeny aktuální hodnoty. PREFERENCES_BLACKBODY;Wolfram +PREFERENCES_CACHECLEAR;Smazat +PREFERENCES_CACHECLEAR_ALL;Smazat z mezipaměti všechny soubory : +PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Smazat z mezipaměti všechny soubory mimo profilů zpracování: +PREFERENCES_CACHECLEAR_ONLYPROFILES;Smazat z mezipaměti pouze profily zpracování: +PREFERENCES_CACHECLEAR_SAFETY;Jsou smazány pouze soubory ve vyrovnávací paměti. Profily zpracování uložené u zdrojových obrázků zůstávají nedotčeny. PREFERENCES_CACHEMAXENTRIES;Maximální počet záznamů v mezipaměti PREFERENCES_CACHEOPTS;Vlastnosti mezipaměti PREFERENCES_CACHETHUMBHEIGHT;Maximální výška náhledu @@ -995,7 +1109,7 @@ PREFERENCES_CLUTSCACHE_LABEL;Maximální počet přednačtených CLUTů PREFERENCES_CLUTSDIR;Složka HaldCLUT PREFERENCES_CMMBPC;Kompenzace černého bodu PREFERENCES_CROP;Úprava ořezu -PREFERENCES_CROP_AUTO_FIT;Automaticky přizpůsobit přiblížení oblasti ořezu +PREFERENCES_CROP_AUTO_FIT;Automaticky přizpůsobit přiblížení ořezu PREFERENCES_CROP_GUIDES;Zobrazovat vodítka i když neprobíhá ořez PREFERENCES_CROP_GUIDES_FRAME;Snímek PREFERENCES_CROP_GUIDES_FULL;Originál @@ -1032,6 +1146,7 @@ PREFERENCES_EDITORCMDLINE;Vlastní příkazová řádka PREFERENCES_EDITORLAYOUT;Rozvržení editoru PREFERENCES_EXTERNALEDITOR;Externí editor PREFERENCES_FBROWSEROPTS;Volby prohlížeče souborů / náhledů +PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Kompaktní nástroje v Prohlížeči souborů PREFERENCES_FILEFORMAT;Formát souboru PREFERENCES_FLATFIELDFOUND;Nalezeno PREFERENCES_FLATFIELDSDIR;Složka Flat Field souborů @@ -1104,6 +1219,8 @@ PREFERENCES_PARSEDEXTADDHINT;Vymazat označenou příponu ze seznamu. PREFERENCES_PARSEDEXTDELHINT;Vymazat označenou příponu ze seznamu. PREFERENCES_PARSEDEXTDOWNHINT;Vybranou příponu posunout na seznamu níže. PREFERENCES_PARSEDEXTUPHINT;Vybranou příponu posunout na seznamu výše. +PREFERENCES_PERFORMANCE_THREADS;Vlákna +PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximální počet vláken pro Redukci šumu a Úrovně vlnky (0 = Automaticky) PREFERENCES_PREVDEMO;Metoda demozajkování náhledu PREFERENCES_PREVDEMO_FAST;Rychlá PREFERENCES_PREVDEMO_LABEL;Metoda demozajkování pro náhled při přiblížení menším než 100%: @@ -1124,7 +1241,7 @@ PREFERENCES_PRTPROFILE;Barevný profil PREFERENCES_PSPATH;Instalační složka Adobe Photoshop PREFERENCES_REMEMBERZOOMPAN;Zapamatovat si procento přiblížení a posun obrázku PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Zapamatovat si procento přiblížení a posun aktuálního obrázku a použít tyto hodnoty při otevírání nového obrázku.\n\nTato volba funguje pouze v režimu "Mód jedné karty editoru" a volba "Metoda demozajkování pro náhled při přiblížení menším než 100%" je nastavena na "Stejně jako v PP3". -PREFERENCES_SAVE_TP_OPEN_NOW;Uložit stav sbalení/rozbalení nástrojů hned +PREFERENCES_SAVE_TP_OPEN_NOW;Uložit současný stav sbalení/rozbalení nástrojů PREFERENCES_SELECTLANG;Volba jazyka PREFERENCES_SERIALIZE_TIFF_READ;Nastavení čtení TIFF PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serializovat čtení TIFF souborů @@ -1133,7 +1250,7 @@ PREFERENCES_SET;Nastavit PREFERENCES_SHOWBASICEXIF;Zobrazovat základní Exif informace PREFERENCES_SHOWDATETIME;Zobrazovat datum a čas PREFERENCES_SHOWEXPOSURECOMPENSATION;Přidat kompenzaci expozice -PREFERENCES_SHOWFILMSTRIPTOOLBAR;Zobrazit lištu s filmovým pásem +PREFERENCES_SHOWFILMSTRIPTOOLBAR;Lišta s filmovým pásem PREFERENCES_SHTHRESHOLD;Práh oříznutých stínů PREFERENCES_SINGLETAB;Mód jedné karty editoru PREFERENCES_SINGLETABVERTAB;Mód jedné karty editoru, svislé karty @@ -1147,10 +1264,11 @@ PREFERENCES_TAB_COLORMGR;Správa barev PREFERENCES_TAB_DYNAMICPROFILE;Pravidla dynamických profilů PREFERENCES_TAB_GENERAL;Obecné PREFERENCES_TAB_IMPROC;Zpracování obrázku +PREFERENCES_TAB_PERFORMANCE;Výkon PREFERENCES_TAB_SOUND;Zvuky -PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Vložený JPEG náhled -PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Obrázek k zobrazení -PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrální vykreslení raw +PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Náhled vloženého JPEG +PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Obrázek pro zobrazení +PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrální vykreslení RAW PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Vložený JPEG náhled pokud je v plné velikosti, jinak neutrální raw PREFERENCES_TP_LABEL;Panel nástrojů: PREFERENCES_TP_VSCROLLBAR;Skrýt svislou posuvnou lištu @@ -1197,13 +1315,16 @@ QINFO_ISO;ISO QINFO_NOEXIF;Exif údaje nejsou k dispozici. QINFO_PIXELSHIFT;Pixel Shift / %2 snímků SAMPLEFORMAT_0;Neznámý datový formát -SAMPLEFORMAT_1;Neznaménkový, 8 bitů -SAMPLEFORMAT_2;Neznaménkový, 16 bitů -SAMPLEFORMAT_4;LogLuv, 24 bitů -SAMPLEFORMAT_8;LogLuv, 32 bitů -SAMPLEFORMAT_16;S pohyblivou čárkou, 32 bitů +SAMPLEFORMAT_1;8-bitový neznaménkový +SAMPLEFORMAT_2;16-bitový neznaménkový +SAMPLEFORMAT_4;24-bitový LogLuv +SAMPLEFORMAT_8;32-bitový LogLuv +SAMPLEFORMAT_16;S pohyblivou čárkou, 16 bitů +SAMPLEFORMAT_32;S pohyblivou čárkou, 24 bitů +SAMPLEFORMAT_64;S pohyblivou čárkou, 32 bitů SAVEDLG_AUTOSUFFIX;Automaticky přidat příponu pokud soubor již existuje SAVEDLG_FILEFORMAT;Formát souboru +SAVEDLG_FILEFORMAT_FLOAT;S pohyblivou čárkou SAVEDLG_FORCEFORMATOPTS;Vynutit volby uložení SAVEDLG_JPEGQUAL;Kvalita JPEG SAVEDLG_PUTTOQUEUE;Vložit soubor do fronty @@ -1228,8 +1349,8 @@ THRESHOLDSELECTOR_HINT;Držte klávesu Shift pro přesun individuálních THRESHOLDSELECTOR_T;Nahoře THRESHOLDSELECTOR_TL;Nahoře vlevo THRESHOLDSELECTOR_TR;Nahoře vpravo -TOOLBAR_TOOLTIP_COLORPICKER;Uzamykatelný Průzkumník barev\n\nPokud je povolen:\nPřidáte průzkumníka barev kliknutím levým tlačítkem myši do náhledu\nPodržením levého tlačítka myši a tažením průzkumníka přesunete\nPokud na průzkumníka kliknete pravým tlačítkem, dojde k jeho smazání\nSmazání všech průzkumníků po stisknutí klávesy Shift a pravého tlačítka myši\nKliknutím pravým tlačítkem kdekoli mimo průzkumníka přepne zpět na nástroj posunu -TOOLBAR_TOOLTIP_CROP;Oříznutí výběru.\nZkratka: c\nOblast výřezu posunete pomocí Shift + tažení myši +TOOLBAR_TOOLTIP_COLORPICKER;Uzamykatelný Průzkumník barev\n\nPokud je nástroj aktivní:\n- Přidání sondy: levý-klik.\n- Posunutí sondy: levý-klik a posunutí.\n- Smazání sondy: pravý-klik.\n- Smazání všech sond: shift+pravý-klik.\n- Návrat k nástroji posunu: pravý-klik. +TOOLBAR_TOOLTIP_CROP;Oříznutí výběru.\nZkratka: c\nVýřez posunete pomocí Shift + tažení myši TOOLBAR_TOOLTIP_HAND;Posun.\nZkratka: h TOOLBAR_TOOLTIP_STRAIGHTEN;Vyznačení roviny / rotace.\nZkratka: s\n\nZobrazení míry rotace pomocí vodící linky na náhledu snímky. Úhel rotace je zobrazen vedle vodící linky. Střed rotace je geometrický střed snímku. TOOLBAR_TOOLTIP_WB;Bodové vyvážení bílé.\nZkratka: w @@ -1264,6 +1385,8 @@ TP_BWMIX_MET;Metoda TP_BWMIX_MET_CHANMIX;Míchání kanálů TP_BWMIX_MET_DESAT;Odbarvení TP_BWMIX_MET_LUMEQUAL;Korekce jasu +TP_BWMIX_MIXC;Míchání kanálů +TP_BWMIX_NEUTRAL;Obnovit TP_BWMIX_RGBLABEL;R: %1%% G: %2%% B: %3%% Celkem: %4%% TP_BWMIX_RGBLABEL_HINT;Výsledné RGB faktory po započtení všech mixérů\n"Celkem" zobrazí součet aktuálně aplikovaných RGB hodnot:\n- vždy 100% v relativním režimu\n- více (světlejší) nebo méně (tmavší) než 100% v absolutním režimu. TP_BWMIX_RGB_TOOLTIP;Mísení RGB kanálů. Jako vodítko můžete použít uložená přednastavení.\nPovšimněte si prosím, že záporné hodnoty mohou vést ke vzniku artefaktů nebo chybnému chování. @@ -1305,6 +1428,7 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Překlopit horizontálně. TP_COARSETRAF_TOOLTIP_ROTLEFT;Otočit doleva.\n\nZkratky:\n[ - režim více karet editoru,\nAlt-[- režim jedné karty editoru. TP_COARSETRAF_TOOLTIP_ROTRIGHT;Otočit doprava.\n\nZkratky:\n] - režim více karet editoru,\nAlt-]- režim jedné karty editoru. TP_COARSETRAF_TOOLTIP_VFLIP;Překlopit vertikálně. +TP_COLORAPP_ABSOLUTELUMINANCE;Absolutní jas TP_COLORAPP_ALGO;Algoritmus TP_COLORAPP_ALGO_ALL;Vše TP_COLORAPP_ALGO_JC;Světlost + Barevnost (JC) @@ -1315,8 +1439,9 @@ TP_COLORAPP_BADPIXSL;Filtr vypálených/mrtvých pixelů TP_COLORAPP_BADPIXSL_TOOLTIP;Potlačení vypálených/mrtvých (jasně zabarvených) pixelů.\n0 = Bez efektu\n1 = Medián\n2 = Gaussův.\nPopřípadě obrázek upravte tak, aby jste se vyhnuli velmi tmavým stínům.\n\nTyto artefakty vznikají díky omezením CIECAM02. TP_COLORAPP_BRIGHT;Jas (O) TP_COLORAPP_BRIGHT_TOOLTIP;Jas v CIECAM02 bere v potaz svítivost bílé a rozdíly jasů mezi L*a*b* a RGB. +TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;U ručního nastavení jsou doporučeny hodnoty nad 65. TP_COLORAPP_CHROMA;Barevnost (C) -TP_COLORAPP_CHROMA_M;Barevnost (M) +TP_COLORAPP_CHROMA_M;Pestrobarevnost (M) TP_COLORAPP_CHROMA_M_TOOLTIP;Pestrobarevnost se v CIECAM02 liší od pestrobarevnosti L*a*b* a RGB. TP_COLORAPP_CHROMA_S;Nasycení (S) TP_COLORAPP_CHROMA_S_TOOLTIP;Nasycení se v CIECAM02 liší od nasycení L*a*b* a RGB. @@ -1335,8 +1460,8 @@ TP_COLORAPP_CURVEEDITOR3_TOOLTIP;Upravte barevnost, nasycení nebo pestrobarevno TP_COLORAPP_DATACIE;CIECAM02 histogramy výstupu v křivkách TP_COLORAPP_DATACIE_TOOLTIP;Pokud je povoleno, zobrazuje histogram v CIECAM02 křivkách přibližné hodnoty/rozsahy po CIECAM02 úpravách J nebo Q, a C, S nebo M.\nVýběr neovlivňuje histogram na hlavním panelu.\n\nPokud je zakázáno, zobrazuje histogram v CIECAM02 křivkách L*a*b* hodnoty před CIECAM02 úpravami. TP_COLORAPP_FREE;Volná teplota + zelená + CAT02 + [výstup] -TP_COLORAPP_GAMUT;Kontrola palety (L*a*b*) -TP_COLORAPP_GAMUT_TOOLTIP;Povolí kontrolu palety v L*a*b* režimu. +TP_COLORAPP_GAMUT;Kontrola gamutu (L*a*b*) +TP_COLORAPP_GAMUT_TOOLTIP;Povolí kontrolu gamutu v L*a*b* režimu. TP_COLORAPP_HUE;Odstín (h) TP_COLORAPP_HUE_TOOLTIP;Odstín (h) - úhel mezi 0° a 360°. TP_COLORAPP_LABEL;CIE model přizpůsobení barev 2002 @@ -1345,6 +1470,7 @@ TP_COLORAPP_LABEL_SCENE;Podmínky scény TP_COLORAPP_LABEL_VIEWING;Podmínky zobrazení TP_COLORAPP_LIGHT;Světlost (I) TP_COLORAPP_LIGHT_TOOLTIP;Světlost v CIECAM02 se liší od světlosti v L*a*b* a RGB. +TP_COLORAPP_MEANLUMINANCE;Střední jas (Yb%) TP_COLORAPP_MODEL;VB - Model TP_COLORAPP_MODEL_TOOLTIP;Model bílého bodu.\n\nWB [RT] + [výstup]: Pro scénu je použito vyvážení bílé RawTherapee , CIECAM02 je nastaven na D50 a vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení.\n\nWB [RT+CAT02] + [výstup]: CAT02 používá RawTherapee nastavení vyvážení bílé a vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení.\n\nVolná teplota+zelená + CAT02 + [výstup]: teplota a zelená je vybrána uživatelem, vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení. TP_COLORAPP_NEUTRAL;Obnovit @@ -1370,7 +1496,7 @@ TP_COLORAPP_TCMODE_SATUR;Nasycení TP_COLORAPP_TEMP_TOOLTIP;Pro výběr osvětlení vždy nastavte Tint=1.\n\nA barva=2856\nD50 barva=5003\nD55 barva=5503\nD65 barva=6504\nD75 barva=7504 TP_COLORAPP_TONECIE;Mapování tónů pomocí CIECAM02 TP_COLORAPP_TONECIE_TOOLTIP;Pokud je volba zakázána, probíhá mapování tónů v prostoru L*a*b*.\nPokud je volba povolena. probíhá mapování tónů pomocí CIECAM02.\nAby měla tato volba efekt, musí být povolen nástroj Mapování tónů. -TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Absolutní jas prostředí prohlížení\n(obvykle 16cd/m²). +TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Absolutní jas prostředí prohlížení\n(obvykle 16 cd/m²). TP_COLORAPP_WBCAM;WB [RT+CAT02] + [výstup] TP_COLORAPP_WBRT;WB [RT] + [výstup] TP_COLORTONING_AB;o C/L @@ -1386,6 +1512,25 @@ TP_COLORTONING_LAB;Mísení L*a*b* TP_COLORTONING_LABEL;Barevné tónování TP_COLORTONING_LABGRID;Korekční mřížka L*a*b* barev TP_COLORTONING_LABGRID_VALUES;SV: a=%1 b=%2\nSA: a=%3 b=%4 +TP_COLORTONING_LABREGIONS;Oblasti oprav barvy +TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2 +TP_COLORTONING_LABREGION_CHANNEL;Kanál +TP_COLORTONING_LABREGION_CHANNEL_ALL;Vše +TP_COLORTONING_LABREGION_CHANNEL_B;Modrá +TP_COLORTONING_LABREGION_CHANNEL_G;Zelená +TP_COLORTONING_LABREGION_CHANNEL_R;Červená +TP_COLORTONING_LABREGION_CHROMATICITYMASK;C +TP_COLORTONING_LABREGION_HUEMASK;H +TP_COLORTONING_LABREGION_LIGHTNESS;Světlost +TP_COLORTONING_LABREGION_LIGHTNESSMASK;L +TP_COLORTONING_LABREGION_LIST_TITLE;Oprava +TP_COLORTONING_LABREGION_MASK;Maska +TP_COLORTONING_LABREGION_MASKBLUR;Maska neostrosti +TP_COLORTONING_LABREGION_OFFSET;Posun +TP_COLORTONING_LABREGION_POWER;Síla +TP_COLORTONING_LABREGION_SATURATION;Nasycení +TP_COLORTONING_LABREGION_SHOWMASK;Ukázat masku +TP_COLORTONING_LABREGION_SLOPE;Sklon TP_COLORTONING_LUMA;Jas TP_COLORTONING_LUMAMODE;Zachování jasu TP_COLORTONING_LUMAMODE_TOOLTIP;Pokud je povoleno, je při změně barvy (červená, zelená, tyrkysová, modrá...) zachován jas každého pixelu. @@ -1425,14 +1570,20 @@ TP_CROP_GUIDETYPE;Druh vodítek: TP_CROP_H;Výška TP_CROP_LABEL;Ořez TP_CROP_PPI;PPI= +TP_CROP_RESETCROP;Obnovit +TP_CROP_SELECTCROP;Vybrat TP_CROP_W;Šířka -TP_CROP_X;X -TP_CROP_Y;Y +TP_CROP_X;Vlevo +TP_CROP_Y;Nahoře TP_DARKFRAME_AUTOSELECT;Automatický výběr TP_DARKFRAME_LABEL;Tmavý snímek TP_DEFRINGE_LABEL;Odstranění lemu TP_DEFRINGE_RADIUS;Poloměr TP_DEFRINGE_THRESHOLD;Práh +TP_DEHAZE_DEPTH;Hloubka +TP_DEHAZE_LABEL;Odstranění závoje +TP_DEHAZE_SHOW_DEPTH_MAP;Ukázat hloubkovou mapu +TP_DEHAZE_STRENGTH;Síla TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Více zónová automatika TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;Automatická celková TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Zkusí odhadnout barevný šum\nPozor, tento výpočet je zprůměrován a zcela subjektivní! @@ -1530,8 +1681,8 @@ TP_EXPOSURE_CURVEEDITOR1;Tónová křivka 1 TP_EXPOSURE_CURVEEDITOR2;Tónová křivka 2 TP_EXPOSURE_CURVEEDITOR2_TOOLTIP;Podívejte se prosím na článek "Exposure > Tone Curves" na RawPedii, kde se můžete naučit. jak pomocí dvou tónových křivek dosáhnout ten nejlepší výsledek. TP_EXPOSURE_EXPCOMP;Kompenzace expozice -TP_EXPOSURE_HISTMATCHING;Automaticky přizpůsobená Tónová křivka -TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatické nastavení posuvníků a křivek (kromě kompenzace expozice) tak, aby bylo dosaženo co největší shody s vloženým JPEG náhledem. +TP_EXPOSURE_HISTMATCHING;Automaticky nalezená Tónová křivka +TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatické nastavení posuvníků a křivek (kromě kompenzace expozice) tak, aby bylo dosaženo co největší shody s vloženým Jpeg náhledem. TP_EXPOSURE_LABEL;Expozice TP_EXPOSURE_SATURATION;Nasycení TP_EXPOSURE_TCMODE_FILMLIKE;Jako film @@ -1558,10 +1709,6 @@ TP_FLATFIELD_BT_VERTICAL;Svisle TP_FLATFIELD_CLIPCONTROL;Kontrola oříznutí TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Kontrola oříznutí zabrání oříznutí světel po aplikaci Flat Field. Pokud byly světla oříznuta ještě před aplikací Flat field, může se objevit barevný nádech. TP_FLATFIELD_LABEL;Flat Field -TP_GAMMA_CURV;Gama -TP_GAMMA_FREE;Volná gama -TP_GAMMA_OUTPUT;Výstupní gama -TP_GAMMA_SLOP;Sklon (lineární) TP_GENERAL_11SCALE_TOOLTIP;Efekt tohoto nástroje je viditelný pouze při přiblížení 1:1. TP_GRADIENT_CENTER;Střed TP_GRADIENT_CENTER_X;Střed X @@ -1622,10 +1769,16 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Uloží lineární TIFF obrázek před aplikování TP_ICM_TONECURVE;Tónová křivka TP_ICM_TONECURVE_TOOLTIP;Použije vloženou DCP tónovou křivku. Nastavení je dostupné pouze v případě, že vybrané DCP obsahuje tónovou křivku. TP_ICM_WORKINGPROFILE;Pracovní barevný prostor +TP_ICM_WORKING_TRC;Tónová křivka odezvy: +TP_ICM_WORKING_TRC_CUSTOM;Vlastní +TP_ICM_WORKING_TRC_GAMMA;Gama +TP_ICM_WORKING_TRC_NONE;Nic +TP_ICM_WORKING_TRC_SLOPE;Sklon +TP_ICM_WORKING_TRC_TOOLTIP;Pouze pro vložené profily. TP_IMPULSEDENOISE_LABEL;Redukce impulzního šumu TP_IMPULSEDENOISE_THRESH;Práh TP_LABCURVE_AVOIDCOLORSHIFT;Zabránit posunu barev -TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Přizpůsobit barvy palety barevného pracovního prostoru a aplikovat Munsellovu korekci. +TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Napasovat barvy do gamutu barevného pracovního prostoru a aplikovat Munsellovu korekci. TP_LABCURVE_BRIGHTNESS;Světlost TP_LABCURVE_CHROMATICITY;Barevnost TP_LABCURVE_CHROMA_TOOLTIP;Pro černobílé tónování nastavte barevnost na -100. @@ -1664,7 +1817,16 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Pracuje s posuvníkem barevnosti a CC křivkou. TP_LENSGEOM_AUTOCROP;Automatický ořez TP_LENSGEOM_FILL;Automatické vyplnění TP_LENSGEOM_LABEL;Objektiv / Geometrie +TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automaticky +TP_LENSPROFILE_CORRECTION_LCPFILE;LCP soubor +TP_LENSPROFILE_CORRECTION_MANUAL;Ručně TP_LENSPROFILE_LABEL;Korekční profily objektivů +TP_LENSPROFILE_LENS_WARNING;Varování: crop factor použitý pro profilování objektivu je větší než crop factor fotoaparátu. Výsledek může být nesprávný. +TP_LENSPROFILE_MODE_HEADER;Výběr profilu objektivu: +TP_LENSPROFILE_USE_CA;Chromatická aberace +TP_LENSPROFILE_USE_GEOMETRIC;Geometrická +TP_LENSPROFILE_USE_HEADER;Vyberte zkreslení na opravu: +TP_LENSPROFILE_USE_VIGNETTING;Vinětace TP_LOCALCONTRAST_AMOUNT;Míra TP_LOCALCONTRAST_DARKNESS;Úroveň tmavé TP_LOCALCONTRAST_LABEL;Místní kontrast @@ -1698,13 +1860,16 @@ TP_PREPROCESS_LINEDENOISE;Filtrovat linkové rušení TP_PREPROCESS_LINEDENOISE_DIRECTION;Směr TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Oba TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Vodorovně -TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Vodorovně pouze PDAF řádky +TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Vodorovně pouze u PDAF řádků TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Svisle TP_PREPROCESS_NO_FOUND;Nic nenalezeno TP_PREPROCESS_PDAFLINESFILTER;Filtr PDAF linek TP_PRSHARPENING_LABEL;Doostření po změně velikosti TP_PRSHARPENING_TOOLTIP;Obrázek po zmenšení doostří. Funguje pouze pokud je použita "Lanczos" metoda zmenšení. Náhled výsledku není v tomto nástroji možný. Podívejte se do RawPedie pro návod k použití. TP_RAWCACORR_AUTO;Automatická korekce +TP_RAWCACORR_AUTOIT;Počet průchodů +TP_RAWCACORR_AUTOIT_TOOLTIP;Toto nastavení je dostupné po zatržení volby "Automatická korekce".\nAutomatická korekce je konzervativní, což znamená, že často neodstraní úplně veškerou chromatickou aberaci..\nPro korekci zbývající chromatické aberace můžete použít až pěti opakování automatické korekce..\nKaždé opakování sníží zbývající chromatickou aberaci z předchozího běhu za cenu prodloužení celkového času zpracování. +TP_RAWCACORR_AVOIDCOLORSHIFT;Zabránit posunu barev TP_RAWCACORR_CABLUE;Modrá TP_RAWCACORR_CARED;Červená TP_RAWCACORR_CASTR;Síla @@ -1720,17 +1885,25 @@ TP_RAWEXPOS_LINEAR;Korekce bílého bodu TP_RAWEXPOS_PRESER;Zachování světel TP_RAWEXPOS_RGB;Červená, telená, modrá TP_RAWEXPOS_TWOGREEN;Spojit zelené -TP_RAW_1PASSMEDIUM;Jeden průchod (střední) -TP_RAW_3PASSBEST;Tři průchody (nejlepší) +TP_RAW_1PASSMEDIUM;Jeden průchod (Markesteijn) +TP_RAW_2PASS;Jeden průchod + rychlý +TP_RAW_3PASSBEST;Tři průchody (Markesteijn) +TP_RAW_4PASS;Tři průchody + rychlý TP_RAW_AHD;AHD TP_RAW_AMAZE;AMaZE +TP_RAW_AMAZEVNG4;AMaZE+VNG4 +TP_RAW_BORDER;Okraj TP_RAW_DCB;DCB TP_RAW_DCBENHANCE;Vylepšení DCB TP_RAW_DCBITERATIONS;Počet průchodů DCB +TP_RAW_DCBVNG4;DCB+VNG4 TP_RAW_DMETHOD;Metoda TP_RAW_DMETHOD_PROGRESSBAR;%1 demozajkování... TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Vylepšení demozajkování... TP_RAW_DMETHOD_TOOLTIP;Poznámka: IGV a LMMSE jsou určeny pro obrázky s vysokým ISO, kterým pomáhají vyhnout se u redukce šumu vzniku vzorů, posterizaci a vyžehlenému vzhledu.\n\nPixel Shift je určen pro soubory Pentax/Sony Pixel Shift.\nPro soubory neobsahující Pixel Shift data je použita metoda AMaZE. +TP_RAW_DUALDEMOSAICAUTOCONTRAST;Automatický práh +TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;Pokud je zatrženo (doporučeno), RawTherapee vypočítá optimální hodnotu, jenž následně používá na ploché oblasti snímku.\nPokud není na snímku plochý region nebo je snímek příliš zašuměný bude hodnota nastavena na 0.\nPro ruční nastavení této hodnoty nejprve zrušte zatržení této volby (vhodné hodnoty závisí na hloubce ostrosti snímku). +TP_RAW_DUALDEMOSAICCONTRAST;Práh kontrastu TP_RAW_EAHD;EAHD TP_RAW_FALSECOLOR;Počet kroků potlačování chybných barev TP_RAW_FAST;Rychlá @@ -1748,8 +1921,9 @@ TP_RAW_MONO;Mono TP_RAW_NONE;Žádná (zobrazí strukturu senzoru) TP_RAW_PIXELSHIFT;Pixel Shift TP_RAW_PIXELSHIFTBLUR;Maska pohybové neostrosti +TP_RAW_PIXELSHIFTDMETHOD;Metoda demozajkování pro pohyb TP_RAW_PIXELSHIFTEPERISO;Citlivost -TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;Výchozí hodnota 0 by měla dostatečně fungovat pro základní hodnoty ISO.\nDetekci pohybu na vyšších hodnotách ISO vylepšíte navýšením této hodnoty.\nZvyšujte po malých krocích a sledujte přitom masku pohybu.\nPro podexponované nebo obrázky s vysokým ISO zvyšte citlivost. +TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;Výchozí hodnota 0 by měla dobře fungovat u základní hodnoty ISO.\nVyšší hodnoty zvýší citlivost detekce pohybu.\nZvyšujte po malých krocích a sledujte přitom masku pohybu.\nZvyšte citlivost u podexponovaných snímků nebo snímků s vysokým ISO. TP_RAW_PIXELSHIFTEQUALBRIGHT;Vyrovnat jas snímků TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Korekce po kanálech TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Zapnuto: Nezávislá korekce jednotlivých RGB kanálů.\nVypnuto: Použije se stejná hodnota pro všechny kanály. @@ -1776,10 +1950,12 @@ TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;Výchozí poloměr 1,0 většinou velmi dobře fu TP_RAW_PIXELSHIFTSMOOTH;Hladké přechody TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Vyhlazení přechodů mezi oblastmi s pohybem a bez pohybu.\nNastavte na 0 pro vypnutí vyhlazování přechodů.\nNastavte na 1 pro získání AMaZE/LMMSE výsledku pro vybraný snímek (závisí na tom, zda je vybrána volba "Použít LMMSE") nebo mediánu všech čtyř snímků (pokud je vybrána volba "Použít medián"). TP_RAW_RCD;RCD +TP_RAW_RCDVNG4;RCD+VNG4 TP_RAW_SENSOR_BAYER_LABEL;Snímač s Bayerovou maskou -TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Tří průchodová dává lepší výsledky (doporučeno pro fotky s nízkým ISO).\nJednoprůchodová je téměř k nerozeznání od tří průchodové pro vysoké ISO a je rychlejší. +TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Tří průchodová dává lepší výsledky (doporučeno pro fotky s nízkým ISO).\nJednoprůchodová je téměř k nerozeznání od tří průchodové pro vysoké ISO a je rychlejší.\n+rychlá vytváří méně artefaktů v plochých oblastech TP_RAW_SENSOR_XTRANS_LABEL;Senzory s X-Trans maticí TP_RAW_VNG4;VNG4 +TP_RESIZE_ALLOW_UPSCALING;Povolit zvětšení TP_RESIZE_APPLIESTO;Aplikovat na: TP_RESIZE_CROPPEDAREA;Oblast ořezu TP_RESIZE_FITBOX;Výřez @@ -1794,9 +1970,10 @@ TP_RESIZE_SCALE;Měřítko TP_RESIZE_SPECIFY;Zvolte: TP_RESIZE_W;Šířka: TP_RESIZE_WIDTH;Šířka -TP_RETINEX_CONTEDIT_HSL;HSV korekce histogramu -TP_RETINEX_CONTEDIT_LAB;Histogram korekce L*a*b* -TP_RETINEX_CONTEDIT_LH;Korekce odstínu +TP_RETINEX_CONTEDIT_HSL;HSL histogram +TP_RETINEX_CONTEDIT_LAB;L*a*b* histogram +TP_RETINEX_CONTEDIT_LH;Odstín +TP_RETINEX_CONTEDIT_MAP;Korekce TP_RETINEX_CURVEEDITOR_CD;L=f(L) TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Jas dle jasu L=f(L).\nUpraví raw data pro snížení výskytu halo efektu a vzniku artefaktů. TP_RETINEX_CURVEEDITOR_LH;Síla=f(O) @@ -1808,6 +1985,7 @@ TP_RETINEX_FREEGAMMA;Volná gama TP_RETINEX_GAIN;Zisk TP_RETINEX_GAINOFFS;Zisk a posun (jasu) TP_RETINEX_GAINTRANSMISSION;Přenos zisku +TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Zesílí nebo zeslabí mapu přenosu pro dosažení požadovaného jasu.\nOsa X je přenos.\nOsa Y je zisk. TP_RETINEX_GAIN_TOOLTIP;Působí na obnovený obrázek.\n\nToto je velmi odlišné od ostatních nastavení. Použito pro černé nebo bílé pixely a pro vyvážení histogramu. TP_RETINEX_GAMMA;Gama TP_RETINEX_GAMMA_FREE;Volná @@ -1833,6 +2011,7 @@ TP_RETINEX_LABEL;Retinex TP_RETINEX_LABEL_MASK;Maska TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Slabé +TP_RETINEX_MAP;Metoda TP_RETINEX_MAP_GAUS;Gaussova maska TP_RETINEX_MAP_MAPP;Ostrá maska (částečná vlnka) TP_RETINEX_MAP_MAPT;Ostrá maska (kompletní vlnka) @@ -1895,6 +2074,7 @@ TP_SHARPENEDGE_LABEL;Hrany TP_SHARPENEDGE_PASSES;Počet průchodů TP_SHARPENEDGE_THREE;Pouze jas TP_SHARPENING_AMOUNT;Míra +TP_SHARPENING_CONTRAST;Práh kontrastu TP_SHARPENING_EDRADIUS;Poloměr TP_SHARPENING_EDTOLERANCE;Tolerance k hranám TP_SHARPENING_HALOCONTROL;Omezení halo efektu @@ -1910,9 +2090,16 @@ TP_SHARPENING_RLD_ITERATIONS;Počet průchodů TP_SHARPENING_THRESHOLD;Práh TP_SHARPENING_USM;Maskování rozostření TP_SHARPENMICRO_AMOUNT;Kvantita +TP_SHARPENMICRO_CONTRAST;Práh kontrastu TP_SHARPENMICRO_LABEL;Mikrokontrast TP_SHARPENMICRO_MATRIX;Matice 3×3 namísto 5×5 TP_SHARPENMICRO_UNIFORMITY;Jednolitost +TP_SOFTLIGHT_LABEL;Měkké světlo +TP_SOFTLIGHT_STRENGTH;Síla +TP_TM_FATTAL_AMOUNT;Míra +TP_TM_FATTAL_ANCHOR;Kotva +TP_TM_FATTAL_LABEL;Komprese dynamického rozsahu +TP_TM_FATTAL_THRESHOLD;Detaily TP_VIBRANCE_AVOIDCOLORSHIFT;Zabránit posunu barev TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tóny pleti @@ -1979,7 +2166,7 @@ TP_WAVELET_COMPGAMMA;Komprese gamy TP_WAVELET_COMPGAMMA_TOOLTIP;Úprava gamy zůstatku obrázku vám umožní vyvážit data a histogram. TP_WAVELET_COMPTM;Mapování tónů TP_WAVELET_CONTEDIT;Křivka kontrastu 'Po' -TP_WAVELET_CONTR;Paleta +TP_WAVELET_CONTR;Gamut TP_WAVELET_CONTRA;Kontrast TP_WAVELET_CONTRAST_MINUS;Kontrast - TP_WAVELET_CONTRAST_PLUS;Kontrast + @@ -1987,7 +2174,7 @@ TP_WAVELET_CONTRA_TOOLTIP;Změní kontrast zůstatku obrazu. TP_WAVELET_CTYPE;Ovládání barevnosti TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Mění lokální kontrast jako funkci originálního lokálního kontrastu(úsečka).\nNízké hodnoty na úsečce představují malý lokální kontrast (skutečné hodnoty okolo 10..20).\n50% z úsečky představuje průměrný lokální kontrast (skutečné hodnoty okolo 100..300).\n66% z úsečky představuje představuje standardní odchylku lokálního kontrastu (skutečné hodnoty okolo 300..800).\n100% z úsečky představuje maximální lokální kontrast (skutečné hodnoty okolo 3000..8000). TP_WAVELET_CURVEEDITOR_CH;Kontrast úrovní=f(Barevnost) -TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Mění kontrast každé úrovně jako funkci odstínu.\nDejte pozor, abyste nepřepsali změny udělané v podnástroji Paleta nástroje Odstín.\nZměny křivky se projeví pouze v případě, že posuvníky kontrastu úrovní vlnky nejsou nastaveny na nulu. +TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Mění kontrast každé úrovně jako funkci odstínu.\nDejte pozor, abyste nepřepsali změny udělané v podnástroji Gamut nástroje Odstín.\nZměny křivky se projeví pouze v případě, že posuvníky kontrastu úrovní vlnky nejsou nastaveny na nulu. TP_WAVELET_CURVEEDITOR_CL;L TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Aplikuje finální křivku kontrastu jasů na konci zpracování vlnky. TP_WAVELET_CURVEEDITOR_HH;HH @@ -2005,7 +2192,7 @@ TP_WAVELET_DTHR;Napříč TP_WAVELET_DTWO;Vodorovně TP_WAVELET_EDCU;Křivka TP_WAVELET_EDGCONT;Místní kontrast -TP_WAVELET_EDGCONT_TOOLTIP;Posunutí bodů doleva snižuje kontrast a posunutí bodů doprava jej zvyšuje.\nRohy levý spodní, levý horní, pravý horní, pravý spodní postupně představují místní kontrast pro nízké hodnoty, průměr, průměr + stdev maximum +TP_WAVELET_EDGCONT_TOOLTIP;Posunutí bodů doleva snižuje kontrast a posunutí bodů doprava jej zvyšuje.\nRohy levý spodní, levý horní, pravý horní, pravý spodní postupně představují místní kontrast pro nízké hodnoty, průměr, průměr + stdev a maximum. TP_WAVELET_EDGE;Doostření hran TP_WAVELET_EDGEAMPLI;Základní zesílení TP_WAVELET_EDGEDETECT;Sklon citlivosti @@ -2016,7 +2203,7 @@ TP_WAVELET_EDGEDETECT_TOOLTIP;Posunutím posuvníku vpravo zvýšíte citlivost TP_WAVELET_EDGESENSI;Citlivost detekce hran TP_WAVELET_EDGREINF_TOOLTIP;Zesílení nebo zeslabení vlivu první úrovně, v porovnání se druhou úrovní. Ostatní úrovně zůstanou nezměněny. TP_WAVELET_EDGTHRESH;Detaily -TP_WAVELET_EDGTHRESH_TOOLTIP;Změní rozložení mezi prvními a ostatními úrovněmi. Čím větší práh, tím větší je význam prvních úrovní. Dejte si pozor na záporné hodnoty. Ty zvětšují efekt vyšších úrovní a mohou způsobit vznik artefaktů. +TP_WAVELET_EDGTHRESH_TOOLTIP;Změní rozložení mezi prvními a ostatními úrovněmi. Čím větší práh, tím větší je význam prvních úrovní. Dejt e si pozor na záporné hodnoty. Ty zvětšují efekt vyšších úrovní a mohou způsobit vznik artefaktů TP_WAVELET_EDRAD;Poloměr TP_WAVELET_EDRAD_TOOLTIP;Toto nastavení poloměru se velmi liší od ostatních nástrojů doostření. Jeho hodnota je pomocí komplexní funkce porovnána s každou úrovní. To znamená, že i nastavení hodnoty na nulu má na úrovně vliv. TP_WAVELET_EDSL;Práh posuvníků @@ -2134,13 +2321,14 @@ TP_WBALANCE_LED_CRS;CRS SP12 WWMR16 TP_WBALANCE_LED_HEADER;LED TP_WBALANCE_LED_LSI;LSI Lumelex 2040 TP_WBALANCE_METHOD;Metoda +TP_WBALANCE_PICKER;Nabrat TP_WBALANCE_SHADE;Stín TP_WBALANCE_SIZE;Rozměr: TP_WBALANCE_SOLUX35;Solux 3500K TP_WBALANCE_SOLUX41;Solux 4100K TP_WBALANCE_SOLUX47;Solux 4700K (vendor) TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery) -TP_WBALANCE_SPOTWB;Bodové vyvážení +TP_WBALANCE_SPOTWB;Použijte pipetu pro nabrání vyvážení bílé z neutrální oblasti v náhledu. TP_WBALANCE_TEMPBIAS;AVB - Zdůraznění teploty TP_WBALANCE_TEMPBIAS_TOOLTIP;Dovolí ovlivnit výpočet "automatického vyvážení bílé"\nzdůrazněním teplejší nebo chladnější teploty. Toto zdůraznění\nje vyjádřeno v procentech vypočtené teploty a výsledek\nlze vyjádřit vzorcem "vypočtenáTeplota + vypočtenáTeplota * zdůraznění". TP_WBALANCE_TEMPERATURE;Teplota @@ -2155,202 +2343,3 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit ořez obrazovce\nZkratka: f ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit celý obrázek obrazovce\nZkratka: Alt-f ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value. -!CURVEEDITOR_CATMULLROM;Flexible -!DYNPROFILEEDITOR_IMGTYPE_ANY;Any -!DYNPROFILEEDITOR_IMGTYPE_HDR;HDR -!DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift -!DYNPROFILEEDITOR_IMGTYPE_STD;Standard -!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles -!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles -!GENERAL_CURRENT;Current -!GENERAL_RESET;Reset -!GENERAL_SAVE_AS;Save as... -!HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram. -!HISTORY_MSG_235;B&W - CM - Auto -!HISTORY_MSG_237;B&W - CM -!HISTORY_MSG_273;CT - Color Balance SMH -!HISTORY_MSG_392;W - Residual - Color Balance -!HISTORY_MSG_488;Dynamic Range Compression -!HISTORY_MSG_489;DRC - Detail -!HISTORY_MSG_490;DRC - Amount -!HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction -!HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel -!HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;CT - region C mask -!HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;CT - H mask -!HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;CT - Lightness -!HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;CT - L mask -!HISTORY_MSG_COLORTONING_LABREGION_LIST;CT - List -!HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;CT - region mask blur -!HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset -!HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power -!HISTORY_MSG_COLORTONING_LABREGION_SATURATION;CT - Saturation -!HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;CT - region show mask -!HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope -!HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth -!HISTORY_MSG_DEHAZE_ENABLED;Haze Removal -!HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map -!HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength -!HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold -!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Dual demosaic - Contrast threshold -!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries -!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D -!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type -!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma -!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope -!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method -!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold -!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion -!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold -!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations -!HISTORY_MSG_RAWCACORR_COLORSHIFT;Raw CA Correction - Avoid color shift -!HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling -!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold -!HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace -!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light -!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength -!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor -!ICCPROFCREATOR_COPYRIGHT;Copyright: -!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" -!ICCPROFCREATOR_CUSTOM;Custom -!ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. -!ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;ICC version: -!ICCPROFCREATOR_ILL;Illuminant: -!ICCPROFCREATOR_ILL_41;D41 -!ICCPROFCREATOR_ILL_50;D50 -!ICCPROFCREATOR_ILL_55;D55 -!ICCPROFCREATOR_ILL_60;D60 -!ICCPROFCREATOR_ILL_65;D65 -!ICCPROFCREATOR_ILL_80;D80 -!ICCPROFCREATOR_ILL_DEF;Default -!ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. -!ICCPROFCREATOR_PRIMARIES;Primaries: -!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -!ICCPROFCREATOR_PRIM_BEST;BestRGB -!ICCPROFCREATOR_PRIM_BETA;BetaRGB -!ICCPROFCREATOR_PRIM_BLUX;Blue X -!ICCPROFCREATOR_PRIM_BLUY;Blue Y -!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -!ICCPROFCREATOR_PRIM_GREX;Green X -!ICCPROFCREATOR_PRIM_GREY;Green Y -!ICCPROFCREATOR_PRIM_PROPH;Prophoto -!ICCPROFCREATOR_PRIM_REC2020;Rec2020 -!ICCPROFCREATOR_PRIM_REDX;Red X -!ICCPROFCREATOR_PRIM_REDY;Red Y -!ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. -!ICCPROFCREATOR_PRIM_WIDEG;Widegamut -!ICCPROFCREATOR_PROF_V2;ICC v2 -!ICCPROFCREATOR_PROF_V4;ICC v4 -!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... -!ICCPROFCREATOR_SLOPE;Slope -!ICCPROFCREATOR_TRC_PRESET;Tone response curve: -!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the sharpening contrast mask.\nShortcut: p\n\nOnly works when sharpening is enabled and zoom >= 100%. -!PARTIALPASTE_DEHAZE;Haze removal -!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA avoid color shift -!PARTIALPASTE_RAW_BORDER;Raw border -!PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic range compression -!PREFERENCES_APPEARANCE;Appearance -!PREFERENCES_APPEARANCE_COLORPICKERFONT;Color picker font -!PREFERENCES_APPEARANCE_CROPMASKCOLOR;Crop mask color -!PREFERENCES_APPEARANCE_MAINFONT;Main font -!PREFERENCES_APPEARANCE_THEME;Theme -!PREFERENCES_AUTOSAVE_TP_OPEN;Save tool collapsed/expanded state on exit -!PREFERENCES_CACHECLEAR;Clear -!PREFERENCES_CACHECLEAR_ALL;Clear all cached files: -!PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles: -!PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles: -!PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched. -!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Compact toolbars in File Browser -!PREFERENCES_PERFORMANCE_THREADS;Threads -!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic) -!PREFERENCES_TAB_PERFORMANCE;Performance -!SAMPLEFORMAT_32;24-bit floating-point -!SAMPLEFORMAT_64;32-bit floating-point -!SAVEDLG_FILEFORMAT_FLOAT; floating-point -!TP_BWMIX_MIXC;Channel Mixer -!TP_BWMIX_NEUTRAL;Reset -!TP_COLORAPP_ABSOLUTELUMINANCE;Absolute luminance -!TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;When setting manually, values above 65 are recommended. -!TP_COLORAPP_MEANLUMINANCE;Mean luminance (Yb%) -!TP_COLORTONING_LABREGIONS;Color correction regions -!TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2 -!TP_COLORTONING_LABREGION_CHANNEL;Channel -!TP_COLORTONING_LABREGION_CHANNEL_ALL;All -!TP_COLORTONING_LABREGION_CHANNEL_B;Blue -!TP_COLORTONING_LABREGION_CHANNEL_G;Green -!TP_COLORTONING_LABREGION_CHANNEL_R;Red -!TP_COLORTONING_LABREGION_CHROMATICITYMASK;C -!TP_COLORTONING_LABREGION_HUEMASK;H -!TP_COLORTONING_LABREGION_LIGHTNESS;Lightness -!TP_COLORTONING_LABREGION_LIGHTNESSMASK;L -!TP_COLORTONING_LABREGION_LIST_TITLE;Correction -!TP_COLORTONING_LABREGION_MASK;Mask -!TP_COLORTONING_LABREGION_MASKBLUR;Mask Blur -!TP_COLORTONING_LABREGION_OFFSET;Offset -!TP_COLORTONING_LABREGION_POWER;Power -!TP_COLORTONING_LABREGION_SATURATION;Saturation -!TP_COLORTONING_LABREGION_SHOWMASK;Show mask -!TP_COLORTONING_LABREGION_SLOPE;Slope -!TP_CROP_RESETCROP;Reset -!TP_CROP_SELECTCROP;Select -!TP_DEHAZE_DEPTH;Depth -!TP_DEHAZE_LABEL;Haze Removal -!TP_DEHAZE_SHOW_DEPTH_MAP;Show Depth Map -!TP_DEHAZE_STRENGTH;Strength -!TP_ICM_WORKING_TRC;Tone response curve: -!TP_ICM_WORKING_TRC_CUSTOM;Custom -!TP_ICM_WORKING_TRC_GAMMA;Gamma -!TP_ICM_WORKING_TRC_NONE;None -!TP_ICM_WORKING_TRC_SLOPE;Slope -!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. -!TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically -!TP_LENSPROFILE_CORRECTION_LCPFILE;LCP file -!TP_LENSPROFILE_CORRECTION_MANUAL;Manually -!TP_LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong. -!TP_LENSPROFILE_MODE_HEADER;Select the lens profile: -!TP_LENSPROFILE_USE_CA;Chromatic aberration -!TP_LENSPROFILE_USE_GEOMETRIC;Geometric -!TP_LENSPROFILE_USE_HEADER;Select distortions to correct: -!TP_LENSPROFILE_USE_VIGNETTING;Vignetting -!TP_RAWCACORR_AUTOIT;Iterations -!TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is checked.\nAuto-correction is conservative, meaning that it often does not correct all chromatic aberration.\nTo correct the remaining chromatic aberration, you can use up to five iterations of automatic chromatic aberration correction.\nEach iteration will reduce the remaining chromatic aberration from the last iteration at the cost of additional processing time. -!TP_RAWCACORR_AVOIDCOLORSHIFT;Avoid color shift -!TP_RAW_2PASS;1-pass+fast -!TP_RAW_4PASS;3-pass+fast -!TP_RAW_AMAZEVNG4;AMaZE+VNG4 -!TP_RAW_BORDER;Border -!TP_RAW_DCBVNG4;DCB+VNG4 -!TP_RAW_DUALDEMOSAICAUTOCONTRAST;Auto threshold -!TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;If the checkbox is checked (recommended), RawTherapee calculates an optimum value based on flat regions in the image.\nIf there is no flat region in the image or the image is too noisy, the value will be set to 0.\nTo set the value manually, uncheck the checkbox first (reasonable values depend on the image). -!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold -!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion -!TP_RAW_RCDVNG4;RCD+VNG4 -!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling -!TP_RETINEX_CONTEDIT_MAP;Equalizer -!TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain. -!TP_RETINEX_MAP;Method -!TP_SHARPENING_CONTRAST;Contrast threshold -!TP_SHARPENMICRO_CONTRAST;Contrast threshold -!TP_SOFTLIGHT_LABEL;Soft Light -!TP_SOFTLIGHT_STRENGTH;Strength -!TP_TM_FATTAL_AMOUNT;Amount -!TP_TM_FATTAL_ANCHOR;Anchor -!TP_TM_FATTAL_LABEL;Dynamic Range Compression -!TP_TM_FATTAL_THRESHOLD;Detail -!TP_WBALANCE_PICKER;Pick From 03dad428e3515152f1df108083c64efa9dd9da48 Mon Sep 17 00:00:00 2001 From: Hombre57 Date: Thu, 13 Dec 2018 23:09:14 +0100 Subject: [PATCH 13/30] Updated French translation --- rtdata/languages/Francais | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index c331bcb22..d37f242a1 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -15,6 +15,7 @@ CURVEEDITOR_AXIS_IN;E: CURVEEDITOR_AXIS_LEFT_TAN;TG: CURVEEDITOR_AXIS_OUT;S: CURVEEDITOR_AXIS_RIGHT_TAN;TD: +CURVEEDITOR_CATMULLROM;Flexible CURVEEDITOR_CURVE;Courbe CURVEEDITOR_CURVES;Courbes CURVEEDITOR_CUSTOM;Personnalisé @@ -2333,8 +2334,3 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: Alt-f ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: + ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!CURVEEDITOR_CATMULLROM;Flexible From 836c44bf93aa0f7c8e7123a8d599b7cc334e4eb4 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sat, 15 Dec 2018 14:30:40 +0100 Subject: [PATCH 14/30] Japanese translation updated by firefly, closes #5097 --- rtdata/languages/Czech | 2 ++ rtdata/languages/Japanese | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index d07a678da..e8b11906d 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -42,6 +42,7 @@ #41 2018-03-03 updated by mkyral #42 2018-04-28 updated by mkyral #43 2018-12-13 updated by mkyral + ABOUT_TAB_BUILD;Verze ABOUT_TAB_CREDITS;Zásluhy ABOUT_TAB_LICENSE;Licence @@ -2343,3 +2344,4 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit ořez obrazovce\nZkratka: f ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit celý obrázek obrazovce\nZkratka: Alt-f ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - + diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 683f9f24b..a8ed3bc2b 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -48,6 +48,7 @@ CURVEEDITOR_AXIS_IN;I: CURVEEDITOR_AXIS_LEFT_TAN;LT: CURVEEDITOR_AXIS_OUT;O: CURVEEDITOR_AXIS_RIGHT_TAN;RT: +CURVEEDITOR_CATMULLROM;フレキシブル CURVEEDITOR_CURVE;カーブ CURVEEDITOR_CURVES;カーブ CURVEEDITOR_CUSTOM;カスタム @@ -254,6 +255,7 @@ GENERAL_AUTO;自動 GENERAL_BEFORE;補正前 GENERAL_CANCEL;キャンセル GENERAL_CLOSE;閉じる +GENERAL_CURRENT;現在 GENERAL_DISABLE;無効 GENERAL_DISABLED;無効 GENERAL_ENABLE;有効 @@ -757,7 +759,7 @@ HISTORY_MSG_485;レンズ補正 HISTORY_MSG_486;レンズ補正 - カメラ HISTORY_MSG_487;レンズ補正 - レンズ HISTORY_MSG_488;ダイナミックレンジ圧縮 -HISTORY_MSG_489;DRC - 細部 +HISTORY_MSG_489;DRC - ディテール HISTORY_MSG_490;DRC - 量 HISTORY_MSG_491;ホワイトバランス HISTORY_MSG_492;RGBカーブ @@ -1855,6 +1857,7 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;PDAFの場合は水平方向だ TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;垂直方向 TP_PREPROCESS_NO_FOUND;未検出 TP_PREPROCESS_PDAFLINESFILTER;PDAFラインフィルタ +TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Sonyのミラーレスカメラの一部では、PDAFイメージセンサが原因で、ゴーストが出るバックライトの画像でストライプノイズが発生することがあり、これを軽減します。 TP_PRSHARPENING_LABEL;リサイズ後のシャープ化 TP_PRSHARPENING_TOOLTIP;リサイズ後の画像をシャープ化します。但し、リサイズの方式がランチョスの場合に限ります。プレビュー画面でこの機能の効果を見ることは出来ません。使用法に関してはRawPediaを参照して下さい。 TP_RAWCACORR_AUTO;自動補正 @@ -2090,7 +2093,7 @@ TP_SOFTLIGHT_STRENGTH;強さ TP_TM_FATTAL_AMOUNT;量 TP_TM_FATTAL_ANCHOR;アンカー TP_TM_FATTAL_LABEL;ダイナミックレンジ圧縮 -TP_TM_FATTAL_THRESHOLD;細部 +TP_TM_FATTAL_THRESHOLD;ディテール TP_VIBRANCE_AVOIDCOLORSHIFT;色ずれを回避 TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;肌色トーン @@ -2335,9 +2338,3 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: + ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!CURVEEDITOR_CATMULLROM;Flexible -!GENERAL_CURRENT;Current From f6a7e43ba08587cc97b5e0d1ebe78adc18dd6af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Sat, 15 Dec 2018 14:48:04 +0100 Subject: [PATCH 15/30] Initialize variable in `lj92.c` (fixes #5090) --- rtengine/lj92.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtengine/lj92.c b/rtengine/lj92.c index c4f1cc15c..d72075a62 100644 --- a/rtengine/lj92.c +++ b/rtengine/lj92.c @@ -521,7 +521,7 @@ static int parseScan(ljp* self) { // First pixel predicted from base value int diff; - int Px; + int Px = 0; int col = 0; int row = 0; int left = 0; From 1ebbe0a0961663379373408a559e1914db015318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Sat, 15 Dec 2018 15:12:52 +0100 Subject: [PATCH 16/30] Resize `baBehav` on load (#4828) --- rtgui/batchtoolpanelcoord.cc | 6 +++--- rtgui/options.cc | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index 55d9f3c79..db06ea59e 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -126,7 +126,7 @@ void BatchToolPanelCoordinator::initSession () pparams = selected[0]->getProcParams (); coarse->initBatchBehavior (); - + int w,h; selected[0]->getOriginalSize(w,h); crop->setDimensions (w, h); @@ -707,11 +707,11 @@ void BatchToolPanelCoordinator::spotWBselected (int x, int y, Thumbnail* thm) double otemp = initialPP[i].wb.temperature; double ogreen = initialPP[i].wb.green; - if (options.baBehav[12]) { + if (options.baBehav[ADDSET_ROTATE_DEGREE]) { temp = temp - otemp; } - if (options.baBehav[13]) { + if (options.baBehav[ADDSET_DIST_AMOUNT]) { green = green - ogreen; } diff --git a/rtgui/options.cc b/rtgui/options.cc index c267c4651..d75f5d94f 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -1283,27 +1283,27 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_key("GUI", "HistogramPosition")) { histogramPosition = keyFile.get_integer("GUI", "HistogramPosition"); } - + if (keyFile.has_key("GUI", "HistogramRed")) { histogramRed = keyFile.get_boolean("GUI", "HistogramRed"); } - + if (keyFile.has_key("GUI", "HistogramGreen")) { histogramGreen = keyFile.get_boolean("GUI", "HistogramGreen"); } - + if (keyFile.has_key("GUI", "HistogramBlue")) { histogramBlue = keyFile.get_boolean("GUI", "HistogramBlue"); } - + if (keyFile.has_key("GUI", "HistogramLuma")) { histogramLuma = keyFile.get_boolean("GUI", "HistogramLuma"); } - + if (keyFile.has_key("GUI", "HistogramChroma")) { histogramChroma = keyFile.get_boolean("GUI", "HistogramChroma"); } - + if (keyFile.has_key("GUI", "HistogramRAW")) { histogramRAW = keyFile.get_boolean("GUI", "HistogramRAW"); } @@ -1311,11 +1311,11 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_key("GUI", "HistogramBar")) { histogramBar = keyFile.get_boolean("GUI", "HistogramBar"); } - + if (keyFile.has_key ("GUI", "HistogramHeight")) { histogramHeight = keyFile.get_integer ("GUI", "HistogramHeight"); } - + if (keyFile.has_key ("GUI", "HistogramDrawMode")) { histogramDrawMode = keyFile.get_integer ("GUI", "HistogramDrawMode"); } @@ -1507,7 +1507,7 @@ void Options::readFromFile(Glib::ustring fname) if (rtSettings.ACESp0 == "RTv4_ACES-AP0") { rtSettings.ACESp0 = "RTv2_ACES-AP0"; } - + } if (keyFile.has_key("Color Management", "ACES-AP1")) { @@ -1515,7 +1515,7 @@ void Options::readFromFile(Glib::ustring fname) if (rtSettings.ACESp1 == "RTv4_ACES-AP1") { rtSettings.ACESp1 = "RTv2_ACES-AP1"; } - + } if (keyFile.has_key("Color Management", "GamutLch")) { @@ -1593,6 +1593,7 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_group("Batch Processing")) { if (keyFile.has_key("Batch Processing", "AdjusterBehavior")) { baBehav = keyFile.get_integer_list("Batch Processing", "AdjusterBehavior"); + baBehav.resize(ADDSET_PARAM_NUM); } } From fa4a883eaf2510c40fc663621bfd6162c87c2677 Mon Sep 17 00:00:00 2001 From: Hombre Date: Sat, 15 Dec 2018 16:00:44 +0100 Subject: [PATCH 17/30] Bugfix in tooltip related to Lockable Color Pickers See issue #4939 --- rtdata/languages/Francais | 2 +- rtdata/languages/default | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index d37f242a1..9819b20a5 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -1314,7 +1314,7 @@ THRESHOLDSELECTOR_HINT;Maintenez la touche Shift appuyée pour déplacer THRESHOLDSELECTOR_T;Haut THRESHOLDSELECTOR_TL;Haut-Gauche THRESHOLDSELECTOR_TR;Haut-droite -TOOLBAR_TOOLTIP_COLORPICKER;Ancre de Vérification Couleur\n\nLorque activé:\nCliquez la zone d'image avec le bouton gauche de la souris pour ajouter une ancre\nDéplacez-le en le "tirant" avec le bouton gauche de la souris\nSupprimez une ancre en cliquant dessus avec le bouton droit de la souris\nSupprimez toutes les ancres avec Shift + click avec le bouton droit\nCliquez avec le bouton droit de la souris en dehors de toute ancre pour revenir au mode Déplacement +TOOLBAR_TOOLTIP_COLORPICKER;Ancre de Vérification Couleur\n\nLorque activé:\n- Ajouter une ancre: clic-gauche.\n- Déplacer une ancre: clic-gauche et tirer.\n- Supprimez une ancre: clic-droit.\n- Supprimez toutes les ancres: ctrl+shift+clic-droit.\n- Revenir au mode Déplacement: clic-droit en dehors de toute ancre. TOOLBAR_TOOLTIP_CROP;Sélection du recadrage\nRaccourci: c\nDéplacez le recadrage en utilisant Shift + Glisser TOOLBAR_TOOLTIP_HAND;Outil de navigation\nRaccourci: h TOOLBAR_TOOLTIP_STRAIGHTEN;Sélection de la ligne d'horizon\nRaccourci: s\n\nIndiquez la verticale ou l'horizontale en dessinant une ligne à travers l'image de prévisualisation. L'angle de rotation sera affiché près de la ligne guide. Le centre de rotation est le centre géométrique de l'image. diff --git a/rtdata/languages/default b/rtdata/languages/default index 651a3c928..dc5f85156 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1309,7 +1309,7 @@ THRESHOLDSELECTOR_HINT;Hold the Shift key to move individual control poin THRESHOLDSELECTOR_T;Top THRESHOLDSELECTOR_TL;Top-left THRESHOLDSELECTOR_TR;Top-right -TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: control+shift+right-click.\n- Revert to hand tool: right-click outside any picker. TOOLBAR_TOOLTIP_CROP;Crop selection.\nShortcut: c\nMove the crop using Shift+mouse drag. TOOLBAR_TOOLTIP_HAND;Hand tool.\nShortcut: h TOOLBAR_TOOLTIP_STRAIGHTEN;Straighten / fine rotation.\nShortcut: s\n\nIndicate the vertical or horizontal by drawing a guide line over the image preview. Angle of rotation will be shown next to the guide line. Center of rotation is the geometrical center of the image. From 1e45112d459a8be0b6dadbf03285268f8d589e49 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sat, 15 Dec 2018 18:28:06 +0100 Subject: [PATCH 18/30] Cleanup of bundled processing profiles #5093 --- .../Black-and-White/Black-and-White 1.pp3 | 158 ---------------- .../Black-and-White/Black-and-White 2.pp3 | 158 ---------------- .../Black-and-White/Black-and-White 3.pp3 | 158 ---------------- .../Black-and-White/Black-and-White 4.pp3 | 158 ---------------- .../Faded/Faded Amber 1 TM Bright.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Amber 1 TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Amber 1.pp3 | 93 ---------- .../profiles/Faded/Faded Blue 1 TM Bright.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Blue 1 TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Blue 1.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Blue Pink TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Blue Pink.pp3 | 93 ---------- .../Faded/Faded Chocolate 1 TM Bright.pp3 | 97 ---------- .../Faded/Faded Chocolate 2 TM Bright.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Golden 1.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Golden 2.pp3 | 97 ---------- .../Faded/Faded Green 1 TM Bright.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Green 1 TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Green 1.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Green 2.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Green 3.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Neutral TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Neutral.pp3 | 93 ---------- .../Faded/Faded Purple 1 TM Bright.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Purple 1 TM.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Purple 1.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Purple 2 TM.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Purple 2.pp3 | 97 ---------- .../Faded/Faded Teal Orange TM Bright.pp3 | 93 ---------- .../profiles/Faded/Faded Teal Orange TM.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Teal Orange.pp3 | 93 ---------- .../profiles/Faded/Faded Warm 1 TM Bright.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Warm 1 TM.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Warm 1.pp3 | 97 ---------- rtdata/profiles/Faded/Faded Warm 2.pp3 | 93 ---------- rtdata/profiles/Faded/Faded Warm 3.pp3 | 93 ---------- rtdata/profiles/Generic/Deep Shadows.pp3 | 158 ---------------- rtdata/profiles/Generic/Equilibrated.pp3 | 158 ---------------- rtdata/profiles/Generic/High-Key.pp3 | 158 ---------------- rtdata/profiles/Generic/Natural 1.pp3 | 158 ---------------- rtdata/profiles/Generic/Natural 2.pp3 | 158 ---------------- rtdata/profiles/Generic/Punchy 1.pp3 | 158 ---------------- rtdata/profiles/Generic/Punchy 2.pp3 | 158 ---------------- rtdata/profiles/Portrait/Portrait Lejto.pp3 | 158 ---------------- rtdata/profiles/Portrait/Portrait Smooth.pp3 | 135 -------------- .../Skintones/Skintones - Natural TM.pp3 | 169 ------------------ .../Skintones/Skintones - Natural.pp3 | 169 ------------------ .../Skintones/Skintones - Pale TM Bright.pp3 | 169 ------------------ .../Skintones/Skintones - Pale TM.pp3 | 169 ------------------ .../profiles/Skintones/Skintones - Pale.pp3 | 169 ------------------ .../Skintones/Skintones - Soft Texture.pp3 | 169 ------------------ .../Skintones/Skintones - Strong Texture.pp3 | 169 ------------------ .../Skintones/Skintones - Studio TM.pp3 | 169 ------------------ .../profiles/Skintones/Skintones - Studio.pp3 | 169 ------------------ .../Skintones/Skintones - StudioBase 1 TM.pp3 | 169 ------------------ .../Skintones/Skintones - StudioBase 1.pp3 | 169 ------------------ 56 files changed, 6914 deletions(-) delete mode 100644 rtdata/profiles/Black-and-White/Black-and-White 1.pp3 delete mode 100644 rtdata/profiles/Black-and-White/Black-and-White 2.pp3 delete mode 100644 rtdata/profiles/Black-and-White/Black-and-White 3.pp3 delete mode 100644 rtdata/profiles/Black-and-White/Black-and-White 4.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Amber 1 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Amber 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Blue 1 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Blue 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Blue Pink TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Blue Pink.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Golden 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Golden 2.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Green 1 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Green 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Green 2.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Green 3.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Neutral TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Neutral.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Purple 1 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Purple 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Purple 2 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Purple 2.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Teal Orange TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Teal Orange.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Warm 1 TM.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Warm 1.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Warm 2.pp3 delete mode 100644 rtdata/profiles/Faded/Faded Warm 3.pp3 delete mode 100644 rtdata/profiles/Generic/Deep Shadows.pp3 delete mode 100644 rtdata/profiles/Generic/Equilibrated.pp3 delete mode 100644 rtdata/profiles/Generic/High-Key.pp3 delete mode 100644 rtdata/profiles/Generic/Natural 1.pp3 delete mode 100644 rtdata/profiles/Generic/Natural 2.pp3 delete mode 100644 rtdata/profiles/Generic/Punchy 1.pp3 delete mode 100644 rtdata/profiles/Generic/Punchy 2.pp3 delete mode 100644 rtdata/profiles/Portrait/Portrait Lejto.pp3 delete mode 100644 rtdata/profiles/Portrait/Portrait Smooth.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Natural TM.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Natural.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Pale TM.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Pale.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Studio TM.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - Studio.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 delete mode 100644 rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 diff --git a/rtdata/profiles/Black-and-White/Black-and-White 1.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 1.pp3 deleted file mode 100644 index 871cc7289..000000000 --- a/rtdata/profiles/Black-and-White/Black-and-White 1.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=1;0;0;0.04;0.03;0.17684498029510265;0.21732319394192093;0.70232558139534862;0.74883720930232545;1;1; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=true -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-100 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Black-and-White/Black-and-White 2.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 2.pp3 deleted file mode 100644 index 20579d56a..000000000 --- a/rtdata/profiles/Black-and-White/Black-and-White 2.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=1;0;0;0.45754265471370759;0.57906737998843294;1;1; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=true -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-100 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.84892086330935235;0.69064748201438808;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Black-and-White/Black-and-White 3.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 3.pp3 deleted file mode 100644 index 0e62f7a0b..000000000 --- a/rtdata/profiles/Black-and-White/Black-and-White 3.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=true -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-100 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=2;0.25;0.5;0.75;50;12;-12;-50; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Black-and-White/Black-and-White 4.pp3 b/rtdata/profiles/Black-and-White/Black-and-White 4.pp3 deleted file mode 100644 index 679630c4c..000000000 --- a/rtdata/profiles/Black-and-White/Black-and-White 4.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=true -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=-35 -Chromaticity=-100 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.18623481781376497;0.028340080971659902;0.50607287449392713;0.50607287449392713;0.77732793522267185;0.97975708502024295;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 deleted file mode 100644 index b636f3a8d..000000000 --- a/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.047430830039525626;0.21343873517786571;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.22924901185770752;0.031620553359683806;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 b/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 deleted file mode 100644 index 781ed1380..000000000 --- a/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.047430830039525626;0.21343873517786571;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.22924901185770752;0.031620553359683806;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Amber 1.pp3 b/rtdata/profiles/Faded/Faded Amber 1.pp3 deleted file mode 100644 index 068fb369c..000000000 --- a/rtdata/profiles/Faded/Faded Amber 1.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.047430830039525626;0.21343873517786571;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.22924901185770752;0.031620553359683806;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 deleted file mode 100644 index 43a1f72bd..000000000 --- a/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 b/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 deleted file mode 100644 index a0931ff2c..000000000 --- a/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Blue 1.pp3 b/rtdata/profiles/Faded/Faded Blue 1.pp3 deleted file mode 100644 index a25670c0f..000000000 --- a/rtdata/profiles/Faded/Faded Blue 1.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 b/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 deleted file mode 100644 index 6950325f1..000000000 --- a/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;0.81034482758620685;0.94827586206896552;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Blue Pink.pp3 b/rtdata/profiles/Faded/Faded Blue Pink.pp3 deleted file mode 100644 index ac426a671..000000000 --- a/rtdata/profiles/Faded/Faded Blue Pink.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;0.81034482758620685;0.94827586206896552;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 deleted file mode 100644 index ec0b45cf8..000000000 --- a/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.16206896551724165;0.079310344827586171;1;1; -gCurve=3;0;0;0.1655172413793104;0.034482758620689787;1;1; -bCurve=3;0;0;0.55827995093362426;0.31529235382308862;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 deleted file mode 100644 index e60da1e22..000000000 --- a/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.15733951206215074;0.55445004770342121;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.16206896551724165;0.079310344827586171;1;1; -gCurve=3;0;0;0.1655172413793104;0.034482758620689787;1;1; -bCurve=3;0;0;0.55827995093362426;0.31529235382308862;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Golden 1.pp3 b/rtdata/profiles/Faded/Faded Golden 1.pp3 deleted file mode 100644 index 68e7d163c..000000000 --- a/rtdata/profiles/Faded/Faded Golden 1.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.53359683794466362;0.72870684529014551;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=56 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.086956521739130432;0.090909090909090856;1;1; -gCurve=3;0;0;0.20266764462192638;0.12923950395936107;1;1; -bCurve=1;0;0;0.25296442687747034;0.22529644268774709;0.8656126482213431;0.80632411067193566;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Golden 2.pp3 b/rtdata/profiles/Faded/Faded Golden 2.pp3 deleted file mode 100644 index ffb688403..000000000 --- a/rtdata/profiles/Faded/Faded Golden 2.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.53359683794466362;0.72870684529014551;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=56 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.086956521739130432;0.090909090909090856;0.94466403162055268;0.89328063241106692;1;1; -gCurve=3;0;0;0.20266764462192638;0.12923950395936107;0.90118577075098805;0.88537549407114613;1;1; -bCurve=1;0;0;0.25296442687747034;0.22529644268774709;0.8656126482213431;0.80632411067193566;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 deleted file mode 100644 index 6e5786bda..000000000 --- a/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Green 1 TM.pp3 b/rtdata/profiles/Faded/Faded Green 1 TM.pp3 deleted file mode 100644 index d3a8b3919..000000000 --- a/rtdata/profiles/Faded/Faded Green 1 TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Green 1.pp3 b/rtdata/profiles/Faded/Faded Green 1.pp3 deleted file mode 100644 index 89a0b1afa..000000000 --- a/rtdata/profiles/Faded/Faded Green 1.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Green 2.pp3 b/rtdata/profiles/Faded/Faded Green 2.pp3 deleted file mode 100644 index 1d25d36cf..000000000 --- a/rtdata/profiles/Faded/Faded Green 2.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.083003952569169981;0.075098814229249022;0.74703557312252944;0.81422924901185822;1;1; -gCurve=3;0;0;0.32806324110671931;0.43083003952569182;1;1; -bCurve=3;0;0;0.040612308653546869;0.12528693478940064;0.85375494071146218;0.9130434782608694;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Green 3.pp3 b/rtdata/profiles/Faded/Faded Green 3.pp3 deleted file mode 100644 index 4353eaa1c..000000000 --- a/rtdata/profiles/Faded/Faded Green 3.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.11903093907591648;0.023682704102494199;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;40;0; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.24505928853754988;0.055335968379447285;0.81034482758620685;0.94827586206896552;1;1; -gCurve=3;0;0;0.1146245059288528;0.023715415019764076;1;1; -bCurve=3;0;0;0.086956521739130363;0.21739130434782611;0.9446640316205519;0.69960474308300313;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Neutral TM.pp3 b/rtdata/profiles/Faded/Faded Neutral TM.pp3 deleted file mode 100644 index 8b5beb761..000000000 --- a/rtdata/profiles/Faded/Faded Neutral TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Neutral.pp3 b/rtdata/profiles/Faded/Faded Neutral.pp3 deleted file mode 100644 index adf5069c1..000000000 --- a/rtdata/profiles/Faded/Faded Neutral.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 deleted file mode 100644 index dc686e332..000000000 --- a/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.15517241379310354;0.075862068965517254;1;1; -gCurve=3;0;0;0.13793103448275862;0.055172413793103607;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 b/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 deleted file mode 100644 index 71b0b780e..000000000 --- a/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.15517241379310354;0.075862068965517254;1;1; -gCurve=3;0;0;0.13793103448275862;0.055172413793103607;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Purple 1.pp3 b/rtdata/profiles/Faded/Faded Purple 1.pp3 deleted file mode 100644 index 9224db874..000000000 --- a/rtdata/profiles/Faded/Faded Purple 1.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.15517241379310354;0.075862068965517254;1;1; -gCurve=3;0;0;0.13793103448275862;0.055172413793103607;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 b/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 deleted file mode 100644 index 12c1d4275..000000000 --- a/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.15517241379310354;0.075862068965517254;0.7;0.9;1;1; -gCurve=3;0;0;0.13793103448275862;0.055172413793103607;0.69655172413793076;0.90689655172413808;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Purple 2.pp3 b/rtdata/profiles/Faded/Faded Purple 2.pp3 deleted file mode 100644 index 39f401ca7..000000000 --- a/rtdata/profiles/Faded/Faded Purple 2.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;20; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.15517241379310354;0.075862068965517254;0.69999999999999973;0.90000000000000013;1;1; -gCurve=3;0;0;0.13793103448275862;0.055172413793103607;0.69655172413793076;0.90689655172413808;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 b/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 deleted file mode 100644 index fba0dc024..000000000 --- a/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=170 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.29527054654490958;0.54755349597928327;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.068858525282812999;0.0083378765162873056;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.094310344827586101;0.09189655172413784;0.9956896551724137;0.92051724137931046;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=1;0.073578595317725717;0.69732441471571893;0.35;0.35;0.33333333333333331;0.5;0.35;0.35;0.5;0.5;0.35;0.35;0.66666666666666663;0.5;0.35;0.35;0.83333333333333326;0.5;0.35;0.35; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.18620689655172415;0.044827586206896544;0.85517241379310338;0.91379310344827591;1;1; -gCurve=3;0;0;0.13224137931034488;0.048793103448275733;0.95172413793103461;0.8655172413793103;1;1; -bCurve=3;0;0;0.12758620689655173;0.075862068965517226;0.90344827586206922;0.78620689655172393;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 b/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 deleted file mode 100644 index 34302c02e..000000000 --- a/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=170 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.29527054654490958;0.40962246149652437;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.068858525282812999;0.0083378765162873056;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.094310344827586101;0.09189655172413784;0.89568965517241339;0.9032758620689656;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=1;0.073578595317725717;0.69732441471571893;0.35;0.35;0.33333333333333331;0.5;0.35;0.35;0.5;0.5;0.35;0.35;0.66666666666666663;0.5;0.35;0.35;0.83333333333333326;0.5;0.35;0.35; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.18620689655172415;0.044827586206896544;0.85517241379310338;0.91379310344827591;1;1; -gCurve=3;0;0;0.13224137931034488;0.048793103448275733;0.95172413793103461;0.8655172413793103;1;1; -bCurve=3;0;0;0.12758620689655173;0.075862068965517226;0.90344827586206922;0.78620689655172393;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Teal Orange.pp3 b/rtdata/profiles/Faded/Faded Teal Orange.pp3 deleted file mode 100644 index 946812758..000000000 --- a/rtdata/profiles/Faded/Faded Teal Orange.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.33320158102766828;0.53720866839307635;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.068858525282812999;0.0083378765162873056;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;80; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.094310344827586101;0.09189655172413784;0.89568965517241339;0.9032758620689656;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=1;0.073578595317725717;0.69732441471571893;0.35;0.35;0.33333333333333331;0.5;0.35;0.35;0.5;0.5;0.35;0.35;0.66666666666666663;0.5;0.35;0.35;0.83333333333333326;0.5;0.35;0.35; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.18620689655172415;0.044827586206896544;0.85517241379310338;0.91379310344827591;1;1; -gCurve=3;0;0;0.13224137931034488;0.048793103448275733;0.95172413793103461;0.8655172413793103;1;1; -bCurve=3;0;0;0.12758620689655173;0.075862068965517226;0.90344827586206922;0.78620689655172393;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 deleted file mode 100644 index 18a5898f2..000000000 --- a/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;40; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.051383399209486022;0.17391304347826081;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 b/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 deleted file mode 100644 index 9f8157139..000000000 --- a/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.27667984189723321;0.47035573122529734;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;40; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.051383399209486022;0.17391304347826081;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Warm 1.pp3 b/rtdata/profiles/Faded/Faded Warm 1.pp3 deleted file mode 100644 index 8fa907460..000000000 --- a/rtdata/profiles/Faded/Faded Warm 1.pp3 +++ /dev/null @@ -1,97 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=60;0;20; -Green=0;60;40; -Blue=-20;20;40; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=-25 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HLRecovery] -Enabled=false -Method=Blend - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.051383399209486022;0.17391304347826081;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Warm 2.pp3 b/rtdata/profiles/Faded/Faded Warm 2.pp3 deleted file mode 100644 index 567e235f4..000000000 --- a/rtdata/profiles/Faded/Faded Warm 2.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;20; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.051383399209486022;0.17391304347826081;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.91699604743083007;0.76284584980237169;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Faded/Faded Warm 3.pp3 b/rtdata/profiles/Faded/Faded Warm 3.pp3 deleted file mode 100644 index 873f01f35..000000000 --- a/rtdata/profiles/Faded/Faded Warm 3.pp3 +++ /dev/null @@ -1,93 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=SatAndValueBlending -CurveMode2=FilmLike -Curve=3;0;0;0.23320158102766808;0.58893280632411094;0.69169960474308201;0.96047430830039549;1;1; -Curve2=3;0;0;0.12213438735177862;0.012648221343873525;0.46245059288537577;0.41250131169330889;1;1; - -[Channel Mixer] -Red=80;0;20; -Green=0;60;40; -Blue=-20;20;20; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=-29 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -LcCurve=0; -ClCurve=0; -lhCurve=0; -hhCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Luma=0 -Ldetail=0 -Chroma=20 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.40 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=3;0;0;0.051383399209486022;0.17391304347826081;1;1; -gCurve=3;0;0;1;1; -bCurve=3;0;0;0.051383399209486022;0.17391304347826081;0.57312252964427013;0.95652173913043359;1;1; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Deep Shadows.pp3 b/rtdata/profiles/Generic/Deep Shadows.pp3 deleted file mode 100644 index cfee29587..000000000 --- a/rtdata/profiles/Generic/Deep Shadows.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=3;0;0;0.10280701754385937;0;0.22561403508771805;0.081754385964912232;0.82456140350877249;0.82456140350877249;1;1; -Curve2=3;0;0;0.20585593677025255;0.44367403149511991;0.6315789473684208;0.89473684210526305;1;1; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=true -Pastels=20 -Saturated=20 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=No -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Equilibrated.pp3 b/rtdata/profiles/Generic/Equilibrated.pp3 deleted file mode 100644 index 3194ca5ff..000000000 --- a/rtdata/profiles/Generic/Equilibrated.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=WeightedStd -Curve=3;0;0;0.10641712584710848;0;0.22561403508771805;0.12507568560390137;0.82456140350877249;0.82456140350877249;1;1; -Curve2=3;0;0;0.20585593677025255;0.44367403149511991;0.6315789473684208;0.89473684210526305;1;1; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=No -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/High-Key.pp3 b/rtdata/profiles/Generic/High-Key.pp3 deleted file mode 100644 index 9714151a0..000000000 --- a/rtdata/profiles/Generic/High-Key.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=-10 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=2;0.105;0.25;0.75;15;60;30;-70; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=5 -Chromaticity=-10 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Natural 1.pp3 b/rtdata/profiles/Generic/Natural 1.pp3 deleted file mode 100644 index 4a21f7a05..000000000 --- a/rtdata/profiles/Generic/Natural 1.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=1;0;0;0.04;0.03;0.17684498029510265;0.21732319394192093;0.70232558139534862;0.74883720930232545;1;1; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Natural 2.pp3 b/rtdata/profiles/Generic/Natural 2.pp3 deleted file mode 100644 index c1bf8a832..000000000 --- a/rtdata/profiles/Generic/Natural 2.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=5 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=1;0;0;0.45754265471370759;0.57906737998843294;1;1; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=5 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.84892086330935235;0.69064748201438808;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Punchy 1.pp3 b/rtdata/profiles/Generic/Punchy 1.pp3 deleted file mode 100644 index 370862258..000000000 --- a/rtdata/profiles/Generic/Punchy 1.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=120;-10;-10; -Green=-10;120;-10; -Blue=-10;-10;120; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=10 -Chromaticity=5 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Generic/Punchy 2.pp3 b/rtdata/profiles/Generic/Punchy 2.pp3 deleted file mode 100644 index c98f8e87f..000000000 --- a/rtdata/profiles/Generic/Punchy 2.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=true -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=10 -Chromaticity=5 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=true -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Portrait/Portrait Lejto.pp3 b/rtdata/profiles/Portrait/Portrait Lejto.pp3 deleted file mode 100644 index 085915ad4..000000000 --- a/rtdata/profiles/Portrait/Portrait Lejto.pp3 +++ /dev/null @@ -1,158 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=25 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=SatAndValueBlending -Curve=1;0;0;0.079285714285714293;0.03;0.18041642857142856;0.21375157142857143;0.702326;0.748837;1;1; -Curve2=1;0;0;0.075;0.13571428571428609;0.3;0.42857142857142855;0.7214285714285712;0.74642857142857144;1;1; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=1;0;0;1;1; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=No -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Portrait/Portrait Smooth.pp3 b/rtdata/profiles/Portrait/Portrait Smooth.pp3 deleted file mode 100644 index 8079c050d..000000000 --- a/rtdata/profiles/Portrait/Portrait Smooth.pp3 +++ /dev/null @@ -1,135 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=FilmLike -CurveMode2=Standard -Curve=1;0;0;0.443;0.574;1;1; -Curve2=0; - -[HLRecovery] -Enabled=true -Method=Luminance - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=-20 -Contrast=-20 -Chromaticity=0 -AvoidColorShift=true -RedAndSkinTonesProtection=50 -LCredsk=true -LCurve=3;0;0;0.043;0.014;0.162;0.162;0.652;0.93;1;1; -aCurve=0; -bCurve=0; -ccCurve=1;0;0;0.254;0.3;1;1; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Sharpening] -Enabled=true -Method=usm -Radius=0.5 -Amount=250 -Threshold=20;80;2000;1200; -OnlyEdges=false -EdgedetectionRadius=1.9 -EdgeTolerance=1800 -HalocontrolEnabled=false -HalocontrolAmount=85 -DeconvRadius=0.75 -DeconvAmount=75 -DeconvDamping=20 -DeconvIterations=30 - -[Vibrance] -Enabled=false - -[SharpenEdge] -Enabled=false - -[SharpenMicro] -Enabled=false - -[White Balance] -Setting=Camera - -[Color appearance] -Enabled=false - -[Impulse Denoising] -Enabled=false - -[Defringing] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=false - -[EPD] -Enabled=false - -[Shadows & Highlights] -Enabled=false - -[Crop] -Enabled=false - -[Gradient] -Enabled=false - -[PCVignette] -Enabled=false - -[Directional Pyramid Equalizer] -Enabled=true -Gamutlab=true -Mult0=1 -Mult1=1 -Mult2=1 -Mult3=0.6 -Mult4=0.6 -Threshold=0.2 -Skinprotect=0 -Hueskin=-5;25;170;120; - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -CA=true - diff --git a/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 b/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 deleted file mode 100644 index d2cd3bb77..000000000 --- a/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=-1500 -HighlightCompr=40 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=FilmLike -CurveMode2=FilmLike -Curve=1;0;0;0.49407114624505927;0.49407114624505927;1;1; -Curve2=1;0;0;0.055335968379446598;0.019762845849802379;0.12648221343873495;0.11067193675889311;1;0.94861660079051413; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.063241106719367585;6.9388939039072284e-18;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=10 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=false -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.29629629629629628;0.19341563786008226;0.69547325102880675;0.80246913580246892;1;1; -Curve2=3;0;0;0.056806920298983779;0.020475350634080798;0.69802637104224341;0.88816662467456142;1;1; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=false -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Natural.pp3 b/rtdata/profiles/Skintones/Skintones - Natural.pp3 deleted file mode 100644 index 0fcdbfbfa..000000000 --- a/rtdata/profiles/Skintones/Skintones - Natural.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=-1500 -HighlightCompr=30 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=FilmLike -CurveMode2=FilmLike -Curve=1;0;0;0.49802371541501977;0.49802371541501977;1;1; -Curve2=1;0;0;0.097430830039525476;0.066798418972331866;0.12648221343873495;0.11067193675889311;1;0.95256916996047469; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.063241106719367585;6.9388939039072284e-18;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=8 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.19753086419753088;0.18106995884773661;0.58847736625514402;0.79012345679012241;1;1; -Curve2=3;0;0;0.056806920298983779;0.020475350634080798;0.69802637104224341;0.88816662467456142;1;1; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 b/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 deleted file mode 100644 index f2d2add0e..000000000 --- a/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=10 -Contrast=10 -Saturation=0 -Black=0 -HighlightCompr=40 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.1013677790907735;0.011341564456759405;0.32302405498281778;0.2147079037800686;1;0.81422924901185889; -Curve2=3;0;0;0.16151202749140844;0.24319627128016638;0.59793814432989756;0.90034364261168354;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.063241106719367585;6.9388939039072284e-18;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=-5 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.29629629629629628;0.19341563786008226;0.69547325102880675;0.80246913580246892;1;1; -Curve2=3;0;0;0.056806920298983779;0.020475350634080798;0.69802637104224341;0.88816662467456142;1;1; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 b/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 deleted file mode 100644 index d1eefc4c8..000000000 --- a/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=10 -Contrast=10 -Saturation=0 -Black=0 -HighlightCompr=40 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.1013677790907735;0.011341564456759405;0.32302405498281778;0.2147079037800686;1;0.81422924901185889; -Curve2=3;0;0;0.16151202749140844;0.24319627128016638;0.59793814432989756;0.90034364261168354;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.063241106719367585;6.9388939039072284e-18;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=-5 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.29629629629629628;0.19341563786008226;0.69547325102880675;0.80246913580246892;1;1; -Curve2=3;0;0;0.14545;0;0.69802600000000004;0.88816700000000004;1;1; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.25 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Pale.pp3 b/rtdata/profiles/Skintones/Skintones - Pale.pp3 deleted file mode 100644 index b22470758..000000000 --- a/rtdata/profiles/Skintones/Skintones - Pale.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=30 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.1013677790907735;0.011341564456759405;0.32302405498281778;0.2147079037800686;1;1; -Curve2=3;0;0;0.16151202749140844;0.24319627128016638;0.59793814432989756;0.90034364261168354;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 b/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 deleted file mode 100644 index 65a8ea742..000000000 --- a/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=No -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=false -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=true -rCurve=3;0;0;0.058419243986254393;0.28522336769759427;0.46735395189003465;0.890034364261168;1;1; -gCurve=3;0;0;0.96563573883161546;0.66323024054982871;1;1; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 b/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 deleted file mode 100644 index 23ae9feac..000000000 --- a/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -CurveMode=Standard -CurveMode2=Standard -Curve=0; -Curve2=0; - -[HLRecovery] -Enabled=false -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=No -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; - -[Directional Pyramid Denoising] -Enabled=false -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=true -rCurve=3;0;0;0.29209621993127149;0.054982817869415793;0.90034364261168398;0.46391752577319617;1;1; -gCurve=3;0;0;0.67697594501718261;0.95532646048109982;1;1; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 b/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 deleted file mode 100644 index 7d9482169..000000000 --- a/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=-1500 -HighlightCompr=40 -HighlightComprThreshold=0 -ShadowCompr=0 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.083003952569169939;0.21343873517786566;1;1; -Curve2=3;0;0;0.063063463161166899;0.13925774599931898;0.86956521739130421;0.76284584980237158;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.15019762845849804;0.02766798418972332;0.31620553359683784;0.23715415019762845;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=10 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.06584362139917696;0.01234567901234568;0.24279835390946511;0.12757201646090524;0.46502057613168757;0.49324520929459226;0.67901234567901192;0.84773662551440199;1;1; -Curve2=0; -Curve3=1;0;0;0.86008230452674928;1; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.15 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - Studio.pp3 b/rtdata/profiles/Skintones/Skintones - Studio.pp3 deleted file mode 100644 index f23d6dbfd..000000000 --- a/rtdata/profiles/Skintones/Skintones - Studio.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=-1500 -HighlightCompr=30 -HighlightComprThreshold=0 -ShadowCompr=0 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;0.083003952569169939;0.21343873517786566;1;1; -Curve2=3;0;0;0.063063463161166899;0.13925774599931898;0.86956521739130421;0.76284584980237158;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=3;0;0;0.15019762845849804;0.02766798418972332;0.31620553359683784;0.23715415019762845;0.49407114624505927;0.50197628458498023;0.92885375494071132;0.99604743083003922;1;1; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=10 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.06584362139917696;0.01234567901234568;0.24279835390946511;0.12757201646090524;0.46502057613168757;0.49324520929459226;0.67901234567901192;0.84773662551440199;1;1; -Curve2=0; -Curve3=1;0;0;0.90534979423868323;1; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.15 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 b/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 deleted file mode 100644 index a04141050..000000000 --- a/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=30 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;1;1; -Curve2=3;0;0;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.11522633744855965;0.01234567901234568;0.49382716049382719;0.49382716049382719;0.76131687242798285;0.95473251028806605;1;1; -Curve2=0; -Curve3=1;0;0;1;1; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=true -Strength=0.15 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - diff --git a/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 b/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 deleted file mode 100644 index 64f284261..000000000 --- a/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=20 -HighlightComprThreshold=0 -ShadowCompr=50 -CurveMode=WeightedStd -CurveMode2=SatAndValueBlending -Curve=3;0;0;1;1; -Curve2=3;0;0;1;1; - -[HLRecovery] -Enabled=true -Method=Blend - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Vibrance] -Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; - -[Color appearance] -Enabled=true -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=QM -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=true -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=3;0;0;0.10699588477366252;0.049382716049382713;0.49382716049382719;0.49382716049382719;0.76131687242798285;0.95473251028806605;1;1; -Curve2=0; -Curve3=1;0;0;1;1; - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Luma=0 -Ldetail=0 -Chroma=15 -Method=Lab -Redchro=0 -Bluechro=0 -Gamma=1.7 - -[EPD] -Enabled=false -Strength=0.15 -EdgeStopping=1.4 -Scale=0.25 -ReweightingIterates=0 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=0 -HighlightTonalWidth=80 -Shadows=0 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=40 - -[Gradient] -Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 - -[PCVignette] -Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - From bf6d8a3278447b3cbea4f81fc9859411f36daf67 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 16 Dec 2018 02:00:14 +0100 Subject: [PATCH 19/30] Update Deutsch locale (Colorpicker Tooltip) --- rtdata/languages/Deutsch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index e1a0acfac..0a3cddbcd 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -75,6 +75,7 @@ #74 24.11.2018 Erweiterung (TooWaBoo) RT 5.5 #75 02.12.2018 Erweiterung (TooWaBoo) RT 5.5 #76 11.12.2018 Erweiterung (TooWaBoo) RT 5.5 +#77 16.12.2018 Korrektur Farbwähler-Tooltip (TooWaBoo) RT 5.5 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -1389,7 +1390,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 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_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- Strg + 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. From 59e2eb04e9453fa18e991b205d54abd6a17b225a Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 16 Dec 2018 14:08:13 +0100 Subject: [PATCH 20/30] crop tool, fix Gui glitch & replace box with grid --- rtgui/crop.cc | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/rtgui/crop.cc b/rtgui/crop.cc index a06965840..1ba3171bc 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -181,6 +181,10 @@ Crop::Crop(): fixr = Gtk::manage (new Gtk::CheckButton (M("TP_CROP_FIXRATIO"))); setExpandAlignProperties(fixr, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); fixr->set_active (1); + + Gtk::Grid* ratiogrid = Gtk::manage(new Gtk::Grid()); + ratiogrid->get_style_context()->add_class("grid-spacing"); + setExpandAlignProperties(ratiogrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); ratio = Gtk::manage (new MyComboBoxText ()); setExpandAlignProperties(ratio, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); @@ -188,24 +192,25 @@ Crop::Crop(): orientation = Gtk::manage (new MyComboBoxText ()); setExpandAlignProperties(orientation, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); + customRatioLabel = Gtk::manage(new Gtk::Label("")); + customRatioLabel->hide(); + setExpandAlignProperties(customRatioLabel, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); + + ratiogrid->set_column_homogeneous (true); + ratiogrid->attach (*ratio, 0, 0, 1, 1); + ratiogrid->attach (*customRatioLabel, 1, 0, 1, 1); + ratiogrid->attach (*orientation, 1, 0, 1, 1); + Gtk::Label* guidelab = Gtk::manage (new Gtk::Label (M("TP_CROP_GUIDETYPE"))); setExpandAlignProperties(guidelab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); guide = Gtk::manage (new MyComboBoxText ()); setExpandAlignProperties(guide, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); - customRatioLabel = Gtk::manage(new Gtk::Label("")); - customRatioLabel->hide(); - Gtk::HBox *hb = Gtk::manage(new Gtk::HBox()); - hb->pack_start(*orientation); - hb->pack_start(*customRatioLabel); - - settingsgrid->set_column_homogeneous(true); settingsgrid->attach (*fixr, 0, 0, 1, 1); - settingsgrid->attach (*ratio, 1, 0, 1, 1); - settingsgrid->attach (*hb, 2, 0, 1, 1); + settingsgrid->attach (*ratiogrid, 1, 0, 1, 1); settingsgrid->attach (*guidelab, 0, 1, 1, 1); - settingsgrid->attach (*guide, 1, 1, 2, 1); + settingsgrid->attach (*guide, 1, 1, 1, 1); pack_start (*settingsgrid, Gtk::PACK_SHRINK, 0 ); From 0810f8f5037fbc37f313075cda66e3614e644a52 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 16 Dec 2018 16:40:18 +0100 Subject: [PATCH 21/30] Partial profile application of Detail settings does not work, fixes #4945 --- rtgui/thumbnail.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index 4d744edcb..7fb547aa6 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -32,6 +32,7 @@ #include "batchqueue.h" #include "extprog.h" #include "profilestorecombobox.h" +#include "procparamchangers.h" using namespace rtengine::procparams; @@ -449,7 +450,9 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh || pparams.hsvequalizer != pp.hsvequalizer || pparams.filmSimulation != pp.filmSimulation || pparams.softlight != pp.softlight - || pparams.dehaze != pp.dehaze; + || pparams.dehaze != pp.dehaze + || whoChangedIt == FILEBROWSER + || whoChangedIt == BATCHEDITOR; { MyMutex::MyLock lock(mutex); From c8042271dfe8870b8a81a4645e93e8b02aca0199 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 16 Dec 2018 23:23:40 +0100 Subject: [PATCH 22/30] Updated bundled PP3 files --- .../Auto-Matched Curve - ISO High.pp3 | 44 ++++------- .../profiles/Auto-Matched Curve - ISO Low.pp3 | 29 ++----- .../Auto-Matched Curve - ISO Medium.pp3 | 29 ++----- rtdata/profiles/Non-raw/Brighten.pp3 | 15 +--- rtdata/profiles/Pop/Pop 1.pp3 | 76 ++++++------------ .../Pop/{Pop 2 L.pp3 => Pop 2 Lab.pp3} | 76 ++++++------------ rtdata/profiles/Pop/Pop 3 Skin.pp3 | 76 ++++++------------ ...Pop 4 BW.pp3 => Pop 4 Black-and-White.pp3} | 77 ++++++------------- .../Standard Film Curve - ISO High.pp3 | 46 ++++------- .../Standard Film Curve - ISO Low.pp3 | 31 +++----- .../Standard Film Curve - ISO Medium.pp3 | 31 +++----- 11 files changed, 157 insertions(+), 373 deletions(-) rename rtdata/profiles/Pop/{Pop 2 L.pp3 => Pop 2 Lab.pp3} (58%) rename rtdata/profiles/Pop/{Pop 4 BW.pp3 => Pop 4 Black-and-White.pp3} (66%) diff --git a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 index a3075cfe3..6108ea54c 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 @@ -1,24 +1,11 @@ +[Exposure] +Auto=false +HistogramMatching=true + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=true -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=1;0;0;1;1; -Curve2=0; - [Directional Pyramid Denoising] Enabled=true Enhance=false @@ -44,19 +31,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true - -[RAW Bayer] -Method=lmmse -CcSteps=2 -LMMSEIterations=2 - -[RAW X-Trans] -Method=1-pass (medium) -CcSteps=2 +UseCA=true [Color Management] ToneCurve=false @@ -64,3 +39,12 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true + +[RAW Bayer] +Method=lmmse + +[RAW X-Trans] +Method=1-pass (medium) diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 index 7af720c4d..d8be8d795 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 @@ -1,32 +1,16 @@ +[Exposure] +Auto=false +HistogramMatching=true + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=true -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=0; -Curve2=0; - [LensProfile] LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true +UseCA=true [Color Management] ToneCurve=false @@ -34,3 +18,6 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 index 620fdc582..a976fdd90 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 @@ -1,24 +1,11 @@ +[Exposure] +Auto=false +HistogramMatching=true + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=0 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=true -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=0; -Curve2=0; - [Directional Pyramid Denoising] Enabled=true Enhance=false @@ -45,10 +32,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true +UseCA=true [Color Management] ToneCurve=false @@ -56,3 +40,6 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true diff --git a/rtdata/profiles/Non-raw/Brighten.pp3 b/rtdata/profiles/Non-raw/Brighten.pp3 index 863102ae0..37f66fb75 100644 --- a/rtdata/profiles/Non-raw/Brighten.pp3 +++ b/rtdata/profiles/Non-raw/Brighten.pp3 @@ -1,16 +1,3 @@ [Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true +Enabled=true LCurve=3;0;0;0.055044034166268768;0;0.52103559870550098;1;1;1; -aCurve=0; -bCurve=0; -ccCurve=3;0;0;0.10679611650485436;0.30420711974110037;1;1; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=3;0;0;0.3592233009708739;0.3592233009708739;0.40129449838187703;0.40129449838187703;1;0.0032362459546936488; diff --git a/rtdata/profiles/Pop/Pop 1.pp3 b/rtdata/profiles/Pop/Pop 1.pp3 index c86b146a8..2152a268b 100644 --- a/rtdata/profiles/Pop/Pop 1.pp3 +++ b/rtdata/profiles/Pop/Pop 1.pp3 @@ -9,31 +9,27 @@ Black=0 HighlightCompr=70 HighlightComprThreshold=0 ShadowCompr=50 +HistogramMatching=false +CurveFromHistogramMatching=false +ClampOOG=true CurveMode=FilmLike CurveMode2=Standard -Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.58;1;1; +Curve=3;0;0;0.084000000000000005;0;0.187;0.188;0.442;0.57999999999999996;1;1; Curve2=0; [HLRecovery] Enabled=true Method=Blend -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - [Luminance Curve] +Enabled=true Brightness=0 Contrast=0 Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true -LCurve=3;0;0;0.5;0.4;1;1; +LCurve=3;0;0;0.5;0.40000000000000002;1;1; aCurve=0; bCurve=0; ccCurve=0; @@ -43,18 +39,14 @@ hhCurve=0; LcCurve=0; ClCurve=0; -[Vibrance] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 - [Color appearance] Enabled=true -Degree=100 +Degree=98 AutoDegree=true +Degreeout=85 +AutoDegreeout=true Surround=Average +Surrsrc=Average AdaptLum=16 Badpixsl=0 Model=RawT @@ -70,58 +62,34 @@ H-Hue=0 RSTProtection=0 AdaptScene=208 AutoAdapscen=true +YbScene=15 +Autoybscen=true SurrSource=false Gamut=true +Tempout=5000 +Greenout=1 +Tempsc=5000 +Greensc=1 +Ybout=18 Datacie=false Tonecie=true CurveMode=Brightness CurveMode2=Lightness CurveMode3=Colorfullness Curve=0; -Curve2=3;0;0;0.15;0;0.67;0.91;1;1; -Curve3=3;0;0;0.08;0.02;0.3;0.5;1;1; +Curve2=3;0;0;0.14999999999999999;0;0.67000000000000004;0.91000000000000003;1;1; +Curve3=3;0;0;0.080000000000000002;0.02;0.29999999999999999;0.5;1;1; [EPD] Enabled=true Strength=0.25 -EdgeStopping=2.4 -Scale=0.10 +Gamma=1 +EdgeStopping=1.3999999999999999 +Scale=0.5 ReweightingIterates=0 -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - [PCVignette] Enabled=true Strength=1 Feather=50 Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -CA=true -HotPixelFilter=true -DeadPixelFilter=false -HotDeadPixelThresh=100 diff --git a/rtdata/profiles/Pop/Pop 2 L.pp3 b/rtdata/profiles/Pop/Pop 2 Lab.pp3 similarity index 58% rename from rtdata/profiles/Pop/Pop 2 L.pp3 rename to rtdata/profiles/Pop/Pop 2 Lab.pp3 index 854bd3eb5..796aeb5ba 100644 --- a/rtdata/profiles/Pop/Pop 2 L.pp3 +++ b/rtdata/profiles/Pop/Pop 2 Lab.pp3 @@ -9,31 +9,27 @@ Black=0 HighlightCompr=70 HighlightComprThreshold=0 ShadowCompr=50 +HistogramMatching=false +CurveFromHistogramMatching=false +ClampOOG=true CurveMode=FilmLike CurveMode2=Standard -Curve=3;0;0;0.179;0;0.384;0.502;1;1; +Curve=3;0;0;0.17899999999999999;0;0.38400000000000001;0.502;1;1; Curve2=0; [HLRecovery] Enabled=true Method=Blend -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - [Luminance Curve] +Enabled=true Brightness=0 Contrast=0 Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true -LCurve=3;0;0;0.12;0.3;0.5;0.46;1;1; +LCurve=3;0;0;0.12;0.29999999999999999;0.5;0.46000000000000002;1;1; aCurve=0; bCurve=0; ccCurve=0; @@ -43,18 +39,14 @@ hhCurve=0; LcCurve=0; ClCurve=0; -[Vibrance] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 - [Color appearance] Enabled=true -Degree=100 +Degree=98 AutoDegree=true +Degreeout=85 +AutoDegreeout=true Surround=Average +Surrsrc=Average AdaptLum=16 Badpixsl=0 Model=RawT @@ -70,58 +62,34 @@ H-Hue=0 RSTProtection=0 AdaptScene=208 AutoAdapscen=true +YbScene=15 +Autoybscen=true SurrSource=false Gamut=true +Tempout=5000 +Greenout=1 +Tempsc=5000 +Greensc=1 +Ybout=18 Datacie=false Tonecie=true CurveMode=Brightness CurveMode2=Lightness CurveMode3=Colorfullness Curve=0; -Curve2=3;0;0;0.15;0;0.67;0.91;1;1; -Curve3=3;0;0;0.08;0.02;0.3;0.5;1;1; +Curve2=3;0;0;0.14999999999999999;0;0.67000000000000004;0.91000000000000003;1;1; +Curve3=3;0;0;0.080000000000000002;0.02;0.29999999999999999;0.5;1;1; [EPD] Enabled=true Strength=0.25 -EdgeStopping=2.4 -Scale=0.10 +Gamma=1 +EdgeStopping=1.3999999999999999 +Scale=0.5 ReweightingIterates=0 -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - [PCVignette] Enabled=true Strength=1 Feather=50 Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -CA=true -HotPixelFilter=true -DeadPixelFilter=false -HotDeadPixelThresh=100 diff --git a/rtdata/profiles/Pop/Pop 3 Skin.pp3 b/rtdata/profiles/Pop/Pop 3 Skin.pp3 index ec50418b1..650b2e189 100644 --- a/rtdata/profiles/Pop/Pop 3 Skin.pp3 +++ b/rtdata/profiles/Pop/Pop 3 Skin.pp3 @@ -9,31 +9,27 @@ Black=0 HighlightCompr=70 HighlightComprThreshold=0 ShadowCompr=50 +HistogramMatching=false +CurveFromHistogramMatching=false +ClampOOG=true CurveMode=SatAndValueBlending CurveMode2=Standard -Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.58;1;1; +Curve=3;0;0;0.084000000000000005;0;0.187;0.188;0.442;0.57999999999999996;1;1; Curve2=0; [HLRecovery] Enabled=true Method=Blend -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - [Luminance Curve] +Enabled=true Brightness=0 Contrast=0 Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true -LCurve=3;0;0;0.5;0.4;1;1; +LCurve=3;0;0;0.5;0.40000000000000002;1;1; aCurve=0; bCurve=0; ccCurve=0; @@ -43,18 +39,14 @@ hhCurve=0; LcCurve=0; ClCurve=0; -[Vibrance] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 - [Color appearance] Enabled=true -Degree=100 +Degree=98 AutoDegree=true +Degreeout=85 +AutoDegreeout=true Surround=Average +Surrsrc=Average AdaptLum=16 Badpixsl=0 Model=RawT @@ -70,58 +62,34 @@ H-Hue=0 RSTProtection=50 AdaptScene=208 AutoAdapscen=true +YbScene=10 +Autoybscen=true SurrSource=false Gamut=true +Tempout=5000 +Greenout=1 +Tempsc=5000 +Greensc=1 +Ybout=18 Datacie=false Tonecie=true CurveMode=Brightness CurveMode2=Lightness CurveMode3=Colorfullness Curve=0; -Curve2=3;0;0;0.15;0;0.67;0.91;1;1; -Curve3=3;0;0;0.08;0.02;0.38;0.73;1;1; +Curve2=3;0;0;0.14999999999999999;0;0.67000000000000004;0.91000000000000003;1;1; +Curve3=3;0;0;0.080000000000000002;0.02;0.38;0.72999999999999998;1;1; [EPD] Enabled=true Strength=0.25 -EdgeStopping=2.4 -Scale=0.10 +Gamma=1 +EdgeStopping=1.3999999999999999 +Scale=0.5 ReweightingIterates=0 -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - [PCVignette] Enabled=true Strength=1 Feather=50 Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -CA=true -HotPixelFilter=true -DeadPixelFilter=false -HotDeadPixelThresh=100 diff --git a/rtdata/profiles/Pop/Pop 4 BW.pp3 b/rtdata/profiles/Pop/Pop 4 Black-and-White.pp3 similarity index 66% rename from rtdata/profiles/Pop/Pop 4 BW.pp3 rename to rtdata/profiles/Pop/Pop 4 Black-and-White.pp3 index b26a9d8a7..9faa32a0a 100644 --- a/rtdata/profiles/Pop/Pop 4 BW.pp3 +++ b/rtdata/profiles/Pop/Pop 4 Black-and-White.pp3 @@ -1,7 +1,7 @@ [Exposure] Auto=false Clip=0.02 -Compensation=0.66 +Compensation=0.66000000000000003 Brightness=0 Contrast=0 Saturation=0 @@ -9,24 +9,22 @@ Black=0 HighlightCompr=70 HighlightComprThreshold=0 ShadowCompr=50 +HistogramMatching=false +CurveFromHistogramMatching=false +ClampOOG=true CurveMode=SatAndValueBlending CurveMode2=Standard -Curve=3;0;0;0.084;0;0.187;0.188;0.587;0.742;1;1; +Curve=3;0;0;0.084000000000000005;0;0.187;0.188;0.58699999999999997;0.74199999999999999;1;1; Curve2=0; [HLRecovery] Enabled=true Method=Blend -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - [Black & White] Enabled=true Method=ChannelMixer -Auto=true +Auto=false ComplementaryColors=true Setting=RGB-Rel Filter=None @@ -49,13 +47,14 @@ BeforeCurve=0; AfterCurve=0; [Luminance Curve] +Enabled=true Brightness=0 Contrast=0 Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true -LCurve=3;0;0;0.212;0.119;0.674;0.773;1;1; +LCurve=3;0;0;0.21199999999999999;0.11899999999999999;0.67400000000000004;0.77300000000000002;1;1; aCurve=0; bCurve=0; ccCurve=0; @@ -65,18 +64,14 @@ hhCurve=0; LcCurve=0; ClCurve=0; -[Vibrance] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 - [Color appearance] Enabled=true -Degree=100 +Degree=97 AutoDegree=true +Degreeout=85 +AutoDegreeout=true Surround=Average +Surrsrc=Average AdaptLum=16 Badpixsl=0 Model=RawT @@ -90,60 +85,36 @@ J-Contrast=0 Q-Contrast=0 H-Hue=0 RSTProtection=0 -AdaptScene=208 +AdaptScene=164.33000000000001 AutoAdapscen=true +YbScene=10 +Autoybscen=true SurrSource=false Gamut=true +Tempout=5000 +Greenout=1 +Tempsc=5000 +Greensc=1 +Ybout=18 Datacie=false Tonecie=true CurveMode=Lightness CurveMode2=Lightness CurveMode3=Colorfullness -Curve=3;0;0;0.15;0;0.545;1;1;1; +Curve=3;0;0;0.14999999999999999;0;0.54500000000000004;1;1;1; Curve2=0; Curve3=0; [EPD] Enabled=true Strength=0.25 -EdgeStopping=2.4 -Scale=0.10 +Gamma=1 +EdgeStopping=1.3999999999999999 +Scale=0.5 ReweightingIterates=0 -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - [PCVignette] Enabled=true Strength=1 Feather=50 Roundness=50 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[Wavelet] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -CA=true -HotPixelFilter=true -DeadPixelFilter=false -HotDeadPixelThresh=100 diff --git a/rtdata/profiles/Standard Film Curve - ISO High.pp3 b/rtdata/profiles/Standard Film Curve - ISO High.pp3 index c3480ec19..ae134e7f4 100644 --- a/rtdata/profiles/Standard Film Curve - ISO High.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO High.pp3 @@ -1,24 +1,13 @@ +[Exposure] +Auto=false +HistogramMatching=false +CurveMode=FilmLike +Curve=1;0;0;0.11;0.089999999999999997;0.32000000000000001;0.42999999999999999;0.66000000000000003;0.87;1;1; + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=90 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=false -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; -Curve2=0; - [Directional Pyramid Denoising] Enabled=true Enhance=false @@ -45,19 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true - -[RAW Bayer] -Method=lmmse -CcSteps=2 -LMMSEIterations=2 - -[RAW X-Trans] -Method=1-pass (medium) -CcSteps=2 +UseCA=true [Color Management] ToneCurve=false @@ -65,3 +42,12 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true + +[RAW Bayer] +Method=lmmse + +[RAW X-Trans] +Method=1-pass (medium) diff --git a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 index d403119b9..4f6ad62c2 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 @@ -1,32 +1,18 @@ +[Exposure] +Auto=false +HistogramMatching=false +CurveMode=FilmLike +Curve=1;0;0;0.11;0.089999999999999997;0.32000000000000001;0.42999999999999999;0.66000000000000003;0.87;1;1; + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=90 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=false -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; -Curve2=0; - [LensProfile] LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true +UseCA=true [Color Management] ToneCurve=false @@ -34,3 +20,6 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true diff --git a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 index 7fad5b3e8..4921ffb22 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 @@ -1,24 +1,13 @@ +[Exposure] +Auto=false +HistogramMatching=false +CurveMode=FilmLike +Curve=1;0;0;0.11;0.089999999999999997;0.32000000000000001;0.42999999999999999;0.66000000000000003;0.87;1;1; + [HLRecovery] Enabled=true Method=Blend -[Exposure] -Auto=false -Clip=0.02 -Compensation=0 -Brightness=0 -Contrast=0 -Saturation=0 -Black=0 -HighlightCompr=90 -HighlightComprThreshold=33 -ShadowCompr=50 -HistogramMatching=false -CurveMode=FilmLike -CurveMode2=WeightedStd -Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; -Curve2=0; - [Directional Pyramid Denoising] Enabled=true Enhance=false @@ -45,10 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=false - -[RAW] -CA=true +UseCA=true [Color Management] ToneCurve=false @@ -56,3 +42,6 @@ ApplyLookTable=true ApplyBaselineExposureOffset=true ApplyHueSatMap=true DCPIlluminant=0 + +[RAW] +CA=true From 0b464c1eb453fc74fbe29ba2ce6dade9d8bd0794 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 17 Dec 2018 00:21:58 +0100 Subject: [PATCH 23/30] Removed Tone Mapping tooltip #2221 --- rtdata/languages/Catala | 3 +-- rtdata/languages/Chinese (Simplified) | 3 +-- rtdata/languages/Chinese (Traditional) | 3 +-- rtdata/languages/Czech | 1 - rtdata/languages/Dansk | 3 +-- rtdata/languages/Deutsch | 1 - rtdata/languages/English (UK) | 3 +-- rtdata/languages/English (US) | 3 +-- rtdata/languages/Espanol | 1 - rtdata/languages/Euskara | 3 +-- rtdata/languages/Francais | 1 - rtdata/languages/Greek | 3 +-- rtdata/languages/Hebrew | 3 +-- rtdata/languages/Italiano | 3 +-- rtdata/languages/Japanese | 1 - rtdata/languages/Latvian | 3 +-- rtdata/languages/Magyar | 3 +-- rtdata/languages/Nederlands | 1 - rtdata/languages/Norsk BM | 3 +-- rtdata/languages/Polish | 3 +-- rtdata/languages/Polish (Latin Characters) | 3 +-- rtdata/languages/Portugues (Brasil) | 1 - rtdata/languages/Russian | 3 +-- rtdata/languages/Serbian (Cyrilic Characters) | 3 +-- rtdata/languages/Serbian (Latin Characters) | 3 +-- rtdata/languages/Slovak | 3 +-- rtdata/languages/Suomi | 3 +-- rtdata/languages/Swedish | 1 - rtdata/languages/Turkish | 3 +-- rtdata/languages/default | 3 +-- rtgui/epd.cc | 2 -- 31 files changed, 22 insertions(+), 54 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index f4c0ab91a..ce7e9e378 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1611,7 +1611,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1874,7 +1874,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image. !TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera. !TP_EPD_GAMMA;Gamma -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_HISTMATCHING;Auto-Matched Tone Curve !TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail. diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index e4d52b774..f0d50ec3e 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1599,7 +1599,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_TOOLTIP;Linear: will produce a normal linear response.\nSpecial effects: will produce special effects by mixing channels non-linearly. !TP_BWMIX_CC_ENABLED;Adjust complementary color @@ -1819,7 +1819,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_EPD_EDGESTOPPING;Edge stopping !TP_EPD_GAMMA;Gamma !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index f6605f63e..b6e4dedbc 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1413,7 +1413,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1702,7 +1702,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index e8b11906d..56900e28b 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -1666,7 +1666,6 @@ TP_EPD_LABEL;Mapování tónů TP_EPD_REWEIGHTINGITERATES;Počet průchodů převážení TP_EPD_SCALE;Měřítko TP_EPD_STRENGTH;Síla -TP_EPD_TOOLTIP;Mapování tónů je dostupné v L*a*b* (standard) a CIECAM02 módu.\n\nV L*a*b* módu může být mapování tónů použito i pro zůstatkový obraz nástroje Vlnka\n\nPro zapnutí mapování tónů v CIECAM02 módu zapněte prosím následující volby:\n1. CIECAM02\n2. Algoritmus="Jas a pestrobarevnost (QM)"\n3. "Mapování tónů pomocí jasu CIECAM02 (Q)" TP_EXPOSURE_AUTOLEVELS;Automatické úrovně TP_EXPOSURE_AUTOLEVELS_TIP;Přepne provedení Automatické úrovně na automatickou sadu hodnot parametrů založených na analýze obrázku\nPokud to je nezbytné, povolí rekonstrukci světel. TP_EXPOSURE_BLACKLEVEL;Černá diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index f1b952b00..72b795c29 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1410,7 +1410,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1699,7 +1699,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 0a3cddbcd..4bf12cbed 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -1707,7 +1707,6 @@ TP_EPD_LABEL;Tonwertkorrektur TP_EPD_REWEIGHTINGITERATES;Iterationen TP_EPD_SCALE;Faktor TP_EPD_STRENGTH;Intensität -TP_EPD_TOOLTIP;Tonwertkorrektur ist mit dem L*a*b*- und CIECAM02-Modus möglich.\n\nFür den CIECAM02-Modus müssen folgende Optionen aktiviert sein:\n1. CIECAM02\n2. Algorithmus = Helligkeit + Farbigkeit (QM)\n3. Tonwertkorrektur mittels CIECAM02-Helligkeit (Q) TP_EXPOSURE_AUTOLEVELS;Auto TP_EXPOSURE_AUTOLEVELS_TIP;Automatische Belichtungseinstellung\nbasierend auf Bildanalyse. TP_EXPOSURE_BLACKLEVEL;Schwarzwert diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index de8f44a27..edde8946e 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -53,7 +53,7 @@ PREFERENCES_PRTPROFILE;Colour profile PREFERENCES_TAB_COLORMGR;Colour Management SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colours with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Colour Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -TOOLBAR_TOOLTIP_COLORPICKER;Lockable Colour Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +TOOLBAR_TOOLTIP_COLORPICKER;Lockable Colour Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. TOOLBAR_TOOLTIP_STRAIGHTEN;Straighten / fine rotation.\nShortcut: s\n\nIndicate the vertical or horizontal by drawing a guide line over the image preview. Angle of rotation will be shown next to the guide line. Centre of rotation is the geometrical centre of the image. TP_BWMIX_CC_ENABLED;Adjust complementary colour TP_BWMIX_CC_TOOLTIP;Enable to allow automatic adjustment of complementary colours in ROYGCBPM mode. @@ -87,7 +87,6 @@ TP_DIRPYRDENOISE_MAIN_COLORSPACE;Colour space TP_DIRPYREQUALIZER_ALGO;Skin Colour Range TP_DIRPYREQUALIZER_ALGO_TOOLTIP;Fine: closer to the colours of the skin, minimizing the action on other colours\nLarge: avoid more artifacts. TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colours (hue, chroma, luma) and the rest of the image. -TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colourfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colours TP_FLATFIELD_CLIPCONTROL_TOOLTIP;Clip control avoids clipped highlights caused by applying the flat field. If there are already clipped highlights before applying the flat field, clip control can lead to colour cast. TP_GRADIENT_CENTER;Centre diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 6b1526dcc..078989905 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -1310,7 +1310,7 @@ !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TOOLBAR_TOOLTIP_CROP;Crop selection.\nShortcut: c\nMove the crop using Shift+mouse drag. !TOOLBAR_TOOLTIP_HAND;Hand tool.\nShortcut: h !TOOLBAR_TOOLTIP_STRAIGHTEN;Straighten / fine rotation.\nShortcut: s\n\nIndicate the vertical or horizontal by drawing a guide line over the image preview. Angle of rotation will be shown next to the guide line. Center of rotation is the geometrical center of the image. @@ -1626,7 +1626,6 @@ !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS;Auto Levels !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_BLACKLEVEL;Black diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index a202e2e47..3260d167c 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1749,7 +1749,6 @@ TP_EPD_LABEL;Mapeo tonal TP_EPD_REWEIGHTINGITERATES;Iteraciones de reponderación TP_EPD_SCALE;Escala TP_EPD_STRENGTH;Intensidad -TP_EPD_TOOLTIP;El mapeo tonal puede hacerse en modo Lab (estándar) y en modo CIECAM02.\n\nPara activar mapeo tonal modo CIECAM02 haga los siguientes ajustes:\n1. CIECAM02\n2. Algoritmo="Brillo + Colorido (QM)"\n3. "Mapeo tonal usando Brillo CIECAM02 (Q)" TP_EXPOSURE_AUTOLEVELS;Niveles automáticos TP_EXPOSURE_AUTOLEVELS_TIP;Ejecuta Niveles Automáticos. Establece automáticamente los valores de los parámetros basándose en el análisis de la imagen.\nHabilita la reconstrucción de luces altas si es necesario TP_EXPOSURE_BLACKLEVEL;Nivel de Negro diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 12deea740..6d947cdd9 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1411,7 +1411,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1700,7 +1700,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 9819b20a5..987774546 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -1632,7 +1632,6 @@ TP_EPD_LABEL;Compression tonale TP_EPD_REWEIGHTINGITERATES;Itérations de la pondération TP_EPD_SCALE;Échelle TP_EPD_STRENGTH;Force -TP_EPD_TOOLTIP;Vous pouvez choisir entre le mode Lab (standard) ou le mode CIECAM02.\n En activant "Compression tonale avec brillance Q CIECAM" dans le menu "Brillance + Niveau de couleur CIECAM" TP_EXPOSURE_AUTOLEVELS;Niveaux Auto TP_EXPOSURE_AUTOLEVELS_TIP;Bascule l'usage de Niveaux automatiques afin de régler automatiquement les valeurs basé sur l'analyse de l'image\nActive la Reconstruction des Hautes Lumières si nécessaire. TP_EXPOSURE_BLACKLEVEL;Noir diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index d5cfc781c..eba373871 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1410,7 +1410,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1699,7 +1699,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 75b3a3dd7..faa279860 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1411,7 +1411,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1700,7 +1700,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 7e81ff386..0c0f66576 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -987,7 +987,6 @@ TP_EPD_LABEL;Tone Mapping TP_EPD_REWEIGHTINGITERATES;Iterazioni di Ribilanciamento TP_EPD_SCALE;Scala TP_EPD_STRENGTH;Forza -TP_EPD_TOOLTIP;Il Tone Mapping è possibile in modalità Lab (standard) o CIECAM02.\n\nPer utilizare il Tone Mapping CIECAM02 abilita quste impostazioni: \n 1. CIECAM02\n 2. Algoritmo="Brillanza + Pienezza (QM)"\n 3. "Tone mapping con CIECAM02" TP_EXPOSURE_AUTOLEVELS;Livelli automatici TP_EXPOSURE_AUTOLEVELS_TIP;Abilita l'esecuzione dei livelli automatici per impostare automaticamente il cursore Esposizione in base all'analisi dell'immagine.\nSe necessario, abilita Ricostruzione Alteluci. TP_EXPOSURE_BLACKLEVEL;Livello del nero @@ -1801,7 +1800,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_MIXC;Channel Mixer !TP_BWMIX_NEUTRAL;Reset !TP_CBDL_AFT;After Black-and-White diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index a8ed3bc2b..ad8996907 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -1658,7 +1658,6 @@ TP_EPD_LABEL;トーンマッピング TP_EPD_REWEIGHTINGITERATES;再加重反復 TP_EPD_SCALE;スケール TP_EPD_STRENGTH;強さ -TP_EPD_TOOLTIP;トーンマッピングは、L*a*b*モード(標準)またはCIECAM02モードを介して可能です\n\nL*a*b*モードの場合、トーンマッピングはウェーブレット機能の残差画像にも使えます\n\n CIECAM02トーンマッピングモードは以下の設定を有効にします:\n 1. CIECAM02\n 2. アルゴリズム="明るさ + 鮮やかさ (QM)"\n 3. "CIECAM02 明るさ(Q)でトーンマッピング" TP_EXPOSURE_AUTOLEVELS;自動露光補正 TP_EXPOSURE_AUTOLEVELS_TIP;画像を解析し露光補正を自動で設定します TP_EXPOSURE_BLACKLEVEL;黒レベル diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index b97aca446..83fd32895 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1411,7 +1411,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1700,7 +1700,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 02d67437b..d13d6d5a4 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1564,7 +1564,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1829,7 +1829,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_DIRPYREQUALIZER_TOOLTIP;Attempts to reduce artifacts in the transitions between skin colors (hue, chroma, luma) and the rest of the image. !TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera. !TP_EPD_GAMMA;Gamma -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CURVEEDITOR1;Tone curve 1 !TP_EXPOSURE_CURVEEDITOR2;Tone curve 2 diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 0f1fdff6e..225b3ecf4 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -1408,7 +1408,6 @@ TP_EPD_LABEL;Tonemapping (Lab/CIECAM02) TP_EPD_REWEIGHTINGITERATES;Herhaling TP_EPD_SCALE;Schaal TP_EPD_STRENGTH;Sterkte -TP_EPD_TOOLTIP;Tonemapping is mogelijk via Lab mode (standaard) of CIECAM02 mode.\n\nOm CIECAM02 Tonemapping mode te gebruiken moeten de volgende instellingen worden gekozen: \n1. CIECAM\n2. Algoritme="Helderheid + Kleurrijkheid (QM)"\n3. "Tonemapping gebruik makend van CIECAM02 helderheid (Q)" TP_EXPOSURE_AUTOLEVELS;Autom. niveaus TP_EXPOSURE_AUTOLEVELS_TIP;Activeer automatische niveaus\nActiveer Herstel Hoge lichten indien nodig. TP_EXPOSURE_BLACKLEVEL;Schaduwen diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index ec695aac6..1fd3e18c1 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1410,7 +1410,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1699,7 +1699,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 2a21b3836..916ea2b90 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1085,7 +1085,6 @@ TP_EPD_LABEL;Tone Mapping TP_EPD_REWEIGHTINGITERATES;Powtarzanie rozważania TP_EPD_SCALE;Skala TP_EPD_STRENGTH;Siła -TP_EPD_TOOLTIP;Tone mapping może się odbyć w przestrzeni kolorów L*a*b* (domyślnie) oraz CIECAM02.\n\nAby wykonać tone mapping w przestrzeni CIECAM02 należy włączyć następujące ustawienia:\n1. CIECAM02\n2. Algorytm="Jasność + Barwistość (QM)"\n3. "Tone mapping za pomocą jasności CIECAM02 (Q)" TP_EXPOSURE_AUTOLEVELS;Wyrównaj poziomy TP_EXPOSURE_AUTOLEVELS_TIP;Dokonaj automatycznego ustawienia parametrów ekspozycji na podstawie analizy obrazu TP_EXPOSURE_BLACKLEVEL;Czerń @@ -1877,7 +1876,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_MIXC;Channel Mixer !TP_BWMIX_NEUTRAL;Reset !TP_CBDL_AFT;After Black-and-White diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 7889a83cf..6b18c604e 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1085,7 +1085,6 @@ TP_EPD_LABEL;Tone Mapping TP_EPD_REWEIGHTINGITERATES;Powtarzanie rozwazania TP_EPD_SCALE;Skala TP_EPD_STRENGTH;Sila -TP_EPD_TOOLTIP;Tone mapping moze sie odbyc w przestrzeni kolorow L*a*b* (domyslnie) oraz CIECAM02.\n\nAby wykonac tone mapping w przestrzeni CIECAM02 nalezy wlaczyc nastepujace ustawienia:\n1. CIECAM02\n2. Algorytm="Jasnosc + Barwistosc (QM)"\n3. "Tone mapping za pomoca jasnosci CIECAM02 (Q)" TP_EXPOSURE_AUTOLEVELS;Wyrownaj poziomy TP_EXPOSURE_AUTOLEVELS_TIP;Dokonaj automatycznego ustawienia parametrow ekspozycji na podstawie analizy obrazu TP_EXPOSURE_BLACKLEVEL;Czern @@ -1877,7 +1876,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_MIXC;Channel Mixer !TP_BWMIX_NEUTRAL;Reset !TP_CBDL_AFT;After Black-and-White diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index f5a72cb4c..1b25b43dc 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1550,7 +1550,6 @@ TP_EPD_LABEL;Mapeamento de Tom TP_EPD_REWEIGHTINGITERATES;Reponderando iterações TP_EPD_SCALE;Escala TP_EPD_STRENGTH;Intensidade -TP_EPD_TOOLTIP;O mapeamento de tom é possível no modo L*a*b* (padão) e no modo CIECAM02.\n\nQuando no modo L*a*b*, o mapeamento de tom também pode ser usado na imagem residual da ferramenta de Níveis de Wavelet.\n\nPara ativar o modo de mapeamento de tom CIECAM02, habilite as seguintes configurações:\n1. CIECAM02\n2. Algorítimo = "Brilho + Colorido (QM)"\n3. "Mapeamento de tom usando o brilho do CIECAM02 (Q)" TP_EXPOSURE_AUTOLEVELS;Níveis Automáticos TP_EXPOSURE_AUTOLEVELS_TIP;Alterna a execução dos Níveis Automáticos para definir automaticamente os valores do controle deslizante de Exposição baseado numa análise de imagem.\nHabilita a Reconstrução de Realce se necessário. TP_EXPOSURE_BLACKLEVEL;Preto diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 584f10d45..b440470a3 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1133,7 +1133,6 @@ TP_EPD_LABEL;Тональная компрессия TP_EPD_REWEIGHTINGITERATES;Перевзвешивание проходов TP_EPD_SCALE;Масштаб TP_EPD_STRENGTH;Интенсивность -TP_EPD_TOOLTIP;Тональная компрессия возможна в режиме L*a*b* (по умолчанию) и CIECAM02.\nВ режиме L*a*b* тональная компрессия также может быть использована для остаточного изображения Вейвлетов.\n\n.Для использования модели тональной компрессии CIECAM02 включите следующие настройки:\n1. CIECAM02\n2. Алгоритм Яркость+Красочность (QM)\n3. Тональная компрессия, использующая яркость CIECAM02 (Q). TP_EXPOSURE_AUTOLEVELS;Автоуровни TP_EXPOSURE_AUTOLEVELS_TIP;Переключение выполнения автоуровней для автоматической установки параметров экспозиции на основе анализа изображения TP_EXPOSURE_BLACKLEVEL;Уровень чёрного @@ -1881,7 +1880,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_CBDL_AFT;After Black-and-White !TP_CBDL_BEF;Before Black-and-White !TP_CBDL_METHOD;Process located diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index cd8d6e640..d6e357068 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -944,7 +944,6 @@ TP_EPD_LABEL;Мапирање тонова TP_EPD_REWEIGHTINGITERATES;Број поновних мерења TP_EPD_SCALE;Размера TP_EPD_STRENGTH;Јачина -TP_EPD_TOOLTIP;Мапирање тонова је могуће у Лаб (стандардном) или CIECAM02 режиму.\n\nЗа рад у CIECAM02 режиму укључите:\n1. CIECAM02\n2. Алгоритам="Осветљење + живописност (QM)"\n3. "Мапирање тонова у CIECAM02 осветљењу (Q)" TP_EXPOSURE_AUTOLEVELS;Ауто-нивои TP_EXPOSURE_AUTOLEVELS_TIP;Омогућава аутоматско одређивање нивоа, који подешава клизаче експозиције на основу податка о самој слици.\nУкључује чупање светлих делова уколико је неопходно. TP_EXPOSURE_BLACKLEVEL;Црна @@ -1789,7 +1788,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. !THRESHOLDSELECTOR_BL;Bottom-left -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_FILTER_TOOLTIP;The color filter simulates shots taken with a colored filter placed in front of the lens. Colored filters reduce the transmission of specific color ranges and therefore affect their lightness. E.g. a red filter darkens blue skies. !TP_BWMIX_FILTER_YELLOW;Yellow !TP_BWMIX_GAMMA;Gamma Correction diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 664894021..4d833d202 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -944,7 +944,6 @@ TP_EPD_LABEL;Mapiranje tonova TP_EPD_REWEIGHTINGITERATES;Broj ponovnih merenja TP_EPD_SCALE;Razmera TP_EPD_STRENGTH;Jačina -TP_EPD_TOOLTIP;Mapiranje tonova je moguće u Lab (standardnom) ili CIECAM02 režimu.\n\nZa rad u CIECAM02 režimu uključite:\n1. CIECAM02\n2. Algoritam="Osvetljenje + živopisnost (QM)"\n3. "Mapiranje tonova u CIECAM02 osvetljenju (Q)" TP_EXPOSURE_AUTOLEVELS;Auto-nivoi TP_EXPOSURE_AUTOLEVELS_TIP;Omogućava automatsko određivanje nivoa, koji podešava klizače ekspozicije na osnovu podatka o samoj slici.\nUključuje čupanje svetlih delova ukoliko je neophodno. TP_EXPOSURE_BLACKLEVEL;Crna @@ -1789,7 +1788,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. !SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. !THRESHOLDSELECTOR_BL;Bottom-left -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_FILTER_TOOLTIP;The color filter simulates shots taken with a colored filter placed in front of the lens. Colored filters reduce the transmission of specific color ranges and therefore affect their lightness. E.g. a red filter darkens blue skies. !TP_BWMIX_FILTER_YELLOW;Yellow !TP_BWMIX_GAMMA;Gamma Correction diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 1319912db..0ceeab884 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1450,7 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1729,7 +1729,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 6ca4406d8..3c3cdc6c5 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1411,7 +1411,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1700,7 +1700,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 868e609bb..5032496a3 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1281,7 +1281,6 @@ TP_EPD_LABEL;Tonmappning TP_EPD_REWEIGHTINGITERATES;Återviktade iterationer TP_EPD_SCALE;Skala TP_EPD_STRENGTH;Styrka -TP_EPD_TOOLTIP;Tonmappning är möjligt via Lab-läge (standard) och CIECAM02-läge.\n\nFör att aktivera CIECAM02- tonmappningsläget, aktivera följande:\n1. CIECAM02\n2. Algoritm="Intensitet + Färgmättnad (QM)"\n3. "Tonmappning mha CIECAM02 intensitet (Q)" TP_EXPOSURE_AUTOLEVELS;Autonivåer TP_EXPOSURE_AUTOLEVELS_TIP;Slå av/på autonivåer för att automatiskt beräkna och använda värden baserat på bildanalys\nAktiverar högdageråterställning om nödvändigt TP_EXPOSURE_BLACKLEVEL;Svärta diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index a9d3e9d5e..39302869d 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1410,7 +1410,7 @@ TP_WBALANCE_TEMPERATURE;Isı !THRESHOLDSELECTOR_T;Top !THRESHOLDSELECTOR_TL;Top-left !THRESHOLDSELECTOR_TR;Top-right -!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: shift+right-click.\n- Revert to hand tool: right-click. +!TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. !TP_BWMIX_ALGO;Algorithm OYCPM !TP_BWMIX_ALGO_LI;Linear !TP_BWMIX_ALGO_SP;Special effects @@ -1699,7 +1699,6 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_EPD_REWEIGHTINGITERATES;Reweighting iterates !TP_EPD_SCALE;Scale !TP_EPD_STRENGTH;Strength -!TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" !TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_CLIP_TIP;The fraction of pixels to be clipped in Auto Levels operation. diff --git a/rtdata/languages/default b/rtdata/languages/default index dc5f85156..50a9aee2b 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1309,7 +1309,7 @@ THRESHOLDSELECTOR_HINT;Hold the Shift key to move individual control poin THRESHOLDSELECTOR_T;Top THRESHOLDSELECTOR_TL;Top-left THRESHOLDSELECTOR_TR;Top-right -TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: control+shift+right-click.\n- Revert to hand tool: right-click outside any picker. +TOOLBAR_TOOLTIP_COLORPICKER;Lockable Color Picker\n\nWhen the tool is active:\n- Add a picker: left-click.\n- Drag a picker: left-click and drag.\n- Delete a picker: right-click.\n- Delete all pickers: Ctrl+Shift+right-click.\n- Revert to hand tool: right-click outside any picker. TOOLBAR_TOOLTIP_CROP;Crop selection.\nShortcut: c\nMove the crop using Shift+mouse drag. TOOLBAR_TOOLTIP_HAND;Hand tool.\nShortcut: h TOOLBAR_TOOLTIP_STRAIGHTEN;Straighten / fine rotation.\nShortcut: s\n\nIndicate the vertical or horizontal by drawing a guide line over the image preview. Angle of rotation will be shown next to the guide line. Center of rotation is the geometrical center of the image. @@ -1625,7 +1625,6 @@ TP_EPD_LABEL;Tone Mapping TP_EPD_REWEIGHTINGITERATES;Reweighting iterates TP_EPD_SCALE;Scale TP_EPD_STRENGTH;Strength -TP_EPD_TOOLTIP;Tone mapping is possible in L*a*b* mode (standard) and CIECAM02 mode.\n\nWhen in L*a*b* mode, tone mapping can also be used on the residual image of the Wavelet Levels tool.\n\nTo engage CIECAM02 tone mapping mode enable the following settings:\n1. CIECAM02\n2. Algorithm="Brightness + Colorfulness (QM)"\n3. "Tone mapping using CIECAM02 brightness (Q)" TP_EXPOSURE_AUTOLEVELS;Auto Levels TP_EXPOSURE_AUTOLEVELS_TIP;Toggles execution of Auto Levels to automatically set Exposure slider values based on an image analysis.\nEnables Highlight Reconstruction if necessary. TP_EXPOSURE_BLACKLEVEL;Black diff --git a/rtgui/epd.cc b/rtgui/epd.cc index 681248994..675a5b9b9 100644 --- a/rtgui/epd.cc +++ b/rtgui/epd.cc @@ -26,8 +26,6 @@ using namespace rtengine::procparams; EdgePreservingDecompositionUI::EdgePreservingDecompositionUI () : FoldableToolPanel(this, "epd", M("TP_EPD_LABEL"), true, true) { - setEnabledTooltipMarkup(M("TP_EPD_TOOLTIP")); - strength = Gtk::manage(new Adjuster (M("TP_EPD_STRENGTH"), -1.0, 2.0, 0.01, 0.5)); gamma = Gtk::manage(new Adjuster (M("TP_EPD_GAMMA"), 0.8, 1.5, 0.01, 1.)); edgeStopping = Gtk::manage(new Adjuster (M("TP_EPD_EDGESTOPPING"), 0.1, 4.0, 0.01, 0.5)); From d9ac235559f48e7554e1dd371f9bf9eb34327921 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 17 Dec 2018 00:36:11 +0100 Subject: [PATCH 24/30] Preparing for release 5.5 --- RELEASE_NOTES.txt | 4 ++-- rtdata/images/non-themed/png/splash.png | Bin 79409 -> 75716 bytes rtdata/images/non-themed/rt-splash.svg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index e08a4bb75..e7e036400 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,6 @@ -RAWTHERAPEE 5.5-RC2 RELEASE NOTES +RAWTHERAPEE 5.5 RELEASE NOTES -This is RawTherapee 5.5 Release Candidate 2, released on 2018-12-11. +This is RawTherapee 5.5, released on 2018-12-17. Start by reading the "Getting Started" article on RawPedia: http://rawpedia.rawtherapee.com/ diff --git a/rtdata/images/non-themed/png/splash.png b/rtdata/images/non-themed/png/splash.png index 2245423664fb9b5b40ff8e5582effe6816dab7b4..4075b3b8940bf604631d37116fa4c7ae4abd5b7c 100644 GIT binary patch delta 12147 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 An*aa+ delta 15869 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 diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg index 7aabe25f4..50e34d1cb 100644 --- a/rtdata/images/non-themed/rt-splash.svg +++ b/rtdata/images/non-themed/rt-splash.svg @@ -929,7 +929,7 @@ Date: Mon, 17 Dec 2018 02:14:16 +0100 Subject: [PATCH 25/30] Preparing to merge release 5.5 back into dev --- RELEASE_NOTES.txt | 77 ++++-------------------- rtdata/images/non-themed/png/splash.png | Bin 75716 -> 78156 bytes rtdata/images/non-themed/rt-splash.svg | 4 +- 3 files changed, 13 insertions(+), 68 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index e7e036400..248d27f36 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,10 +1,17 @@ -RAWTHERAPEE 5.5 RELEASE NOTES +RAWTHERAPEE 5.5-dev RELEASE NOTES -This is RawTherapee 5.5, released on 2018-12-17. +This is a development version of RawTherapee. We update the code almost daily. Every few months, once enough changes have accumulated and the code is stabilized, we make a new official release. Every code change between these releases is known as a "development" version, and this is one of them. Start by reading the "Getting Started" article on RawPedia: http://rawpedia.rawtherapee.com/ +While we only commit tested and relatively stable code and so the development versions should be fairly stable, you should be aware that: +- Development versions only had limited testing, so there may be bugs unknown to us. +- You should report these bugs so that they get fixed for the next stable release. See + www.rawpedia.rawtherapee.com/How_to_write_useful_bug_reports +- The way new tools work in the development versions is likely to change as we tweak and tune them, so your processing profiles may produce different results when used in a future stable version. +- Bugs present in the stable versions get fixed in the development versions, and make it into the next stable version when we make a new official release. That means that in some ways the development versions can be "more stable" than the latest stable release. At the same time, new features may introduce new bugs. This is a trade-off you should be aware of. + NEWS RELEVANT TO PHOTOGRAPHERS @@ -19,57 +26,8 @@ In order to use RawTherapee efficiently you should know that: - All curves support the Shift and Ctrl keys while dragging a point. Shift+drag makes the point snap to a meaningful axis (top, bottom, diagonal, other), while Ctrl+drag makes your mouse movement super-fine for precise point positioning. - There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control. Make sure you familiarize yourself with them on RawPedia's "Keyboard Shortcuts" page! -New features since 5.4: -- Filter to remove striping artifacts caused by Phase Detection Auto Focus (PDAF) as seen in Sony cameras, and to remove banding artifacts apparently caused by Nikon's too-aggressive in-camera PDAF correction. These are available for any camera which has a PDAF entry in camconst.json, currently: - - Nikon Z 6 - - Nikon Z 7 - - Sony DSC-RX1RM2 - - Sony ILCE-6000 - - Sony ILCE-6300 - - Sony ILCE-6500 - - Sony ILCE-7M3 - - Sony ILCE-7RM2 - - Sony ILCE-7RM3 - - Sony ILCE-9 -- Out-of-gamut warning compatible with ICC v2 and v4 profiles. -- Ability to specify custom working color spaces through workingspaces.json file. -- Unbounded processing - allows you to decide whether out-of-gamut colors should get clipped. -- Improved support for Canon mRaw format variants. -- New Shadows/Highlights tool (replaced previous one). -- Contrast threshold mask which divides an image into areas of high and low detail, allowing the effect of certain tools to be focused where it matters most and to mitigate the effect on areas where it would be undesirable, for example having the Sharpening tool affect only the in-focus subject without affecting the out-of-focus background. Available for: - - Sharpening - - Post-Resize Sharpening - - Microcontrast - - Demosaicing -- Dual-demosaic algorithms, making use of the new contrast threshold mask, allowing one to use a combination of demosaicing algorithms where one is best for details and the other best for plain areas. -- New color toning methods: - - Grid, allowing you to separately tone the shadows and highlights using two points on a simple color grid. - - Regions, allowing you to tone based on any number of masks. Supports functions from the American Society of Cinematographers Color Decision List (ASC CDL). -- Resizable main histogram with scaling modes: - - Linear - - Log - - Log-log -- Support for Blackmagic and Canon Magic Lantern lj92 encoded files. -- Allows you to specify how many border rows/columns to discard during demosaicing - those who shoot raw video at a standard resolution such as 1920x1080 will appreciate being able to preserve the dimensions. -- New Soft Light tool which enhances contrast and saturation by emulating the effect of blending an image with a copy of itself in "soft light" blending mode in GIMP. -- New Haze Removal tool to reduce the effects of haze or fog. -- The Resize tool allows you to specify whether you want it to upscale or only downscale. -- New icon and cursor theme. -- ICC profile generator. -- The bundled profiles have been re-generated, and now include ICC v2 and v4 variants. -- If your screen's resolution is such that not all icons fit in a toolbar, you can now scroll the toolbar using the mouse scroll-wheel. -- New "Flexible" tone curve type. A characteristic of the cubic spline curve (renamed from "Custom" to "Standard") is that editing one node could have a huge impact on what happens to the curve in relation to the other nodes. The new "Flexible" centripetal Catmull–Rom spline curve allows you to make adjustments to any part of the curve with little impact on the other parts. -- Allow saving both floating-point and integer type files at both 16-bit and 32-bit precision from RawTherapee GUI and CLI. -- Improves lensfun chromatic aberration correction. -- The raw chromatic aberration correction tool can now run in several iterations, and gained a feature to avoid introducing a color shift which could result from correcting chromatic aberration before demosaicing. -- Certain sliders now operate on a logarithmic scale, allowing for a meaningful response over large ranges. -- Dedicated "Reset" button in Crop tool. -- Support for new cameras, and new input color profiles. -- Speed enhancements and bug fixes, for a total of over 1300 commits. - -RawTherapee and other open-source projects require access to sample raw files from various camera makes and models in order to support those raw formats correctly. -You can help by submitting raw files to RPU: -https://raw.pixls.us/ +New features since 5.5: +TODO. @@ -84,12 +42,6 @@ In general: - For stable releases use -DCACHE_NAME_SUFFIX="" - For development builds and release-candidates use -DCACHE_NAME_SUFFIX="5-dev" -Changes since 5.4: -- Requires libtiff >= 4.0.4. -- Requires CMake >= 2.8.8. -- Optional codesigning commands have been added to the CMakeLists.txt and macosx_bundle.sh scripts. If you wish to codesign the built packages (.app and .dmg), add your details to your CMake command flags: - -DCODESIGNID:STRING="Developer ID Application: Firstname Lastname (xxx)" - NEWS RELEVANT TO DEVELOPERS @@ -131,13 +83,6 @@ More information here: http://rawpedia.rawtherapee.com/IRC -SOCIAL NETWORKS - -Google+ -https://plus.google.com/+RawTherapee - - - REVISION HISTORY The complete changelog is available at: diff --git a/rtdata/images/non-themed/png/splash.png b/rtdata/images/non-themed/png/splash.png index 4075b3b8940bf604631d37116fa4c7ae4abd5b7c..f3c523b88f90d3a42eb49a5e9fdd3727a1d465ff 100644 GIT binary patch delta 14607 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 Y)sV%hv=xM*z(YYs6<+$6q-n_i0grZW#Q*>R delta 12147 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 AtN;K2 diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg index 50e34d1cb..87b493153 100644 --- a/rtdata/images/non-themed/rt-splash.svg +++ b/rtdata/images/non-themed/rt-splash.svg @@ -912,7 +912,7 @@ y="279.20517" /> Release Candidate 2 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 1 From af80df7a37d5b0578e9441b0473097f978c4a2f6 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 17 Dec 2018 21:19:04 +0100 Subject: [PATCH 26/30] Fix a warning, #5016 --- rtgui/toolpanelcoord.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 99dcdde8d..276f690e3 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -28,7 +28,7 @@ using namespace rtengine::procparams; -ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr), favoritePanelSW(nullptr) +ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favoritePanelSW(nullptr), hasChanged (false), editDataProvider (nullptr) { favoritePanel = Gtk::manage (new ToolVBox ()); From 39d37a6ded3690ad73670f3d8b0e0d9fb4aa396e Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 17 Dec 2018 23:49:18 +0100 Subject: [PATCH 27/30] New star icon for Favorites tab --- rtdata/images/themed/png/dark/star.png | Bin 0 -> 542 bytes rtdata/images/themed/png/light/star.png | Bin 0 -> 549 bytes rtdata/images/themed/svg/star.svg | 124 ++++++++++++++++++++++++ rtgui/toolpanelcoord.cc | 2 +- 4 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 rtdata/images/themed/png/dark/star.png create mode 100644 rtdata/images/themed/png/light/star.png create mode 100644 rtdata/images/themed/svg/star.svg diff --git a/rtdata/images/themed/png/dark/star.png b/rtdata/images/themed/png/dark/star.png new file mode 100644 index 0000000000000000000000000000000000000000..dcc05e7d17a92191a6fb9e04dcce423834027267 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpD70(?ST&wzn@fzR2qXCZ7j1IWF2 z@!}~k0J0zCsUHOD;wuUA3vSrV(6Ml>aKN-mb_K)yzsDmAfHGS=T^vIsE++>#G4Uh> zWeW&tEQLH3m=%KBas@6+HRkwrs&v?j zH?kF+a?&+r(G+ega*~L!k&IcWC-6)_ERK!`}5n0T@z;^_M8K-LVNdpCS1AIbURl&f$z(++z1;|uWQ-g>o zDk?%45OJV#Aa|BiU_Ow=UlQaO+^~sZX0>qFa`qtke0@gmyHB=H1WIl9ba4!kxSSl| z#Ke;jw3xGVu_b5c<+#QpGc`INWK5ZEe$a9jQ|IIdbIKUMacMk%W$DhwHqm^eL*Km3 z3l=P3W}aYBd1OJB#<2&74jec%K||)q0%@IN3~W8i9Bfy$aVnV2E)Y1;khURYk>(AP zP-pf9atl~)% + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 276f690e3..99b1f3748 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -217,7 +217,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); rawPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); - toiF = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_FAVORITES"), M ("MAIN_TAB_FAVORITES_TOOLTIP"))); + toiF = Gtk::manage (new TextOrIcon ("star.png", M ("MAIN_TAB_FAVORITES"), M ("MAIN_TAB_FAVORITES_TOOLTIP"))); toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"))); toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"))); toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"))); From 01cb4fb36cecb6588f5b5bee1620bec3a874d084 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 21 Dec 2018 14:01:08 +0100 Subject: [PATCH 28/30] Disabled lensfun CA correction in default profiles If the lensfun profile supports CA correction, having both lensfun CA correction and raw auto-CA correction enabled leads to artifacts as they badly interact with each other. Issue #5110 --- rtdata/profiles/Auto-Matched Curve - ISO High.pp3 | 2 +- rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 | 2 +- rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO High.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO Low.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO Medium.pp3 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 index 6108ea54c..99f0af8fe 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 @@ -31,7 +31,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 index d8be8d795..882c0130f 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 @@ -10,7 +10,7 @@ Method=Blend LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 index a976fdd90..f9196bb30 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 @@ -32,7 +32,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO High.pp3 b/rtdata/profiles/Standard Film Curve - ISO High.pp3 index ae134e7f4..4dd3a9b1d 100644 --- a/rtdata/profiles/Standard Film Curve - ISO High.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO High.pp3 @@ -34,7 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 index 4f6ad62c2..c23b5b8a4 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 @@ -12,7 +12,7 @@ Method=Blend LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 index 4921ffb22..4aff630f5 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 @@ -34,7 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false From 0918d295788da75b60152a8c1140d1f4b3bb2c54 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 21 Dec 2018 21:34:47 +0100 Subject: [PATCH 29/30] Better white level for Canon PowerShot SX50 HS --- rtengine/camconst.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 7aab3b0bd..55acf8307 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1209,6 +1209,11 @@ Camera constants: "ranges": { "white": 4050 } }, + { // Quality C + "make_model": "Canon PowerShot SX50 HS", + "ranges": { "white": 4050 } + }, + { // Quality B "make_model": "Canon PowerShot SX60 HS", "dcraw_matrix": [ 13161,-5451,-1344,-1989,10654,1531,-47,1271,4955 ], // DNG_V8.7 D65 From 3461328a8c6006734c74bf15b82cb99702c53bde Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 21 Dec 2018 21:36:22 +0100 Subject: [PATCH 30/30] Opening a locked raw file in RawTherapee causes crash, fixes #5111 --- rtengine/rawimagesource.cc | 2 +- rtgui/filepanel.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 3c7a34e73..b59e8ecab 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -473,7 +473,7 @@ RawImageSource::~RawImageSource () delete riFrames[i]; } - for(size_t i = 0; i < numFrames - 1; ++i) { + for(size_t i = 0; i + 1 < numFrames; ++i) { delete rawDataBuffer[i]; } diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index 23b7c3983..aef2b0a22 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -301,7 +301,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + ""; - Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); goto MAXGDIHANDLESREACHED; } @@ -322,7 +322,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n"; - Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); } #ifdef WIN32