From 96715ba7b387b476f444032e58159c32cc7f34bd Mon Sep 17 00:00:00 2001 From: Benitoite Date: Sat, 1 Dec 2018 09:44:19 -0800 Subject: [PATCH 01/75] macOS: Update lensfun version, copy some libs Copies 2 libs not picked up by the routine and bumps the lensfun dylib version. --- tools/osx/macosx_bundle.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index e5c9d0bd3..7dd6f212c 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -152,12 +152,18 @@ done ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme "${GTK_PREFIX}/bin/gtk-update-icon-cache-3.0" "${RESOURCES}/share/icons/Adwaita" +# Copy libjpeg-turbo into the app bundle +cp /opt/local/lib/libjpeg.62.dylib "${RESOURCES}/../Frameworks" + +# Copy libtiff into the app bundle +cp /opt/local/lib/libtiff.5.dylib "${RESOURCES}/../Frameworks" + # Copy the Lensfun database into the app bundle mkdir -p "${RESOURCES}/share/lensfun" cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" # Copy liblensfun to Frameworks -cp /opt/local/lib/liblensfun.1.dylib "${RESOURCES}/../Frameworks" +cp /opt/local/lib/liblensfun.2.dylib "${RESOURCES}/../Frameworks" # Copy libiomp5 to Frameworks cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks" From 96c53ca566a8bfffaed5d10bdc5c4856ae517d80 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Sat, 1 Dec 2018 11:37:59 -0800 Subject: [PATCH 02/75] mac: specify HFS+ filesystem for dmg Fixes incompatibility between generated dmg on macos 10.14 and trying to open in 10.11. --- tools/osx/macosx_bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index 7dd6f212c..1413b5d76 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -234,7 +234,7 @@ function CreateDmg { fi msg "Creating disk image:" - hdiutil create -format UDBZ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg" + hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg" # Sign disk image codesign --deep --force -v -s "${CODESIGNID}" "${dmg_name}.dmg" From c75a0d6bd7bf53b6a48ec0d6a62447c0cd25c939 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sat, 1 Dec 2018 22:30:11 +0100 Subject: [PATCH 03/75] do not apply "filmlike_clip" in rgbProc when clampOOG is false --- rtengine/improcfun.cc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index d368eb0cd..bf35bee70 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -2450,20 +2450,6 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer btemp[ti * TS + tj] = b; } } - } else { - for (int i = istart, ti = 0; i < tH; i++, ti++) { - for (int j = jstart, tj = 0; j < tW; j++, tj++) { - // clip out of gamut colors, without distorting colour too bad - float r = std::max(rtemp[ti * TS + tj], 0.f); - float g = std::max(gtemp[ti * TS + tj], 0.f); - float b = std::max(btemp[ti * TS + tj], 0.f); - - if (OOG(max(r, g, b)) && !OOG(min(r, g, b))) { - filmlike_clip(&r, &g, &b); - } - setUnlessOOG(rtemp[ti * TS + tj], gtemp[ti * TS + tj], btemp[ti * TS + tj], r, g, b); - } - } } if (histToneCurveThr) { From d7d823e41b4550745358bf8a8e53af0a00185da5 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 01:27:41 +0100 Subject: [PATCH 04/75] Added support for Panasonic DC-LX100M2 Preliminary support, no white frames available yet. Issue #5049 --- rtengine/camconst.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 1b2d0cdfa..7aab3b0bd 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1694,6 +1694,13 @@ Camera constants: "global_green_equilibration" : true }, + { // Quality X + "make_model": [ "Panasonic DC-LX100M2" ], + "dcraw_matrix": [ 11577, -4230, -1106, -3967, 12211, 1957, -758, 1762, 5610 ], // Adobe DNG Converter 11.0 ColorMatrix2 + "raw_crop": [ 0, 0, 0, 0 ], + "ranges": { "black": 15 } + }, + { // Quality C, proper ISO 100-125-160 samples missing, pixelshift files have no black offset etc. #4574 "make_model": [ "Panasonic DC-G9" ], "dcraw_matrix": [ 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 ], // Adobe DNG Converter 10.3 ColorMatrix2 From 15638548154a5514f983578fe48beea1e15f0c07 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 02:02:53 +0100 Subject: [PATCH 05/75] Lensfun crop factor warning icon Replaced inconsistnent stock "dialog-warning" icon with custom warning.png --- rtdata/images/themed/png/dark/warning.png | Bin 0 -> 560 bytes rtdata/images/themed/png/light/warning.png | Bin 0 -> 579 bytes rtdata/images/themed/svg/warning.svg | 134 +++++++++++++++++++++ rtgui/lensprofile.cc | 7 +- 4 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 rtdata/images/themed/png/dark/warning.png create mode 100644 rtdata/images/themed/png/light/warning.png create mode 100644 rtdata/images/themed/svg/warning.svg diff --git a/rtdata/images/themed/png/dark/warning.png b/rtdata/images/themed/png/dark/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc60b95a74a7a08ded216959f195f7210830a9c GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}ub5#STz>R#Y;=FFK(mo5RxvuDr# z|NkGzfUqHqbLY<8x^)Z421-EyG8-oLzh=rhRiK#?B|(0{46z&wi=XvwR$JpB!S5}m zs@b$I%wzAJ#gh+iF9oWZ=jq}YqH%udq}xKx3Op`>2Y9)(;{N~l_s((E*i$l#J)tbI zSgl#$f5`Q#rR+OqnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}r~7~m7)>R#X@Cnu+>s;Z)*0wn+c z{|{jR+3M=*5OFm%HMkT|0R#Y*!I&UgNl6L9O}k@!8ECk4NswPK1INPr)z5l2tBJbA zR|K!vAf~F>#Ix7qj!kIz_q~z=KxIokT^vI+&M%#GlCRl-$Ax{B*uG=3lT{zuhI*&wP@{tRBS-8P6qF*6BUUemxVj7A#Bo@0OaF8+b|V z_3ofjuhOgU>KA75c=28^{M2{q-iw2Vn-;KrSlsZevu4`b*H>lwo&+*x*VZY-YrMbC zTCrHJKeh9fQ~vvva+42l%bd4-^3lp^YPK&O&rjiHJ3UA5=lA&^88^&fJDMY_dmQLs N22WQ%mvv4FO#pM3 + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index ae8bbb7fe..a3dbc2e63 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -55,7 +55,7 @@ LensProfilePanel::LensProfilePanel() : lensfunCameras(Gtk::manage((new MyComboBox()))), lensfunLensesLbl(Gtk::manage((new Gtk::Label(M("EXIFFILTER_LENS"))))), lensfunLenses(Gtk::manage((new MyComboBox()))), - warning(Gtk::manage((new Gtk::Image()))), + warning(Gtk::manage(new RTImage("warning.png"))), ckbUseDist(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_GEOMETRIC"))))), ckbUseVign(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_VIGNETTING"))))), ckbUseCA(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_CA"))))) @@ -65,12 +65,12 @@ LensProfilePanel::LensProfilePanel() : } // Main containers: - + Gtk::Frame *nodesFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_MODE_HEADER"))); modesGrid->get_style_context()->add_class("grid-spacing"); setExpandAlignProperties(modesGrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); - + Gtk::Frame *distFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_USE_HEADER"))); distGrid->get_style_context()->add_class("grid-spacing"); @@ -104,7 +104,6 @@ LensProfilePanel::LensProfilePanel() : lensesCellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE; lensesCellRenderer->property_ellipsize_set() = true; - warning->set_from_icon_name("dialog-warning", Gtk::ICON_SIZE_LARGE_TOOLBAR); warning->set_tooltip_text(M("TP_LENSPROFILE_LENS_WARNING")); warning->hide(); From d6bdce3417bbd55e02c6cc2aebaba68aeadf1b2d Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 2 Dec 2018 13:29:48 +0100 Subject: [PATCH 06/75] Lens profile bug fix When changed distortion the profile changed too. Fixed --- rtgui/lensprofile.cc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index a3dbc2e63..d421632a9 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -247,8 +247,6 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa setLensfunLens(pp->lensProf.lfLens); } - lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false; - useLensfunChanged = lensfunAutoChanged = lensfunCameraChanged = lensfunLensChanged = false; /* if (!batchMode && !checkLensfunCanCorrect(true)) { @@ -286,6 +284,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa ckbUseCA->set_sensitive(true); } + lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false; + useLensfunChanged = lensfunAutoChanged = lensfunCameraChanged = lensfunLensChanged = false; + updateLensfunWarning(); enableListener(); conUseDist.block(false); @@ -478,9 +479,10 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged) Glib::ustring mode; if (rbChanged == corrOffRB) { + lcModeChanged = true; useLensfunChanged = true; lensfunAutoChanged = true; - lcpFileChanged = true; + lcpFileChanged = false; ckbUseDist->set_sensitive(false); ckbUseVign->set_sensitive(false); @@ -489,13 +491,12 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged) mode = M("GENERAL_NONE"); } else if (rbChanged == corrLensfunAutoRB) { + lcModeChanged = true; useLensfunChanged = true; lensfunAutoChanged = true; lensfunCameraChanged = true; lensfunLensChanged = true; - lcpFileChanged = true; - useDistChanged = true; - useVignChanged = true; + lcpFileChanged = false; ckbUseDist->set_sensitive(true); ckbUseVign->set_sensitive(true); @@ -514,19 +515,18 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged) setLensfunLens(l.getLens()); } if (disabled) { - enableListener(); + enableListener(); } mode = M("TP_LENSPROFILE_CORRECTION_AUTOMATCH"); } else if (rbChanged == corrLensfunManualRB) { + lcModeChanged = true; useLensfunChanged = true; lensfunAutoChanged = true; lensfunCameraChanged = true; lensfunLensChanged = true; - lcpFileChanged = true; - useDistChanged = true; - useVignChanged = true; + lcpFileChanged = false; ckbUseDist->set_sensitive(true); ckbUseVign->set_sensitive(true); @@ -535,17 +535,17 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged) mode = M("TP_LENSPROFILE_CORRECTION_MANUAL"); } else if (rbChanged == corrLcpFileRB) { + lcModeChanged = true; useLensfunChanged = true; lensfunAutoChanged = true; lcpFileChanged = true; - useDistChanged = true; - useVignChanged = true; updateDisabled(true); mode = M("TP_LENSPROFILE_CORRECTION_LCPFILE"); } else if (rbChanged == corrUnchangedRB) { + lcModeChanged = false; useLensfunChanged = false; lensfunAutoChanged = false; lcpFileChanged = false; @@ -559,7 +559,6 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged) mode = M("GENERAL_UNCHANGED"); } - lcModeChanged = true; updateLensfunWarning(); if (rbChanged == corrLensfunManualRB || (!batchMode && rbChanged == corrLensfunAutoRB)) { From 61c84b9ee746de9c99151de7b86814dba7d781ba Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 2 Dec 2018 20:29:11 +0100 Subject: [PATCH 07/75] Get rid of windirmonitor --- rtgui/CMakeLists.txt | 2 +- rtgui/dirbrowser.cc | 15 ------ rtgui/dirbrowser.h | 14 ++---- rtgui/filecatalog.cc | 35 ------------- rtgui/filecatalog.h | 14 ------ rtgui/windirmonitor.cc | 109 ----------------------------------------- rtgui/windirmonitor.h | 57 --------------------- 7 files changed, 4 insertions(+), 242 deletions(-) delete mode 100644 rtgui/windirmonitor.cc delete mode 100644 rtgui/windirmonitor.h diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index 434e8187e..6ea768a03 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -170,7 +170,7 @@ endif() if(WIN32) set(EXTRA_SRC_CLI myicon.rc) - set(EXTRA_SRC_NONCLI myicon.rc windirmonitor.cc) + set(EXTRA_SRC_NONCLI myicon.rc) set(EXTRA_LIB_RTGUI winmm) include_directories(${EXTRA_INCDIR} ${GIOMM_INCLUDE_DIRS} diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index 81ee85fed..e1acbad3e 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -246,16 +246,6 @@ int updateVolumesUI (void* br) return 1; } -void DirBrowser::winDirChanged () -{ - const auto func = [](gpointer data) -> gboolean { - static_cast(data)->updateDirTreeRoot(); - - return FALSE; - }; - - idle_register.add(func, this); -} #endif void DirBrowser::fillRoot () @@ -333,14 +323,9 @@ void DirBrowser::row_expanded (const Gtk::TreeModel::iterator& iter, const Gtk:: expandSuccess = true; } -#ifdef WIN32 - Glib::RefPtr monitor = Glib::RefPtr(new WinDirMonitor (iter->get_value (dtColumns.dirname), this)); - iter->set_value (dtColumns.monitor, monitor); -#else Glib::RefPtr monitor = dir->monitor_directory (); iter->set_value (dtColumns.monitor, monitor); monitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &DirBrowser::file_changed), iter, dir->get_parse_name())); -#endif } void DirBrowser::updateDir (const Gtk::TreeModel::iterator& iter) diff --git a/rtgui/dirbrowser.h b/rtgui/dirbrowser.h index 9d004f5f9..15b6dd201 100644 --- a/rtgui/dirbrowser.h +++ b/rtgui/dirbrowser.h @@ -21,16 +21,13 @@ #include #include -#ifdef WIN32 -#include "windirmonitor.h" -#endif #include "guiutils.h" +#ifdef WIN32 +#include "windows.h" +#endif class DirBrowser : public Gtk::VBox -#ifdef WIN32 - , public WinDirChangeListener -#endif { public: typedef sigc::signal DirSelectionSignal; @@ -45,11 +42,7 @@ private: Gtk::TreeModelColumn > icon1; Gtk::TreeModelColumn > icon2; Gtk::TreeModelColumn dirname; -#ifdef WIN32 - Gtk::TreeModelColumn > monitor; -#else Gtk::TreeModelColumn > monitor; -#endif DirTreeColumns() { @@ -89,7 +82,6 @@ public: void updateVolumes (); void updateDirTree (const Gtk::TreeModel::iterator& iter); void updateDirTreeRoot (); - void winDirChanged () override; private: void addRoot (char letter); #endif diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 0b45d3e3d..305b3985e 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -459,9 +459,6 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : } selectedDirectory = ""; -#ifdef WIN32 - wdMonitor = NULL; -#endif } FileCatalog::~FileCatalog() @@ -540,21 +537,10 @@ void FileCatalog::closeDir () exportPanel->set_sensitive (false); } -#ifndef WIN32 - if (dirMonitor) { dirMonitor->cancel (); } -#else - - if (wdMonitor) { - delete wdMonitor; - wdMonitor = NULL; - } - -#endif - // ignore old requests ++selectedDirectoryId; @@ -671,12 +657,8 @@ void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring filepanel->loadingThumbs(M("PROGRESSBAR_LOADINGTHUMBS"), 0); } -#ifdef WIN32 - wdMonitor = new WinDirMonitor (selectedDirectory, this); -#else dirMonitor = dir->monitor_directory (); dirMonitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::on_dir_changed), false)); -#endif } catch (Glib::Exception& ex) { std::cout << ex.what(); } @@ -1748,21 +1730,6 @@ void FileCatalog::reparseDirectory () fileNameList = nfileNameList; } -#ifdef WIN32 - -void FileCatalog::winDirChanged () -{ - const auto func = [](gpointer data) -> gboolean { - static_cast(data)->reparseDirectory(); - - return FALSE; - }; - - idle_register.add(func, this); -} - -#else - void FileCatalog::on_dir_changed (const Glib::RefPtr& file, const Glib::RefPtr& other_file, Gio::FileMonitorEvent event_type, bool internal) { @@ -1777,8 +1744,6 @@ void FileCatalog::on_dir_changed (const Glib::RefPtr& file, const Gli } } -#endif - void FileCatalog::checkAndAddFile (Glib::RefPtr file) { diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index 407535ba0..7e613a2b4 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -19,9 +19,6 @@ #ifndef _FILECATALOG_ #define _FILECATALOG_ -#ifdef WIN32 -#include "windirmonitor.h" -#endif #include "filebrowser.h" #include "exiffiltersettings.h" #include @@ -48,9 +45,6 @@ class FileCatalog : public Gtk::VBox, public FilterPanelListener, public FileBrowserListener, public ExportPanelListener -#ifdef WIN32 - , public WinDirChangeListener -#endif { public: typedef sigc::slot DirSelectionSlot; @@ -142,11 +136,7 @@ private: std::set editedFiles; guint modifierKey; // any modifiers held when rank button was pressed -#ifndef _WIN32 Glib::RefPtr dirMonitor; -#else - WinDirMonitor* wdMonitor; -#endif IdleRegister idle_register; @@ -288,11 +278,7 @@ public: void showToolBar(); void hideToolBar(); -#ifndef _WIN32 void on_dir_changed (const Glib::RefPtr& file, const Glib::RefPtr& other_file, Gio::FileMonitorEvent event_type, bool internal); -#else - void winDirChanged (); -#endif }; diff --git a/rtgui/windirmonitor.cc b/rtgui/windirmonitor.cc deleted file mode 100644 index 1888d9405..000000000 --- a/rtgui/windirmonitor.cc +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This file is part of RawTherapee. - * - * Copyright (c) 2004-2010 Gabor Horvath - * - * RawTherapee is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * RawTherapee is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with RawTherapee. If not, see . - */ -#include "windirmonitor.h" -#include "options.h" - -static void CALLBACK current_directory_monitor_callback (DWORD error, DWORD nBytes, LPOVERLAPPED lpOverlapped) -{ - DWORD dwOffset = 0; - FILE_NOTIFY_INFORMATION* pInfo = NULL; - - WinDirMonitor::MonitorData* monData = (WinDirMonitor::MonitorData*)lpOverlapped; - - if (!nBytes) { - delete monData; - return; - } - - bool notify = false; - - // Analysis of the modifications. Let only parsed file extensions emit a notify, not PP3 changes - do { - // Get a pointer to the first change record... - pInfo = (FILE_NOTIFY_INFORMATION*) &monData->file_notify_buffer[dwOffset]; - - char fnameC[(MAX_PATH + 1) * 2] = {0}; - int strLen = WideCharToMultiByte(CP_UTF8, 0, pInfo->FileName, pInfo->FileNameLength / sizeof(WCHAR), fnameC, sizeof(fnameC), 0, 0); - fnameC[strLen] = 0; - Glib::ustring fname = fnameC; - - if (options.has_retained_extention(fname)) { - notify = true; - } - - // More than one change may happen at the same time. Load the next change and continue... - dwOffset += pInfo->NextEntryOffset; - } while (!notify && pInfo->NextEntryOffset != 0); - - // ReadDirectoryChangesW sometimes emits multiple events per change (one for each change type) - // To make sure it's not flooding update, this gets filtered. - DWORD curTick = GetTickCount(); - - if (notify && monData->listener && (curTick - monData->lastTimeUpdateTick) > 500) { - monData->lastTimeUpdateTick = curTick; - monData->listener->winDirChanged (); - } - - ReadDirectoryChangesW (monData->hDirectory, - monData->file_notify_buffer, - monData->buffer_allocated_bytes, - FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME | - FILE_NOTIFY_CHANGE_DIR_NAME | - FILE_NOTIFY_CHANGE_LAST_WRITE, - &monData->buffer_filled_bytes, - &monData->overlapped, - current_directory_monitor_callback); -} - -WinDirMonitor::WinDirMonitor (Glib::ustring dirName, WinDirChangeListener* listener) : monData(NULL) -{ - wchar_t* wdirname = (wchar_t*)g_utf8_to_utf16 (dirName.c_str(), -1, NULL, NULL, NULL); - HANDLE hDirectory = CreateFileW (wdirname, FILE_LIST_DIRECTORY, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); - g_free (wdirname); - - if (hDirectory != INVALID_HANDLE_VALUE) { - - monData = new MonitorData (); - monData->listener = listener; - monData->buffer_allocated_bytes = 32768; - monData->file_notify_buffer = new char [monData->buffer_allocated_bytes]; - monData->hDirectory = hDirectory; - monData->lastTimeUpdateTick = GetTickCount(); - - ReadDirectoryChangesW (monData->hDirectory, - monData->file_notify_buffer, - monData->buffer_allocated_bytes, - FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME | - FILE_NOTIFY_CHANGE_DIR_NAME | - FILE_NOTIFY_CHANGE_LAST_WRITE, - &monData->buffer_filled_bytes, - &monData->overlapped, - current_directory_monitor_callback); - } -} - -WinDirMonitor::~WinDirMonitor () -{ - - if (monData && monData->hDirectory != INVALID_HANDLE_VALUE) { - CloseHandle (monData->hDirectory); - } -} diff --git a/rtgui/windirmonitor.h b/rtgui/windirmonitor.h deleted file mode 100644 index 8e18b7914..000000000 --- a/rtgui/windirmonitor.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of RawTherapee. - * - * Copyright (c) 2004-2010 Gabor Horvath - * - * RawTherapee is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * RawTherapee is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with RawTherapee. If not, see . - */ -#ifndef _WINDIRMONITOR_ -#define _WINDIRMONITOR_ - -#include -#include - -class WinDirChangeListener -{ -public: - virtual ~WinDirChangeListener() = default; - - virtual void winDirChanged() = 0; -}; - -class WinDirMonitor : public Glib::Object -{ - -public: - struct MonitorData { - OVERLAPPED overlapped; - DWORD buffer_allocated_bytes; - char *file_notify_buffer; - DWORD buffer_filled_bytes; - HANDLE hDirectory; - WinDirChangeListener* listener; - int bigyo; - DWORD lastTimeUpdateTick; // for filtering multiple updates events - }; - -private: - MonitorData* monData; - -public: - WinDirMonitor (Glib::ustring dirName, WinDirChangeListener* listener); - ~WinDirMonitor (); -}; - -#endif - From 562ed3b22a964b6561fcb2bc18dd5a0322a580ce Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 2 Dec 2018 21:07:54 +0100 Subject: [PATCH 08/75] MultiLangMgr::getOSUserLanguage (): get rid of special windows code --- rtgui/multilangmgr.cc | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 8d2985436..a439c0602 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -209,27 +209,6 @@ Glib::ustring MultiLangMgr::getOSUserLanguage () { Glib::ustring langName ("default"); -#if defined (WIN32) - - const LCID localeID = GetUserDefaultLCID (); - TCHAR localeName[18]; - - const int langLen = GetLocaleInfo (localeID, LOCALE_SISO639LANGNAME, localeName, 9); - if (langLen <= 0) { - return langName; - } - - localeName[langLen - 1] = '-'; - - const int countryLen = GetLocaleInfo (localeID, LOCALE_SISO3166CTRYNAME, &localeName[langLen], 9); - if (countryLen <= 0) { - return langName; - } - - langName = localeToLang (localeName); - -#elif defined (__linux__) || defined (__APPLE__) - // Query the current locale and force decimal point to dot. const char *locale = getenv("LANG"); if (locale || (locale = setlocale (LC_CTYPE, ""))) { @@ -238,7 +217,5 @@ Glib::ustring MultiLangMgr::getOSUserLanguage () setlocale (LC_NUMERIC, "C"); -#endif - return langName; } From c9e848a896ce546480df9b80700f9307e773da8a Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 21:33:21 +0100 Subject: [PATCH 09/75] Updated rtexif using ExifTool-11.20 --- rtexif/nikonattribs.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc index 888bebe5a..84ebd22be 100644 --- a/rtexif/nikonattribs.cc +++ b/rtexif/nikonattribs.cc @@ -1074,6 +1074,7 @@ const std::map NALensDataInterpreter::lenses = { {"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"}, {"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"}, {"C9 48 37 5C 24 24 4B 4E", "Sigma 24-70mm f/2.8 DG OS HSM | A"}, + {"CA 48 27 3E 24 24 DF 4E", "Tamron SP 15-30mm f/2.8 Di VC USD G2 (A041)"}, {"CC 4C 50 68 14 14 4B 06", "Sigma 50-100mm f/1.8 DC HSM | A"}, {"CD 3D 2D 70 2E 3C 4B 0E", "Sigma 18-125mm f/3.8-5.6 DC OS HSM"}, {"CE 34 76 A0 38 40 4B 0E", "Sigma 150-500mm f/5-6.3 DG OS APO HSM"}, From 4aed2ab1039598694d4602c0bf62c9f44024f32e Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 21:55:47 +0100 Subject: [PATCH 10/75] generateTranslationDiffs --- rtdata/languages/Catala | 1 + rtdata/languages/Chinese (Simplified) | 1 + rtdata/languages/Chinese (Traditional) | 1 + rtdata/languages/Czech | 1 + rtdata/languages/Dansk | 1 + rtdata/languages/Deutsch | 5 +++++ rtdata/languages/English (UK) | 1 + rtdata/languages/English (US) | 1 + rtdata/languages/Espanol | 1 + rtdata/languages/Euskara | 1 + rtdata/languages/Francais | 1 + rtdata/languages/Greek | 1 + rtdata/languages/Hebrew | 1 + rtdata/languages/Italiano | 1 + rtdata/languages/Japanese | 5 +++++ rtdata/languages/Latvian | 1 + rtdata/languages/Magyar | 1 + rtdata/languages/Nederlands | 1 + rtdata/languages/Norsk BM | 1 + rtdata/languages/Polish | 1 + rtdata/languages/Polish (Latin Characters) | 1 + rtdata/languages/Portugues (Brasil) | 1 + rtdata/languages/Russian | 1 + rtdata/languages/Serbian (Cyrilic Characters) | 1 + rtdata/languages/Serbian (Latin Characters) | 1 + rtdata/languages/Slovak | 1 + rtdata/languages/Suomi | 1 + rtdata/languages/Swedish | 1 + rtdata/languages/Turkish | 1 + 29 files changed, 37 insertions(+) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index bf1a12876..97a973c02 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1001,6 +1001,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !GENERAL_ASIMAGE;As Image !GENERAL_AUTO;Automatic !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 38c4a37fe..fcbaa3275 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1016,6 +1016,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: Alt-6 !FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: Alt-0 !FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: Shift-0 +!GENERAL_CURRENT;Current !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... !GENERAL_SLIDER;Slider diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 4c4e727c1..2f04282e4 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -574,6 +574,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !GENERAL_ASIMAGE;As Image !GENERAL_AUTO;Automatic !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 51873b391..0d23d40c4 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2168,6 +2168,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !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. diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index beb4f2711..acc41f01d 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 8cc1bc000..a53ab991e 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -2405,3 +2405,8 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!GENERAL_CURRENT;Current diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 648eca675..76103b42c 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -339,6 +339,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !GENERAL_BEFORE;Before !GENERAL_CANCEL;Cancel !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_DISABLE;Disable !GENERAL_DISABLED;Disabled !GENERAL_ENABLE;Enable diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index ead6f7abb..cbeccac41 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -224,6 +224,7 @@ !GENERAL_BEFORE;Before !GENERAL_CANCEL;Cancel !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_DISABLE;Disable !GENERAL_DISABLED;Disabled !GENERAL_ENABLE;Enable diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index dfd0bc84b..079f87c1d 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1493,6 +1493,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 33cb478a3..f1c1b3a3c 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 94f0f3fc9..50fb21046 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2298,6 +2298,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! +!GENERAL_CURRENT;Current !HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel !HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;CT - region mask blur !HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index d930c3948..1d5ee7fee 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 64b29759a..2bb35e982 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 6b3e6ef4d..14ac71ae7 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1328,6 +1328,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index abc8ae4e7..3681fca15 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -2336,3 +2336,8 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: + ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!GENERAL_CURRENT;Current diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 45d06fdd8..2b56c2937 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 9a459d5be..a2a9afd96 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -927,6 +927,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !GENERAL_ASIMAGE;As Image !GENERAL_AUTO;Automatic !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index e9b05ab7f..24d50791d 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2058,6 +2058,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !EXIFPANEL_SHOWALL;Show all !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... !GENERAL_SLIDER;Slider diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 3db05ead0..aec6c8256 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 1026e9bd1..72d35b7db 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1450,6 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 7f3271885..909154913 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1450,6 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index b8d85ed59..ccabad796 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -2225,6 +2225,7 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - !DYNPROFILEEDITOR_IMGTYPE_STD;Standard !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!GENERAL_CURRENT;Current !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram. !HISTORY_MSG_489;DRC - Detail !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index c930b43d8..6c211244c 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1447,6 +1447,7 @@ 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 diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index fe64675c8..accfb139e 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1301,6 +1301,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 9cffebc2f..f0ce781c3 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1301,6 +1301,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !FILECHOOSER_FILTER_TIFF;TIFF files !GENERAL_APPLY;Apply !GENERAL_ASIMAGE;As Image +!GENERAL_CURRENT;Current !GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 09c4d83db..66debb12b 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -641,6 +641,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !GENERAL_ASIMAGE;As Image !GENERAL_AUTO;Automatic !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 9e05dc05b..8f6ebdc15 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -570,6 +570,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index a063f0516..626afc38b 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1826,6 +1826,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default +!GENERAL_CURRENT;Current !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... !GENERAL_SLIDER;Slider diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 36e5033c4..a62704a92 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Isı !GENERAL_AUTO;Automatic !GENERAL_BEFORE;Before !GENERAL_CLOSE;Close +!GENERAL_CURRENT;Current !GENERAL_FILE;File !GENERAL_NONE;None !GENERAL_OPEN;Open From e7923aa5e8ef2a72b6473344765148f0a9483e48 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 2 Dec 2018 22:13:48 +0100 Subject: [PATCH 11/75] 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 07867aa53b8cd01f72f0c54bb0341ea4c487752a Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 22:21:50 +0100 Subject: [PATCH 12/75] Added missing semicolon to bundled processing profiles --- rtdata/profiles/Auto-Matched Curve - ISO High.pp3 | 4 ++-- rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 | 4 ++-- rtdata/profiles/Standard Film Curve - ISO High.pp3 | 4 ++-- rtdata/profiles/Standard Film Curve - ISO Medium.pp3 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 index 36dd66908..a3075cfe3 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 @@ -37,8 +37,8 @@ Redchro=0 Bluechro=0 Gamma=1.7 Passes=1 -LCurve=0 -CCCurve=0 +LCurve=0; +CCCurve=0; [LensProfile] LcMode=lfauto diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 index a391a7d2c..620fdc582 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 @@ -38,8 +38,8 @@ Redchro=0 Bluechro=0 Gamma=1.7 Passes=1 -LCurve=0 -CCCurve=0 +LCurve=0; +CCCurve=0; [LensProfile] LcMode=lfauto diff --git a/rtdata/profiles/Standard Film Curve - ISO High.pp3 b/rtdata/profiles/Standard Film Curve - ISO High.pp3 index bedc931ee..c3480ec19 100644 --- a/rtdata/profiles/Standard Film Curve - ISO High.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO High.pp3 @@ -38,8 +38,8 @@ Redchro=0 Bluechro=0 Gamma=1.7 Passes=1 -LCurve=0 -CCCurve=0 +LCurve=0; +CCCurve=0; [LensProfile] LcMode=lfauto diff --git a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 index 6e00d6705..7fad5b3e8 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 @@ -38,8 +38,8 @@ Redchro=0 Bluechro=0 Gamma=1.7 Passes=1 -LCurve=0 -CCCurve=0 +LCurve=0; +CCCurve=0; [LensProfile] LcMode=lfauto From 05547d0348cd0088f5282dd60863922994063ee8 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 22:22:54 +0100 Subject: [PATCH 13/75] 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 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 delta 33785 zcmXtfWmH^E(`^KjAVCLr_u%f%;O-LKJy?+QV1Yry;BJGvL$CmYLr8FUcY^yR?_J;D zIcwIc?ylZdd)Mxa1BBsqglh9jU@mUy+CO`x;;TZHO%Bl#{wvND#5#0-CNFg?{z(Z4 zR;=S~N+b4Qtz~bGdqO^(PNdO6R*l)9CjJJl4g$x3hGSwFq+^)%{^Sxf!uUXg1ZdXZ zQvBbtr4SrOFSo9!djPi^%LZD`do$=_UT;@RSe0}4wU$bCs_xol0_>mFR1d+tO*;Pcd-}PRs6(jER!A}obK)~a?8n-rB;yWGqWJFr*qN8no2>9qA5Gqt3y5IOo86IF_GaK^Zu0V?3W)~(&)g@I2RN`#rgIZ*o=JGyM;Z+GfUo&S6f|TCjIh5@62Yw zT5!j>T?0M|NlPAvN-;v~o=*u@KYP=XCsEV#S0=K@U0J}kLBH){T;ZXM?BVsw-E`CJ z?CijR{FQ}MD3?+&9nW>~_ju6tZ4{6#CKGi(Yz>oUkE1{~9}Mrs7l*$IlH05cFW1p3 zr=zAA*#H|QS#DOYW}Ss|?tHp;Gjb0{%S9s%=dV`LTagp&;YXB!l2lcHpOR&87?umu z(c!tw`T}64jHV^h*WkzpsheH@p0M72g03>qHzJKW_Kuj-O*M5zsaH6$ew6#j#kXKU^0kvw6h(|VssDu<>DOHfW4|+Lk?WSR zvu+gD>YAFk1_da>heG`Y1@%`{eSmU21C0}caWH_{B^89JQ$-y?%m7i`l#A4*%n#Q+ zQNWxu$sO^{qu~428NjcGNmV~T(+)0qZw9Sc7}0FDttyzS4T-9XD*hg}9I;6QcM+%> zSUu3d`i>j~IOzqr zVL;JTkXzm_a{DOWFiH{5UIuBkFSl!%OyY6X;U7-?PkdW;vV3paSMG)Xt)-@|ZSnqA z{YXu{d%`<~Xv3}r-#nbE3!j4H8+~^y{9qu0{a6r-Ao4q|gqZm2Y7vl?`$qXUjysXX zjWH^YZ;4td_$T~Z2e>u$jZPLJUo-F;fdg_%Jw9gm^n=Kf=tRJQaP8z-z#%L_Ro;;1 z-;pG%vaMX=^974@pc{R;QKese+g^(So;;75dD{TvO$mZFDr4#t`tjec@(&)tU$1>_ zW~_Be*Rr%ISI+;Fr@au-=E&N;Qmxq|BF_^VS3m`%rP6a=#k+@`59fX|!jxiunY^~#D zugaG5-V|=i5e`C1qSiB>HOZ`|W^A^pZJUXa~O#pTBs$=33RY?cJ*oQ-w zuY-fWWGDNG-Jt718l&GX?;CzGVdnYEGoAp`)WRYJ-EZ}62A^vXtKS-m;g2s2L_%z3 zTtYp;Olh6aUj zGBk4R_Z&fVp*lX=2@urCcFd9k;vP&8mBgmT`1_{<$vao?!RgKn4mS-mIyI~WteKAj zoL=)x z!xNDk^rM5{qn~9z4VbLO2*#j|d_wMT{<8PR0SU z31GFR(ehk;Q2)Ni8C=8(`Eh1589kj|$Xr$a_mVDqZMG&^S6A1<)itoUSNbJNTP_|O z9zw3Pk5E{2DNO|GWt;%^M*QNJiPtft?ZLh$?a2U@Yz!L*hntpEFMiMAA#<$A9sSO) z%#D#$PJHuP^Kbfmff-V2io~*-j5viw);ED*_ke_uU^&b@j z2?d&j5{XIf%tWF*VvhzhjUj{xQZ%Yp__|YTcx_4N=C%!_#S5cNqkSQBfsA}sva3-a@Dpa>d z)B0)EB4*?LcX}iYLw1MHb)8Q|^pR_0V?*fl=cCZm&Bmht_0r_QB@-nBWj7p-;I-s| zry_g_+8N6p0}+`kCY4yWQB23hGrs&~5%5~^7rL6g$0s5px@%uJ!fnte!6ry9bd=;# z$u{CKI+>>BWirepMfc}BvM4+?eNx@ipX!&b#~ zPPh!n{60=Jf5Qce6oBU8Dv5K`fL(e=D7$i+#SxblA@8QcBHe<_+TO$F?EU~YT;6{N zi(XD`RU`Wjgf4u6k)NNhBc)zC#W*oBLCoj!-$sAz3lebj!V4M9{0Ln)!SXcQt6h?Q zGhY5dkN4KB8^VdOCE7~O5BY3f3DTqCgzX{HE;BptB-tIjre+U0k}V40+*05dL^Z$Y z9K;37$EAeOEt|H{^i2--15PdMGluD!qGL4P zsE*FtSi-wVy@ah5NJ0-d4PNxwF(MgK^0Hn$F@$na#4!Gn&8NkS00a!PyO<5goy3>| zAvHv0ytr``-GU+ud-5xr@9vHgZmuL>B42#9ThATQ9Jtc>!&m0)Lr;r-C0RHDO#_O} zz+0T3=zcpAA~7up9qP;;N&1)O6ZCyQRAWjnhaf0tA(YNO?Wr!pj=2*$Q4n1dlbyr4 zx(t5zZ<1kX>^wZ4fOK}rOOPTW$`#rN1G8QDiko$wjOa)kR|nrN=;2A#lk{u z?CMt!;ao0E8Q8>u^qMdXYS_g+EF?5w7G&yfTUG9E7;(}!i$^p%?0$QLe`7z0sx0}W zEx)dAhNt=hMy)ZUCyqu9_%L?^Ho+hCz0(MYl%mR`(Qg6sKDk50NwGhJ^m=Bl{~dVr z4l7WgCX{L@GApyNBV2Zs(V5N_F@{mR)6~$(hwD?W%o)7kr_%KFbful>6n-WJgsk^ zM;=6A!YXN~twfC7i)n7Yak$c%{k1)yHyf;F+q961Y%WzT5?`baAs`~zs%$-8mn3_@ zc#lqcNKRKe^za~U9B_;H$++!jU^<%99Uvm3c$EsLW3w!UyjFBV_T0E^K8?ZG)t7JC zT8+N6BuLBAMFAmM?XV8}D}@~85EW#pn+g8Ioz{>%1G9KX#H04k8m+qY5}M1Vxz`wV zTJN?!!ivA5j7~|bsG{2JpGPBheFkUZOO9q+Qdt5WBJvFMjO zrCoJ(jIMbeyL35C5|@l{c|;zbPxq5m1n{UhT1PG>t8H5IMWJGbz}=D$W+C)EllGVs zzI3+SL@?V0U*++rsA46xgIe#&bj#rGRlE2Pu7ei0AhG9b=>Fk@gM(#^ zKF$@E{{ERwD*@?Nb*cVHQS4DsQEoe#vbO`WBIEH5`K8RPtgeT%?rlB~A7A)3)KhSi z^)gTu!qkjPy)lr1?kwH+nKFIKP<%Wp1OKgdqTN>Cf%ue@|NV5N4b2m)lSG#~ZtU1Ya2I zC(P}FE2`UmgbRq>9Kdy(F?o-mY^SieqntlDTTJ#} z%=URU6XzwGrT<~+P)3z}c6`Iri?3k8OsoDqfgTI43#Sjaw4~WuU5wtzP%Uv-+I8p# zQWd&qZ8kYFb0oognBa$#Izi&eGoq!^M%8S8`8OKt^8dRK5l;^^bjcB3bCk%G z0o9V`UuF6ws$~2Fxxu_!`5(&Y0s$i`!mvB)-q&xda4WPU>9TG(n97(!P2Y!JV6dTb0EFRGAI zqW+`QhTHep90#Afy&|7S;Bv;cDZc!xLxK9*=~|E9q4`SJ?5wwnP0=5l(@71Joyn4T zdU;~mx$Dp0^_tX6u%t0Bzh+X`z^BbL5S1{%kT#uu{7^A<)C}*k(UoUbC!wGhy+BDd zZ8W55j6uV9Ju1V(eWg&AMa|jjq=&1%SrURJ_%F+6tx(f#iZ1{tbe)HHtSn$#UaoT)@gD$&B=b9hU^?Wr}Z6n<=@olWSZ-%NA6^TA!lo{ua}p{V8x6mC@2qQ zz$M`F^nl2F71KaosSRmJ(r%sNt$)iVAkbGNa=F*hzY>)Z;wbCXUbJBt6<8(o8ne&( zytxYilr|-VP!t?Vy<@lHV!5kvadB6tyvz>2j(BUOreew1rFU#`hmbdYR7;mx$ml30 zZg1Kj46|UAC#Oy2DOsjpP}1+#JS`6SII}iZ3U9*v$MlKVQoh)z97~gq{ko?+x)X)r zdVTW((L@}G1zS<|TJAbzkrMW6XqJ7GITrxfhV3HK-VJ8GI|^n$YTc3Bb_$bk_og6T zzGs-udJrzWBI&)mFyoS#3?lT>>TRy^iXyt@dp%9~5jR-}pN!~$e=`OU^0?I6-eEmk z=zLrddhR~2pI4GCMVJg~V36m^$pSlbFPO$n{TcjRq9t1l$7G-_`)uz=A&8Acr|bxv z&W-(;?)!PcrKmzDCIS7~dwzP=f^XY@SkkqORBZTuZlGlPkx$4#6=C7CD~=tvWF5|v zjQWiE3!Eb;wF+mBJ-UO5oNvD{)rWiF`NZcgedV*G zotyp7-5Qk$kBZSQrL@PJM5nVuiB{d`ukRX`dt)6T*sD2S%a+AeD!v! zwAEurQ*&WfKlmzvCN&bUS@z{rRK&3_!}|oKqs3)2qVAQNmAoEzFwEnr?Z>gFdSkDq zqFS!6UL!>bV}wnc1x6<0+BRXA3eMhIXX`Hclvh;#lNe8LMel^1J8o$Y4h}w5=(^ap zW0_X4;?t7L*fe-fw-JAkFVHWTL!gSuXa<=NKNR4ii&_wPrU1Edn9aAII=g6}eF&7> z&3`w9mm>Sh5Sz|@Tq|{KLOa>L#XT88NsJgv(Wsu6R(-%%`b7lV&;EiHcj%fs{HahF z#lk~NK4BIu0ighnV4cPsP;rGHo!^T?PXer@!j(>rz^prL>m(v zCns(woIoFxY^=9&@_dnK5;h1A8uBq^Cqq$nthZv zP3Zmyo8ZO+o#_oDfRKan7b%1WtMkVml5rd-4N+uA|1W6`i4$CDOa@uKH#eA4G3cK@abL*F*AyxVOvBpI z=bMzjlk&ZB9aRt%`GUPX@9f_&@j1`4?>-3SDNI_SLol*|OuO)_aFbFPA zN-KpH*Z#3{4G0MAP1K_8>t77$YaVy1_1OVLPO0w4%!I-6;|T@5FWh9yGV88SqwVRA z=%vqN7Z4aSKkE&(zk^SfEe7k{{Nu!%nhhk&m?PR_mn)@odK23lD05>ffEfDdE8w-&DZpvg z`xmYLB9y%v5ItNu33n+f2Qjl@(_z>f`q+S`E|aF}Q}(BgsQZBu+COD(h_m{|gD=^tFpub_>!` z33^{3A}~5sfcK4~Gv=fvOnwVN2f$T36@mWY86>qKDUKsf3%t_}=k~ahOC5 z8p+v=yG*xoI1`ye_QY(@3Zz2j@^!Uz-uDtxyKNn}8~vxr4CxLH#d*pWy(MJraLw>_ z>I@Z(T^wO~kM8pMnF||xLvy`Z3?Yc}&m{z<2L(Z*_Q#K*Id^M**L8%d4&aWFPC4sE zv5V6#gD7c$_*_ zk&usSn|+5RaLg&Y&=)=9d@1`u{J8VPbpP^c==b5i+0l`Z(7Gqhf(+Vky{hvrO1 z5M>GLcwyVkUu4m<4MFP+pi+BnmE|W(Om%rh*R9vb!CH)_P)G!u_Ev<XN=V zJD2yPqxa1p{iNP$C7HXp#3;C!wOr9@{NY93@2O%b$dUL9{vEy|W*961yO!9mcE+>| z^aw7+N1!LlNf{E+)eJj0)Vr>wkCG`#+eO8EsF-%)RVj$B;E|&Pm@86|E7FTTJB+t5 zDkaBKhZrrQe2RrRv{woJ4K5cwtHMtgj9^zQloSD_#)->=|;hgys z^KTo6-%d^7_z*5Y$#B0~R0CU9&zn4Ay<>Z306&k9Hi8n$m77^#dyZ$Q9nCIbK^{TH zm>4ckLklje*Z;^HzWyKD??R*q8ZcqKei=QH7&aA)&NH>!8cF2VD6hf8oC)FnK{X3L zQE*MGn?$_}(z1wSHPbgcMn$cJKl-eChha&XpTiN%xr{b|hc}9f@cIQO>UA`9WYguu z(Ftj>h(s$C*`gKQbsAxYn#_Os?AWy}09mQ5JeGQIdFCZG1zY<4pg~GYJ;{^ZnDCGP-O_vtu4r zo$o9b=ej^LrABxJgB{L7Z9TS4I2Hs8$E z7;IWA$m8wDA3WsYf$|{pwxL8AQoHn@It?m%Gi{b>S{Tph_+WJJy>>{%4~|PYMDucu zKaIO>S}ftx4WR{y^Aa#bC^@Y-oRW5HD_Q%7NffXnP*u0=ukj)~T-teH0>42yce%<8 zx9L$;`n(dZz5w4?Y%~b-vMI>OQo+a`)S{+sWIN#*y}KK|{h5VmrT%c4s0f2Q{cAlc z-%vyaqxTH_rcbl8WdIUOeHL;hU@fmc97KeVCM{=``|Z3>4(ElAV7xdBVoyi(rmwMmbr^ z`-@S2Q!pa|VF#y1JChaBItQmgY8`nK1$V=jnkr^hPR{%nX)cSMu&o+ODS@dtO9c9` zZc&qbX@l;hOq_@>3WH) zaf^MXqoyyrgP4=o;DC}M7cJs>$*R2SbIeg$t=O4$+9L#|ykKONp=Rk{T4jm@fw31> zf8~;D^66Wu^Fk-hvez~w3H3f!mZL>*{Mez@-d3spafQ!mkTG%tXOS|m8Yiydy4JE$ zQW5hPPmHJD?3Io)P@?t~u*H9hsGizb_;5HL@z;RB&@#sI@ zsf3B3T0mY=^x6bw%udE(+h^7STcyPpu$bS)Xjf4onqG3MU<_NqEjTQ^CS~C7q{i^W zQTBMQMr0LYsTQAincL|!!hcg*-a8fHeZ48gYHQ2a=y6>Wx;tg8KUsKz86%tiyR-BJ z=8Osc5;A~pY!#_W8ZNC(gZ|dT`qUu;T9wd@{I9n`%k%bf%d6RBU~zJE&H0(55BgY( zI7Q7Ym|t#b;g=NZURBePHQp8e%6>-A$TwQ%3*<|s@vqU0DsWcM2rD_DAx za+*?Cj$}_&MIFI|f>_1o)V3EPvG-bCrfW8QpqY>vLMCZF;T&8_MM#fJLvxwE5^7bh zk2k2+b*Il-f>;(b1&_|=r2j7huZGKoC&-Zo&410Jx{2UU`E(z||IsPDHf72TLBeAN$LtOH&6L3FYEVk$(D8Xl@ZIPePtwkj_-#Kr(OZ6{P&Xe8%bO976p z^`0s^dpg2Ij`<8v2i}odoY{T*KJV!{7{wP1!@Cj&{~6I_(vzbb)r`luLK@apQG5fD zQp1#DuHX{?SP%8Is*S#r1A*rYGwW@OSjuUQqeJEaa zuQ5p_3Ha>Z^Ls+T{W~11ecHpL6YHZxa3A_|+Vv;BX1X_JPI2LrjAn*(RDEIYAO89& ziv{&lD)3(fAMauFXGhC*+>ZvN^3**eC)5q1qP0a`zLlSRYo(-bm< zpE)Wl5Eb_&1tai>iK;68wrAHbezng&IsW*zXL7`1Odqpn;0sCN(t$=*#pyjO{1C{l z;M;xPxc#xD1%(el`$RDD;FzR*2KMLYsr{a$r0~5X!k@~t} zJ<#h}XN7rwxYo(8VQ;*~#no1+hMkxjn$-rO_Z5*EEV`m<7RIva`(#bwW?ssy-qA4x znA~ozz|QPN#U1Tf6Ke(^{^(2|(E)@Po_G@SJyz1x5*pHMG1WH3W$QgwB96K+rXI!% z%~H8d0bXYXF;#U?{b<3Kg3#?qye1=i9KNE(;>rj%MH$19XQbzNcPY`XT5l{lsN3ir zHI`R^j4BqnneEn_G2v&+WLzV5c#SF~lwO-M-i$Ibj)zj|J8qmUm0E-p1Ar3AvMkWi z#ribn-vQ;t&_8l5_1_=u6^t;ZHE9v~QaZZju=Q>s3kn2|CW#aS=Y)C!2tlUMe?~sZ zTMe`@$Uz)u`;Te|Bd;Gt`oLrh3yIfeR>rVjrp19nu8}EVAT(`t!tQNCU}b_JaxYqa z@u0Kh0ihJ_4c+pijQKOrJQ#A>HyZ7#VWCP@%AOcqZ@)XLhtNoKcco2Q9!nwj0cK{WeYmoy(LsDY zWd%x5r{8u}HqJ_mv$FctpKqM}qY?cv>lqq~ zm%Xnbe+LC^ghQy9do4Fc8v4Wzk-*dh?5>;C7&yoly(%J+bT|s742}zhmIhoe;*f28 zlH)`p3zn$!0#AvfdGD<>*I&kn*ANhPD@H68(=;HxuNYAfotBXB^4ZMR)b_LOT}kM; zL;+&q$2gQTzYU1=(;pz&ZT07||AyDQ?#)RI1nKm)3n*5<6Ek%gG}J374H};)A{r?2 zPm>DGws#JfZQWiPezBdr9>P$8WJ;cLZ!!%?2r-6wI3W{=bm1FtEtX#A@nOT#-{b89 zyOR_=pW5K#Ex{v8U$Tc^H8S9ntuuu9%ESu6XZO7H96$0@Sq&%SM071()+OunDV{m` zU#^k1ocF+rVruUCP!tz0NmY}tQfUOi*M=wyiUD&pLrqK~TeDuu)1kqJ+cA+9sj53N z!hs+>1U6muXPvs`CbLPcCXbHf&rzO0E-JaHsp?3^$Pd$0CNk6$$cJi)YFxOnKcn=ur>#mDF1dJRtMSuAor+QDV zBP{Sp*EkGdkrHy$N|4h9GYup?z~G*FnyT^+g7v4*RtCZHl%Z%<#f@^g(Zc}aDRMCS z>rhSeUJiDD1m82Qq#1+H*wjpkbFyGHQ|AxohRV%_)y(PTWKSu=Zxy4C9s^d)0MHGO%sp#ym`MtuFvgJ~ejB5w>Pcvci#qz#)%?GVnY zfmv0oOWl|=JiHhbi#ktRL&FFCeZy>$UH(?Q8%~QYDcMoI}CG`ytwc^Q)l6NA`J@CwmK+vQS5V-21caIn@*|mV15YU&9+a zSo61!1MsH$|^UL<^8Pw%xA>ZN17lApJhc6QZos219>X3jQ&s|eNrRj=lR8xQLBJIbTkjDK zO!02SJ*LLeXyLI1-5LK0g zu&;`!aVp$s=NRh{^I8{W;`q=nd%ldrkrI$!M33$qx{_nZV^^g*owTtAwul-X*}p@zX{i>HIgTXQN0atgTRAZU~Xc@i55G0$?nEz$`HVKUZw@%v^W;vARX$ojzmK5{$ zT`|%XuFsdVG~NCsV?Ny@Q@O1JhKVE|vnLGb@H>b9wiM+Nse{#`=jyyt4oM2;bT{o) z3W?jzCy_$6h30lYp4~ftK<~JUWJ?4#Z&K?m^T!B$#n2E7S498 zyKF6h!H_uI(eC5Klws~O|4BCe^zvsN1+JZ|=@W&0k@w|PH3n!e3$;n?oBAl@DUZkiO!6@SO*_^R^rl?UX- zuh}}v4-@_(yO~rBe?+{GrF+`ld9}IcrW*L|E`<#m?aNut1)rS~vFYrI`8njF5jv`E z6g(b{<<%LuQy}Mzshq5vmeTEadVfz<=(r4YHtB$Z=a=G~`>!~QPCh1wRtT<7&Hs@V zbcH9joT#dVC`zlD%!{ZTo(&<3Z02+zbm(6Zx4jpBCO(g}{~Z4bF)s(^U0}AoEod}! zhBGO-*VL9TFW(xfnB5<6BmO|nA6hcDV!DF*(Cs|V=aLdyB_i(Y|FHsYR0`SS!&|cU|q*9eg=a(0%KsXj5cFT zxQ+CmSt|q@D!RB)xeql*6g0gvQZXs?LxVd>J_jw90sGlZq7U&w@`2%O-pUAzc@GQL zPN>k@jv91}a3R~J)jjJp=1)kzw2TBu;9!29sS$f9E^{0zjcr}JSE5=S7+E=^fmBfsdY0g6Jj<+#qOZJ9YU zzQRvR+pH|xyh~+Vqn`eM%TNx;bC3j@QU{Pu|IbVi92#h z{Li_aaZ%J)ILsF{@vh>y+c9uzi}PWr)0+S54mCD*3qKE-;^VoQHyw_OAwt9YK;(K7 zj;zZ=P6Dv@!|5d*=KhT={+ZOoLES>39wDHOJpRVwte1Qc8HtbmoDmi#;VoOcaa&_N z$?@Zwc07@jnbkOt8_3Ji)RpVWH%((;pyFK`yC_DjvT`U1X=cz+=h3qI<{eufN~$X% zdYbjCTDhN{AgB1tCF#m#`>B1W?74ro#S;pkQv0wDF87FtNLTFF)Km+C2I;6RCa^Bd z=GAz}%k$XsAaYxBUc&fF^tV@Zw{D-=#{5qlPgMXs()(j$s>7c?*^mzxY!BOY+ds6_ zr>CvN_9g2b&aX-=jlcG~osUv|;_SbdcL;R(65{>AgnJZ{F;1|Y%VuQdT|~`9(})ce zybR3K|2VS6k?U`kiYG}dHmKBmE#Kq%DNo;&$-vNF(wElYQL6C6FRfl+a5FGJ^JFF; z_90)Z=VdSw@?~iK)+=MjlF+1}`N>VGjz=85BLAdw1&r~SWpVHEK|kZ#hZVE=-1uh1 zgi`4v(eqiXt&x7uB-My_MhU|wlG(3-wAA^ec};397IHOsY!fG*Z91lA&Zf7IiJ`9u zO`!|4U})pI*NgM1z3tbAXu>JBDAnR^b*pD`ev(B-g?(kSD8PZn+Tkh8$bdQZXTb%} zn=OeobA#+LKB3*WKQ*h8e~X$zM@6F4RiAC-Tm5>_SFEA84CzLaJVDr_VMul6?1;PbR8iVLF>{S*m2UathufP9;D6e zBhPcYAic>QGjr~Y?Q1g52hO6C<@6UzS<2)7A z`sO8n_~xI1;{ETv{#|k^;RSL9{^@R>6VAci=>IHA<)`V-vqCnCKLm+KeXb~I_k7Kb zLwiMbL_=gmZTZCkdW%x@xN5t!^CObFw{T$eqeEQA#TNvQlwwp#vxpP^cCy=Dy0!PB z3IZIXeKi_fSplhibAUO_Gq_k=)^0r!ls<+Mk60F)`*F z6MeeHz5GGuMOVOf74yYM&8-$|JR&m!>f7%g1ZATAR9D#qXb%B~c; zkH1f|K@#-66-zL&M{@V#*x*(VMqJGd+X=|{e}jI^LA`d!jEDT*cuZsdS&ds_etPA`N3f!eGHlw;{bXs{-q7KxVA|g6v5Mc{)i^(+ zf00CcRdfFU_=X+eTwEOw({;?uni*V^<)=Iw9l9tYkUjDJU5mwT|64}Q`zXxQ(E-1k ziKW`1QhYJy^Cx*V`Gm&mtR)URHNW(t3!%k$ZTOhrJDos@G!iho6%;299R`At|#?_aU zUYyWhYTP<%5ss7T4v#7Pl_nk*@FmR(4b{oJYX!A~p|w`WZ;+OJ2g93p)+&c<+walE z2tNYU4DQzewAVQxFp+t(4k`C%kmrjdLI4V--gQK}n{BuFHXEZ*i>OBM4SsR&9^w;M zT%7k8C*@thtIhX|mo>2JcYA{$(~1IdK7Z6jG;%#*#eTE#6QAuhF@n=&)!tQCJz^TU+a$mHlk3Me27#k0HS;(!hr!i=c7B zUL$W8EIu9TGAY1#@-XXfm#ur3ZZ6zy_OE%E_}4rb{de%%J-_S(2if25$zr<|_c?@h z{X=-f*+XwUGTAbws}xN!y|P-3F4JdbUnhZ~A$I`Y-4T}Bek0J3+A2h`N6C=o0LX#d z&ja<00}fEX(nNqgV~h?^7!^&RX0Dr?areahHQo&+I~?Q5QK-^pcNGT{#t75e)paTt z05d7#@wrBS9M3ruXt@;y?}{d)oqptK#W;3w3yRBK&B63AY#q}16uzVd&12Nu51U&& zQIm@FS~lK{G~syI>f};xRif|(!kGOwWPDs;G$tniMQNz|jks`bSkwguHVqX^JK6ev z)r(Cih)2pWYgeUqp@mq`syRH{)d$A}>Yt&hI5D zypEx{Cgc9-9_;aG$sq{}{Hmc@7IaQttL7h?8(sJEHU4RNO|-jI*S|FY3Z4VY$b)aQ z(_SS0F@J#cmK)|DUNk3DUN*Jnrv**t-{Dh*m?onlcAsr=13Z#7zRzgyi1mH5Z}t0@ z{n&zh0<2gZ)1B>ui+#*AYAGE*Wk_zb4z|%E>)F-lC`L#Xi0X|iX~jcdR0^d3LAgZ7;YTgAa=uTmELm-}AS?OHcGsqS2Wyjvfl) z^S;iXj5-togXecEaQ!!(lDBIa26McY#MH-&9#!Fej`4jHEzPy@*r$eOFC9H=&Y=-7bt8>;md{=E-zXbaq!r|+Ez%;|1%7f5o0(Mo_4Kqpq zZEs}U`1vK06wH?~&3yP&8L}kyZ@ACM(^|DfEPY=}pH@O2V+ca2-(rlQqE?nZlSguT z$lMbo4W2OB&eWizu>IOy%@2miT)Url*cFY}EK$=at$KQFhUB?*zgqtjn}BLJ_R4I+ zI$cW++u;F_UI{*V_)=?U+u$k2Lg2RIG@kb+*)tUO;b_z9TZzw`>K_+qqL1k2q=26Z z&#K9K|1!8PqDEXAsZh5X@iL^kT>s_=y`CL=dR*)%!9O591pO-^Gk^BdFQxM3|GxDqrOyeUABn_DDl_*Dm$Eha3WP>h1(b;4^UyK)o;)GcnHQ?`cYb^c z`OgC4{b{>{F@@(V0)l!+47ItxHxcEAQq~<^N&EdgN|EtN8#|T@kbbQrCYJ!hrx_Az z1|}x=Ng28@yH;=4td)m~1g;7;VGSCkM>%-O7Z}F-6EHbV>NPbL?e}=hy$8ED>8a+C zz;ZnFd%`Ts|8hg(B{#%do4i=880B?j2{jWi)(7o}f5fbm(AvuApE5?wPnOZgLNlHS ztv@kO=zIIxL*Ed0T=zujz#{!n6=-=V7;J-vYjy~3;lY~9>lh#*|sSzYy+<3U{ z5v0g@Mdzpn(|tO|I%|&d*IIoLxdHH276YKr`u>zz--+)P3*{BrTX+HDx3gY~afK4l zVind;#dKg*)k$pJ-HWX6p}w^<#=?78%z~;|P^=l`f6tyBf4k0{d-aRSb2R4h>oFA5 z+mJKnZZrk>Hn+apk`j({wUaljU}yJb+J4A(+rDA{OSqCA57Nlq99T;a2SSH6~YP4<)_42+Rl+H9sZ8FVer!@a)Za#%A2?ZC!C|D!d!fT3s~0F=>p070bXcsZf3I zjSNIaS03Nv90Q+&^jWS-;6}mEILOs{Od@c}s%uzr*2TjfuL8@j(Ha^bhMM$$m`U=@ zbEGzO#HEPDk9wt|THPO5ihrS)^}~@+OdJ)SAav;uQr!i-illAWt$%sSl9g-x{vL#) zedUDaMUe)C2gi@E#MaKabz-POe;Q%#NrqM{qvw8pH8^XrPzc{}TVSf!w>gSzRaRZD zV2Zx9FG@nCW_b5Yu}k#1@9KL(L4hPWm1M)z6|#z-Wwf)uLdyy811^Nw zXm=QMPfFzGz(AAOWg-9BvocT^n8dVdtn248dzhHvk(1P!Q8fDbWmT7`uCg#wb)JK7tX7g&)ue?o{(!rhMs zEqM7ix+uS%?iL2P$HR`@=LD7^d6$4ZE3Ga32Qxu*4M!SoBgZUu__vn zjkXYf{10qh(e3e@0U-Om(oY8;>nOJH8C-UAQofYX&G7@9)P+)zrGEy>LoAC|Nc0^^ z58RuM$ZgV*oB6YatMZua2ojVCf7iFw3Y6#PbJ{&)WUx57y$seK?l4giu{m3uza>VV z{8s)H57R}to+ROCNBpCHUw=YD5G<$I=^+Wt$}(?uU)DA8cSHNjnjySoJo5CR|W5L|-~?(Xj7K_Iwmu;A|Q!QFj_e|KNi z6jeN(w%hldzTH*_>Pq|_0xJh{Z%gqKorEB@E4sIU%<*>&eqe+aK)_wolSJCc98SS{ zpY5aS60CKtW|n^~y;wqdYly#U;PS$YQUMIKd9$^uIRkhP7+=&gHg5z@ettw^ANQR6 zFdOG7Elb*(GU{;>M89M=UjJ!viM;+A1=q!{M&Gz$GNJ{-bG#E|rF#5bq(}H0A&IJA z10*pAU~ez8kE#30aJ@tzT;vuf^3cVg|4_X%(RVX`lb40DDOZhSjK8^G<|iI17Ih72fh#xbbT&`$q$KK(OOnDuO{o(?YWK5Mr5(6E zf%SCPkq}!EgCz}Q1qW>_*t-zcdg0uSQA6Dg0U%1H#IEC_>bE>frKVbR8_D@bfa_;! zsTl)?AHI=j?$nE!B0xOp>)898hZijc9KO1qQW{Hcc?a9Xx{~cAlYlSv5w*OlD{E9s z#DD2$60qiA-@-pWTOd9>yV1l%puuO%HA!}Mtdk`2z^%nc*Po(F{Nh3e3}30r$J_6) z0LCNJHNPc{uzD)`nYNIyl$e_3$}F3R9JNpX+S%ek-=KsGL7#|fFO+;JLpgqT2mKB! z$>(%o#%IGc^<}Lht^B+3d0yz@9eDk)7(!LI)K>DX`J z=?DJKm}i&9`+lk#r)zOp$U2uCzl1<9V4bZ}IPweo{RCNJ6J`XLHc44_;wpF>AKx%x zuD}jLyf%_v8*$e@COk(cW1^6=Xsl}YYOK5Mof8QgoI2)d${>}P#l-UkO4(+m$EOC~ z+ev%}U2Kz$Y-_#ux0*L=uWdw`&S|_t8`+$l%L4L`osae=QUZ|ZN@Q)jLqg!+huUMu zr52mXr=Jm`dtB*odOB+_{x;f44IPuWYJS*i$vMyRrc?G~o0H@>$2qH4_~TJU_m@wb zEVMeQ750x4Y>PG)4M~NH(z4YU%9C8Y26_J0h{wJi*+CWND#~3_r;zBx1G%t6=(iJ2 z5#!NXyEG$97C%}xn@2y=$pgZ|%4|EDzd5)A7wN=L6ysv^%kU-=pKrZlw~wZDc)`?s zOMhU@5<~9GkmBh*iEVnKQhYp3>Z2fE91I`5@Xy=pDC=r)kz0sQtaNV~sn?3Qn6U!M zC}(*lxd!|l2H75^1UxQ#FT269C(8<2Q`37WwJ9g>_M_(s9sPg%z%KIz;p@Bh%X9Bh zoD6v-{&;^aV;X#LSpd9%>#G=BK}Ng*uKE z8Kv+35?HVY=Da=UMR?*N*bvoX&rL)*v*7D(s>J3w@sR|k44IV&kdcrQ#i{M1LkVJe z6t&gK|9{1P(C>=rKFHC>`n3lysG#&_JW0}hG#9A$W8W#vEq9ZWrskQ{=%cZ$_!L{- z-YsAAceRN!G%Uhy(Opk03wk>{bh}=AK6d0iPzCSEhC}~h`h`7oFxMu?xc}m`JG%lM zH+W$JDReea#{5T)o6aZ8F9wvWLq#`Cq^YG>uL4*1-DS*K>vk_VWjt2PkADhzdObSi zT4L+4#Rc-ht@Cceey#n)`rAA#&2nNMd92R#oMr*>n0zK?1S3>S)MS9_=0{NhvtImr z096%bsm>tPC6G$+W`|GUz?)8mNP(3Q#OuHP%3c?$8aGT=RLQ8mjYfzAOQulPwzKd% z5Yzub=EoA^>$ONkM)&mZeWJZyLsDlnRy|RV3HPVkmpG~y>J?)IEVSnmsVuH&=d!^p ziulWazZox+b)r~yz6*V#9PlA|>Bme5PCsnn>n#&({(u@nf!yD}mW)KOAjNnYgu8Ak zR2`G_QYq6bsk&@a1-h0oI<4{47WiqpIc}!8ioD9*Y3+3U#iB0%^u{=H`Cn-r;UDBN zf&s~8k??>%(0+MDLrj7Eic$;lC&w_Qo}6FR0%cjYTR7_P{3x!!=5~yk+L{0k#?Zy~ zQsh&evIHC!lIKY)yq-|!f!Xq_qgC?zMQOvOToTjLn?rnqr<^~P=+6R?8gM^&f`qW= zApcF;txe1lp#$4yk&Suu+BILZeSEUe(Nt9NcE>J(*AOY6>$#xQmpnd5WFSAS*8W3g zrpb&EN*=M*KGN|v(SItX@H+sNLPnsgJV@}l1izg<4BjI>h|6blH7M>&abyhkfQnQ3 z^P7W+(z)GrgLrB~3KNsHYi}7-L+=@Dt^nTRp_rnUh~d`05ddJ_umQm|Ha3~B~J&RDJd!OOS3T- z(-j*$2D!fbV9W*R=J#B`otbO=JKw{)bS^n(8I8J4O-VH_#tOqX@VJ*x+H2B7YnM>U zv_XI+6*)>`wv)sHRO)3>+UglO|4qPA)XHiSeU=ek(QaDK8J`!DDQt7_;#qnS*N1epIQaz?=)O^)<|Q2t*L!MiKoOEu*CR(FwPGK?>9Y zzWcxXsi)sLIKt-vPU^p^Sh}RSl^2!Rsw@pLL`hGowCXg0hPG5_yWfiT6JrAYH%&`U*}5}w1k5BcxI+C$ zpGKnm_}Wh3MKJP{txv0!uQW0#5vIb<;M;-`zQX`+7UI!r^`(lylnfi=8}EGmmIZ!LVY; zbR*V?OWRs+H%s$G&TCppu(kkKInsr7lQVW3s@D=~?>X2*rNE=>xPME@vSrODSvO63vfHD$@gRS%?!YQ>wq13gzjIopGy7P3KYDlKYW9QV z!40mp2MT2gM?-~QI_d2X)E0C_cXYJFv*LhOHU*qJ(NGaqb@thTy4ePMhhtBP(uu`Kmi{|~>h ziQ6cz#n%q{NdCy3k1OfFzGP;iWo8C!0-U1LIVv$<@dRekt^wy2?ajnJaQ@Z4o{3mX)=qHVW(ORk?kv4fphb(mo=*FaOvqx@6^(JNj(n*zvs1 zW20s1B7{nNn)Mcky7(tv7>j*qH{cNT?v*;LP&>yq1CZygZVAqc4}>EvX`{)C0F8K~8N&=lH8E zbMis@M(|nWh=d=l{DWAD;bD|!cJ&>H(gy`a2|N*e zekvcdC!JU*!d6D!^G{@Kxmb;~i-=5`KV+~7#hDaslQmQ=Xyuq|w>UAjp#ab|f{@d+}F`FXy0gc&J=$cUiaVf~dC|3csv@`fCsGAFw!>#%J+UI^F2sXF zbcr(UUJ}(HMHB-_PVOXrk1VN&&$}cmY-Zbax;gl%1OJ>cg#Bb-&$!l#eZP^7h&z9| zmgOB~eJM;OZHnF+U%=JJhHw$j=`1N_RH4nJ>MDRc}R(`4v`Bvalj?d!p-n&tJkt zelw}BvcJW#zZ}HW1}}esg!(SJ8J_3_MV?WZw?UFrd-EH6ts#?)0-?fx)LnQ1ac;za z>Z7t+F9#XwUwX{PR68BaxydC3J0vxg!pQ7`G5Xf2?8L$VxmaoWq7!X7AU@9Xl zW`W+Z0Z2l)j(`Tq4o`Lo(_8y!enYsrYijQ<*<~(hH@gWXjgFf1>ov?owXVd3kHZQT zaock`oRQeRa z6x>JinSCe{@(#4ra9M7}GJv|hwfmI4Y8n?1 z49)4OZp#+ZQ6=IrZWCv5a15@*aQ8HTw<}6UvbEvJ4};;p?;p5J82U-8x_Bpm8lh2h4cu04e2ce)pyzqm)BB*AFeB66XTHzG5|XEdNbeNa zxmfdd>fNy@ucvNPdn87)bladZ_HGoip7u1+Dj`JlV9F3}_;6*ts|=R_!cnm>{|lv^ zKpuku33N{qaktLto9vLDfJFS-Yt?mk*$puUcs=BO_fYkZ`$c3);vOXiB1z&uyKGeH zy$qIy#wZyP;xZmzd9BCEzK`+N-L;N*D3ThT&e}LL>y0JXF)nOC&bACcIpy3q$ug*^ z%v8a5TrkmndYMK@bUaG~9Aomjw;$7;73E{9b%?wF@=Wp;a$-tbBg*;XO+Q}j{x?5c zANNV*Dz;^khz&xb?AA}z`PnaY_|O|g>0&a_r7#JDFeG7|Ev}Qh(>2FFpSiljo%R$# z>8E0bw6U?Vn7fk`2O+n$!PHO1N1qGtY4EuE2TltNsLv_Prq2)80O$4emx8X0&i95A{jLE>A3C>&G|w9 z8rDn*sjvF!@})?VfM1{8y!3YU&kqYi&@74!Tq0z)4DY=`dGvFduAoL{a;H8F#`}Ov zEm1CIj`{s1p@okz&!Nw|f}a{}CerZ56TIv!vB}#04xh{Thxo{$l`0*T3Ry-z3aBa? zqZ_cmAU>keo_@pEb0g1rn1+PUR_HXvXV^A}ebaL{eFfYAOz#~={f)hXn0M<-YcJd} zf*1WEHw&b}zkdDVeb_5V<9A_TX}_bWXuDbTYcE89a|bjMDSqwi6w1K0zihH>e6$A{ ze3i|xx#Rk){9f3i;rLe{^^l(gyVM}b_v^e!{eoTS(Hs(q*QR0X&HgUFRN#8|W!8;A zJEu7&dItEcxtd_^=8gK5mNaKr$J-BCg*`7h4||u@#3}mUt9B1}T3$jM6fRQy96AZ_ zm&N$*vZyKjIV$SU^rs(&8?~<0>C8*#Ly6KpYT0E@SI2RHy7hWi`}DN?p+tu{rO~^1FPyP_9lW3nju-1dkz}Hkm67m3 zgKbDKfCfid^-CyK7l_ziO_J|asK|h% zPo{g8IYln}he!A49hE0#jC593=JQ|rRM?xD?_F(F4^_wf1oskTjym|%@ z3;dX(nB1lW*lCF}4*#-fIgdjRqOmBO3lt7Tv`}{n(vVQ!e;h2?I!og!3<_mhoWqZ# zYNBab^whi`q;X}kHC`FZHPqyj$q@qRd{MZ*3h~EC280CT9v9x>mEDnN2A-x?Dnc>h z#rCXArbpDwPJVgChjwjY7JKaeQU$$}7ecc6m(Y$XVSv@?pMq`MwZ`}F-|6V-Hx5cG z{(({Euv-Yd65kHaJ9H8SD=S9OO?UhdNOJ4yaMx}}xOOg~jWoV~bvS9- zW%qt?{%&Qp(C9$mv!wrDD32FW(-cddg9_?3BqzL|CZsa5w!mn&X#SLBUBX8@diERMghKd=$7I9& z-p}dmneBJFh}6$MdjPD2@UR@@gD}7Tda^9N>?5v;Q(dHRd9>L6m2ju5*Igxg>!Sk7 zk^p!0P73{E^1Z@~8*EV$^W(g@CRyp3DElYc`bp$?H5q-{kIWa2l>FCWw3`Q5%6@bkjk33P6TR|1T@%B9?uA+;YG)Me5j(=*T28JT(PYQ z*ncj(=f?jPg>+8_YYs2Rt7}d|PR*VJ$jGj>md-3;_>iQXiru*f{-+>STx1dCv2WwZ z$G)@kUg(%3u?T+Ce6ISrPUP(5H0S5mb%SR|U7_BzPYDUvOzO`U4qB%>h_cZ|@kS(u zkowjZ=4!)S9UME-F2NoPG@&a!kEDMOWkSWzYA0S}83nUh2W-BFK=Nri-l{w*fOIMP zbZO_K5_kE0cj;KU!OUfb<_j0ySPI*5jl@853f$E6t?ya^QDXME+_}?ieLB~y!k=VX zf)VTw@=PO}z@*-j@(7ld27{6>_AyzIJ;ftD?c~%Q;H9a?{rmt@YjPig{LbU`3n?`|^_@(8v{j-EbfM0^h^S<(MDqDaZ z@VEr^{v&7T5KG5$BMk;rS3~>tCs^9jZx#PSM4rg)TF>7>MMXs|yDr(pJh# z{AhZgK~6vfw?`?IbtamNc-AOsv8ao&0#RrOtr z*!fKT84!7%5^-2|=u3;8GZ()6@Hd*+YBXcStfajBU(z={Fv5%^=6D>Gyt%ar7}S0q zf&IC*Jl7scmg;R7FR=L=cfOoPttv@2}sISWb{h!H-Mse>h#l3$ZrK#$hV37-12?SkvegCVRZ#1p>pPqMm_O~3< zoewE0b+*J&3BuAhXL-Gj{*Sm16Q-tWGOFA*R1z2CHRTby5&A|cSM%M6h$T}V=p;yR zpYGo;oPejW!oN(FmJFEqwmC^ZI4aiL?HjF3j?^-(jr?nY2Q1mWj)wnZUtpbsSTIsz#cO`{T+Qxo=EhCi71Wipye~cUOvV9!Aa+wdDCMQbT zG;hU-tXh9lS3irg^9l$LM^@uD>OsU~*6H7eg;tAnxR62o<9 zp!FC>^Swj#wY)i67|s^Tu;#WJVkA1m;p;Lm+)!rMpW z^q%x_z7NW6zbM6R-4B6ReFv&{fBh>P7$pfNR1)6Pcc!#U$_jPKh#?E7EBmLl`Tu~H zMGvg_izpXH7NmzxxA!C@Nm6*F9$)TgVS*f6IBEG&i8t*;_xI7=NX#Aqdn7Kz8^{(r zeP86T=wKp^_g|;9TrL&@Ua6v)bMnIkt=b&Y>j0u(dyT7%;p6AkpMMiDQ`I_ zDj_l_u@}VlL4hx4d15`j5v0-M3R$w z8Xb4+_T_!(BdhH)FPgv+D-_53#-^sU`^#OzknL$TWiH|$%F5_5A}_o=t8N8+eW`55 z!x-k?(Z@>-3Gzh>8R6mK{V$7kor`M6$H&%d?JJEOb#-+=qmJQzYgTnx#{dLu6fh#C z8o$|hC;zK4Lly10C*ZVD+0MLinwVRenDF~8@^T&{y8h8}f7dE!sJ%hr%UcF2uGQv% zRXDFdf8+MqPz*V5%a7|y(~Z0k&Yk|FYAac7!K?)vIi)Hh=AQ@^@Gm_)MIc&uBH~y; zA`EU)jjHNbiK!Cv$#yepKmc%{JWhxdndRQa9T| zg{`XcG4w^*9(%#%rn=5$N4Zm{g=)@|VhCB)*d;HIWYp6@QGO!(AYD>XqDN6;6bq#Q z8{tS&T&0^Fejl;cL%Ttb?Ns(q%|X!bqxps5dVPqcH?B01TIW2_ggZ!#MBd{oBRotw z(L_fB>2XyooEe=vm6SQ4gGi<}Df*M{D~wty%}azT7l)?0^wTuk#)Zs~OxjMtkFVnGSzHsDJwgD@IpPR1`Fl z!IM$1EPPMZunahU?&LdZf3&SxnVb~={5b+T7F$^`&OF;ac%nc?#!>aCNtH%1T~bXA zJA=pW-@I`Q*UmYd&N0bCZ0?YCsD-U9P0kpo=`+C?FhaK)*d~LW89D4$1)-W-S{A^j zIh!?MIW6t&?YS#?R0v?6QxYEN@&Hdy0HH*t7eg=t$fO=*_2FPWy-I?~L+mL8lR^(l zn8#6;G1X!uuxGRo_;?T66KZ?x5&RG1EeUcuN}5U5i(v_hG%7a zVCyqL`mEnsCwF!QbWuu$W68@V&`1PF4#y6d(S6VncNNF0Sp59L9q#h0lzS)5$AsPf zXr$0ez}2~CBg)M6WTEqBt^h$7 z`DijmF2KIO)o$lTW@FhlgZge8@IRHZzTdc%M;sGb`c{$WmzGAn8HKXfCN`KB-L87N zZ-&wC9UK^esdQpW%4GoQ)1TVYlM`;+1aDjKHvV1s_528CqrZ_Ko~|GwJLtfj#OBzZ zK{AMt257Po&}-;H(fi_%1BH7MDvF$i7>%S@3O?azrHF8{n899G)O&p2ta+$YMX8~% z*U$%RGd59L!TeXKkhYkJBYLoEYvFoS)phOOWs!z>B>Fg~$jA~~B0ar0)xqR^`es#B z%D?!z_6qOQel_jqob`| z5;E$s#}X-9>a{h9#$B;0efUq8^OafgkZ_#01k|qvB_fs%?D|?Z1Zv9ps!pPODD4z=37_@KbHt^)cm z7b$X(sZ95OX>s*{N9s{QjPM|sTv+n&MiKH{Onzp8J_C1G_DePmY@j2tr@c4Nba)3| z(%VEgT<+O@%D{sfsA=BUr^^Aenz+nFP#ZB7KG&t{UxS9e)YjI<$`|qOB&sPaEY?}M zpLHVefjb?=v{COWL&@Ehc~j6LrWAQ5=I1TUR)IEfzoPieF(!x&-F!y@xvAfEXZo); z6x=V7`c_x7zriTrHY_B6nbjB~Axd$9N6$jwm&y8GOL;Gt>%CSRxO;5pRQqTAvr7h5 zxjuwqYyVpphAEeKyX?Z$p67SEYW!iN!=l)1l7sihR^O_u7O+}7yZc{9bgC(7CRFqQ z>FY3B^1(+D!G*QtfQJN(YlPdLuhohd10Ka{dG)IXk{!*3Cf7Nx6O%Pr^+{RQuQutr zcDojtI&xFn2Y>jcI2swwSnsLvQs>>NT|@hZpMEVZTJ6r06XzJ9iJ?+5e9#!vuomq> z+t=J6B2*o24GeS%8#{!3aTU3lH>RWnRQ$&hL6KED?#L%V3`@a5AqzF;Q}gq(T3R1$ zY;4N38=~P+@CbI-6LOvk{eovozg_N%yz)6llS>5KcOlWTI`63r4i3(@dGZ|2{@yBq zWE+iU^3fDtf_vd~D*_=8&KmPEv$OTiZAU&l7QNwosfhmFOCp!)FM@aL0Z;&wc70?7 zOM9xCvQW~O0_iI6N7rn(O{B%e#Z)2B`hhI>=j%E5)3#gQjX-PyZfgPzsA(`s9xBtS zAz(9t!-zEd540tGDKwf3xU`rb+43VeAU0}vt7qR2CG;#1 z*E0hKGX>O@aEb%BeR_Ej_v22HD&IguJ6G1no(oBW2~$46VCX@qzRV)8t{`YOCHJ2G zY)J@BpgDbU!<5{he;l)lTq?wDIPuD1P7<#^3RccY76D##((wz^?zVwnf`r^#n%40! zQ{hX-c5?&{>G|_*8;-eW%UQOV>@W83ghl!ZMHfW62OCo5Y+ME^sv@*|xSDbKujac& zWJtN<@__)POCUR)QQt#$%~8n&d80%URvB)Cj3x9F5;=_TIXne!rZ%#emN8|KV$}9+ z?bOW;1%LK4mks6Ls>3_wxW(GAW`*#@653c2y|^d3=GRQt=Kb~Q*{t3Wyav}D%}Z63 zmS^H450<_gh-&SpplY!X(!|;lmS1V?c|8zi7E%EstV#(sel`th9cv;RX-w`ixLYf`TLdLEKhpD%a<}3^OM`xp@RJ_;lj~E6vAQM`#MZS_nma3^a+P6zaKyLqVwBmB(12&FUrZ% zPo+SQo-&zy&9qXM{P8rUrG7*5N=FO!+UF|o$tvrG=Ir=I!|6mfbyQ-d`)N79n#};7 z?K+8{y9dReCnV0)F8w|UG|xYz=pOxy0_QGS_;5=d=6Lr*EClo8&Zk23;{QhEq}?@OFw&5Kw6E3qeOmVizX`Al(% zjANuWnz4+{sDq90!E=Pj>7>yLi&WftCnJyy>vM3B|2P^iufv1I;G3F?!D`m9v(yW^ zLMWO{C*EUpo_;E~NKs)UB{Z<%3F=9dj1$?M_V^oMgE>4**j zsVZA1jCca>k8G~2D^qx}zt4)V80eK#)cES+uMGEvoxY(pdYxr>FXA`UKy1*D?_K$C zj|}@S-d_mKw++%JT@-)Nl3r;Yw;NG~N zTe*ybt5!|c8;Mvg+B;1Tp$hzvCk02zu8n#YHM=J$?l67{m-@L*E?+k!QXy&Ix*XP8-Oq?ls zB`TZHvHw-X{7%61y(b15qtbxtJ?RI6FWpfi79>Mrom1uV1gp?XQgMS?NJp^rPq_+r zvKy4oB>WAvlXWFQ<^Q+~b3(*KDf+k6qZh!eEckn zE{9Ocvc$+Fk%tWw;5SUf%pfdK57>-M)D&f8*Aq3BlYrnf$%2G=d&0>mvucY_s|$=B zY$g1*k}Q(g!a5Ufw|t59aJ)Q19$_9{(S!;GXQHfS6AgK>K~hjRkbfp7(pji45&Ud2 z7g!h@{ajXSxw+o6PgxEPO;@5Ge!kT=H9Z}O;ji1`S_K&OBG+V#xx4cj|BcLRYT{#` zsnReurrg=tF>8HHq*t4-wZs;1J)*M^_&!ZXro)lPGcz;8W;RT4aByH@XJ>x-Zv5kr@we3=cQ`V|o!LI0Pz4WzA10+lZt z*}3n*Oqw~IG?HNQ50+oDVAD#LGta3;h0tA-m%UC&Oz~wdS~0xV*4DS(I9y>0*g|-c z&YmwYeksUiQSkmvrkBE4VW*FGljwM}LvpPEw_n3hw-t7!gg8n+G1de10`A39^gQU_E+HWyCjE9IdTK>QMIe%p zCwk21rl#z_y6`j(^NR@mCx4rz`ZxSs3eO0p@n5=CDyJpZ+xr%*lR?-t>#(9DJA~Ay zah(GIA%CUAEurkOhX+BJe$n!WLi13r?EStD4eJezlbUHI+DRB5STjMxA|-8RYQ+al#Za zkhB>?9Bj4bM+Jw|bvWTp>%$3GkcC628n_b=^~GE&xLkpkpY~2D4mlB7HzBvRA~rez zn-)@xHV?2GlfyMEJECxyk8UqoRlFfiq0`^KevKP~uhC0ROdMZW2uqBw@IJQkI@DeZ zul@At6IadN{(i_YE{%<8jTS79T)Ln;`y13eCh{r>$#j(O3BnX-bvrYt$x(v5F$j&9 zqXHx5B2Q=CIxaI`pTI8RglP(9IcB$q2M53#t-y4b2`Xq2dQe!-^Pkkg6^02DFPo5T zV`&j2XZG;eH#8AGWbfIF^)^h&V}uX}87!iOLc^jc2q;A4*J7Qc^~zhu@}Hn1fws5{ zJcLJLf)W#xfFkZnK*T+n5Tyv*X+)G`&DV-oDw3T`0&V+ayuWR!KFrDvR`d{nMw(ce zljjjBE~J1dpm5_Gg6vnKBqU3g^s@k6z}rxqzPK_x(eNcqcs1|`6+;iUAP+2>j~g?w z2a@!^Vk>zV?49^KBud94D^`in5e`HN{&P(JkKrSASifUz@aXLw`LCS+KY$_R#b8#I}A^n0!_7otGPKXNV=43!3ZV{P?g8oFPNrOf%dHv z5+(x$g`x8{KV*;Z3`J`pk8KNx=+Ll zp7AdiQmzCYMkg;5dF7r5d7-12zsIwd>RP5x$xxLp?WJ9h;I}R8VjFm>*@D@u=2f1U zPUa~abqgsGpD87vg_4bqZQMX2gvza)jTMOqV<%N}BabRYQgfFx)})EDS0~|2Osm6e z)|;l8#+4Aclqi$eTiyAOnbciN$D=?t$bd-lhJ6;Gd$Yb6p&J68W%~eV%us$he%eBU zzy#*E}= zwHZKmkS}W^Krkoi0)%LMXokf_{&RJSHJh=MDM_kw#stFr>wb~~W{|=_I_|YtQK~b1j6#Dou#f zLL|N+yjS@JGA`0Z&d$#E-KacJ_I<=ZQfHVL85s7Cj^GUDfO6es@ClG{Ar=HncUx~3 ztxRebe1hD-^%6`pq%PI2xO!I-AlV+_AiWo*Rb%#siGbLm-=E(L)ut#Qa!iq>bP2|e z98^N?)GaUr!G<;ki#^^x3B;;$48T`S&&)V1T0$Hqr0~*~&g}wzfxMW6cUZNU0KQD)YMqyMi&jbKa>>H>t;mj*s}Z6RY&)ox@x9It>k*czrm>;q!DStHqpRygykadPbew zO`DXI^j8d8v(cXX4ddlmamIGq9i`3~Nv{X_a47g#Xg|+QcM@s%#2lzJ}Yd6yg&93b_ zx#`CBMe*FcF*VkUE+2f7{w>2_u;Y#e33;+G{cLQG52?KF(-;%%WMV{uXz%=Qbh zv{6d>;%}zaGVg3I#djcq?$mc(+qv`i)Xiu+VE@BRZ2eT@>*<@D@vZ*%RT@T2voRgx zTvb3wS99QqFmhI=Fh9Qm+F;x5>JV5w)$~^5uoW%fb~(bc(CW?s8rxg_1Sm>a>aSnF zVj{pBfb%Pt!Cv{xK99%FuC5<3H0!?Of`)=Or{jbQ=Dy%;gF~n{(p(3e3<FH2`>p_Z# zliHR3kp^!s;HsvO#UDbRK7VFRT;7ScBKeAiE(4wSPm0|BYau5vUnC4mon>@iM zVb>pp^&civ8bPV1fjnw=FscM%=fm~k{agAji)9=CHWvBcXx7l%3N^yB23Qki&(3Ph z{?_h0^|=)wgNg-13jT;WJqwFDNVaBro;1B(am}BZn*u@J=n||Hb6jzmbC}cpv2i$n z?@JlY>klTc>A}J83KLsFB>Iir2g`dpa+K#R*G%~6XLYE9uJMX3R(+K1@tg`4NTbV*U_6EaC* z3N#kBIr;7oH1v`beHEIr?XQ-LlF*Xr{D$7;oGu#LrAn`5R}v`L#s#<7@CnaFq* z6*S3V$PA=!=apiAp$pFiV=XBn4Rs?O@1qrs~HIp-|*#k_Zvrt^2JCQ_x|Z&IQ*2EaA$hh?w6H`j(P)fS3X2s& zbr>zYSv(K)g|SLfdHaXWQ}HVl%D}>}G}#Yi>0;B5{K;+f#G+{r z-r0CxwIP&hINh5&QXWcOLdY})Wz;Ep$6NG}GsFCjaH4SGOcNF7fnbRqX;E7xzd|{u zA$PR>Wv}iAMd9HvotM?Y@!;!Qz1l-!aEOr$hBy#;aunewe>HY!k#iEVfyB|HNoxLF zXD3QoJnn0F+u*St<@!xBe`wRn>2I?w@@mn_;UZdG`|G^7CaKC@S)~{)8hxi6MRzC? zX{k#%4B3Q9-mX+!6+bGqp}W6!{*S=xTn}h$@72{mR6eq&LEy2edayQ_@A`9F6TKX0 z7J#IOTxq|shPfmGLg!!wh8V=Mu`h+eZ`L0co+|e+%r{uh5^VqdjseS2aoD=}pKJFR z2iA?)gK&8NxZ0INnhfqvRi~)T0n3V7^j!Z%AcmKLqS@v;wd>$__g;kSS5E7|-MYDM%o|fn z{9dRCcnWTuy|XA65!bA*A6p=)fuTO!VFE!R+DFNV6b2`A*|5~Ygf@um?9QBJ+z$9X zRI3ML5e*Su?bitkjtWPY@nmmK?fD6$K9wG+_5t3&FoO(c_~}#NdOlE!aun-7o;X9dk9qYk|E^azi8oZTp;VC25B_3 zoDmuIW+eEuS9*<#M1Jj_`dkgyYHNG@>g9iW?kE+>74OP9s#<;zOHn@)H(sJ0-hwmm z2TMSP&0Y@R|7M5vyx)85i6bROhRH){!p>Ia(Z4f^( z+AdOQ6rwKck6TJ793$JB^&F?M_cu`Ls51JcvH#wrkm>w_GDUOyou>mO)-B55CaaOR z28#ivNYL*WQMszmhx$bc2~&^YK@nOAy414^@OAjL*E)(yGc3sTVZo3_3`Ns0JJm43 z%l=CBM!q*!-X`2_j}eXXdkYVg9E0bYl3d3}UOv8K7Vvz4We#|DN5Sg|+bdRL9S94{P7QPNC09)IVDkh`Tc z4EZ7zma^sBGq4}~KhXuqwKY;pd9DiQN#T_4skQwa?FnAEVoa||;iG+yhsC0W1gO4! z7MjL27hL07-`~EilO4+&e5m)em!SBFRo=wMuRa}PcQz`VW1f3p(5wOaO&f>^gWDFZ zwy0IU`E3L6>nN$;JeO4J+WcxXChZ{|9u*_80&F 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 14/75] 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 eb24230d0840b44bd5658501f498ab5dde959645 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 2 Dec 2018 22:32:18 +0100 Subject: [PATCH 15/75] Update Deutsch (Forgot to remove the "!" sign --- rtdata/languages/Deutsch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 09736d74f..462fe922a 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -2410,4 +2410,4 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!GENERAL_CURRENT;Aktuell +GENERAL_CURRENT;Aktuell From 4e79d688074410184f95b4641e4a8bc967a6d4c3 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 2 Dec 2018 23:00:29 +0100 Subject: [PATCH 16/75] CMake file cleanup --- CMakeLists.txt | 52 ++++++++++++++++++------------------ UpdateInfo.cmake | 58 ++++++++++++++++++++--------------------- rtengine/CMakeLists.txt | 2 +- win.cmake | 2 +- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2739c4da..9dab10f0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ if(APPLE) cmake_minimum_required(VERSION 3.3) - CMAKE_POLICY(SET CMP0025 NEW) + cmake_policy(SET CMP0025 NEW) else() cmake_minimum_required(VERSION 2.8.8) endif() -# Must stay before the PROJECT() command: +# Must stay before the project() command: if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4") set(CMAKE_CXX_COMPILER_ARG1 "-std=c++11" CACHE STRING "C++ version for eclipse" FORCE) # Users building with Eclipse should set CMAKE_ECLIPSE_VERSION through the @@ -13,18 +13,18 @@ if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4") #set(CMAKE_ECLIPSE_VERSION "4.6.0" CACHE STRING "Eclipse version" FORCE) endif() -PROJECT(RawTherapee) +project(RawTherapee) # The default target is Debug: if(CMAKE_BUILD_TYPE STREQUAL "") - set (CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebInfo MinSizeRel" FORCE) + set(CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebInfo MinSizeRel" FORCE) endif() string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE) # Set required C and C++ standards and check GCC version: -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") message(FATAL_ERROR "Building RawTherapee requires using GCC version 4.9 or higher!") @@ -32,14 +32,14 @@ endif() # We might want to build using the old C++ ABI, even when using a new GCC version: if(USE_OLD_CXX_ABI) - add_definitions (-D_GLIBCXX_USE_CXX11_ABI=0) + add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) endif() if(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG") - add_definitions (-D_DEBUG) + add_definitions(-D_DEBUG) else() - add_definitions (-DNDEBUG) - add_definitions (-D_DNDEBUG) + add_definitions(-DNDEBUG) + add_definitions(-D_DNDEBUG) endif() message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") @@ -141,7 +141,7 @@ if(WIN32 OR APPLE) if(BUILD_BUNDLE) message(STATUS "You have set BUILD_BUNDLE=ON but this is not necessary - the option is forced to ON for Windows and macOS.") endif() - set (BUILD_BUNDLE ON FORCE) + set(BUILD_BUNDLE ON FORCE) endif() if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR) @@ -262,7 +262,7 @@ endif() if(NOT BUILD_BUNDLE) foreach(path BINDIR DATADIR LIBDIR DOCDIR CREDITSDIR LICENCEDIR) if(NOT (IS_ABSOLUTE "${${path}}")) - message (FATAL_ERROR "The ${path} path has to be absolute when using -DBUILD_BUNDLE=OFF") + message(FATAL_ERROR "The ${path} path has to be absolute when using -DBUILD_BUNDLE=OFF") endif() endforeach() endif() @@ -342,35 +342,35 @@ endif() if(WITH_LTO) # Using LTO with older versions of binutils requires setting extra flags - SET(BINUTILS_VERSION_MININUM "2.29") + set(BINUTILS_VERSION_MININUM "2.29") execute_process(COMMAND ar --version OUTPUT_VARIABLE BINUTILS_VERSION_DETECTED) string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}") if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}") if(APPLE) - SET(CMAKE_AR "/opt/local/bin/ar") - SET(CMAKE_RANLIB "/opt/local/bin/ranlib") + set(CMAKE_AR "/opt/local/bin/ar") + set(CMAKE_RANLIB "/opt/local/bin/ranlib") else() - SET(CMAKE_AR "/usr/bin/gcc-ar") - SET(CMAKE_RANLIB "/usr/bin/gcc-ranlib") + set(CMAKE_AR "/usr/bin/gcc-ar") + set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") endif() message(STATUS "Binutils version detected as less than " ${BINUTILS_VERSION_MININUM} " - setting CMake parameters to enable LTO linking:\n CMAKE_AR=\"" ${CMAKE_AR} "\"\n CMAKE_RANLIB=\"" ${CMAKE_RANLIB} "\"") endif() - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto") endif() if(WITH_SAN) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}") endif() if(WITH_PROF) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") endif() if(OPTION_OMP) diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake index 8ffaf0636..d1f532506 100644 --- a/UpdateInfo.cmake +++ b/UpdateInfo.cmake @@ -2,25 +2,25 @@ # If we find ReleaseInfo.cmake we use the info from there and don't need Git to be installed find_file(REL_INFO_FILE ReleaseInfo.cmake PATHS "${PROJECT_SOURCE_DIR}" NO_DEFAULT_PATH) -if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) +if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) # we look for the git command in this paths by order of preference - if (WIN32) + if(WIN32) find_program(GIT_CMD git.exe HINTS ENV Path PATH_SUFFIXES ../) - elseif (APPLE) + elseif(APPLE) find_program(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") find_program(GIT_CMD git) - set (SHELL "/bin/bash") - else (WIN32) # Linux + set(SHELL "/bin/bash") + else(WIN32) # Linux find_program(GIT_CMD git) - set (SHELL "/bin/bash") - endif (WIN32) + set(SHELL "/bin/bash") + endif(WIN32) # Fail if Git is not installed - if (GIT_CMD STREQUAL GIT_CMD-NOTFOUND) + if(GIT_CMD STREQUAL GIT_CMD-NOTFOUND) message(FATAL_ERROR "git command not found!") - else () + else() message(STATUS "git command found: ${GIT_CMD}") - endif () + endif() # Get version description. # Depending on whether you checked out a branch (dev) or a tag (release), @@ -50,19 +50,19 @@ if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) execute_process(COMMAND ${GIT_CMD} rev-list --count HEAD --not --tags OUTPUT_VARIABLE GIT_COMMITS_SINCE_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}") # If user checked-out something which is not a branch, use the description as branch name. - if (GIT_BRANCH STREQUAL "") - set (GIT_BRANCH "${GIT_DESCRIBE}") + if(GIT_BRANCH STREQUAL "") + set(GIT_BRANCH "${GIT_DESCRIBE}") endif() # Create numeric version. # This version is nonsense, either don't use it at all or use it only where you have no other choice, e.g. Inno Setup's VersionInfoVersion. # Strip everything after hyphen, e.g. "5.0-gtk2" -> "5.0", "5.1-rc1" -> "5.1" (ergo BS). - if (GIT_COMMITS_SINCE_TAG STREQUAL "") - set (GIT_NUMERIC_VERSION_BS "0.0.0") - else () + if(GIT_COMMITS_SINCE_TAG STREQUAL "") + set(GIT_NUMERIC_VERSION_BS "0.0.0") + else() string(REGEX REPLACE "-.*" "" GIT_NUMERIC_VERSION_BS ${GIT_DESCRIBE}) set(GIT_NUMERIC_VERSION_BS "${GIT_NUMERIC_VERSION_BS}.${GIT_COMMITS_SINCE_TAG}") - endif () + endif() message(STATUS "Git checkout information:") message(STATUS " Commit description: ${GIT_DESCRIBE}") @@ -73,38 +73,38 @@ if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) message(STATUS " Commits since branch: ${GIT_COMMITS_SINCE_BRANCH}") message(STATUS " Version (unreliable): ${GIT_NUMERIC_VERSION_BS}") - if (NOT DEFINED CACHE_NAME_SUFFIX) + if(NOT DEFINED CACHE_NAME_SUFFIX) set(CACHE_NAME_SUFFIX "${GIT_DESCRIBE}") message(STATUS "CACHE_NAME_SUFFIX was not defined, it is now \"${CACHE_NAME_SUFFIX}\"") - else () + else() message(STATUS "CACHE_NAME_SUFFIX is \"${CACHE_NAME_SUFFIX}\"") - endif () + endif() -else (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) +else(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake") -endif (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) +endif(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) -if (WIN32) - if (BIT_DEPTH EQUAL 4) +if(WIN32) + if(BIT_DEPTH EQUAL 4) set(BUILD_BIT_DEPTH 32) # 32 bits builds has to be installable on 64 bits system, to support WinXP/64. set(ARCHITECTURE_ALLOWED "x86 x64 ia64") # installing in 32 bits mode even on 64 bits OS and architecture set(INSTALL_MODE "") - elseif (BIT_DEPTH EQUAL 8) + elseif(BIT_DEPTH EQUAL 8) set(BUILD_BIT_DEPTH 64) # Restricting the 64 bits builds to 64 bits systems only set(ARCHITECTURE_ALLOWED "x64 ia64") # installing in 64 bits mode for all 64 bits processors, even for itanium architecture set(INSTALL_MODE "x64 ia64") - endif (BIT_DEPTH EQUAL 4) + endif(BIT_DEPTH EQUAL 4) # set part of the output archive name set(SYSTEM_NAME "WinVista") - configure_file ("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss") -endif (WIN32) + configure_file("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss") +endif(WIN32) # build version.h from template -configure_file ("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h") +configure_file("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h") # build AboutThisBuild.txt from template -configure_file ("${PROJECT_SOURCE_DIR}/AboutThisBuild.txt.in" "${CMAKE_BINARY_DIR}/AboutThisBuild.txt") +configure_file("${PROJECT_SOURCE_DIR}/AboutThisBuild.txt.in" "${CMAKE_BINARY_DIR}/AboutThisBuild.txt") diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index 7bb35ad01..4ffad24a1 100644 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -164,7 +164,7 @@ add_dependencies(rtengine UpdateInfo) # It may be nice to store library version too if(BUILD_SHARED_LIBS) - install (TARGETS rtengine DESTINATION ${LIBDIR}) + install(TARGETS rtengine DESTINATION ${LIBDIR}) endif() set_target_properties(rtengine PROPERTIES COMPILE_FLAGS "${RTENGINE_CXX_FLAGS}") diff --git a/win.cmake b/win.cmake index 3b330ebe0..9c292b2df 100644 --- a/win.cmake +++ b/win.cmake @@ -24,7 +24,7 @@ set(PROC_TARGET_NUMBER 0 CACHE STRING "Target Processor") # If you want to force the target processor name when PROC_TARGET_NUMBER = 0 or 2, # uncomment the next line and replace labelWithoutQuotes by its value -#set (PROC_LABEL labelWithoutQuotes CACHE STRING "Target Processor label") +#set(PROC_LABEL labelWithoutQuotes CACHE STRING "Target Processor label") # Important: MinGW-w64 user may need to specify the -m32 or -m64 flag in CMAKE_CXX_FLAGS, # CMAKE_C_FLAGS and CMAKE_EXE_LINKER_FLAGS to select between 32/64bit build From e2490e5381ce97cc1d77034b65ea15cd1c73dc1c Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 3 Dec 2018 01:56:10 +0100 Subject: [PATCH 17/75] Updated French translation --- rtdata/languages/Francais | 154 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 79 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 50fb21046..9779e4145 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -221,6 +221,7 @@ GENERAL_AUTO;Automatique GENERAL_BEFORE;Avant GENERAL_CANCEL;Annuler GENERAL_CLOSE;Fermer +GENERAL_CURRENT;Actuel GENERAL_DISABLE;Désactiver GENERAL_DISABLED;Désactivé GENERAL_ENABLE;Activer @@ -509,33 +510,33 @@ HISTORY_MSG_254;CpND - Teinte chair HISTORY_MSG_255;Réd. de bruit - Filtre médian HISTORY_MSG_256;Réd. de bruit - Médian - Type HISTORY_MSG_257;Virage Partiel -HISTORY_MSG_258;Virage Partiel - Couleur -HISTORY_MSG_259;Virage Partiel - Opacité -HISTORY_MSG_260;Virage Partiel - Opacité 'a[b]' -HISTORY_MSG_261;Virage Partiel - Méthode -HISTORY_MSG_262;Virage Partiel - Opacité 'b' -HISTORY_MSG_263;Virage Partiel - Ombres - Rouge -HISTORY_MSG_264;Virage Partiel - Ombres - Vert -HISTORY_MSG_265;Virage Partiel - Ombres - Bleu -HISTORY_MSG_266;Virage Partiel - Moyen - Rouge -HISTORY_MSG_267;Virage Partiel - Moyen - Vert -HISTORY_MSG_268;Virage Partiel - Moyen - Bleu -HISTORY_MSG_269;Virage Partiel - HL - Rouge -HISTORY_MSG_270;Virage Partiel - HL - Vert -HISTORY_MSG_271;Virage Partiel - HL - Bleu -HISTORY_MSG_272;Virage Partiel - Balance -HISTORY_MSG_273;Virage Partiel - Balance Couleur O/TM/HL -HISTORY_MSG_274;Virage Partiel - Saturation des ombres -HISTORY_MSG_275;Virage Partiel - Saturation des HL -HISTORY_MSG_276;Virage Partiel - Opacité +HISTORY_MSG_258;VP - Couleur +HISTORY_MSG_259;VP - Opacité +HISTORY_MSG_260;VP - Opacité 'a[b]' +HISTORY_MSG_261;VP - Méthode +HISTORY_MSG_262;VP - Opacité 'b' +HISTORY_MSG_263;VP - Ombres - Rouge +HISTORY_MSG_264;VP - Ombres - Vert +HISTORY_MSG_265;VP - Ombres - Bleu +HISTORY_MSG_266;VP - Moyen - Rouge +HISTORY_MSG_267;VP - Moyen - Vert +HISTORY_MSG_268;VP - Moyen - Bleu +HISTORY_MSG_269;VP - HL - Rouge +HISTORY_MSG_270;VP - HL - Vert +HISTORY_MSG_271;VP - HL - Bleu +HISTORY_MSG_272;VP - Balance +HISTORY_MSG_273;VP - Balance Couleur O/TM/HL +HISTORY_MSG_274;VP - Saturation des ombres +HISTORY_MSG_275;VP - Saturation des HL +HISTORY_MSG_276;VP - Opacité HISTORY_MSG_277;--inutilisé-- -HISTORY_MSG_278;Virage Partiel - Préserver luminance -HISTORY_MSG_279;Virage partiel - Ombres -HISTORY_MSG_280;Virage partiel - Hautes lumières -HISTORY_MSG_281;Virage partiel - Protect. Saturé -HISTORY_MSG_282;Virage partiel - Seuil de protection -HISTORY_MSG_283;Virage partiel - Force -HISTORY_MSG_284;Virage partiel - Protect. saturé auto +HISTORY_MSG_278;VP - Préserver luminance +HISTORY_MSG_279;VP - Ombres +HISTORY_MSG_280;VP - Hautes lumières +HISTORY_MSG_281;VP - Protect. Saturé +HISTORY_MSG_282;VP - Seuil de protection +HISTORY_MSG_283;VP - Force +HISTORY_MSG_284;VP - Protect. saturé auto HISTORY_MSG_285;Réd. de bruit - Médiane - Méthode HISTORY_MSG_286;Réd. de bruit - Médiane - Type HISTORY_MSG_287;Réd. de bruit - Médiane - Itérations @@ -730,15 +731,20 @@ HISTORY_MSG_491;Balances des Blancs HISTORY_MSG_492;Courbes RVB HISTORY_MSG_493;Ajustements L*a*b* HISTORY_MSG_CLAMPOOG;Tronquer les couleurs hors gamut -HISTORY_MSG_COLORTONING_LABGRID_VALUE;Virage Partiel - Correction couleur -HISTORY_MSG_COLORTONING_LABREGION_AB;Virage Partiel - Correction couleur -HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;Virage Partiel - Masque C -HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;Virage Partiel - Masque T -HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;Virage Partiel - Luminosité -HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;Virage Partiel - Masque L -HISTORY_MSG_COLORTONING_LABREGION_LIST;Virage Partiel - Liste -HISTORY_MSG_COLORTONING_LABREGION_SATURATION;Virage Partiel - Saturation -HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;Virage Partiel - Montrer le masque +HISTORY_MSG_COLORTONING_LABGRID_VALUE;VP - Correction couleur +HISTORY_MSG_COLORTONING_LABREGION_AB;VP - Correction couleur +HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;VP - Canal +HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;VP - Masque C +HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;VP - Masque T +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;VP - Luminosité +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;VP - Masque L +HISTORY_MSG_COLORTONING_LABREGION_LIST;VP - Liste +HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;VP - Masque flou local +HISTORY_MSG_COLORTONING_LABREGION_OFFSET;VP - Offset local +HISTORY_MSG_COLORTONING_LABREGION_POWER;VP - Puissance locale +HISTORY_MSG_COLORTONING_LABREGION_SATURATION;VP - Saturation +HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;VP - Montrer le masque +HISTORY_MSG_COLORTONING_LABREGION_SLOPE;VP - Pente locale HISTORY_MSG_DEHAZE_DEPTH;EB - Profondeur HISTORY_MSG_DEHAZE_ENABLED;Élimination de la Brume HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;EB - Montrer carte de profondeur @@ -1036,9 +1042,15 @@ PARTIALPASTE_VIGNETTING;Correction du vignettage PARTIALPASTE_WAVELETGROUP;Niveaux d'ondelette PARTIALPASTE_WHITEBALANCE;Balance des blancs PREFERENCES_ADD;Ajoute +PREFERENCES_APPEARANCE;Apparence +PREFERENCES_APPEARANCE_COLORPICKERFONT;Police des ancres de vérification couleur +PREFERENCES_APPEARANCE_CROPMASKCOLOR;Couleur du masque de recadrage +PREFERENCES_APPEARANCE_MAINFONT;Police principale PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Couleur du cadre dans le Navigateur +PREFERENCES_APPEARANCE_THEME;Thème PREFERENCES_APPLNEXTSTARTUP;appliqué au prochain lancement PREFERENCES_AUTOMONPROFILE;Utiliser automatiquement le profil de l'écran principal +PREFERENCES_AUTOSAVE_TP_OPEN;Sauvegarder l'état ouvert/fermé des outils en quittant PREFERENCES_BATCH_PROCESSING;Traitement par lot PREFERENCES_BEHADDALL;Tout à 'Ajoute' PREFERENCES_BEHADDALLHINT;Règle tous les paramètres sur le mode Ajoute.\nLa modification des paramètres dans le panneau d'édition en par lot sera des deltas par-rapport aux valeurs existantes @@ -1097,6 +1109,7 @@ PREFERENCES_EDITORCMDLINE;Ligne de commande personnelle PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur PREFERENCES_EXTERNALEDITOR;Éditeur externe PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes +PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre d'outil compact dans le Navigateur de Fichiers PREFERENCES_FILEFORMAT;Format du fichier PREFERENCES_FLATFIELDFOUND;Trouvé PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme @@ -1379,6 +1392,7 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche\nRaccourci: [\n\nRaccourci en mode Éditeur unique: Alt-[ TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotation vers la droite\nRaccourci: ]\n\nRaccourci en mode Éditeur unique: Alt-] TP_COARSETRAF_TOOLTIP_VFLIP;Symétriser / axe horizontal +TP_COLORAPP_ABSOLUTELUMINANCE;Luminance absolue TP_COLORAPP_ALGO;Algorithme TP_COLORAPP_ALGO_ALL;Tout TP_COLORAPP_ALGO_JC;Luminosité + Chroma (JC) @@ -1389,6 +1403,7 @@ TP_COLORAPP_BADPIXSL;Filtrer les pixels chauds/morts TP_COLORAPP_BADPIXSL_TOOLTIP;Suppression des pixels chauds/morts (colorés de manière intense).\n0=Aucun effet 1=Médian 2=Gaussien.\n\nCes artefacts sont dus aux limitations de CIECAM02. Vous pouvez également adjuster l'image afin d'éviter les ombres très sombres. TP_COLORAPP_BRIGHT;Brillance (Q) TP_COLORAPP_BRIGHT_TOOLTIP;Brillance dans CIECAM02 est différent de Lab et RVB, prend en compte la luminosité du blanc +TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;Lorsque réglé manuellement, les valeurs au-dessus de 65 sont recommandées. TP_COLORAPP_CHROMA;Chroma (C) TP_COLORAPP_CHROMA_M;Niveau de couleurs (M) TP_COLORAPP_CHROMA_M_TOOLTIP;Niveau de couleurs dans CIECAM02 est différent de Lab et RVB @@ -1419,6 +1434,7 @@ TP_COLORAPP_LABEL_SCENE;Conditions de la scène TP_COLORAPP_LABEL_VIEWING;Conditions de visionnage TP_COLORAPP_LIGHT;Luminosité (J) TP_COLORAPP_LIGHT_TOOLTIP;Luminosité dans CIECAM02 est différent de celui de Lab et RVB +TP_COLORAPP_MEANLUMINANCE;Luminance moyenne (Yb%) TP_COLORAPP_MODEL;Modèle de Point Blanc TP_COLORAPP_MODEL_TOOLTIP;Modèle de Point Blanc\n\nBB [RT] + [sortie]:\nLa BB de RT est utilisée pour la scène, CIECAM est réglé sur D50, le blanc du périphérique de sortie utilise la valeur réglée dans Préférences\n\nBB [RT+CAT02] + [sortie]:\nLes réglages de BB de RT sont utilisés par CAT02 et le blanc du périphérique de sortie utilise la valeur réglée dans Préférences TP_COLORAPP_NEUTRAL;Résinitialiser @@ -1462,14 +1478,23 @@ TP_COLORTONING_LABGRID;Grille de correction L*a*b* TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nO: a=%3 b=%4 TP_COLORTONING_LABREGIONS;Régions de correction L*a*b* TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2 +TP_COLORTONING_LABREGION_CHANNEL;Canal +TP_COLORTONING_LABREGION_CHANNEL_ALL;Tous +TP_COLORTONING_LABREGION_CHANNEL_B;Bleu +TP_COLORTONING_LABREGION_CHANNEL_G;Vert +TP_COLORTONING_LABREGION_CHANNEL_R;Rouge TP_COLORTONING_LABREGION_CHROMATICITYMASK;C TP_COLORTONING_LABREGION_HUEMASK;T TP_COLORTONING_LABREGION_LIGHTNESS;Luminosité TP_COLORTONING_LABREGION_LIGHTNESSMASK;L TP_COLORTONING_LABREGION_LIST_TITLE;Correction TP_COLORTONING_LABREGION_MASK;Masque +TP_COLORTONING_LABREGION_MASKBLUR;Masque Flou +TP_COLORTONING_LABREGION_OFFSET;Décalage +TP_COLORTONING_LABREGION_POWER;Puissance TP_COLORTONING_LABREGION_SATURATION;Saturation TP_COLORTONING_LABREGION_SHOWMASK;Montrer le masque +TP_COLORTONING_LABREGION_SLOPE;Pente TP_COLORTONING_LUMA;Luminance TP_COLORTONING_LUMAMODE;Préserver la luminance TP_COLORTONING_LUMAMODE_TOOLTIP;Si activé, lorsque vous changez la couleur (rouge, vert, cyan, bleu, etc.), la luminance de chaque pixel est préservé @@ -1509,6 +1534,8 @@ TP_CROP_GUIDETYPE;Type de guide: TP_CROP_H;H TP_CROP_LABEL;Recadrage TP_CROP_PPI;PPI= +TP_CROP_RESETCROP;Réinitialiser +TP_CROP_SELECTCROP;Sélectionner TP_CROP_W;L TP_CROP_X;X TP_CROP_Y;Y @@ -1760,7 +1787,16 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Peut être utilisé avec le curseur Chromaticité et TP_LENSGEOM_AUTOCROP;Recadrage auto TP_LENSGEOM_FILL;Remplir TP_LENSGEOM_LABEL;Objectif / Géométrie +TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatiquement +TP_LENSPROFILE_CORRECTION_LCPFILE;Fichier LCP +TP_LENSPROFILE_CORRECTION_MANUAL;Manuellement TP_LENSPROFILE_LABEL;Profil de correction d'objectif +TP_LENSPROFILE_LENS_WARNING;Attention: le facteur de recadrage utilisé pour la caractérisation d'un objectif est plus grand que le facteur de recadrage de l'appareil photo, les résultats pourraient être faux. +TP_LENSPROFILE_MODE_HEADER;Sélectionner le profil d'objectif: +TP_LENSPROFILE_USE_CA;Aberration chromatique +TP_LENSPROFILE_USE_GEOMETRIC;Géometrique +TP_LENSPROFILE_USE_HEADER;Sélectionner les distortions à corriger: +TP_LENSPROFILE_USE_VIGNETTING;Vignetage TP_LOCALCONTRAST_AMOUNT;Quantité TP_LOCALCONTRAST_DARKNESS;Niveau des ombres TP_LOCALCONTRAST_LABEL;Contraste Local @@ -1803,6 +1839,7 @@ TP_PRSHARPENING_LABEL;Netteté post-redimensionnement TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimentionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisé. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation. TP_RAWCACORR_AUTO;Correction automatique TP_RAWCACORR_AUTOIT;Itérations +TP_RAWCACORR_AUTOIT_TOOLTIP;Ce réglage est disponible si "Correction-auto" est activé.\nCorrection-auto est conservatif, signifiant qu'il ne corrige souvent pas toute l'aberration chromatique.\nPour corriger l'aberration restante, vous pouvez uttiliser jusqu'à cinq itérations de de la correction automatique de l'aberration chromatique.\nChaque itération réduira l'aberration restante de l'itération précédente avec un prix d'un temps de traitement plus long. TP_RAWCACORR_AVOIDCOLORSHIFT;Éviter les dérives couleurs TP_RAWCACORR_CABLUE;Bleu TP_RAWCACORR_CARED;Rouge @@ -1926,6 +1963,7 @@ TP_RESIZE_WIDTH;Largeur TP_RETINEX_CONTEDIT_HSL;Égaliseur d'histogramme TSV TP_RETINEX_CONTEDIT_LAB;Égaliseur d'histogramme L*a*b* TP_RETINEX_CONTEDIT_LH;Égaliseur de teinte +TP_RETINEX_CONTEDIT_MAP;Égaliseur TP_RETINEX_CURVEEDITOR_CD;L=f(L) TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance en fonction de la luminance L=f(L)\nCorrige les données raw pour réduire halos et artéfacts. TP_RETINEX_CURVEEDITOR_LH;Force=f(T) @@ -1963,6 +2001,7 @@ TP_RETINEX_LABEL;Retinex TP_RETINEX_LABEL_MASK;Masque TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Bas +TP_RETINEX_MAP;Méthode TP_RETINEX_MAP_GAUS;Masque gaussien TP_RETINEX_MAP_MAPP;Masque pointu (ondelettes partielles) TP_RETINEX_MAP_MAPT;Masque pointu (ondelettes totales) @@ -2272,6 +2311,7 @@ TP_WBALANCE_LED_CRS;CRS SP12 WWMR16 TP_WBALANCE_LED_HEADER;LED TP_WBALANCE_LED_LSI;LSI Lumelex 2040 TP_WBALANCE_METHOD;Méthode +TP_WBALANCE_PICKER;Sélectionner TP_WBALANCE_SHADE;Ombre TP_WBALANCE_SIZE;Taille: TP_WBALANCE_SOLUX35;Solux 3500K @@ -2294,47 +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. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!GENERAL_CURRENT;Current -!HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel -!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_SLOPE;CT - region slope -!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_FILEBROWSERTOOLBARSINGLEROW;Compact toolbars in File Browser -!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_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_MASKBLUR;Mask Blur -!TP_COLORTONING_LABREGION_OFFSET;Offset -!TP_COLORTONING_LABREGION_POWER;Power -!TP_COLORTONING_LABREGION_SLOPE;Slope -!TP_CROP_RESETCROP;Reset -!TP_CROP_SELECTCROP;Select -!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_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_RETINEX_CONTEDIT_MAP;Equalizer -!TP_RETINEX_MAP;Method -!TP_WBALANCE_PICKER;Pick From 7cfd9dc8f4269a2bf774385275161839e708fd77 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Mon, 3 Dec 2018 00:55:54 +0100 Subject: [PATCH 18/75] colortoning: fixed bug in setting method in batch mode --- rtgui/colortoning.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc index ec89118df..effd76eca 100644 --- a/rtgui/colortoning.cc +++ b/rtgui/colortoning.cc @@ -640,7 +640,7 @@ void ColorToning::read (const ProcParams* pp, const ParamsEdited* pedited) labgrid->setParams(pp->colorToning.labgridALow / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridBLow / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridAHigh / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridBHigh / ColorToningParams::LABGRID_CORR_MAX, false); if (pedited && !pedited->colorToning.method) { - method->set_active (5); + method->set_active (7); } else if (pp->colorToning.method == "Lab") { method->set_active (0); } else if (pp->colorToning.method == "RGBSliders") { From 2ec094b1ce3fec7965dd2f8938171038578b29e2 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 3 Dec 2018 13:30:51 +0100 Subject: [PATCH 19/75] remove special windows code, #5058 --- rtgui/thumbbrowserbase.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index 5f75967e6..6c15411a1 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -1009,9 +1009,6 @@ void ThumbBrowserBase::zoomChanged (bool zoomIn) } redraw (); -#ifdef WIN32 - gdk_window_process_updates (get_window()->gobj(), true); -#endif } void ThumbBrowserBase::refreshThumbImages () From bd665e7133110d8c6ab27ff48f480c97dfaffa44 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 3 Dec 2018 16:18:16 +0100 Subject: [PATCH 20/75] Updated language keys in Preferences, closes #5061 Commit bba0f7 cleaned up some language keys. Two of them were consolidated into one as they had an identical label but belonged to a different section of the CIECAM02 tool. As a result, Preferences needed to be updated. --- rtgui/preferences.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 19fa41d2b..4151eacd4 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -268,17 +268,17 @@ Gtk::Widget* Preferences::getBatchProcPanel () mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_COLORAPP_LABEL")); - appendBehavList (mi, M ("TP_COLORAPP_ADAPTSCENE"), ADDSET_CAT_ADAPTSCENE, true); + appendBehavList (mi, M("TP_COLORAPP_LABEL_SCENE") + " - " + M("TP_COLORAPP_ABSOLUTELUMINANCE"), ADDSET_CAT_ADAPTSCENE, true); + appendBehavList (mi, M("TP_COLORAPP_LABEL_VIEWING") + " - " + M("TP_COLORAPP_ABSOLUTELUMINANCE"), ADDSET_CAT_ADAPTVIEWING, true); appendBehavList (mi, M ("TP_COLORAPP_LIGHT"), ADDSET_CAT_LIGHT, true); appendBehavList (mi, M ("TP_COLORAPP_BRIGHT"), ADDSET_CAT_BRIGHT, true); appendBehavList (mi, M ("TP_COLORAPP_CHROMA"), ADDSET_CAT_CHROMA, true); + appendBehavList (mi, M ("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true); + appendBehavList (mi, M ("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true); appendBehavList (mi, M ("TP_COLORAPP_RSTPRO"), ADDSET_CAT_RSTPRO, true); appendBehavList (mi, M ("TP_COLORAPP_CONTRAST"), ADDSET_CAT_CONTRAST, true); appendBehavList (mi, M ("TP_COLORAPP_CONTRAST_Q"), ADDSET_CAT_CONTRAST_Q, true); - appendBehavList (mi, M ("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true); - appendBehavList (mi, M ("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true); appendBehavList (mi, M ("TP_COLORAPP_HUE"), ADDSET_CAT_HUE, true); - appendBehavList (mi, M ("TP_COLORAPP_ADAPTVIEWING"), ADDSET_CAT_ADAPTVIEWING, true); appendBehavList (mi, M ("TP_COLORAPP_BADPIXSL"), ADDSET_CAT_BADPIX, true); mi = behModel->append (); From 4a949685ca64422ad64af3213689ad14dbeb82c5 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 3 Dec 2018 16:24:41 +0100 Subject: [PATCH 21/75] generateTranslationDiffs --- rtdata/languages/Deutsch | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 462fe922a..33bec128f 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -296,6 +296,7 @@ GENERAL_AUTO;Automatisch GENERAL_BEFORE;Vorher GENERAL_CANCEL;Abbrechen GENERAL_CLOSE;Schließen +GENERAL_CURRENT;Aktuell GENERAL_DISABLE;Deaktivieren GENERAL_DISABLED;Deaktiviert GENERAL_ENABLE;Aktivieren @@ -2406,8 +2407,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -GENERAL_CURRENT;Aktuell From 75a34ef87ee1f5faa5286dc7817d14b0cfc1a7b9 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 4 Dec 2018 14:51:13 +0100 Subject: [PATCH 22/75] Improve caclulation of dual demosaic contrast threshold --- rtengine/rt_algo.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index 3925fc1ec..4552593cc 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -207,15 +207,16 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr if (autoContrast) { for (int pass = 0; pass < 2; ++pass) { const int tilesize = 80 / (pass + 1); - const int numTilesW = W / tilesize; - const int numTilesH = H / tilesize; + const int skip = pass < 1 ? tilesize : tilesize / 4; + const int numTilesW = W / skip - 3 * pass; + const int numTilesH = H / skip - 3 * pass; std::vector>> variances(numTilesH, std::vector>(numTilesW)); #pragma omp parallel for for (int i = 0; i < numTilesH; ++i) { - int tileY = i * tilesize; + int tileY = i * skip; for (int j = 0; j < numTilesW; ++j) { - int tileX = j * tilesize; + int tileX = j * skip; #ifdef __SSE2__ vfloat avgv = ZEROV; for (int y = tileY; y < tileY + tilesize; ++y) { @@ -268,10 +269,9 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } - const int minY = tilesize * minI; - const int minX = tilesize * minJ; + const int minY = skip * minI; + const int minX = skip * minJ; -// std::cout << pass << ": minvar : " << minvar << std::endl; if (minvar <= 1.f || pass == 1) { // a variance <= 1 means we already found a flat region and can skip second pass // in second pass we allow a variance of 2 From a5c52c86928d750314ed36162cefee26f238fd34 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Tue, 4 Dec 2018 18:00:53 +0100 Subject: [PATCH 23/75] TWB-theme fix csd --- rtdata/themes/TooWaBlue-GTK3-20_.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index d4565829a..c0bfd207c 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -2,7 +2,7 @@ This file is part of RawTherapee. Copyright (c) 2016-2018 TooWaBoo - Version 2.98 + Version 2.99 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1191,7 +1191,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { /*** end ***************************************************************************************/ /*** Context & popups menus *****************************************************************************/ -.popup > decoration { +.csd.popup > decoration { background-image: none; border-radius: 0; border: none; @@ -2042,7 +2042,7 @@ entry:focus > selection { /*** end ***************************************************************************************/ /*** Window Layout *****************************************************************************/ -:not(.popup):not(tooltip) > decoration { +.csd:not(.popup):not(tooltip) > decoration { background-color: @winHeaderbar; background-image: none; border-radius: 0.416666666666666666em 0.416666666666666666em 0 0; @@ -2076,7 +2076,7 @@ headerbar .title{ /**/ /* Window in background */ -:not(.popup):not(tooltip) > decoration:backdrop { +.csd:not(.popup):not(tooltip) > decoration:backdrop { box-shadow: 0 0.25em 0.75em 0.083333333333333333em rgba(0, 0, 0, 0.3), 0 0 0 0.083333333333333333em @bg-dark-grey; } headerbar:backdrop { From 09c55ca6eccae42892139791cc560643f7368c25 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 4 Dec 2018 23:13:20 +0100 Subject: [PATCH 24/75] Small speedup and code cleanup for autocontrast calculation --- rtengine/rt_algo.cc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index 4552593cc..a258287bf 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -203,20 +203,19 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } else { - constexpr float scale = 0.0625f / 327.68f; if (autoContrast) { for (int pass = 0; pass < 2; ++pass) { const int tilesize = 80 / (pass + 1); const int skip = pass < 1 ? tilesize : tilesize / 4; const int numTilesW = W / skip - 3 * pass; const int numTilesH = H / skip - 3 * pass; - std::vector>> variances(numTilesH, std::vector>(numTilesW)); + std::vector> variances(numTilesH, std::vector(numTilesW)); - #pragma omp parallel for + #pragma omp parallel for schedule(dynamic) for (int i = 0; i < numTilesH; ++i) { - int tileY = i * skip; + const int tileY = i * skip; for (int j = 0; j < numTilesW; ++j) { - int tileX = j * skip; + const int tileX = j * skip; #ifdef __SSE2__ vfloat avgv = ZEROV; for (int y = tileY; y < tileY + tilesize; ++y) { @@ -226,7 +225,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } float avg = vhadd(avgv); #else - float avg = 0.; + float avg = 0.f; for (int y = tileY; y < tileY + tilesize; ++y) { for (int x = tileX; x < tileX + tilesize; ++x) { avg += luminance[y][x]; @@ -234,6 +233,11 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } #endif avg /= SQR(tilesize); + if (avg < 2000.f || avg > 20000.f) { + // too dark or too bright => skip the tile + variances[i][j] = RT_INFINITY_F; + continue; + } #ifdef __SSE2__ vfloat varv = ZEROV; avgv = F2V(avg); @@ -244,16 +248,15 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } float var = vhadd(varv); #else - float var = 0.0; + float var = 0.f; for (int y = tileY; y < tileY + tilesize; ++y) { for (int x = tileX; x < tileX + tilesize; ++x) { var += SQR(luminance[y][x] - avg); } } - #endif +#endif var /= (SQR(tilesize) * avg); - variances[i][j].first = var; - variances[i][j].second = avg; + variances[i][j] = var; } } @@ -261,8 +264,8 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr int minI = 0, minJ = 0; for (int i = 0; i < numTilesH; ++i) { for (int j = 0; j < numTilesW; ++j) { - if (variances[i][j].first < minvar && variances[i][j].second > 2000.f && variances[i][j].second < 20000.f) { - minvar = variances[i][j].first; + if (variances[i][j] < minvar) { + minvar = variances[i][j]; minI = i; minJ = j; } @@ -295,6 +298,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } else { + constexpr float scale = 0.0625f / 327.68f; #ifdef _OPENMP #pragma omp parallel #endif From 1b0baf78ff8fb2e4830a76444128066736df23a3 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 5 Dec 2018 15:17:12 +0100 Subject: [PATCH 25/75] buildBlendMask() cleanup --- rtengine/rt_algo.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index a258287bf..af2083d8e 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -22,8 +22,6 @@ #include #include #include -#include -#include #ifdef _OPENMP #include #endif @@ -206,12 +204,14 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr if (autoContrast) { for (int pass = 0; pass < 2; ++pass) { const int tilesize = 80 / (pass + 1); - const int skip = pass < 1 ? tilesize : tilesize / 4; + const int skip = pass == 0 ? tilesize : tilesize / 4; const int numTilesW = W / skip - 3 * pass; const int numTilesH = H / skip - 3 * pass; std::vector> variances(numTilesH, std::vector(numTilesW)); +#ifdef _OPENMP #pragma omp parallel for schedule(dynamic) +#endif for (int i = 0; i < numTilesH; ++i) { const int tileY = i * skip; for (int j = 0; j < numTilesW; ++j) { From feb718adb522cfe1f3a37a27ab05da2ae9e4e8d5 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 5 Dec 2018 15:40:14 +0100 Subject: [PATCH 26/75] Some changes to CMakeLists.txt, closes #5066 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dab10f0b..ff221ffef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,10 +373,11 @@ if(WITH_PROF) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") endif() +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations") if(OPTION_OMP) find_package(OpenMP) if(OPENMP_FOUND) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -Werror=unknown-pragmas -Wall -Wno-unused-result -Wno-deprecated-declarations") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -Werror=unknown-pragmas") endif() endif() From d51e9b9bd46b40f525aeb9ab4834053fe623ab05 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 5 Dec 2018 19:20:57 +0100 Subject: [PATCH 27/75] Remove obsolete MSR() in imagesource.h --- rtengine/dcrop.cc | 2 +- rtengine/imagesource.h | 1 - rtengine/improccoordinator.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index 778f29fe8..e49e03329 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -869,7 +869,7 @@ void Crop::update(int todo) bool cclutili = parent->cclutili; LUTu dummy; - // parent->ipf.MSR(labnCrop, labnCrop->W, labnCrop->H, 1); + parent->ipf.chromiLuminanceCurve(this, 1, labnCrop, labnCrop, parent->chroma_acurve, parent->chroma_bcurve, parent->satcurve, parent->lhskcurve, parent->clcurve, parent->lumacurve, utili, autili, butili, ccutili, cclutili, clcutili, dummy, dummy); parent->ipf.vibrance(labnCrop); parent->ipf.labColorCorrectionRegions(labnCrop); diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h index c87ce4b0d..6c39d8d42 100644 --- a/rtengine/imagesource.h +++ b/rtengine/imagesource.h @@ -76,7 +76,6 @@ public: virtual void flushRGB () {}; virtual void HLRecovery_Global (const ToneCurveParams &hrp) {}; virtual void HLRecovery_inpaint (float** red, float** green, float** blue) {}; - virtual void MSR (LabImage* lab, LUTf & mapcurve, bool &mapcontlutili, int width, int height, int skip, RetinexParams deh, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax) {}; virtual bool isRGBSourceModified () const = 0; // tracks whether cached rgb output of demosaic has been modified diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 851f78ed8..24107ea1f 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -706,7 +706,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) nprevl->CopyFrom(oprevl); progress("Applying Color Boost...", 100 * readyphase / numofphases); - // ipf.MSR(nprevl, nprevl->W, nprevl->H, 1); + histCCurve.clear(); histLCurve.clear(); ipf.chromiLuminanceCurve(nullptr, pW, nprevl, nprevl, chroma_acurve, chroma_bcurve, satcurve, lhskcurve, clcurve, lumacurve, utili, autili, butili, ccutili, cclutili, clcutili, histCCurve, histLCurve); From 72ee9918587bb69efc3de935768d21ab61d5a498 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 7 Dec 2018 00:39:41 +0100 Subject: [PATCH 28/75] Improve detection of flat regions for calculation of dual demosaic contrast threshold --- rtengine/rt_algo.cc | 159 +++++++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 46 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index af2083d8e..bd45819d9 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -51,6 +51,49 @@ vfloat calcBlendFactor(vfloat valv, vfloat thresholdv) { return onev / (onev + xexpf(c16v - c16v * valv / thresholdv)); } #endif + +float tileAverage(float **data, size_t tileY, size_t tileX, size_t tilesize) { + +#ifdef __SSE2__ + vfloat avgv = ZEROV; + for (size_t y = tileY; y < tileY + tilesize; ++y) { + for (size_t x = tileX; x < tileX + tilesize; x += 4) { + avgv += LVFU(data[y][x]); + } + } + const float avg = vhadd(avgv); +#else + float avg = 0.f; + for (size_t y = tileY; y < tileY + tilesize; ++y) { + for (size_t x = tileX; x < tileX + tilesize; ++x) { + avg += data[y][x]; + } + } +#endif + return avg / rtengine::SQR(tilesize); +} + +float tileVariance(float **data, size_t tileY, size_t tileX, size_t tilesize, float avg) { + +#ifdef __SSE2__ + vfloat varv = ZEROV; + const vfloat avgv = F2V(avg); + for (size_t y = tileY; y < tileY + tilesize; ++y) { + for (size_t x = tileX; x < tileX + tilesize; x +=4) { + varv += SQRV(LVFU(data[y][x]) - avgv); + } + } + const float var = vhadd(varv); +#else + float var = 0.f; + for (size_t y = tileY; y < tileY + tilesize; ++y) { + for (size_t x = tileX;; x < tileX + tilesize; ++x) { + var += rtengine::SQR(data[y][x] - avg); + } + } +#endif + return var / (rtengine::SQR(tilesize) * avg); +} } namespace rtengine @@ -202,6 +245,8 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } else { if (autoContrast) { + constexpr float minLuminance = 2000.f; + constexpr float maxLuminance = 20000.f; for (int pass = 0; pass < 2; ++pass) { const int tilesize = 80 / (pass + 1); const int skip = pass == 0 ? tilesize : tilesize / 4; @@ -216,47 +261,14 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr const int tileY = i * skip; for (int j = 0; j < numTilesW; ++j) { const int tileX = j * skip; -#ifdef __SSE2__ - vfloat avgv = ZEROV; - for (int y = tileY; y < tileY + tilesize; ++y) { - for (int x = tileX; x < tileX + tilesize; x += 4) { - avgv += LVFU(luminance[y][x]); - } - } - float avg = vhadd(avgv); -#else - float avg = 0.f; - for (int y = tileY; y < tileY + tilesize; ++y) { - for (int x = tileX; x < tileX + tilesize; ++x) { - avg += luminance[y][x]; - } - } -#endif - avg /= SQR(tilesize); - if (avg < 2000.f || avg > 20000.f) { + const float avg = tileAverage(luminance, tileY, tileX, tilesize); + if (avg < minLuminance || avg > maxLuminance) { // too dark or too bright => skip the tile variances[i][j] = RT_INFINITY_F; continue; + } else { + variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); } -#ifdef __SSE2__ - vfloat varv = ZEROV; - avgv = F2V(avg); - for (int y = tileY; y < tileY + tilesize; ++y) { - for (int x = tileX; x < tileX + tilesize; x +=4) { - varv += SQRV(LVFU(luminance[y][x]) - avgv); - } - } - float var = vhadd(varv); -#else - float var = 0.f; - for (int y = tileY; y < tileY + tilesize; ++y) { - for (int x = tileX; x < tileX + tilesize; ++x) { - var += SQR(luminance[y][x] - avg); - } - } -#endif - var /= (SQR(tilesize) * avg); - variances[i][j] = var; } } @@ -276,17 +288,72 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr const int minX = skip * minJ; if (minvar <= 1.f || pass == 1) { - // a variance <= 1 means we already found a flat region and can skip second pass - // in second pass we allow a variance of 2 - JaggedArray Lum(tilesize, tilesize); - JaggedArray Blend(tilesize, tilesize); - for (int i = 0; i < tilesize; ++i) { - for (int j = 0; j < tilesize; ++j) { - Lum[i][j] = luminance[i + minY][j + minX]; + if (pass == 0) { + // a variance <= 1 means we already found a flat region and can skip second pass + JaggedArray Lum(tilesize, tilesize); + JaggedArray Blend(tilesize, tilesize); + for (int i = 0; i < tilesize; ++i) { + for (int j = 0; j < tilesize; ++j) { + Lum[i][j] = luminance[i + minY][j + minX]; + } + } + contrastThreshold = calcContrastThreshold(Lum, Blend, tilesize, tilesize) / 100.f; + break; + } else { + // in second pass we allow a variance of 4 + // we additionally scan the tiles +-skip pixels around the best tile from pass 2 + // Means we scan (2 * skip + 1)^2 tiles in this step to get a better hit rate + // fortunately the scan is quite fast, so we use only one core and don't parallelize + const int topLeftYStart = std::max(minY - skip, 0); + const int topLeftXStart = std::max(minX - skip, 0); + const int topLeftYEnd = std::min(minY + skip, H - tilesize); + const int topLeftXEnd = std::min(minX + skip, W - tilesize); + const int numTilesH = topLeftYEnd - topLeftYStart + 1; + const int numTilesW = topLeftXEnd - topLeftXStart + 1; + + std::vector> variances(numTilesH, std::vector(numTilesW)); + for (int i = 0; i < numTilesH; ++i) { + const int tileY = topLeftYStart + i; + for (int j = 0; j < numTilesW; ++j) { + const int tileX = topLeftXStart + j; + const float avg = tileAverage(luminance, tileY, tileX, tilesize); + + if (avg < minLuminance || avg > maxLuminance) { + // too dark or too bright => skip the tile + variances[i][j] = RT_INFINITY_F; + continue; + } else { + variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); + } + } + } + + float minvar = RT_INFINITY_F; + int minI = 0, minJ = 0; + for (int i = 0; i < numTilesH; ++i) { + for (int j = 0; j < numTilesW; ++j) { + if (variances[i][j] < minvar) { + minvar = variances[i][j]; + minI = i; + minJ = j; + } + } + } + if (minvar <= 4.f) { + JaggedArray Lum(tilesize, tilesize); + JaggedArray Blend(tilesize, tilesize); + const int minY = topLeftYStart + minI; + const int minX = topLeftXStart + minJ; + for (int i = 0; i < tilesize; ++i) { + for (int j = 0; j < tilesize; ++j) { + Lum[i][j] = luminance[i + minY][j + minX]; + } + } + contrastThreshold = calcContrastThreshold(Lum, Blend, tilesize, tilesize) / 100.f; + } else { + contrastThreshold = 0.f; } } - contrastThreshold = (pass == 0 || minvar <= 4.f) ? calcContrastThreshold(Lum, Blend, tilesize, tilesize) / 100.f : 0.f; - break; } } } From d9d8005706cb400cb7afdde3f89eb291ead130e7 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 7 Dec 2018 16:22:24 +0100 Subject: [PATCH 29/75] Some changes as suggested by @Floessie, #5070 --- rtengine/rt_algo.cc | 472 +++++++++++++++++++++----------------------- rtengine/rt_algo.h | 1 - 2 files changed, 225 insertions(+), 248 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index bd45819d9..a2ca3cac4 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #ifdef _OPENMP @@ -31,7 +32,6 @@ #include "rt_algo.h" #include "rt_math.h" #include "sleef.c" -#include "jaggedarray.h" namespace { float calcBlendFactor(float val, float threshold) { @@ -54,46 +54,110 @@ vfloat calcBlendFactor(vfloat valv, vfloat thresholdv) { float tileAverage(float **data, size_t tileY, size_t tileX, size_t tilesize) { + float avg = 0.f; #ifdef __SSE2__ vfloat avgv = ZEROV; - for (size_t y = tileY; y < tileY + tilesize; ++y) { - for (size_t x = tileX; x < tileX + tilesize; x += 4) { +#endif + for (std::size_t y = tileY; y < tileY + tilesize; ++y) { + std::size_t x = tileX; +#ifdef __SSE2__ + for (; x < tileX + tilesize - 3; x += 4) { avgv += LVFU(data[y][x]); } - } - const float avg = vhadd(avgv); -#else - float avg = 0.f; - for (size_t y = tileY; y < tileY + tilesize; ++y) { - for (size_t x = tileX; x < tileX + tilesize; ++x) { +#endif + for (; x < tileX + tilesize; ++x) { avg += data[y][x]; } } +#ifdef __SSE2__ + avg += vhadd(avgv); #endif return avg / rtengine::SQR(tilesize); } float tileVariance(float **data, size_t tileY, size_t tileX, size_t tilesize, float avg) { + float var = 0.f; #ifdef __SSE2__ vfloat varv = ZEROV; const vfloat avgv = F2V(avg); - for (size_t y = tileY; y < tileY + tilesize; ++y) { - for (size_t x = tileX; x < tileX + tilesize; x +=4) { +#endif + for (std::size_t y = tileY; y < tileY + tilesize; ++y) { + std::size_t x = tileX; +#ifdef __SSE2__ + for (; x < tileX + tilesize - 3; x += 4) { varv += SQRV(LVFU(data[y][x]) - avgv); } - } - const float var = vhadd(varv); -#else - float var = 0.f; - for (size_t y = tileY; y < tileY + tilesize; ++y) { - for (size_t x = tileX;; x < tileX + tilesize; ++x) { +#endif + for (; x < tileX + tilesize; ++x) { var += rtengine::SQR(data[y][x] - avg); } } +#ifdef __SSE2__ + var += vhadd(varv); #endif return var / (rtengine::SQR(tilesize) * avg); } + +float calcContrastThreshold(float** luminance, int tileY, int tileX, int tilesize) { + + constexpr float scale = 0.0625f / 327.68f; + std::vector> blend(tilesize - 4, std::vector(tilesize - 4)); + +#ifdef __SSE2__ + const vfloat scalev = F2V(scale); +#endif + + for(int j = tileY + 2; j < tileY + tilesize - 2; ++j) { + int i = tileX + 2; +#ifdef __SSE2__ + for(; i < tileX + tilesize - 5; i += 4) { + vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) + + SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev; + STVFU(blend[j - tileY - 2][i - tileX - 2], contrastv); + } +#endif + for(; i < tileX + tilesize - 2; ++i) { + + float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) + + rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale; + + blend[j - tileY - 2][i - tileX - 2] = contrast; + } + } + + const float limit = rtengine::SQR(tilesize - 4) / 100.f; + + int c; + for (c = 1; c < 100; ++c) { + const float contrastThreshold = c / 100.f; + float sum = 0.f; +#ifdef __SSE2__ + const vfloat contrastThresholdv = F2V(contrastThreshold); + vfloat sumv = ZEROV; +#endif + + for(int j = 0; j < tilesize - 4; ++j) { + int i = 0; +#ifdef __SSE2__ + for(; i < tilesize - 7; i += 4) { + sumv += calcBlendFactor(LVFU(blend[j][i]), contrastThresholdv); + } +#endif + for(; i < tilesize - 4; ++i) { + sum += calcBlendFactor(blend[j][i], contrastThreshold); + } + } +#ifdef __SSE2__ + sum += vhadd(sumv); +#endif + if (sum <= limit) { + break; + } + } + + return c / 100.f; +} } namespace rtengine @@ -237,254 +301,168 @@ void findMinMaxPercentile(const float* data, size_t size, float minPrct, float& void buildBlendMask(float** luminance, float **blend, int W, int H, float &contrastThreshold, float amount, bool autoContrast) { - if(contrastThreshold == 0.f && !autoContrast) { + if (autoContrast) { + constexpr float minLuminance = 2000.f; + constexpr float maxLuminance = 20000.f; + for (int pass = 0; pass < 2; ++pass) { + const int tilesize = 80 / (pass + 1); + const int skip = pass == 0 ? tilesize : tilesize / 4; + const int numTilesW = W / skip - 3 * pass; + const int numTilesH = H / skip - 3 * pass; + std::vector> variances(numTilesH, std::vector(numTilesW)); + +#ifdef _OPENMP + #pragma omp parallel for schedule(dynamic) +#endif + for (int i = 0; i < numTilesH; ++i) { + const int tileY = i * skip; + for (int j = 0; j < numTilesW; ++j) { + const int tileX = j * skip; + const float avg = tileAverage(luminance, tileY, tileX, tilesize); + if (avg < minLuminance || avg > maxLuminance) { + // too dark or too bright => skip the tile + variances[i][j] = RT_INFINITY_F; + continue; + } else { + variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); + } + } + } + + float minvar = RT_INFINITY_F; + int minI = 0, minJ = 0; + for (int i = 0; i < numTilesH; ++i) { + for (int j = 0; j < numTilesW; ++j) { + if (variances[i][j] < minvar) { + minvar = variances[i][j]; + minI = i; + minJ = j; + } + } + } + + const int minY = skip * minI; + const int minX = skip * minJ; + + if (minvar <= 1.f || pass == 1) { + if (pass == 0) { + // a variance <= 1 means we already found a flat region and can skip second pass + contrastThreshold = calcContrastThreshold(luminance, minY, minX, tilesize); + break; + } else { + // in second pass we allow a variance of 4 + // we additionally scan the tiles +-skip pixels around the best tile from pass 2 + // Means we scan (2 * skip + 1)^2 tiles in this step to get a better hit rate + // fortunately the scan is quite fast, so we use only one core and don't parallelize + const int topLeftYStart = std::max(minY - skip, 0); + const int topLeftXStart = std::max(minX - skip, 0); + const int topLeftYEnd = std::min(minY + skip, H - tilesize); + const int topLeftXEnd = std::min(minX + skip, W - tilesize); + const int numTilesH = topLeftYEnd - topLeftYStart + 1; + const int numTilesW = topLeftXEnd - topLeftXStart + 1; + + std::vector> variances(numTilesH, std::vector(numTilesW)); + for (int i = 0; i < numTilesH; ++i) { + const int tileY = topLeftYStart + i; + for (int j = 0; j < numTilesW; ++j) { + const int tileX = topLeftXStart + j; + const float avg = tileAverage(luminance, tileY, tileX, tilesize); + + if (avg < minLuminance || avg > maxLuminance) { + // too dark or too bright => skip the tile + variances[i][j] = RT_INFINITY_F; + continue; + } else { + variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); + } + } + } + + float minvar = RT_INFINITY_F; + int minI = 0, minJ = 0; + for (int i = 0; i < numTilesH; ++i) { + for (int j = 0; j < numTilesW; ++j) { + if (variances[i][j] < minvar) { + minvar = variances[i][j]; + minI = i; + minJ = j; + } + } + } + contrastThreshold = minvar <= 4.f ? calcContrastThreshold(luminance, topLeftYStart + minI, topLeftXStart + minJ, tilesize) : 0.f; + } + } + } + } + + if(contrastThreshold == 0.f) { for(int j = 0; j < H; ++j) { for(int i = 0; i < W; ++i) { blend[j][i] = amount; } } } else { - if (autoContrast) { - constexpr float minLuminance = 2000.f; - constexpr float maxLuminance = 20000.f; - for (int pass = 0; pass < 2; ++pass) { - const int tilesize = 80 / (pass + 1); - const int skip = pass == 0 ? tilesize : tilesize / 4; - const int numTilesW = W / skip - 3 * pass; - const int numTilesH = H / skip - 3 * pass; - std::vector> variances(numTilesH, std::vector(numTilesW)); - + constexpr float scale = 0.0625f / 327.68f; #ifdef _OPENMP - #pragma omp parallel for schedule(dynamic) + #pragma omp parallel +#endif + { +#ifdef __SSE2__ + const vfloat contrastThresholdv = F2V(contrastThreshold); + const vfloat scalev = F2V(scale); + const vfloat amountv = F2V(amount); #endif - for (int i = 0; i < numTilesH; ++i) { - const int tileY = i * skip; - for (int j = 0; j < numTilesW; ++j) { - const int tileX = j * skip; - const float avg = tileAverage(luminance, tileY, tileX, tilesize); - if (avg < minLuminance || avg > maxLuminance) { - // too dark or too bright => skip the tile - variances[i][j] = RT_INFINITY_F; - continue; - } else { - variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); - } - } - } - - float minvar = RT_INFINITY_F; - int minI = 0, minJ = 0; - for (int i = 0; i < numTilesH; ++i) { - for (int j = 0; j < numTilesW; ++j) { - if (variances[i][j] < minvar) { - minvar = variances[i][j]; - minI = i; - minJ = j; - } - } - } - - const int minY = skip * minI; - const int minX = skip * minJ; - - if (minvar <= 1.f || pass == 1) { - if (pass == 0) { - // a variance <= 1 means we already found a flat region and can skip second pass - JaggedArray Lum(tilesize, tilesize); - JaggedArray Blend(tilesize, tilesize); - for (int i = 0; i < tilesize; ++i) { - for (int j = 0; j < tilesize; ++j) { - Lum[i][j] = luminance[i + minY][j + minX]; - } - } - contrastThreshold = calcContrastThreshold(Lum, Blend, tilesize, tilesize) / 100.f; - break; - } else { - // in second pass we allow a variance of 4 - // we additionally scan the tiles +-skip pixels around the best tile from pass 2 - // Means we scan (2 * skip + 1)^2 tiles in this step to get a better hit rate - // fortunately the scan is quite fast, so we use only one core and don't parallelize - const int topLeftYStart = std::max(minY - skip, 0); - const int topLeftXStart = std::max(minX - skip, 0); - const int topLeftYEnd = std::min(minY + skip, H - tilesize); - const int topLeftXEnd = std::min(minX + skip, W - tilesize); - const int numTilesH = topLeftYEnd - topLeftYStart + 1; - const int numTilesW = topLeftXEnd - topLeftXStart + 1; - - std::vector> variances(numTilesH, std::vector(numTilesW)); - for (int i = 0; i < numTilesH; ++i) { - const int tileY = topLeftYStart + i; - for (int j = 0; j < numTilesW; ++j) { - const int tileX = topLeftXStart + j; - const float avg = tileAverage(luminance, tileY, tileX, tilesize); - - if (avg < minLuminance || avg > maxLuminance) { - // too dark or too bright => skip the tile - variances[i][j] = RT_INFINITY_F; - continue; - } else { - variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); - } - } - } - - float minvar = RT_INFINITY_F; - int minI = 0, minJ = 0; - for (int i = 0; i < numTilesH; ++i) { - for (int j = 0; j < numTilesW; ++j) { - if (variances[i][j] < minvar) { - minvar = variances[i][j]; - minI = i; - minJ = j; - } - } - } - if (minvar <= 4.f) { - JaggedArray Lum(tilesize, tilesize); - JaggedArray Blend(tilesize, tilesize); - const int minY = topLeftYStart + minI; - const int minX = topLeftXStart + minJ; - for (int i = 0; i < tilesize; ++i) { - for (int j = 0; j < tilesize; ++j) { - Lum[i][j] = luminance[i + minY][j + minX]; - } - } - contrastThreshold = calcContrastThreshold(Lum, Blend, tilesize, tilesize) / 100.f; - } else { - contrastThreshold = 0.f; - } - } - } - } - } - - if(contrastThreshold == 0.f) { - for(int j = 0; j < H; ++j) { - for(int i = 0; i < W; ++i) { - blend[j][i] = amount; - } - } - } else { - constexpr float scale = 0.0625f / 327.68f; #ifdef _OPENMP - #pragma omp parallel + #pragma omp for schedule(dynamic,16) +#endif + + for(int j = 2; j < H - 2; ++j) { + int i = 2; +#ifdef __SSE2__ + for(; i < W - 5; i += 4) { + vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) + + SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev; + + STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv)); + } +#endif + for(; i < W - 2; ++i) { + + float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) + + rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale; + + blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold); + } + } + +#ifdef _OPENMP + #pragma omp single #endif { -#ifdef __SSE2__ - const vfloat contrastThresholdv = F2V(contrastThreshold); - const vfloat scalev = F2V(scale); - const vfloat amountv = F2V(amount); -#endif -#ifdef _OPENMP - #pragma omp for schedule(dynamic,16) -#endif - - for(int j = 2; j < H - 2; ++j) { - int i = 2; -#ifdef __SSE2__ - for(; i < W - 5; i += 4) { - vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) + - SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev; - - STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv)); - } -#endif - for(; i < W - 2; ++i) { - - float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) + - rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale; - - blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold); + // upper border + for(int j = 0; j < 2; ++j) { + for(int i = 2; i < W - 2; ++i) { + blend[j][i] = blend[2][i]; } } - -#ifdef _OPENMP - #pragma omp single -#endif - { - // upper border - for(int j = 0; j < 2; ++j) { - for(int i = 2; i < W - 2; ++i) { - blend[j][i] = blend[2][i]; - } - } - // lower border - for(int j = H - 2; j < H; ++j) { - for(int i = 2; i < W - 2; ++i) { - blend[j][i] = blend[H-3][i]; - } - } - for(int j = 0; j < H; ++j) { - // left border - blend[j][0] = blend[j][1] = blend[j][2]; - // right border - blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3]; + // lower border + for(int j = H - 2; j < H; ++j) { + for(int i = 2; i < W - 2; ++i) { + blend[j][i] = blend[H-3][i]; } } - - // blur blend mask to smooth transitions - gaussianBlur(blend, blend, W, H, 2.0); + for(int j = 0; j < H; ++j) { + // left border + blend[j][0] = blend[j][1] = blend[j][2]; + // right border + blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3]; + } } + + // blur blend mask to smooth transitions + gaussianBlur(blend, blend, W, H, 2.0); } } } -int calcContrastThreshold(float** luminance, float **blend, int W, int H) { - - constexpr float scale = 0.0625f / 327.68f; - -#ifdef __SSE2__ - const vfloat scalev = F2V(scale); -#endif - - for(int j = 2; j < H - 2; ++j) { - int i = 2; -#ifdef __SSE2__ - for(; i < W - 5; i += 4) { - vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) + - SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev; - STVFU(blend[j -2 ][i - 2], contrastv); - } -#endif - for(; i < W - 2; ++i) { - - float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) + - rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale; - - blend[j -2][i- 2] = contrast; - } - } - - const float limit = (W - 4) * (H - 4) / 100.f; - - int c; - for (c = 1; c < 100; ++c) { - const float contrastThreshold = c / 100.f; - float sum = 0.f; -#ifdef __SSE2__ - const vfloat contrastThresholdv = F2V(contrastThreshold); - vfloat sumv = ZEROV; -#endif - - for(int j = 0; j < H - 4; ++j) { - int i = 0; -#ifdef __SSE2__ - for(; i < W - 7; i += 4) { - sumv += calcBlendFactor(LVFU(blend[j][i]), contrastThresholdv); - } -#endif - for(; i < W - 4; ++i) { - sum += calcBlendFactor(blend[j][i], contrastThreshold); - } - } -#ifdef __SSE2__ - sum += vhadd(sumv); -#endif - if (sum <= limit) { - break; - } - } - - return c; -} } diff --git a/rtengine/rt_algo.h b/rtengine/rt_algo.h index 0207e6f57..a8e2e3e23 100644 --- a/rtengine/rt_algo.h +++ b/rtengine/rt_algo.h @@ -25,5 +25,4 @@ namespace rtengine { void findMinMaxPercentile(const float* data, size_t size, float minPrct, float& minOut, float maxPrct, float& maxOut, bool multiThread = true); void buildBlendMask(float** luminance, float **blend, int W, int H, float &contrastThreshold, float amount = 1.f, bool autoContrast = false); -int calcContrastThreshold(float** luminance, float **blend, int W, int H); } From 3f606c776a06a42f6851bec4142d4a7da6e9d09d Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 7 Dec 2018 22:07:56 +0100 Subject: [PATCH 30/75] exclude tiles with too low variance from calculation of dual demosaic contrast threshold --- rtengine/rt_algo.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index a2ca3cac4..a304b654f 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -304,6 +304,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr if (autoContrast) { constexpr float minLuminance = 2000.f; constexpr float maxLuminance = 20000.f; + constexpr float minTileVariance = 0.5f; for (int pass = 0; pass < 2; ++pass) { const int tilesize = 80 / (pass + 1); const int skip = pass == 0 ? tilesize : tilesize / 4; @@ -325,6 +326,8 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr continue; } else { variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); + // exclude tiles with a variance less than minTileVariance + variances[i][j] = variances[i][j] < minTileVariance ? RT_INFINITY_F : variances[i][j]; } } } @@ -341,10 +344,9 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } - const int minY = skip * minI; - const int minX = skip * minJ; - if (minvar <= 1.f || pass == 1) { + const int minY = skip * minI; + const int minX = skip * minJ; if (pass == 0) { // a variance <= 1 means we already found a flat region and can skip second pass contrastThreshold = calcContrastThreshold(luminance, minY, minX, tilesize); @@ -374,6 +376,8 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr continue; } else { variances[i][j] = tileVariance(luminance, tileY, tileX, tilesize, avg); + // exclude tiles with a variance less than minTileVariance + variances[i][j] = variances[i][j] < minTileVariance ? RT_INFINITY_F : variances[i][j]; } } } From 04d5ba3f918f49b89b5b1f4bf95fa190e48e3bcc Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 8 Dec 2018 01:30:09 +0100 Subject: [PATCH 31/75] reduce silencing of warnings for dcraw code --- rtengine/dcraw.cc | 6 ++---- rtengine/dcraw.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 7d4ec4376..180eed1c0 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -1,12 +1,9 @@ #ifdef __GNUC__ #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wparentheses" #if (__GNUC__ >= 6) #pragma GCC diagnostic ignored "-Wmisleading-indentation" #if (__GNUC__ >= 7) -#pragma GCC diagnostic ignored "-Wdangling-else" #endif #endif #endif @@ -1045,10 +1042,11 @@ void CLASS canon_sraw_load_raw() for (row=0; row < height; row++, ip+=width) { if (row & (jh.sraw >> 1)) for (col=0; col < width; col+=2) - for (c=1; c < 3; c++) + for (c=1; c < 3; c++) { if (row == height-1) ip[col][c] = ip[col-width][c]; else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1; + } for (col=1; col < width; col+=2) for (c=1; c < 3; c++) if (col == width-1) diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h index 923d6190f..96d778815 100644 --- a/rtengine/dcraw.h +++ b/rtengine/dcraw.h @@ -343,7 +343,7 @@ void parse_qt (int end); // ph1_bithuff(int nbits, ushort *huff); class ph1_bithuff_t { public: - ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):parent(p),order(o),ifp(i),bitbuf(0),vbits(0){} + ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} unsigned operator()(int nbits, ushort *huff); unsigned operator()(int nbits); unsigned operator()(); @@ -376,7 +376,6 @@ private: } } - DCraw *parent; short ℴ IMFILE* const ifp; UINT64 bitbuf; From 033b021b9b04997d1fe228fc85ff076997cd5a6b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 8 Dec 2018 01:45:55 +0100 Subject: [PATCH 32/75] removed useless #if --- rtengine/dcraw.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 180eed1c0..660d65385 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -3,8 +3,6 @@ #pragma GCC diagnostic ignored "-Wsign-compare" #if (__GNUC__ >= 6) #pragma GCC diagnostic ignored "-Wmisleading-indentation" -#if (__GNUC__ >= 7) -#endif #endif #endif From 8995f839cc4673f2ff3ac2bd3698de0ffccf95e1 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sat, 8 Dec 2018 09:58:55 +0100 Subject: [PATCH 33/75] TWB-theme, cosmetic changes --- rtdata/themes/TooWaBlue-GTK3-20_.css | 34 ++++++++++++---------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index c0bfd207c..164e5431d 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -2,7 +2,7 @@ This file is part of RawTherapee. Copyright (c) 2016-2018 TooWaBoo - Version 2.99 + Version 3.00 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1245,47 +1245,47 @@ menu image:not(.dummy), } /*** Selection popup list (used in filechooser) ***/ -entry > window > frame { +entry > window > frame:not(.dummy) { background-color: @bg-dark-grey; + padding: 0; } -entry > window > frame > border { +entry > window > frame > border:not(.dummy) { background-color: @bg-dark-grey; padding: 0.083333333333333333em; - border: 0.083333333333333333em solid @accent-color; -} -entry > window > frame > border { margin: 0.083333333333333333em; + border: 0.083333333333333333em solid @accent-color; } /* end */ /*** end ***************************************************************************************/ /*** Popover *** Context menu filechooser ******************************************************/ - -popover.background { +.csd popover { + box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey; +} +popover { background-color: @bg-dark-grey; border: 0.083333333333333333em solid @accent-color; border-radius: 0; padding: 0; margin: 0; - box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey; } -popover.background > box { +popover > box { padding: 0; margin: -9px; } -popover.background modelbutton { +popover modelbutton { min-height: 2em; padding: 0 0.416666666666666666em; margin: 0; border-radius: 0; } -popover.background label { +popover label { margin-right: 0.5em; } -popover.background modelbutton:hover label, -popover.background modelbutton:hover { +popover modelbutton:hover label, +popover modelbutton:hover { background-color: @accent-color; color: @text-hl-color; } @@ -2057,14 +2057,10 @@ headerbar { background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86)); border-bottom: 0.083333333333333333em solid @bg-dark-grey; border-radius: 0.416666666666666666em 0.416666666666666666em 0 0; - min-height: 2.333333333333333333em; + min-height: 2em; padding: 0.083333333333333333em 0.416666666666666666em 0; margin: 0; } -messagedialog headerbar { - min-height: 2em; - -} headerbar .title{ color: @winTitle; } From 1d010029538833bd21af3b3d9ae1d19211ec9474 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 8 Dec 2018 17:42:31 +0100 Subject: [PATCH 34/75] Added console output, #5070 --- rtengine/rt_algo.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index a304b654f..60042cba4 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -32,7 +32,7 @@ #include "rt_algo.h" #include "rt_math.h" #include "sleef.c" - +#include namespace { float calcBlendFactor(float val, float threshold) { // sigmoid function @@ -343,7 +343,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } - + std::cout << pass + 1 << " : " << minvar << std::endl; if (minvar <= 1.f || pass == 1) { const int minY = skip * minI; const int minX = skip * minJ; @@ -393,6 +393,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } + std::cout << 3 << " : " << minvar << std::endl; contrastThreshold = minvar <= 4.f ? calcContrastThreshold(luminance, topLeftYStart + minI, topLeftXStart + minJ, tilesize) : 0.f; } } From 3a95922c7c0b2193a1924ee4cb0acf520d019cde Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sat, 8 Dec 2018 19:10:07 +0100 Subject: [PATCH 35/75] Cosmetic changes --- rtdata/themes/TooWaBlue-GTK3-20_.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 164e5431d..33017626a 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -1260,7 +1260,7 @@ entry > window > frame > border:not(.dummy) { /*** end ***************************************************************************************/ /*** Popover *** Context menu filechooser ******************************************************/ -.csd popover { +popover { box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey; } popover { From ef4160a7ceefb37bfeb5d7f06fba2e5e3392481c Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 9 Dec 2018 10:03:30 +0100 Subject: [PATCH 36/75] Make "Save Profile" dialog act like other save dialogs --- rtgui/profilepanel.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 64f10ca0e..eb835c648 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -307,8 +307,6 @@ void ProfilePanel::save_clicked (GdkEventButton* event) do { if (dialog.run() == Gtk::RESPONSE_OK) { - dialog.hide(); - std::string fname = dialog.get_filename(); Glib::ustring ext = getExtension (fname); From 1a0a2f4eaa05a7a2fe951d1136b505871f257ec7 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 9 Dec 2018 21:40:35 +0100 Subject: [PATCH 37/75] Spanish translation updated by Faber777 Closes #5079 --- rtdata/languages/Espanol | 1580 ++++++++++++++++++++------------------ 1 file changed, 833 insertions(+), 747 deletions(-) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 079f87c1d..54995f678 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -60,20 +60,29 @@ #60 2013-01-03 OdeLama, translation for v4.0.12 of untranslated/changed strings #61 2014-01-14 mapelo, bug correction and small enhancements. #62 2014-10-10 fotger +#63 2018-12-09 Faber777 +;PREFERENCES_D50_OLD;5000K ABOUT_TAB_BUILD;Versión ABOUT_TAB_CREDITS;Créditos ABOUT_TAB_LICENSE;Licencia ABOUT_TAB_RELEASENOTES;Notas de la versión ABOUT_TAB_SPLASH;Splash +ADJUSTER_RESET_TO_DEFAULT;Restablece los valores predeterminados BATCHQUEUE_AUTOSTART;Inicio automático BATCHQUEUE_AUTOSTARTHINT;Iniciar automáticamente el procesamiento en cuanto llega un nuevo trabajo BATCHQUEUE_DESTFILENAME;Ruta y nombre del archivo +BATCHQUEUE_STARTSTOPHINT;Iniciar o detener el procesamiento de las imágenes en la cola.\nAtajo: Ctrl + s BATCH_PROCESSING;Proceso por lotes +CURVEEDITOR_AXIS_IN;I: +CURVEEDITOR_AXIS_LEFT_TAN;LT: +CURVEEDITOR_AXIS_OUT;O: +CURVEEDITOR_AXIS_RIGHT_TAN;RT: CURVEEDITOR_CURVE;Curva CURVEEDITOR_CURVES;Curvas CURVEEDITOR_CUSTOM;Personalizado CURVEEDITOR_DARKS;Oscuros +CURVEEDITOR_EDITPOINT_HINT;Active la edición de los valores de entrada / salida del nodo. \nHaga clic con el botón derecho en un nodo para seleccionarlo. \nHaga clic con el botón derecho en el espacio vacío para anular la selección del nodo. CURVEEDITOR_HIGHLIGHTS;Luces altas CURVEEDITOR_LIGHTS;Luces CURVEEDITOR_LINEAR;Lineal @@ -90,6 +99,16 @@ CURVEEDITOR_TOOLTIPPASTE;Pegar curva desde el portapapeles CURVEEDITOR_TOOLTIPSAVE;Guardar curva actual CURVEEDITOR_TYPE;Tipo: DIRBROWSER_FOLDERS;Carpetas +DONT_SHOW_AGAIN;No muestres este mensaje otra vez. +DYNPROFILEEDITOR_DELETE;Borrar +DYNPROFILEEDITOR_EDIT;Editar +DYNPROFILEEDITOR_EDIT_RULE;Editar regla de perfil dinámico +DYNPROFILEEDITOR_ENTRY_TOOLTIP;La coincidencia no distingue entre mayúsculas y minúsculas. \nUtilice el prefijo "re:" para ingresar \nUna expresión regular. +DYNPROFILEEDITOR_MOVE_DOWN;Mover hacia abajo +DYNPROFILEEDITOR_MOVE_UP;Mover hacia arriba +DYNPROFILEEDITOR_NEW;Nuevo +DYNPROFILEEDITOR_NEW_RULE;Nueva regla de perfil dinámico +DYNPROFILEEDITOR_PROFILE;Perfil de procesamiento EDITWINDOW_TITLE;Edición de imagen EDIT_OBJECT_TOOLTIP;Muestra un instrumento en la ventana de previo, el cual le permitirá ajustar esta herramienta. EDIT_PIPETTE_TOOLTIP;Para agregar un punto de ajuste en la curva , mantenga presionada la tecla Ctrl mientras oprime el botón izquierdo del ratón sobre el punto deseado en el previo de la imagen.\nPara ajustar el punto, mantenga presionada la tecla Ctrl mientras oprime el botón izquierdo del ratón sobre la correspondiente area en el previo y muevase hacia arriba y/o hacia abajo, logrando un ajuste fino del punto en la curva. Si desea un ajuste mayor, libere la tecla Ctrl. @@ -115,11 +134,14 @@ EXIFPANEL_RESET;Restablecer EXIFPANEL_RESETALL;Restablecer todo EXIFPANEL_RESETALLHINT;Restablecer todos los atributos a los valores predeterminados EXIFPANEL_RESETHINT;Restablecer atributos seleccionados a los valores predeterminados +EXIFPANEL_SHOWALL;Mostrar todo EXIFPANEL_SUBDIRECTORY;Subcarpeta +EXPORT_BYPASS;Procesamiento de pasos a bypass EXPORT_BYPASS_ALL;Seleccionar / Deseleccionar todo EXPORT_BYPASS_DEFRINGE;Saltar Quitar borde púrpura EXPORT_BYPASS_DIRPYRDENOISE;Saltar Reducción de ruido EXPORT_BYPASS_DIRPYREQUALIZER;Saltar Contraste por niveles de detalle +EXPORT_BYPASS_EQUALIZER;Bypass Wavelet niveles EXPORT_BYPASS_RAW_CA;Saltar [raw] Corrección de aberración cromática EXPORT_BYPASS_RAW_CCSTEPS;Saltar [raw] Supresión de falso color EXPORT_BYPASS_RAW_DCB_ENHANCE;Saltar [raw] Aplicar pasos de mejora DCB @@ -137,8 +159,12 @@ EXPORT_FASTEXPORTOPTIONS;Opciones de Exportación Rápida EXPORT_INSTRUCTIONS;Las opciones de Exportación Rápida proporcionan la posibilidad de saltarse pasos de revelado que consumen mucho tiempo y recursos, ejecutando en su lugar el procesamiento de la cola utilizando los ajustes de Exportación Rápida. Se recomienda este método para generar más rápidamente imágenes de menor resolución: cuando la velocidad es prioritaria, o cuando se desea cambiar el tamaño de una o muchas imágenes de salida sin modificar sus parámetros de revelado. EXPORT_MAXHEIGHT;Altura máxima: EXPORT_MAXWIDTH;Anchura máxima: +EXPORT_PIPELINE;Fuente de procesamiento EXPORT_PUTTOQUEUEFAST; Poner en la cola de Exportación Rápida EXPORT_RAW_DMETHOD;Método de interpolado +EXPORT_USE_FAST_PIPELINE;Dedicado (procesamiento completo en imagen redimensionada) +EXPORT_USE_FAST_PIPELINE_TIP;Usar un conducto de procesamiento dedicado para las imágenes en el modo Exportación rápida, que cambia la velocidad por la calidad. El cambio de tamaño de la imagen se realiza lo antes posible, en lugar de hacerlo al final como en el conducto normal. La aceleración puede ser importante, pero prepárese para ver elementos extraños y una degradación general de la calidad de salida. +EXPORT_USE_NORMAL_PIPELINE;Standard (bypass some steps, resize at the end) EXTPROGTARGET_1;Raw EXTPROGTARGET_2;procesado en cola FILEBROWSER_ADDDELTEMPLATE;Añadir/Borrar plantillas... @@ -149,6 +175,8 @@ FILEBROWSER_AUTOFLATFIELD;Campo plano automático FILEBROWSER_BROWSEPATHBUTTONHINT;Pulsar para examinar la carpeta seleccionada FILEBROWSER_BROWSEPATHHINT;Ingrese la ruta a examinar \nCtrl-O poner el foco en campo con la ruta\nEnter / Ctrl-Enter para examinar allí;\nEscPara quitar los cambios.\nShift-Esc Para quitar el foco.\n\n\nAbreviaturas de ruta:\n ~ - Carpeta hogar del usuario\n ! - Carpeta de imágenes del usuario FILEBROWSER_CACHE;Caché +FILEBROWSER_CACHECLEARFROMFULL;Limpiar del caché - Total +FILEBROWSER_CACHECLEARFROMPARTIAL;Limpiar del caché - Parcial FILEBROWSER_CLEARPROFILE;Borrar perfil FILEBROWSER_COLORLABEL_TOOLTIP;Etiquetar con color\n\nUse menú desplegable o atajos de teclado:\nShift-Ctrl-0 No Color\nShift-Ctrl-1 Rojo\nShift-Ctrl-2 Amarillo\nShift-Ctrl-3 Verde\nShift-Ctrl-4 Azul\nShift-Ctrl-5 Púrpura FILEBROWSER_COPYPROFILE;Copiar perfil @@ -169,6 +197,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Pegar perfil parcialmente FILEBROWSER_PASTEPROFILE;Pegar perfil FILEBROWSER_POPUPCANCELJOB;Cancelar trabajo FILEBROWSER_POPUPCOLORLABEL;Etiquetar con un color +FILEBROWSER_POPUPCOLORLABEL0;Etiqueta: Ninguna FILEBROWSER_POPUPCOLORLABEL1;Etiqueta: Rojo FILEBROWSER_POPUPCOLORLABEL2;Etiqueta: Amarillo FILEBROWSER_POPUPCOLORLABEL3;Etiqueta: Verde @@ -207,6 +236,7 @@ FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nAtajoShift-3 FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nAtajoShift-4 FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nAtajoShift-5 FILEBROWSER_RENAMEDLGLABEL;Renombrar archivo +FILEBROWSER_RESETDEFAULTPROFILE;Restablecen a los predeterminados FILEBROWSER_SELECTDARKFRAME;Seleccionar Toma Negra… FILEBROWSER_SELECTFLATFIELD;Seleccionar Campo Plano… FILEBROWSER_SHOWCOLORLABEL1HINT;Mostrar imágenes etiquetadas con Rojo Alt-1 @@ -218,6 +248,8 @@ FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nAtajo: d FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nAtajo: 7 FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nAtajo: 6 FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nAtajo: i\n\nAtajo en modo editor simple: Alt-I +FILEBROWSER_SHOWNOTTRASHHINT;Mostrar solo las imágenes no borradas. +FILEBROWSER_SHOWORIGINALHINT;Muestre solo imágenes originales. \nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias> Explorador de archivos> Extensiones analizadas. FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nAtajo: 1 FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nAtajo: 2 FILEBROWSER_SHOWRANK3HINT;Mostrar imágenes con 3 estrellas.\nAtajo: 3 @@ -232,8 +264,17 @@ FILEBROWSER_THUMBSIZE;Tamaño miniatura FILEBROWSER_UNRANK_TOOLTIP;Sin Rango\nAtajoShift - 0 FILEBROWSER_ZOOMINHINT;Agrandar miniatura.\nAtajo: +\n\nAtajo en modo editor simple: Alt-+ FILEBROWSER_ZOOMOUTHINT;Reducir miniatura.\nAtajo: -\n\nAtajo en modo editor simple: Alt-- +FILECHOOSER_FILTER_ANY;Todos los archivos +FILECHOOSER_FILTER_COLPROF;Perfiles de color +FILECHOOSER_FILTER_CURVE;Archivos de curva +FILECHOOSER_FILTER_LCP;Perfiles de corrección de lentes. +FILECHOOSER_FILTER_PP;Processing profiles +FILECHOOSER_FILTER_SAME;Same format as current photo +FILECHOOSER_FILTER_TIFF;Archivos TIFF GENERAL_ABOUT;Acerca de GENERAL_AFTER;Después +GENERAL_APPLY;Aplicar +GENERAL_ASIMAGE;Como imagen GENERAL_AUTO;Automático GENERAL_BEFORE;Antes GENERAL_CANCEL;Cancelar @@ -248,10 +289,13 @@ GENERAL_NA;n/a GENERAL_NO;No GENERAL_NONE;Ninguno GENERAL_OK;Aceptar +GENERAL_OPEN;Abrir GENERAL_PORTRAIT;Retrato GENERAL_SAVE;Guardar +GENERAL_SLIDER;Deslizador GENERAL_UNCHANGED;(Sin cambios) GENERAL_WARNING;Advertencia +GIMP_PLUGIN_INFO;¡Bienvenido al complemento GIMP de RawTherapee! \nUna vez que haya terminado de editar, simplemente cierre la ventana principal de RawTherapee y la imagen se importará automáticamente en GIMP. HISTOGRAM_TOOLTIP_B;Mostrar/Ocultar Histograma Azul HISTOGRAM_TOOLTIP_BAR;Mostrar/Ocultar barra indicadora RGB\nHacer clic con el botón derecho del ratón en la previsualización para congelar/descongelar HISTOGRAM_TOOLTIP_CHRO;Mostrar/Ocultar Histograma de cromaticidad @@ -358,7 +402,7 @@ HISTORY_MSG_91;RR - Crominancia Maestra HISTORY_MSG_92;RR - Gamma HISTORY_MSG_93;Contraste/niveles de detalle - Valor HISTORY_MSG_94;Contraste por niveles de detalle -HISTORY_MSG_95;Lab - Cromaticidad +HISTORY_MSG_95;Lab - Cromaticidad (saturación) HISTORY_MSG_96;Curva 'a' HISTORY_MSG_97;Curva 'b' HISTORY_MSG_98;Método de Interpolación @@ -413,7 +457,7 @@ HISTORY_MSG_146;Enfoque de bordes (EB) HISTORY_MSG_147;EB - Sólo luminancia HISTORY_MSG_148;Micro-contraste HISTORY_MSG_149;Micro-contraste - matriz 3×3 -HISTORY_MSG_150;Reducción artefactos/ruido post interpolado +HISTORY_MSG_150;Reducción elementos extraños/ruido post interpolado HISTORY_MSG_151;Vibranza (Vib) HISTORY_MSG_152;Vib - Tonos pastel HISTORY_MSG_153;Vib - Tonos saturados @@ -429,12 +473,14 @@ HISTORY_MSG_162;Mapeo tonal (MT) HISTORY_MSG_163;Curvas RGB - Rojo HISTORY_MSG_164;Curvas RGB - Verde HISTORY_MSG_165;Curvas RGB - Azul +HISTORY_MSG_166;Exposición - Restablecer HISTORY_MSG_167;Método de Interpolación HISTORY_MSG_168;Curva 'CC' HISTORY_MSG_169;Curva 'CM' HISTORY_MSG_170;Vib - Curva HISTORY_MSG_171;Curva 'LC' HISTORY_MSG_172;Lab - Restringe 'LC' +HISTORY_MSG_173;NR - Recuperación del detalle HISTORY_MSG_174;CIECAM02 HISTORY_MSG_175;CAM02 - Adaptación CAT02 HISTORY_MSG_176;CAM02 - Entorno de visualización @@ -464,6 +510,7 @@ HISTORY_MSG_199;CAM02 - Histogramas de salida HISTORY_MSG_200;CAMO2 - Mapeo tonal HISTORY_MSG_201;RR - Crominancia Ro,Ve HISTORY_MSG_202;RR - Crominancia Az,Am +HISTORY_MSG_203;NR - Espacio de color HISTORY_MSG_204;Pasos de mejora LMMSE HISTORY_MSG_205;CAM02 - Píxel caliente/muerto HISTORY_MSG_206;CAT02 - Luz de escena auto. @@ -494,7 +541,9 @@ HISTORY_MSG_231;B&N - Curva 'Antes' HISTORY_MSG_232;B&N - Tipo de curva 'Antes' HISTORY_MSG_233;B&N - Curva 'Después' HISTORY_MSG_234;B&N - Tipo de curva 'Después' +HISTORY_MSG_235;B&N - Mezcla canales Auto. HISTORY_MSG_236;--Sin uso-- +HISTORY_MSG_237;B&N - Mezclador HISTORY_MSG_238;FG - Difuminado HISTORY_MSG_239;FG - Intensidad HISTORY_MSG_240;FG - Centro @@ -513,6 +562,7 @@ HISTORY_MSG_252;CbDL - Tono de piel HISTORY_MSG_253;CbDL - Reducir elementos extraños HISTORY_MSG_254;CbDL - Matiz de piel HISTORY_MSG_255;RR - Filtro Median +HISTORY_MSG_256;NR - La mediana - Tipo HISTORY_MSG_257;Tonificación de Color HISTORY_MSG_258;TC - Color HISTORY_MSG_259;TC - Opacidad @@ -529,6 +579,7 @@ HISTORY_MSG_269;TC - Altas Luces - Rojo HISTORY_MSG_270;TC - Altas Luces - Verde HISTORY_MSG_271;TC - Altas Luces - Azul HISTORY_MSG_272;TC - Balance +HISTORY_MSG_273;TC - Restablecer HISTORY_MSG_274;TC - Sat. de Sombras HISTORY_MSG_275;TC - Sat. de Altas Luces HISTORY_MSG_276;TC - Opacidad @@ -552,28 +603,246 @@ HISTORY_MSG_293;Simulación de Fílmico HISTORY_MSG_294;Simulación de Fílmico - Intensidad HISTORY_MSG_295;Simulación de Fílmico - Filme HISTORY_MSG_296;RR - Modular luminancia +HISTORY_MSG_297;NR - Modo HISTORY_MSG_298;Filtro Pixel Muerto +HISTORY_MSG_299;NR - Curva de crominancia +HISTORY_MSG_300;- +HISTORY_MSG_301;NR - Luma control +HISTORY_MSG_302;NR - Método crominancia(color) +HISTORY_MSG_303;NR - Método crominancia(color) +HISTORY_MSG_304;W - Niveles de contraste +HISTORY_MSG_305;Wavelet niveles +HISTORY_MSG_306;W - Proceso +HISTORY_MSG_307;W - Proceso +HISTORY_MSG_308;W - dirección del Proceso +HISTORY_MSG_309;W - ES - Detalle +HISTORY_MSG_310;W - Residual - cielo tar/prot +HISTORY_MSG_311;W - Wavelet niveles +HISTORY_MSG_312;W - Residual - Umbral de sombras +HISTORY_MSG_313;W - Cromaticidad(color) - Saturados/pastel +HISTORY_MSG_314;W - Gamut - Reduce elementos extraños +HISTORY_MSG_315;W - Residual - Contraste +HISTORY_MSG_316;W - Gamut- Piel tar/prot +HISTORY_MSG_317;W - Gamut - Tono de piel +HISTORY_MSG_318;W - Contraste - Niveles luces altas +HISTORY_MSG_319;W - Contraste - Rango de luces altas +HISTORY_MSG_320;W - Contraste - Rango de las sombras +HISTORY_MSG_321;W - Contraste - Niveles de sombra +HISTORY_MSG_322;W - Gamut - Evita el cambio de color. +HISTORY_MSG_323;W - ES - Contraste local +HISTORY_MSG_324;W - Cromaticidad(colores) - Pastel +HISTORY_MSG_325;W - Cromaticidad(color) - Saturado +HISTORY_MSG_326;W - Cromaticidad(color) - Método +HISTORY_MSG_327;W - Contraste - Aplicar a +HISTORY_MSG_328;W - Cromaticidad - Fuerza de enlace +HISTORY_MSG_329;W - Tonificación - Opacidad RG +HISTORY_MSG_330;W - Tonificación - Opacidad BY +HISTORY_MSG_331;W - Niveles de contraste - Extra +HISTORY_MSG_332;W - Método de mosaico +HISTORY_MSG_333;W - Sombras-Residual +HISTORY_MSG_334;W - Cromaticidad(color)-Residual +HISTORY_MSG_335;W - Umbral de luces-Residual +HISTORY_MSG_336;W - Umbral de luces altas-Residual +HISTORY_MSG_337;W - Tono del cielo-Residual +HISTORY_MSG_338;W - ES - Radio +HISTORY_MSG_339;W - ES - Fuerza +HISTORY_MSG_340;W - Fuerza +HISTORY_MSG_341;W - Rendimiento del enfoque +HISTORY_MSG_342;W - ES-Primer nivel +HISTORY_MSG_343;W - Niveles de crominancia(color) +HISTORY_MSG_344;W - Método de crominancia (color)sl/cur +HISTORY_MSG_345;W - ES - Contraste local +HISTORY_MSG_346;W - ES - Método de contraste local +HISTORY_MSG_347;W - Quitar ruido - Nivel 1 +HISTORY_MSG_348;W - Quitar ruido - Nivel 2 +HISTORY_MSG_349;W - Quitar ruido - Nivel 3 +HISTORY_MSG_350;W - ES - Edge detection +HISTORY_MSG_351;W - Residual-curva HH +HISTORY_MSG_352;W - Fondo +HISTORY_MSG_353;W - ES - Sensibilidad del gradiente +HISTORY_MSG_354;W - ES - Mejorado +HISTORY_MSG_355;W - ES - Umbral bajo +HISTORY_MSG_356;W - ES - Umbral alto +HISTORY_MSG_357;W - Quitar ruido -Enlace con ES +HISTORY_MSG_358;W - Gamut - CH +HISTORY_MSG_359;Vivo/Muerto - Umbral +HISTORY_MSG_360;TM - gamma +HISTORY_MSG_361;W - Final - Balance del cromaticidad(color) +HISTORY_MSG_362;W - Residual - Método de compresión +HISTORY_MSG_363;W - Residual - Fuerza comprensiva +HISTORY_MSG_364;W - Final - Balance del contraste +HISTORY_MSG_365;W - Final - balance Delta +HISTORY_MSG_366;W - Residual - Compresión gamma +HISTORY_MSG_367;W - Final - curva de contraste 'Después' +HISTORY_MSG_368;W - Final - Balance de contraste +HISTORY_MSG_369;W - Final - Método de balance +HISTORY_MSG_370;W - Final - Curva de contraste local +HISTORY_MSG_371;Enfocar después del cambio de tamaño +HISTORY_MSG_372;PRS USM - Radio +HISTORY_MSG_373;PRS USM - Cantidad +HISTORY_MSG_374;PRS USM - Límite +HISTORY_MSG_375;PRS USM - Enfocar solo los bordes +HISTORY_MSG_376;PRS USM - Radio de detección de bordes +HISTORY_MSG_377;PRS USM - Tolerancia del borde +HISTORY_MSG_378;PRS USM - Control del halo +HISTORY_MSG_379;PRS USM - Cantidad de control del halo +HISTORY_MSG_380;PRS - Método +HISTORY_MSG_381;PRS RLD - Radio +HISTORY_MSG_382;PRS RLD - Cantidad +HISTORY_MSG_383;PRS RLD - Amortiguador +HISTORY_MSG_384;PRS RLD - Iteraciones +HISTORY_MSG_385;W - Residual - Balance del color +HISTORY_MSG_386;W - Residual - CB Verde Alto +HISTORY_MSG_387;W - Residual - CB Azul Alto +HISTORY_MSG_388;W - Residual - CB Verde medio +HISTORY_MSG_389;W - Residual - CB Azul medio +HISTORY_MSG_390;W - Residual - CB Verde Bajo +HISTORY_MSG_391;W - Residual - CB Azul Bajo +HISTORY_MSG_392;W - Residual - CB Reiniciar +HISTORY_MSG_393;DCP - revisar tabla +HISTORY_MSG_394;DCP - Punto de partida en la exposición +HISTORY_MSG_395;DCP - Tabla base +HISTORY_MSG_396;W - Contraste sub-herramienta +HISTORY_MSG_397;W - Cromaticidad(color) sub-herramienta +HISTORY_MSG_398;W - ES sub-herramienta +HISTORY_MSG_399;W - Residual sub-herramienta +HISTORY_MSG_400;W - Final sub-herramienta +HISTORY_MSG_401;W - Viraje sub-herramienta +HISTORY_MSG_402;W - Quitar ruido sub-herramienta +HISTORY_MSG_403;W - ES - Edge sensitivity +HISTORY_MSG_404;W - ES - Amplificación de base +HISTORY_MSG_405;W - Quitar ruido - Nivel 4 +HISTORY_MSG_406;W - ES - Píxeles vecinos +HISTORY_MSG_407;Retinex - Método +HISTORY_MSG_408;Retinex - Radio +HISTORY_MSG_409;Retinex - Contraste +HISTORY_MSG_410;Retinex - Offset +HISTORY_MSG_411;Retinex - Fuerza +HISTORY_MSG_412;Retinex - Gradiente gaussiano +HISTORY_MSG_413;Retinex - Contraste +HISTORY_MSG_414;Retinex - Histograma - Lab +HISTORY_MSG_415;Retinex - Transmisión +HISTORY_MSG_416;Retinex +HISTORY_MSG_417;Retinex - Transmisión mediana +HISTORY_MSG_418;Retinex - Límite +HISTORY_MSG_419;Retinex - Espacio de color +HISTORY_MSG_420;Retinex - Histograma - HSL +HISTORY_MSG_421;Retinex - Gamma +HISTORY_MSG_422;Retinex - Gamma +HISTORY_MSG_423;Retinex - Gamma slope +HISTORY_MSG_424;Retinex - HL Límite +HISTORY_MSG_425;Retinex - Base del registro +HISTORY_MSG_426;Retinex - Ecualizador(ajuste) de tono +HISTORY_MSG_427;Intento de reproducción de salida +HISTORY_MSG_428;Monitoreo del intento de representación +HISTORY_MSG_429;Retinex - Iteraciones +HISTORY_MSG_430;Retinex - Transmisión gradiente +HISTORY_MSG_431;Retinex - Fuerza del gradiente +HISTORY_MSG_432;Retinex - M - Luces altas +HISTORY_MSG_433;Retinex - M - Luces altas TW +HISTORY_MSG_434;Retinex - M - Sombras +HISTORY_MSG_435;Retinex - M - Sombras TW +HISTORY_MSG_436;Retinex - M - Radio +HISTORY_MSG_437;Retinex - M - Método +HISTORY_MSG_438;Retinex - M - Equalizer +HISTORY_MSG_439;Retinex - Proceso +HISTORY_MSG_440;CbDL - Método +HISTORY_MSG_441;Retinex - Ganancia de la transmisión +HISTORY_MSG_442;Retinex - Escala +HISTORY_MSG_443;Compensación del punto negro de salida +HISTORY_MSG_444;WB - Sesgo temporal +HISTORY_MSG_445;Raw sub-imágen +HISTORY_MSG_449;PS - ISO adaptación +HISTORY_MSG_452;PS - Mostrar movimiento +HISTORY_MSG_453;PS - Mostrar máscara solamente +HISTORY_MSG_457;PS - Verificar rojo/azul +HISTORY_MSG_462;PS - Verificar verde +HISTORY_MSG_464;PS - Máscara de desenfoque del movimiento +HISTORY_MSG_465;PS - Radio de desenfoque +HISTORY_MSG_468;PS - Rellenar fallos +HISTORY_MSG_469;PS - Mediano/a +HISTORY_MSG_471;PS - Corrección del movimiento +HISTORY_MSG_472;PS - Transiciones suaves +HISTORY_MSG_473;PS - Utilizar LMMSE +HISTORY_MSG_474;PS - Ecualizar (ajustar) +HISTORY_MSG_475;PS - Equalizar(ajustar) el canal +HISTORY_MSG_476;CAM02 - Fuera de tempera +HISTORY_MSG_477;CAM02 - Fuera del verde +HISTORY_MSG_478;CAM02 - Yb Fuera +HISTORY_MSG_479;CAM02 - CAT02 adaptación incorrecta +HISTORY_MSG_480;CAM02 - Salida automática CAT02 +HISTORY_MSG_481;CAM02 - Temperatura de la scena +HISTORY_MSG_482;CAM02 - Escena verde +HISTORY_MSG_483;CAM02 - Yb escena +HISTORY_MSG_484;CAM02 - Auto Yb escena +HISTORY_MSG_485;Corrección de lentes +HISTORY_MSG_486;Corrección de lente - Cámara +HISTORY_MSG_487;Lente Corrección - Lente +HISTORY_MSG_488;HDR Mapeo de tonos +HISTORY_MSG_489;HDR TM - Límite +HISTORY_MSG_490;HDR TM - Cantidad +HISTORY_MSG_491;Balance de Blancos +HISTORY_MSG_492;RGB Curvas +HISTORY_MSG_493;L*a*b* Ajustes +HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Corrección del color +HISTORY_MSG_HISTMATCHING;Curva de tono auto-emparejado +HISTORY_MSG_LOCALCONTRAST_AMOUNT;Contraste cantidad-local +HISTORY_MSG_LOCALCONTRAST_DARKNESS;Contraste Oscuridad-local +HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste local +HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste luminosidad-local +HISTORY_MSG_LOCALCONTRAST_RADIUS;Contraste radio-local +HISTORY_MSG_METADATA_MODE;Modo de copia de metadatos +HISTORY_MSG_TM_FATTAL_ANCHOR;HDR TM - Ancla HISTORY_NEWSNAPSHOT;Agregar HISTORY_NEWSNAPSHOT_TOOLTIP;Atajo: Alt-s HISTORY_SNAPSHOT;Instantánea HISTORY_SNAPSHOTS;Instantáneas IPTCPANEL_CATEGORY;Categoría +IPTCPANEL_CATEGORYHINT;Identifica el tema de la imagen en la opinión del proveedor. IPTCPANEL_CITY;Ciudad +IPTCPANEL_CITYHINT;Ingrese el nombre de la ciudad representada en esta imagen. IPTCPANEL_COPYHINT;Copiar ajustes IPTC al portapapeles +IPTCPANEL_COPYRIGHT;aviso de copyright +IPTCPANEL_COPYRIGHTHINT;Ingrese un Aviso sobre el propietario actual de los derechos de autor de esta imagen, como © 2008 Jane Doe. IPTCPANEL_COUNTRY;País +IPTCPANEL_COUNTRYHINT;Ingrese el nombre del país representado en esta imagen. +IPTCPANEL_CREATOR;Creador +IPTCPANEL_CREATORHINT;Ingrese el nombre de la persona que creó esta imagen. +IPTCPANEL_CREATORJOBTITLE;Título del trabajo del creador +IPTCPANEL_CREATORJOBTITLEHINT;Ingrese el título de trabajo de la persona que aparece en el campo Creador. IPTCPANEL_CREDIT;Créditos IPTCPANEL_CREDITHINT;Identifica el proveedor de la imagen, que no necesariamente el dueño o creador. IPTCPANEL_DATECREATED;Fecha de creación +IPTCPANEL_DATECREATEDHINT;Ingrese la fecha en que se tomó la imagen. +IPTCPANEL_DESCRIPTION;Descripción +IPTCPANEL_DESCRIPTIONHINT;Ingrese una "leyenda" que describa quién, qué y por qué de lo que está sucediendo en esta imagen, esto podría incluir nombres de personas y / o su rol en la acción que se lleva a cabo dentro de la imagen. +IPTCPANEL_DESCRIPTIONWRITER;Descripción del escritor +IPTCPANEL_DESCRIPTIONWRITERHINT;Ingrese el nombre de la persona involucrada en escribir, editar o corregir la descripción de la imagen. IPTCPANEL_EMBEDDED;Incrustado IPTCPANEL_EMBEDDEDHINT;Restablecer a los datos IPTC incrustados en el archivo de la imagen IPTCPANEL_HEADLINE;Encabezado +IPTCPANEL_HEADLINEHINT;Ingrese un breve resumen publicable o resumen de los contenidos de la imagen. IPTCPANEL_INSTRUCTIONS;Instrucciones +IPTCPANEL_INSTRUCTIONSHINT;Ingrese información sobre embargos u otras restricciones no cubiertas por el campo de Copyright. IPTCPANEL_KEYWORDS;Palabras clave +IPTCPANEL_KEYWORDSHINT;Ingrese cualquier número de palabras clave, términos o frases utilizadas para expresar el tema en la imagen. IPTCPANEL_PASTEHINT;Pegar ajustes IPTC desde el portapapeles +IPTCPANEL_PROVINCE;Provincia o Estado +IPTCPANEL_PROVINCEHINT;Ingrese el nombre de la provincia o estado que se muestra en esta imagen. IPTCPANEL_RESET;Restablecer IPTCPANEL_RESETHINT;Restablecer a los ajustes predeterminados del perfil. IPTCPANEL_SOURCE;Fuente +IPTCPANEL_SOURCEHINT;Ingrese o edite el nombre de una persona o parte que tiene un rol en la cadena de suministro de contenido, como una persona o entidad de la que recibió esta imagen. +IPTCPANEL_SUPPCATEGORIES;Categorias suplementarias +IPTCPANEL_SUPPCATEGORIESHINT;Además purifica el tema de la imagen. IPTCPANEL_TITLE;Título +IPTCPANEL_TITLEHINT;Ingrese un nombre corto legible y humano para la imagen, este puede ser el nombre del archivo. +IPTCPANEL_TRANSREFERENCE;Identificación del trabajo +IPTCPANEL_TRANSREFERENCEHINT;Ingrese un número o identificador necesario para el control o seguimiento del flujo de trabajo. +LENSPROFILE_CORRECTION_AUTOMATCH;Parámetros de corrección auto-emparejados +LENSPROFILE_CORRECTION_LCPFILE;LCP archivo +LENSPROFILE_CORRECTION_MANUAL;Parámetros de corrección manual +LENSPROFILE_LENS_WARNING;Advertencia: el factor de recorte utilizado para el perfilado de la lente es mayor que el factor de recorte de la cámara, los resultados pueden ser incorrectos. MAIN_BUTTON_FULLSCREEN;Pantalla completa MAIN_BUTTON_NAVNEXT_TOOLTIP;Navegar hasta la imagen Siguiente a la que está abierta en el editor:\nShift-F4\n\nPara navegar hasta la imagen Siguiente a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\nF4 MAIN_BUTTON_NAVPREV_TOOLTIP;Navegar hasta la imagen Anterior a la que está abierta en el editor:\nShift-F3\n\nPara navegar hasta la imagen Anterior a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\nF3 @@ -609,7 +878,10 @@ MAIN_MSG_OPERATIONCANCELLED;Operación cancelada MAIN_MSG_PATHDOESNTEXIST;La ruta\n\n%1\n\nno existe. Por favor, establezca una ruta correcta en la ventana de Preferencias. MAIN_MSG_QOVERWRITE;¿Quiere sobre-escribirlo? MAIN_MSG_SETPATHFIRST;Para poder usar esta función, primero tiene que establecer una \nruta objetivo en la ventana de Preferencias! +MAIN_MSG_TOOMANYOPENEDITORS;Demasiados editores abiertos.\nPor favor cierre un editor para continuar. MAIN_MSG_WRITEFAILED;Falla al escribir\n\n"%1"\n\nAsegurese de que el folder exista y que usted tenga permiso de escritura sobre él. +MAIN_TAB_ADVANCED;Avanzado +MAIN_TAB_ADVANCED_TOOLTIP;Método rápido: Alt-w MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Atajo: Alt-C MAIN_TAB_DETAIL;Detalle @@ -620,6 +892,7 @@ MAIN_TAB_EXPORT; Exportación Rápida MAIN_TAB_EXPOSURE;Exposición MAIN_TAB_EXPOSURE_TOOLTIP;Atajo: Alt-E MAIN_TAB_FILTER;Filtro +MAIN_TAB_INSPECT; Inspeccionar MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Metadatos MAIN_TAB_METADATA_TOOLTIP;Atajo: Alt-M @@ -630,6 +903,7 @@ MAIN_TAB_TRANSFORM_TOOLTIP;Atajo: Alt-T MAIN_TOOLTIP_BACKCOLOR0;Color de fondo de la previsualización: Color del tema\nAtajo: 8 MAIN_TOOLTIP_BACKCOLOR1;Color de fondo de la previsualización: Negro\nAtajo: 9 MAIN_TOOLTIP_BACKCOLOR2;Color de fondo de la previsualización: Blanco\nAtajo: 0 +MAIN_TOOLTIP_BACKCOLOR3;Color de fondo de la vista previa: Medio gris \nMétodo rápido: 9 MAIN_TOOLTIP_BEFOREAFTERLOCK;Bloquear / Desbloquear la vista Antes\n\nBloquear: la vista Antes permanece inalterada - \nútil para evaluar el efecto acumulativo de varias herramientas.\nAdemás, se puede hacer una comparación con cualquier estado en el Historial\n\nDesbloquear: la vista Antes seguirá a la vista Después un paso por detrás, mostrando la imagen antes del efecto de la herramienta que se está usando MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar panel izquierdo (incluyendo historial).\nAtajo: i MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas.\nAtajo: < @@ -645,9 +919,23 @@ MAIN_TOOLTIP_SHOWHIDERP1;Mostrar/ocultar el panel derecho.\nAtajo: Alt-L MAIN_TOOLTIP_SHOWHIDETP1;Mostrar/ocultar el panel superior.\nAtajo: Shift-L MAIN_TOOLTIP_THRESHOLD;Umbral MAIN_TOOLTIP_TOGGLE;Cambiar vista antes/después.\nAtajo: Shift-B +MONITOR_PROFILE_SYSTEM;Sistema por defecto +NAVIGATOR_B;B: +NAVIGATOR_G;G: +NAVIGATOR_H;H: +NAVIGATOR_LAB_A;a*: +NAVIGATOR_LAB_B;b*: +NAVIGATOR_LAB_L;L*: NAVIGATOR_NA; -- +NAVIGATOR_R;R: +NAVIGATOR_S;S: +NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Ancho = %1, Alto = %2 NAVIGATOR_XY_NA;x = n/a, y = n/a +OPTIONS_BUNDLED_MISSING;No se pudo encontrar el perfil "% 1 " incluido. \nSe podría dañar su instalación. \nnLos valores internos predeterminados se usarán en su lugar. +OPTIONS_DEFIMG_MISSING;No se pudo encontrar el perfil predeterminado para fotos sin formato o no está establecido. \nPor favor, compruebe el directorio de sus perfiles, puede que falte o esté dañado. \n "% 1 "se utilizará en su lugar +OPTIONS_DEFRAW_MISSING;No se pudo encontrar el perfil predeterminado para fotos sin procesar o no está configurado. \nPor favor, compruebe el directorio de sus perfiles, puede que falte o esté dañado. \n "% 1 < / b> "será usado en su lugar. +PARTIALPASTE_ADVANCEDGROUP;Ajustes avanzados PARTIALPASTE_BASICGROUP;Ajustes básicos PARTIALPASTE_CACORRECTION;Corrección de aberraciones cromáticas PARTIALPASTE_CHANNELMIXER;Mezclador de canales @@ -668,6 +956,7 @@ PARTIALPASTE_DIRPYRDENOISE;Reducción de ruido PARTIALPASTE_DIRPYREQUALIZER;Contraste por niveles de detalle PARTIALPASTE_DISTORTION;Corrección de Distorsión PARTIALPASTE_EPD;Mapeo tonal +PARTIALPASTE_EQUALIZER;Niveles Wavelet PARTIALPASTE_EVERYTHING;Todo PARTIALPASTE_EXIFCHANGES;Cambio en datos Exif PARTIALPASTE_EXPOSURE;Exposición @@ -677,6 +966,7 @@ PARTIALPASTE_FLATFIELDBLURRADIUS;Radio de difuminado de campo plano PARTIALPASTE_FLATFIELDBLURTYPE;Tipo de difuminado de campo plano PARTIALPASTE_FLATFIELDCLIPCONTROL;Control de recorte de Campo Plano PARTIALPASTE_FLATFIELDFILE;Archivo de campo plano +PARTIALPASTE_GRADIENT;Graduar filtro PARTIALPASTE_HSVEQUALIZER;Ecualizador HSV PARTIALPASTE_ICMSETTINGS;Ajustes de Gestión de Color PARTIALPASTE_IMPULSEDENOISE;Impulsar Reducción de ruido @@ -684,6 +974,8 @@ PARTIALPASTE_IPTCINFO;Información IPTC PARTIALPASTE_LABCURVE;Ajustes Lab PARTIALPASTE_LENSGROUP;Ajustes relativos al lente PARTIALPASTE_LENSPROFILE;Perfil de corrección de lente +PARTIALPASTE_LOCALCONTRAST;Contraste local +PARTIALPASTE_METADATA;Modo de metadatos PARTIALPASTE_METAGROUP;Ajustes de metadatos PARTIALPASTE_PCVIGNETTE;Filtro quitar viñeteado PARTIALPASTE_PERSPECTIVE;Perspectiva @@ -691,7 +983,9 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Aplicar filtro Pixel Muerto PARTIALPASTE_PREPROCESS_GREENEQUIL;Equilibrio del verde PARTIALPASTE_PREPROCESS_HOTPIXFILT;Aplicar filtro Pixel Caliente PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtro de ruido de línea +PARTIALPASTE_PRSHARPENING;Enfocar después del cambio de tamaño PARTIALPASTE_RAWCACORR_AUTO;Auto corrección de Aberración Cromática +PARTIALPASTE_RAWCACORR_CAREDBLUE;CA Rojo & Azul PARTIALPASTE_RAWEXPOS_BLACK;Nivel de negro PARTIALPASTE_RAWEXPOS_LINEAR;Corrección de punto blanco PARTIALPASTE_RAWEXPOS_PRESER;Preservar Luces Altas @@ -700,21 +994,31 @@ PARTIALPASTE_RAW_DCBENHANCE;Aplicar paso de mejora DCB PARTIALPASTE_RAW_DCBITERATIONS;Número de iteraciones DCB PARTIALPASTE_RAW_DMETHOD;Método de interpolado PARTIALPASTE_RAW_FALSECOLOR;Pasos de supresión de falso color de interpolado +PARTIALPASTE_RAW_IMAGENUM;Sub-imagen PARTIALPASTE_RAW_LMMSEITERATIONS;Pasos de mejora LMMSE +PARTIALPASTE_RAW_PIXELSHIFT;Cambio de píxel PARTIALPASTE_RESIZE;Cambiar tamaño +PARTIALPASTE_RETINEX;Retinex PARTIALPASTE_RGBCURVES;Curvas RGB PARTIALPASTE_ROTATION;Rotar PARTIALPASTE_SHADOWSHIGHLIGHTS;Sombras/Luces altas PARTIALPASTE_SHARPENEDGE;Bordes PARTIALPASTE_SHARPENING;Enfoque PARTIALPASTE_SHARPENMICRO;Micro-contraste +PARTIALPASTE_TM_FATTAL;Mapeo de tonos HDR PARTIALPASTE_VIBRANCE;Vibranza PARTIALPASTE_VIGNETTING;Corrección de viñeteo PARTIALPASTE_WHITEBALANCE;Equilibrio de blancos PREFERENCES_ADD;Añadir -PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Color de la guía del navegador PREFERENCES_APPLNEXTSTARTUP;requiere reinicio +PREFERENCES_AUTLISLOW;Bajo +PREFERENCES_AUTLISMAX;Max - Promedio de todos los mosaicos +PREFERENCES_AUTLISSTD;Alto +PREFERENCES_AUTLISVLOW;Ninguno +PREFERENCES_AUTLOW;Bajo PREFERENCES_AUTOMONPROFILE;Usar perfil de color del monitor principal en el sistema operativo +PREFERENCES_AUTOSAVE_TP_OPEN;Guardar automáticamente las herramientas contraídas/expandidas \nEstado antes de salir +PREFERENCES_AUTSTD;Estandar PREFERENCES_BATCH_PROCESSING;Procesamiento por lotes PREFERENCES_BEHADDALL;Todo para 'Agregar' PREFERENCES_BEHADDALLHINT;Establezca todos los parámetros del modo Agregar.\nLos ajustes de parámetros en el panel de la herramienta de lotes serán deltas de los valores guardados @@ -722,17 +1026,39 @@ PREFERENCES_BEHAVIOR;Comportamiento PREFERENCES_BEHSETALL;Todo para 'Establecer' PREFERENCES_BEHSETALLHINT;Todos los parámetros para el modo Establecer.\nLos ajustes de parámetros en el panel de la herramienta de lotes serán serán absolutos, se mostrarán los valores vigentes PREFERENCES_BLACKBODY;Tungsteno +PREFERENCES_CACHECLEARALL;Borrar todo +PREFERENCES_CACHECLEARPROFILES;Borrar perfiles +PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas PREFERENCES_CACHEMAXENTRIES;Cantidad máxima de entradas en la memoria intermedia PREFERENCES_CACHEOPTS;Opciones de memoria intermedia PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas +PREFERENCES_CIEART;Optimización CIECAM02 +PREFERENCES_CIEART_FRAME;Configuración específica de CIECAM02 +PREFERENCES_CIEART_LABEL;Usar precisión flotante simple en lugar de doble. +PREFERENCES_CIEART_TOOLTIP;Si se habilita, los cálculos CIECAM02 se realizan con precisión flotante simple en lugar de doble. Esto provee un pequeño aumento en la velocidad de cálculo a expensas de una casi imperceptible pérdida de calidad PREFERENCES_CLIPPINGIND;Indicación de recortes +PREFERENCES_CLUTSCACHE;HaldCLUT Cache +PREFERENCES_CLUTSCACHE_LABEL;Número máximo de CLUTs en caché PREFERENCES_CLUTSDIR;Directorio HaldCLUT +PREFERENCES_CMMBPC;Compensación de punto negro +PREFERENCES_CROP;Edición del corte +PREFERENCES_CROP_AUTO_FIT;Zoom automático para adaptarse al área de recorte +PREFERENCES_CROP_GUIDES;Guías mostradas al no editar el recorte. +PREFERENCES_CROP_GUIDES_FRAME;Cuadro +PREFERENCES_CROP_GUIDES_FULL;Original +PREFERENCES_CROP_GUIDES_NONE;Ninguno +PREFERENCES_CURVEBBOXPOS;Posición de la curva copiar y pegar nodos +PREFERENCES_CURVEBBOXPOS_ABOVE;Encima +PREFERENCES_CURVEBBOXPOS_BELOW;Abajo +PREFERENCES_CURVEBBOXPOS_LEFT;Izquierda +PREFERENCES_CURVEBBOXPOS_RIGHT;Derecha PREFERENCES_CUSTPROFBUILD;Programa generador de perfiles de procesamiento de imagen del usuario PREFERENCES_CUSTPROFBUILDHINT;Archivo ejecutable (o script) invocado un nuevo perfil de procesamiento inicial debe ser generado para una imagen.\n\nLa ruta del archivo de comunicación (estilo .ini) es agregado como parámetro de comando en línea. Éste contiene diversos parámetros requeridos y metadatos Exif de la imagen para permitir la generación de perfiles de procesamientos basados en reglas.\n\nADVERTENCIA:Usted es responsable de colocar comillas donde se requieren cuando se usan rutas conteniendo espacios en blanco. PREFERENCES_CUSTPROFBUILDKEYFORMAT;Clave de formato PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Nombre PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;ID Etiqueta PREFERENCES_CUSTPROFBUILDPATH;Ruta al programa ejecutable +PREFERENCES_CUTOVERLAYBRUSH;Recortar máscara de color/transparencia PREFERENCES_D50;5000ºK PREFERENCES_D55;5500ºK PREFERENCES_D60;6000ºK @@ -742,15 +1068,21 @@ PREFERENCES_DARKFRAMESHOTS;disparos PREFERENCES_DARKFRAMETEMPLATES;plantillas PREFERENCES_DATEFORMAT;Formato de fecha PREFERENCES_DATEFORMATHINT;Puede usar las siguientes variables :\n%y : año\n%m : mes\n%d : dia\n\nPor ejemplo, la fecha en formato Húngaro es: \n%y/%m/%d +PREFERENCES_DAUB_LABEL;Use las wavelets D6 de Daubechies en lugar de D4 +PREFERENCES_DAUB_TOOLTIP;Las herramientas de reducción de ruido y niveles de wavelet utilizan una wavelet madre de Debauchies. Si elige D6 en lugar de D4, aumenta el número de coeficientes de Daubechies ortogonales y probablemente aumenta la calidad de los niveles de pequeña escala. \nNo hay diferencia entre los dos, en el uso de memoria o de tiempo de procesamiento. PREFERENCES_DIRDARKFRAMES;Carpeta con las Tomas Negras +PREFERENCES_DIRECTORIES;Directorios PREFERENCES_DIRHOME;Carpeta de usuario PREFERENCES_DIRLAST;Última carpeta visitada PREFERENCES_DIROTHER;Otro PREFERENCES_DIRSELECTDLG;Seleccionar carpeta de imágenes en el arranque... PREFERENCES_DIRSOFTWARE;Carpeta de instalación +PREFERENCES_EDITORCMDLINE;Línea de comando personalizada PREFERENCES_EDITORLAYOUT;Disposición del editor +PREFERENCES_EXPAUT;Experto PREFERENCES_EXTERNALEDITOR;Editor externo PREFERENCES_FBROWSEROPTS;Opciones del explorador de archivos/Miniaturas +PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barra de herramientas del explorador en una sola fila (deseleccionar para pantallas de baja resolución) PREFERENCES_FILEFORMAT;Formato de archivo PREFERENCES_FLATFIELDFOUND;Encontrado PREFERENCES_FLATFIELDSDIR;Carpeta de archivos de campo plano @@ -761,27 +1093,44 @@ PREFERENCES_FLUOF7;Fluorescente F7 PREFERENCES_FLUOF11;Fluorescente F11 PREFERENCES_FORIMAGE;Para fotos de tipo diferente a raw PREFERENCES_FORRAW;Para fotos Raw +PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;La misma altura en miniatura entre la tira de película y el explorador de archivos +PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Tener un tamaño separado,en las miniaturas, requerirá más tiempo de procesamiento cada vez que alterne entre la única pestaña Editor y el Explorador de archivos. PREFERENCES_GIMPPATH;Carpeta de instalación de GIMP PREFERENCES_GREY;Luminancia (%) Yb del dispositivo de salida PREFERENCES_GREY05;Yb=05 CIE L#30 PREFERENCES_GREY10;Yb=10 CIE L#40 PREFERENCES_GREY15;Yb=15 CIE L#45 PREFERENCES_GREY18;Yb=18 CIE L#50 +PREFERENCES_GREY18_OLD;Yb=18 CIE L#50 PREFERENCES_GREY23;Yb=23 CIE L#55 PREFERENCES_GREY30;Yb=30 CIE L#60 PREFERENCES_GREY40;Yb=40 CIE L#70 +PREFERENCES_GREYSC;Escena Yb luminancia (%) +PREFERENCES_GREYSC18;Yb=18 CIE L#50 +PREFERENCES_GREYSCA;Automático PREFERENCES_HISTOGRAMPOSITIONLEFT;Histograma en panel izquierdo PREFERENCES_HISTOGRAMWORKING;Usar perfil de trabajo para el histograma principal y el navegador PREFERENCES_HISTOGRAM_TOOLTIP;Si está activado, el perfil de trabajo se utiliza para renderizar el histograma principal y el panel navegador, de lo contrario se utiliza el perfil de Gamma Corregida de salida. PREFERENCES_HLTHRESHOLD;Umbral de luces altas cortadas PREFERENCES_ICCDIR;Carpeta con perfiles de color ICC +PREFERENCES_IMG_RELOAD_NEEDED;Estos cambios requieren que la imagen se vuelva a cargar (o que se abra una nueva imagen) para que tenga efecto. PREFERENCES_IMPROCPARAMS;Parámetros de procesamiento de imágenes predeterminados +PREFERENCES_INSPECT_LABEL;Inspeccionar +PREFERENCES_INSPECT_MAXBUFFERS_LABEL;Número máximo de imágenes en caché +PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP;Establezca el número máximo de imágenes almacenadas en la memoria caché cuando se desplaza sobre ellas en el explorador de archivos;\nLos sistemas con poca RAM (2 GB) deben mantener este valor establecido en 1 o 2. PREFERENCES_INTENT_ABSOLUTE;Colorimétrico absoluto PREFERENCES_INTENT_PERCEPTUAL;Perceptual PREFERENCES_INTENT_RELATIVE;Colorimétrico relativo PREFERENCES_INTENT_SATURATION;Saturación PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Mostrar miniatura JPEG incrustada si foto Raw no se ha editado +PREFERENCES_LANG;Idioma PREFERENCES_LANGAUTODETECT;Usar idioma del sistema +PREFERENCES_LEVAUTDN;Nivel de supresión de ruido +PREFERENCES_LEVDN;Tamaño de celda +PREFERENCES_LISS;Suavizado automático multizona +PREFERENCES_MAX;Maxi (baldoza) +PREFERENCES_MAXRECENTFOLDERS;Número máximo de carpetas recientes +PREFERENCES_MED;Medio(Tile/2) PREFERENCES_MENUGROUPEXTPROGS;Grupo "Abrir con" PREFERENCES_MENUGROUPFILEOPERATIONS;Grupo "Operaciones de archivo" PREFERENCES_MENUGROUPLABEL;Grupo "Etiquetado con color" @@ -789,50 +1138,97 @@ PREFERENCES_MENUGROUPPROFILEOPERATIONS;Grupo "Operaciones de Perfil de Procesami PREFERENCES_MENUGROUPRANK;Grupo "Asignar Rango" PREFERENCES_MENUOPTIONS;Opciones de menú de contexto PREFERENCES_METADATA;Metadatos +PREFERENCES_MONINTENT;Intento de representación predeterminado +PREFERENCES_MONITOR;Monitor +PREFERENCES_MONPROFILE;Perfil de color predeterminado +PREFERENCES_MONPROFILE_WARNOSX;Debido a las limitaciones de MacOS, solo se admite sRGB. PREFERENCES_MULTITAB;Modo Editor de varias pestañas PREFERENCES_MULTITABDUALMON;Modo Editor de varias pestañas, si está disponible en segundo monitor +PREFERENCES_NAVGUIDEBRUSH;Color de la guía del navegador +PREFERENCES_NAVIGATIONFRAME;Navegación +PREFERENCES_NOISE;Reducción de ruido PREFERENCES_OUTDIR;Carpeta de salida PREFERENCES_OUTDIRFOLDER;Guardar en carpeta PREFERENCES_OUTDIRFOLDERHINT;Guardar las imágenes creadas en una carpeta elegida PREFERENCES_OUTDIRTEMPLATE;Usar plantilla PREFERENCES_OUTDIRTEMPLATEHINT;Se pueden usar las variables siguientes:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nEstas variables son referencias a las carpetas y subrutas de las rutas del lugar donde se encuentra la imagen raw.\n\nPor ejemplo, si abres /home/tom/image/02-09-2006/dsc0012.nef, los valores de las variables son:\n%f=dsc0012, %d1=02-09-2006, %d2=image, ...\n%p1=/home/tom/image/02-09-2006, %p2=/home/tom/image, p3=/home/tom, ...\n\nSi quieres guardar la imagen de salida en el lugar original, usa:\n%p1/%f\n\nSi quieres guardar la imagen de salida en una carpeta 'convertida' dentro de la carpeta original, usa:\n%p1/convertida/%f\n\nSi quieres guardar la imagen de salida en la carpeta '/home/tom/convertida' conservando la misma subcarpeta de fechas, usa:\n%p2/convertida/%d1/%f PREFERENCES_OVERLAY_FILENAMES;Superponer nombres de archivo en miniaturas +PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Superponer los nombres de archivo en las miniaturas en el panel del editor PREFERENCES_OVERWRITEOUTPUTFILE;Sobreescribir archivos de salida existentes PREFERENCES_PANFACTORLABEL;Factor PREFERENCES_PARSEDEXT;Extensiones analizadas PREFERENCES_PARSEDEXTADD;Agregar extensión PREFERENCES_PARSEDEXTADDHINT;Ingrese una extensión y pulse este botón para agregarla a la lista PREFERENCES_PARSEDEXTDELHINT;Borrar de la lista las extensiones seleccionadas +PREFERENCES_PARSEDEXTDOWNHINT;Mueve la extensión seleccionada hacia abajo en la lista. +PREFERENCES_PARSEDEXTUPHINT;Mueve la extensión seleccionada hacia arriba en la lista. +PREFERENCES_PREVDEMO;Vista previa del método Desmosaicado +PREFERENCES_PREVDEMO_FAST;Rápido +PREFERENCES_PREVDEMO_LABEL;Método de desmosaicado utilizado para la vista previa al <100% de zoom: +PREFERENCES_PREVDEMO_SIDECAR;Como en PP3 +PREFERENCES_PRINTER;Impresora(tenue-corregir) PREFERENCES_PROFILEHANDLING;Tratamiento de perfiles de procesamiento PREFERENCES_PROFILELOADPR;Prioridad de perfiles cuando se abre imagen PREFERENCES_PROFILEPRCACHE;Perfil en memoria intermedia PREFERENCES_PROFILEPRFILE;Perfil junto a imagen de entrada +PREFERENCES_PROFILESAVEBOTH;Guarda el perfil de procesamiento tanto en la memoria caché como junto al archivo de entrada PREFERENCES_PROFILESAVECACHE;Guardar perfiles de procesamiento en memoria intermedia PREFERENCES_PROFILESAVEINPUT;Guardar perfiles de procesamiento junto con imagen de entrada +PREFERENCES_PROFILESAVELOCATION;Ubicación del lugar donde se guardo el perfil de procesamiento +PREFERENCES_PROFILE_NONE;Ninguno PREFERENCES_PROPERTY;Propiedad +PREFERENCES_PRTINTENT;Intento de representación +PREFERENCES_PRTPROFILE;Perfil de color PREFERENCES_PSPATH;Carpeta de instalación de Adobe Photoshop +PREFERENCES_REMEMBERZOOMPAN;Recuerde el % de zoom y el desplazamiento del paneo +PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Recuerde que el% de zoom y el desplazamiento de la panorámica de la imagen actual al abrir una nueva imagen. \nEsta opción solo funciona en el "Modo de pestaña Editor único" y cuando el "Método de demostración utilizado para la vista previa a <100% de zoom" está configurado en " Como en PP3 " +PREFERENCES_RGBDTL_LABEL;Número máximo de hilos para reducción de ruido +PREFERENCES_RGBDTL_TOOLTIP;La Reducción de Ruido requiere como base 128MB de RAM para una imagen de 10MPix o 512MB para una imagen de 40MPix; más 128MB RAM por hilo de proceso.\nMientras más hilos corren en paralelo, más rápido es el procesamiento. Coloque “0” para que automáticamente se use tantos hilos como sea posible según la capacidad de su equipo. +PREFERENCES_SAVE_TP_OPEN_NOW;Guardar herramientas colapsadas/expandidas ahora +PREFERENCES_SELECTFONT;Seleccionar fuente +PREFERENCES_SELECTFONT_COLPICKER;Seleccione la fuente del Selector de color PREFERENCES_SELECTLANG;Seleccionar idioma +PREFERENCES_SELECTTHEME;Seleccionar tema +PREFERENCES_SERIALIZE_TIFF_READ;Configuración de lectura Tiff +PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serializar la lectura de archivos tiff +PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Cuando trabaje con carpetas llenas de archivos tiff sin comprimir, habilitar esta opción puede aumentar el rendimiento en la generación de la miniatura. PREFERENCES_SET;Establecer PREFERENCES_SHOWBASICEXIF;Mostrar datos Exif básicos PREFERENCES_SHOWDATETIME;Mostrar fecha y hora PREFERENCES_SHOWEXPOSURECOMPENSATION;Mostrar compensación de exposición +PREFERENCES_SHOWFILMSTRIPTOOLBAR;Mostrar barra de herramientas estilo tira de película PREFERENCES_SHTHRESHOLD;Umbral de sombras cortadas +PREFERENCES_SIMPLAUT;Modo de herramienta PREFERENCES_SINGLETAB;Modo Editor de pestaña única PREFERENCES_SINGLETABVERTAB;Modo Editor de pestaña única, pestañas verticales +PREFERENCES_SMA;A una escala pequeña(250x287) PREFERENCES_SND_BATCHQUEUEDONE;Trabajos en cola finalizados PREFERENCES_SND_HELP;Introducir el path o dejar en blanco (sin sonido). En Windows, usar "SystemDefault", "SystemAsterisk" etc. para los sonidos del sistema\nEn Linux use "complete", "window-attention" etc. para los sonidos del sistema. PREFERENCES_SND_LNGEDITPROCDONE;Procesado del editor terminado -PREFERENCES_SND_THRESHOLDSECS;después de seg. +PREFERENCES_SND_TRESHOLDSECS;después de seg. PREFERENCES_STARTUPIMDIR;Carpeta de imágenes en el arranque +PREFERENCES_STDAUT;Estándar PREFERENCES_TAB_BROWSER;Explorador de archivos PREFERENCES_TAB_COLORMGR;Gestión del color +PREFERENCES_TAB_DYNAMICPROFILE;Reglas de perfil dinámico PREFERENCES_TAB_GENERAL;General PREFERENCES_TAB_IMPROC;Procesamiento de imágenes +PREFERENCES_TAB_PERFORMANCE;Rendimiento PREFERENCES_TAB_SOUND;Sonidos +PREFERENCES_THEME;Tema +PREFERENCES_TIMAX;Alto +PREFERENCES_TINB;Número de mosaicos +PREFERENCES_TISTD;Estándar PREFERENCES_TP_LABEL;Panel de herramientas: +PREFERENCES_TP_USEICONORTEXT;Usar iconos de pestaña en lugar de texto PREFERENCES_TP_VSCROLLBAR;Ocultar barra de desplazamiento vertical del panel de herramientas +PREFERENCES_TUNNELMETADATA;Copie Exif / IPTC / XMP sin cambios en el archivo de salida PREFERENCES_USEBUNDLEDPROFILES;Usar perfiles empaquetados PREFERENCES_VIEW;Balance de blancos en el dispositivo de salida (monitor, TV, proyector...) +PREFERENCES_WAVLEV;Aumentar el nivel de wavelet en calidad 'alta' +PREFERENCES_WLONE;Un nivel +PREFERENCES_WLTWO;Dos niveles +PREFERENCES_WLZER;No PREFERENCES_WORKFLOW;Disposición PROFILEPANEL_COPYPPASTE;Parámetros a copiar PROFILEPANEL_GLOBALPROFILES;Perfiles empaquetados @@ -843,6 +1239,7 @@ PROFILEPANEL_MODE_TIP;Modo de procesamiento de perfiles.\n\nBotón Presionado: l PROFILEPANEL_MYPROFILES;Mis perfiles PROFILEPANEL_PASTEPPASTE;Parámetros PROFILEPANEL_PCUSTOM;A medida +PROFILEPANEL_PDYNAMIC;Dinámico PROFILEPANEL_PFILE;Desde archivo PROFILEPANEL_PINTERNAL;Neutro PROFILEPANEL_PLASTSAVED;Último guardado @@ -866,8 +1263,15 @@ PROGRESSBAR_SAVEPNG;Guardando archivo PNG... PROGRESSBAR_SAVETIFF;Guardando archivo TIFF... PROGRESSBAR_SNAPSHOT_ADDED;Se añadió instantánea PROGRESSDLG_PROFILECHANGEDINBROWSER;Perfil de procesamiento cambiado en explorador +QINFO_FRAMECOUNT;%2 cuadro +QINFO_HDR;HDR / %2 cuadro(s) QINFO_ISO;ISO QINFO_NOEXIF;No hay datos EXIF. +QINFO_PIXELSHIFT;Pixel variación /% 2 cuadro(s) +SAMPLEFORMAT_0;Formato de datos desconocido +SAMPLEFORMAT_1;Sin firma 8 bits +SAMPLEFORMAT_2;Sin firma 16 bits +SAMPLEFORMAT_16;Punto flotante de 32 bits SAVEDLG_AUTOSUFFIX;Automáticamente añade un sufijo cuando el archivo ya existe SAVEDLG_FILEFORMAT;Formato de archivo SAVEDLG_FORCEFORMATOPTS;Opciones de guardar forzado @@ -882,9 +1286,12 @@ SAVEDLG_SUBSAMP;Submuestreo SAVEDLG_SUBSAMP_1;Máxima compresión SAVEDLG_SUBSAMP_2;Balanceado SAVEDLG_SUBSAMP_3;Máxima calidad +SAVEDLG_SUBSAMP_TOOLTIP;Mejor compresión: \nJ: a: b 4: 2: 0 \nh / v 2/2 \nColor reducido a la mitad horizontal y verticalmente. \n Equilibrado: \nJ: a: b 4: 2: 2 \nh / v 2 / 1 \nColor dividido a la mitad horizontalmente. \nMejor calidad: \ nJ: a: b 4: 4: 4 \nh / v 1/1 \nNo hay submuestreo del color. SAVEDLG_TIFFUNCOMPRESSED;TIFF sin compresión SAVEDLG_WARNFILENAME;Se asignará nombre al archivo SHCSELECTOR_TOOLTIP;Pulsar el botón derecho del ratón para restablecer la posición de los tres controles deslizantes +SOFTPROOF_GAMUTCHECK_TOOLTIP;Resalta los píxeles con colores fuera de gamma con respecto a: \n-El perfil de la impresora, si se establece uno y la prueba evaluacion de la correspondencia con el perfil está habilitada, \n-El perfil de salida, si el perfil de la impresora no está configurado y la prueba de la evaluacion de la saturación del perfil está habilitada \n-El perfil del monitor, si la prueba de evaluacion de la correspondencia con el perfil está deshabilitada. +SOFTPROOF_TOOLTIP;La prueba evaluacion de la correspondencia con el perfil simula la apariencia de la imagen: \n-Cuando se imprime, si un perfil de impresora está configurado en Preferencias-> Administración de color, \n-Cuando se ve en una pantalla que usa el perfil de salida actual, si no se configura un perfil de impresora . THRESHOLDSELECTOR_B;Inferior THRESHOLDSELECTOR_BL;Inferior izquierdo THRESHOLDSELECTOR_BR;Inferior derecho @@ -892,6 +1299,7 @@ THRESHOLDSELECTOR_HINT;Mantenga la tecla Mayús presionada para mover pun THRESHOLDSELECTOR_T;Superior THRESHOLDSELECTOR_TL;Superior izquierdo THRESHOLDSELECTOR_TR;Superior derecho +TOOLBAR_TOOLTIP_COLORPICKER;Selector de color bloqueable \nCuando esté habilitado: \nHaga clic en la vista previa con el botón izquierdo del ratón para agregar un selector de color \nArrastre alrededor mientras presiona el botón izquierdo del mouse \ nElimine el selector de color con el botón derecho del mouse haga clic en \nEliminar todos los selectores de color con Mayús + clic con el botón derecho del mouse \nHaz clic derecho para alejarse de cualquier selector de color y volver a la herramienta Mano TOOLBAR_TOOLTIP_CROP;Selección de recorte.\nAtajo: c TOOLBAR_TOOLTIP_HAND;Herramienta mano.\nAtajo: h TOOLBAR_TOOLTIP_STRAIGHTEN;Enderezado / Rotación Fina.\nAtajo: s\n\nIndique la vertical u horizontal trazando una línea guía sobre la vista previa de la imagen. El ángulo de rotación será mostrado al continuación de la línea guía. El centro de la imagen es el centro de rotación. @@ -901,6 +1309,7 @@ TP_BWMIX_ALGO_LI;Lineal TP_BWMIX_ALGO_SP;Efectos especiales TP_BWMIX_ALGO_TOOLTIP;Lineal: producirá una respuesta lineal normal.\nEfectos especiales: producirá efectos especiales por mezclar no linealmente los canales. TP_BWMIX_AUTOCH;Auto +TP_BWMIX_AUTOCH_TIP;Calcular valores óptimos para el Mezclador de Canales TP_BWMIX_CC_ENABLED;Ajustar color complementario TP_BWMIX_CC_TOOLTIP;Permite el ajuste automático de colores complementarios en modo RNAmVCAzPM TP_BWMIX_CHANNEL;Ecualizador de luminancia @@ -927,6 +1336,9 @@ TP_BWMIX_MET;Método TP_BWMIX_MET_CHANMIX;Mezclador de canales TP_BWMIX_MET_DESAT;Des-saturación TP_BWMIX_MET_LUMEQUAL;Ecualizador de Luminancia +TP_BWMIX_MIXC;Mezclador +TP_BWMIX_NEUTRAL;Restablece el mezclador +TP_BWMIX_NEUTRAL_TIP;Restablece todos los parámetros (filtro, mezclador de canales) a sus valores predeterminados. TP_BWMIX_RGBLABEL;R: %1%% V: %2%% A: %3%% Total: %4%% TP_BWMIX_RGBLABEL_HINT;Factores finales RGB tomando en cuenta todas las opciones del mezclador\nTotal muestra la suma de los valores RGB actualmente aplicados:\n- En modo relativo Siempre 100% \n- En modo absoluto mayor (más claro) o menor (más oscuro) que 100% TP_BWMIX_RGB_TOOLTIP;Mezcla de canales RGB. Use como guía valores pre-establecidos.\nTenga en cuenta que valores negativos pueden introducir elementos extraños (artifacts) o resultados erráticos. @@ -955,6 +1367,10 @@ TP_BWMIX_VAL;L TP_CACORRECTION_BLUE;Azul TP_CACORRECTION_LABEL;Corrección de aberraciones cromáticas TP_CACORRECTION_RED;Rojo +TP_CBDL_AFT;Después de blanco y negro +TP_CBDL_BEF;Antes de blanco y negro +TP_CBDL_METHOD;Proceso localizado +TP_CBDL_METHOD_TOOLTIP;Elija si la herramienta Contraste por niveles de detalle se colocará después de la herramienta Blanco y negro, que la hace funcionar en el espacio L * a * b *, o antes, que la hace funcionar en el espacio RGB. TP_CHMIXER_BLUE;Canal Azul TP_CHMIXER_GREEN;Canal Verde TP_CHMIXER_LABEL;Mezclador de canales @@ -964,6 +1380,11 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Voltear horizontalmente.\nAtajo: '[' TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotar a la izquierda.\nAtajo: ']' TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotar a la derecha TP_COARSETRAF_TOOLTIP_VFLIP;Voltear verticalmente +TP_COLORAPP_ADAPTSCENE;Adaptación a la luminosidad de la escena +TP_COLORAPP_ADAPTSCENE_TOOLTIP;Luminancia absoluta del entorno de la escena (cd/m²).\n1) Calculado en base a datos Exif: \nTiempo de Exposición - Velocidad ISO - Número F de apertura - Corrección de exposición\n2) Calculado a partir del Punto Blanco raw y Compensación de Exposición RT. +TP_COLORAPP_ADAPTVIEWING;Luminosidad de visualización (cd/m²) +TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Luminancia absoluta del entorno de visualización\n(usualmente 16cd/m²) +TP_COLORAPP_ADAP_AUTO_TOOLTIP;Si la casilla está seleccionada (como se recomienda) RT calcula el valor óptimo a partir de los datos Exif.\nPara establecer el valor manualmente, primero desmarque la casilla TP_COLORAPP_ALGO;Algoritmo TP_COLORAPP_ALGO_ALL;Todo TP_COLORAPP_ALGO_JC;Claridad + Crominancia (JC) @@ -993,6 +1414,9 @@ TP_COLORAPP_CURVEEDITOR3;Curva de color TP_COLORAPP_CURVEEDITOR3_TOOLTIP;Ajusta Crominancia, Saturación o Colorido.\n\nMuestra el histograma de Cromaticidad (Lab) antes de los ajustes CIECAM02.\nSi la casilla "Muestra en las curvas histogramas de salida CIECAM02" está seleccionada, muestra el histograma de C, s o M después de CIECAM02.\n\nC, s y M no se muestran en el histograma del panel principal.\n\nVea el histograma de salida final en el panel principal TP_COLORAPP_DATACIE;Curvas con histogramas de salida CIECAM02 TP_COLORAPP_DATACIE_TOOLTIP;Si está seleccionada, los histogramas en las curvas CIECAM02 muestran aproximadamente valores/rangos de J o Q, y C, s o M después de los ajustes CIECAM02.\nEsta selección no influye en el histograma del panel principal.\n\nCuando no está seleccionada, los histogramas en las curvas CIECAM02 muestran valores Lab antes de los ajustes CIECAM02 +TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Si la casilla está seleccionada (como se recomienda), RT calcula el valor óptimo, que es usado por CAT02, y también por todo CIECAM02.\nPara establecer manualmente el valor, primero desmarque la casilla (se recomienda usar valores mayores a 65) +TP_COLORAPP_DEGREE_TOOLTIP;Cantidad de transformación de adaptación cromática CIE 2002 +TP_COLORAPP_FREE;Libre tempera+verde + CAT02 + [output] TP_COLORAPP_GAMUT;Control de Gamut (Lab) TP_COLORAPP_GAMUT_TOOLTIP;Permite control de gamut en modo Lab TP_COLORAPP_HUE;Matiz (h) @@ -1005,8 +1429,12 @@ TP_COLORAPP_LIGHT;Claridad (J) TP_COLORAPP_LIGHT_TOOLTIP;Claridad en CIECAM02 es diferente a la de Lab y a la de RGB TP_COLORAPP_MODEL;Modelo de Punto Blanco TP_COLORAPP_MODEL_TOOLTIP;Modelo de Punto Blanco\n\nWB [RT] + [salida]:\nEl Balance de Blancos de RT es usado para la escena, CIECAM02 es establecido a D50, y el Balance de Blancos del dispositivo de salida es el establecido en Preferencias > Gestión de Color\n\nWB [RT+CAT02] + [salida]:\nEl Balance de Blancos de RT es usado por CAT02 y el del dispositivo de salida es el establecido en preferencias +TP_COLORAPP_NEUTRAL;Restablecer +TP_COLORAPP_NEUTRAL_TIP;Restablecer todos los controles deslizantes y las curvas a sus valores predeterminados TP_COLORAPP_RSTPRO; Protección de tonos rojos y color piel TP_COLORAPP_RSTPRO_TOOLTIP;Intensidad de protección de tonos rojos y color piel (en curvas y en controles deslizantes) +TP_COLORAPP_SHARPCIE;Enfoque, Contraste por niveles de detalle, Micro-contraste & Eliminación de AC con Q/C +TP_COLORAPP_SHARPCIE_TOOLTIP;Si se selecciona, Enfoque, Contraste por niveles de detalle, Micro-contraste & Eliminación de AC usarán CIECAM02 TP_COLORAPP_SURROUND;Entorno TP_COLORAPP_SURROUND_AVER;Promedio TP_COLORAPP_SURROUND_DARK;Oscuro @@ -1023,11 +1451,14 @@ TP_COLORAPP_TCMODE_LABEL2;Curve modo 2 TP_COLORAPP_TCMODE_LABEL3;Curva en modo crominancia TP_COLORAPP_TCMODE_LIGHTNESS;Claridad TP_COLORAPP_TCMODE_SATUR;Saturación +TP_COLORAPP_TEMP_TOOLTIP;Para seleccionar un iluminante, configure siempre Tinte = 1. \nA temperatura = 2856 \nD50 temperatura = 5003 \nD55 temperatura = 5503 \nD65 temperatura = 6504 \nD75 temperatura = 7504 TP_COLORAPP_TONECIE;Mapeo tonal usando Brillo (Q) CIECAM02. TP_COLORAPP_TONECIE_TOOLTIP;Si esta opción no está seleccionada, el mapeo tonal se hace usando el espacio de color Lab.\nSi esta opción está seleccionada, el mapeo tonal se hace usando CIECAM02.\nLa herramienta de mapeo tonal debe de estar habilitada para que esta selección tenga efecto -TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Luminancia absoluta del entorno de visualización\n(usualmente 16cd/m²) TP_COLORAPP_WBCAM;BalBlanco [RT+CAT02] + [salida] TP_COLORAPP_WBRT;BalBlanco [RT] + [salida] +TP_COLORAPP_YB;Yb% (luminancia media) +TP_COLORAPP_YBSCENE;Yb% (luminancia media) +TP_COLORAPP_YBSCENE_TOOLTIP;Si está habilitado el modo automático, Yb se calcula a partir del valor medio de la luminancia de la imagen real TP_COLORTONING_AB;o C/L TP_COLORTONING_AUTOSAT;Automático TP_COLORTONING_BALANCE;Balance @@ -1039,6 +1470,8 @@ TP_COLORTONING_HIGHLIGHT;Luces Altas TP_COLORTONING_HUE;Matiz TP_COLORTONING_LAB;Mezcla Lab TP_COLORTONING_LABEL;Tonificación de Color +TP_COLORTONING_LABGRID;L*a*b* cuadrícula de corrección del color +TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nS: a=%3 b=%4 TP_COLORTONING_LUMA;Luminancia TP_COLORTONING_LUMAMODE;Preservar luminancia TP_COLORTONING_LUMAMODE_TOOLTIP;Si está activado, cuando se cambia el color(rojo, verde, cian, azul, etc.) la luminancia de cada pixel es preservada. @@ -1062,19 +1495,23 @@ TP_COLORTONING_STRENGTH;Intensidad TP_COLORTONING_TWO2;Crominancia especial '2 colores' TP_COLORTONING_TWOALL;Crominancia especial TP_COLORTONING_TWOBY;Especial 'a' y 'b' -TP_COLORTONING_TWOCOLOR_TOOLTIP;Crominancia estándar:\nRespuesta lineal, a* = b*.\n\nCrominancia especial:\nRespuesta lineal, a* = b*, pero no unidas - intentar debajo de la diagonal.\n\nEspecial a* and b*:\nRespuesta lineal no unida con curvas separadas para a* y b*. Previsto para efectos especiales.\n\nCrominancia especial 2 colores:\nMás predecible. +TP_COLORTONING_TWOCOLOR_TOOLTIP;Crominancia estándar:\nRespuesta lineal, a* = b*.\n\nCrominancia especial:\nRespuesta lineal, a* = b*, pero no unidas - intentar debajo de la diagonal.\n\nEspecial a* and b*:\nRespuesta lineal no unida con curvas separadas para a* y b*. Previsto para efectos especiales.\nCrominancia especial 2 colores:\nMás predecible. TP_COLORTONING_TWOSTD;Crominancia estándar TP_CROP_FIXRATIO;Fijar proporciones: TP_CROP_GTDIAGONALS;Regla de las diagonales TP_CROP_GTEPASSPORT;Pasaporte biométrico TP_CROP_GTFRAME;Marco TP_CROP_GTGRID;Rejilla +TP_CROP_GTHARMMEANS;Proporciones Armónicas TP_CROP_GTNONE;Ninguna TP_CROP_GTRULETHIRDS;Regla de los tercios +TP_CROP_GTTRIANGLE1;Triángulos de oro(áureo)1 +TP_CROP_GTTRIANGLE2;Triángulos de oro(áureo)2 TP_CROP_GUIDETYPE;Clase de guía: TP_CROP_H;Al TP_CROP_LABEL;Recortar TP_CROP_PPI;Ptos/Pulgada= +TP_CROP_SELECTCROP;Seleccionar recorte TP_CROP_W;Ancho TP_CROP_X;x TP_CROP_Y;y @@ -1083,15 +1520,36 @@ TP_DARKFRAME_LABEL;Toma Negra TP_DEFRINGE_LABEL;Quitar borde púrpura TP_DEFRINGE_RADIUS;Radio TP_DEFRINGE_THRESHOLD;Umbral +TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Control automático de multi-zonas +TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;Control automático global +TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Trate de evaluar el ruido del color \nTenga cuidado, este cálculo es promedio y es bastante subjetivo. TP_DIRPYRDENOISE_CHROMINANCE_BLUEYELLOW;Crominancia: Azul-Amarillo +TP_DIRPYRDENOISE_CHROMINANCE_CURVE;Curva de Crominancia +TP_DIRPYRDENOISE_CHROMINANCE_CURVE_TOOLTIP;Aumente (multiplique) el valor de todos los controles deslizantes de crominancia. \nEsta curva le permite ajustar la intensidad de la reducción de ruido cromático en función de la cromaticidad, por ejemplo, para aumentar la acción en áreas de baja saturación y para disminuirla en aquellas de alta saturación. +TP_DIRPYRDENOISE_CHROMINANCE_FRAME;Crominancia +TP_DIRPYRDENOISE_CHROMINANCE_MANUAL;Manual TP_DIRPYRDENOISE_CHROMINANCE_MASTER;Crominancia: Maestra +TP_DIRPYRDENOISE_CHROMINANCE_METHOD;Método +TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP;Manual \nActos en la imagen completa. \nUsted controla la configuración de reducción de ruido manualmente. \nAutomático global \ nAcciones en la imagen completa. \n9 zonas se utilizan para calcular una configuración de reducción de ruido de crominancia global. \nVista previa \nAcciones activadas en la totalidad de la imagen. \ nLa parte de la imagen visible en la vista previa se utiliza para calcular la configuración global de reducción de ruido de crominancia. +TP_DIRPYRDENOISE_CHROMINANCE_METHOD_TOOLTIP;Manual \nAcciones en la imagen completa. \nUsted controla las configuraciones de reducción de ruido manualmente. \nAutomático global \nAcciones en la imagen completa. \n9 zonas se utilizan para calcular una configuración global de reducción de ruido de crominancia. \nMúltiples zonas automáticas \ nNo hay vista previa: funciona solo durante el guardado, pero al usar el método de "Vista previa" al hacer coincidir el tamaño y centro del mosaico con el centro y el tamaño de la vista previa, puede obtener una idea de los resultados esperados. \ nLa imagen se divide en mosaicos (aproximadamente 10 a 70 dependiendo del tamaño de la imagen) y cada ficha recibe su propia configuración de reducción de ruido de crominancia. \nPrevisión \nAcciones en toda la imagen. \nLa parte de la imagen visible en la vista previa se utiliza para calcular la configuración global de reducción de ruido de crominancia. +TP_DIRPYRDENOISE_CHROMINANCE_PMZ;Vista previa de múltiples zonas +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW;Vista previa +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;Muestra los niveles de ruido restantes de la parte de la imagen visible en la vista previa después de wavelet. \n> 300 Muy ruidoso \n100-300 Ruidoso \n50-100 Un poco ruidoso \n <50 Muy bajo ruido \n Cuidado, los valores diferirán entre los modos RGB y L * a * b *. Los valores RGB son menos precisos porque el modo RGB no separa completamente la luminancia y la crominancia. +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO;Tamaño de la vista previa =% 1, Centro: Px =% 2 Py =% 3 +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO;Previsualización de ruido: Media =% 1 Alta =% 2 +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO_EMPTY;Previsualización del ruido: Media = - Alta = - +TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_TILEINFO;Tamaño del mosaico =% 1, Centro: Tx =% 2 Ty =% 3 TP_DIRPYRDENOISE_CHROMINANCE_REDGREEN;Crominancia: Rojo-Verde TP_DIRPYRDENOISE_ENH;Modo mejorado TP_DIRPYRDENOISE_ENH_TOOLTIP;Incrementa la calidad de la Reducción de Ruido a costa de un incremento de 20% en el tiempo de procesamiento +TP_DIRPYRDENOISE_LABEL;Reducción del ruido +TP_DIRPYRDENOISE_LUMINANCE_CONTROL;Control de luminancia TP_DIRPYRDENOISE_LUMINANCE_CURVE;Curva de Luminancia TP_DIRPYRDENOISE_LUMINANCE_DETAIL;Detalle en luminancia +TP_DIRPYRDENOISE_LUMINANCE_FRAME;Luminancia TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING;Luminancia TP_DIRPYRDENOISE_MAIN_COLORSPACE;Método +TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;L*a*b* TP_DIRPYRDENOISE_MAIN_COLORSPACE_LABEL;Reducción de ruido TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;Para imágenes raw puede usar tanto el método RGB como el Lab.\n\nPara imágenes no raw el método Lab será usado de todas maneras, ignorando el método seleccionado. @@ -1102,15 +1560,27 @@ TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Alto TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Estándar TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;La Calidad puede ser adaptada a un patrón de ruido. Al seleccionar "Alto" se incrementa el efecto de reducción de ruido a costa de prolongar el tiempo de procesamiento. TP_DIRPYRDENOISE_MEDIAN_METHOD;Método Median -TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;Lab +TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;Solo croma(color) +TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;L*a*b* TP_DIRPYRDENOISE_MEDIAN_METHOD_LABEL;Median TP_DIRPYRDENOISE_MEDIAN_METHOD_LUMINANCE;Sólo luminancia TP_DIRPYRDENOISE_MEDIAN_METHOD_RGB;RGB TP_DIRPYRDENOISE_MEDIAN_METHOD_TOOLTIP;Cuando se utiliza "Sólo Luminancia" y los métodos "Lab", el filtro Median será aplicado inmediatamente después de cada proceso de toda la cadena de reducción de ruido.\nCuando se utiliza el modo "RGB", el filtro Median se aplicará al final de toda la cadena de procesos de reducción de ruido. +TP_DIRPYRDENOISE_MEDIAN_METHOD_WEIGHTED;Ponderado L * (pequeño) + a * b * (normal) TP_DIRPYRDENOISE_MEDIAN_PASSES;Iteracciones Median +TP_DIRPYRDENOISE_MEDIAN_PASSES_TOOLTIP;La aplicación de tres iteraciones de filtro de mediana con un tamaño de ventana de 3 × 3 a menudo conduce a mejores resultados que el uso de una iteración de filtro de mediana con un tamaño de ventana de 7 × 7. TP_DIRPYRDENOISE_MEDIAN_TYPE;Tipo Median +TP_DIRPYRDENOISE_MEDIAN_TYPE_TOOLTIP;Aplica un filtro de mediana para el tamaño de la ventana deseada. Cuanto mayor sea el tamaño de la ventana, más tiempo tardará. \n3 × 3 soft: trata 5 píxeles en una ventana de 3 × 3 píxeles. \n3 × 3: trata 9 píxeles en una ventana de 3 × 3 píxeles. \n5 × 5 suave: trata 13 píxeles en una ventana de 5 × 5 píxeles. \n5 × 5: trata 25 píxeles en una ventana de 5 × 5 píxeles. \n7 × 7: trata 49 píxeles en una ventana de 7 × 7 píxeles. \n9 × 9: trata 81 píxeles en una ventana de 9 × 9 píxeles. \nA veces es posible lograr una mayor calidad ejecutando varias iteraciones con un tamaño de ventana más pequeño que una iteración con una más grande. +TP_DIRPYRDENOISE_SLI;Deslizador +TP_DIRPYRDENOISE_TYPE_3X3;3×3 +TP_DIRPYRDENOISE_TYPE_3X3SOFT;3×3 suavisado +TP_DIRPYRDENOISE_TYPE_5X5;5×5 +TP_DIRPYRDENOISE_TYPE_5X5SOFT;5×5 suavisado +TP_DIRPYRDENOISE_TYPE_7X7;7×7 +TP_DIRPYRDENOISE_TYPE_9X9;9×9 TP_DIRPYREQUALIZER_ALGO;Rango de Color de Piel TP_DIRPYREQUALIZER_ALGO_TOOLTIP;Fino: cercano a los colores de la piel, minimizando la acción en otros colores\nAmplio: evita más elementos extraños. +TP_DIRPYREQUALIZER_ARTIF;Reduce elementos extraños TP_DIRPYREQUALIZER_HUESKIN;Matiz de la piel TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;En la parte superior se selecciona la zona con los valores máximos.\nEn la parte inferior se ajusta la transición.\nSi necesita para mover el área de manera significativa a la izquierda o a la derecha - o si hay elementos extraños:.. El balance de blancos es incorrecto \nPuedes reducir ligeramente la zona para evitar que el resto de la imagen se vea afectada. TP_DIRPYREQUALIZER_LABEL;Contraste por niveles de detalle @@ -1124,8 +1594,10 @@ TP_DIRPYREQUALIZER_SKIN_TOOLTIP;A -100 se focalizan los tonos de piel.\nA 0 todo TP_DIRPYREQUALIZER_THRESHOLD;Umbral TP_DIRPYREQUALIZER_TOOLTIP;Reduce los elementos extraños producidos en la transición entre los colores de piel (matiz, crominancia, luminancia) y el resto de la imagen. TP_DISTORTION_AMOUNT;Cantidad +TP_DISTORTION_AUTO_TIP;Corrige automáticamente la distorsión de la lente en archivos sin procesar al compararla con la imagen JPEG incrustada, si existe, y la cámara ha corregido automáticamente la distorsión de la lente. TP_DISTORTION_LABEL;Corrección de Distorsión TP_EPD_EDGESTOPPING;Parada en los bordes +TP_EPD_GAMMA;Gamma TP_EPD_LABEL;Mapeo tonal TP_EPD_REWEIGHTINGITERATES;Iteraciones de reponderación TP_EPD_SCALE;Escala @@ -1145,17 +1617,22 @@ TP_EXPOSURE_CURVEEDITOR1;Curva tonal 1 TP_EXPOSURE_CURVEEDITOR2;Curva tonal 2 TP_EXPOSURE_CURVEEDITOR2_TOOLTIP;Por favor, consulte RawPedia para aprender cómo obtener mejores resultados usando dos curvas tonales TP_EXPOSURE_EXPCOMP;Compensación de exposición +TP_EXPOSURE_HISTMATCHING;Curva de tono auto-balanceada +TP_EXPOSURE_HISTMATCHING_TOOLTIP;Ajuste automáticamente los controles deslizantes y las curvas (excepto la compensación de exposición) para que coincidan con el aspecto de la miniatura JPEG incrustada. TP_EXPOSURE_LABEL;Exposición TP_EXPOSURE_SATURATION;Saturación TP_EXPOSURE_TCMODE_FILMLIKE;Similar a película TP_EXPOSURE_TCMODE_LABEL1;Curva modo 1 TP_EXPOSURE_TCMODE_LABEL2;Curva modo 2 +TP_EXPOSURE_TCMODE_LUMINANCE;Luminancia +TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual TP_EXPOSURE_TCMODE_SATANDVALBLENDING;Mezcla de saturación y valor TP_EXPOSURE_TCMODE_STANDARD;Estándar TP_EXPOSURE_TCMODE_WEIGHTEDSTD;Estándar ponderado TP_EXPOS_BLACKPOINT_LABEL;Raw - Puntos Negros TP_EXPOS_WHITEPOINT_LABEL;Raw - Puntos Blancos TP_FILMSIMULATION_LABEL;Simulación de Fílmico +TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee está configurado para buscar imágenes Hald CLUT, que se usan para la herramienta Simulación de película, en una carpeta que tarda demasiado en cargarse. \nVaya a Preferencias> Procesamiento de imagen> Simulación de película \npara ver qué carpeta se está utilizando. Debería apuntar RawTherapee a una carpeta que contenga solo imágenes de Hald CLUT y nada más, o a una carpeta vacía si no desea usar la herramienta Simulación de película. \nLea el artículo de Simulación de película en RawPedia para obtener más información. \n¿Desea cancelar el escaneo ahora? TP_FILMSIMULATION_STRENGTH;Intensidad TP_FILMSIMULATION_ZEROCLUTSFOUND;Seleccionar el directorio HaldCLUT en Preferencias TP_FLATFIELD_AUTOSELECT;Auto selección @@ -1197,8 +1674,15 @@ TP_HSVEQUALIZER_HUE;H TP_HSVEQUALIZER_LABEL;Ecualizador HSV TP_HSVEQUALIZER_SAT;S TP_HSVEQUALIZER_VAL;V +TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Exposición, punto de partida +TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Emplear el desplazamiento de la línea de base de DCP incrustado. La configuración solo está disponible si el DCP seleccionado tiene uno. +TP_ICM_APPLYHUESATMAP;Tabla base +TP_ICM_APPLYHUESATMAP_TOOLTIP;Emplear la tabla base DCP incrustada (Mapa Hue Sat). La configuración solo está disponible si el DCP seleccionado tiene unoloy the embedded DCP base table (HueSatMap). The setting is only available if the selected DCP has one. +TP_ICM_APPLYLOOKTABLE;Revisar tabla +TP_ICM_APPLYLOOKTABLE_TOOLTIP;Emplear la tabla de apariencia DCP incrustada. La configuración solo está disponible si el DCP seleccionado tiene uno. TP_ICM_BLENDCMSMATRIX;Mezclar las luces altas ICC con matriz TP_ICM_BLENDCMSMATRIX_TOOLTIP;Permite recuperar luces altas quemadas cuando se usan perfiles ICC basados en LUT +TP_ICM_BPC;Compensación de punto negro TP_ICM_DCPILLUMINANT;Iluminante TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado TP_ICM_DCPILLUMINANT_TOOLTIP;Seleccione el Iluminante a emplear. El valor predeterminado es "interpolado", que es una mezcla entre dos basados en el Balance de Blancos. Este ajuste es posible solo si un Iluminante dual DCP con soporte de interpolación es seleccionado. @@ -1217,6 +1701,10 @@ TP_ICM_INPUTPROFILE;Perfil de entrada TP_ICM_LABEL;Gestión de color TP_ICM_NOICM;Sin ICM: Salida sRGB TP_ICM_OUTPUTPROFILE;Perfil de salida +TP_ICM_PROFILEINTENT;Iintento de interpretación. +TP_ICM_SAVEREFERENCE;Guardar imagen de referencia +TP_ICM_SAVEREFERENCE_APPLYWB;Aplicar balance de blancos +TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;En general, aplique el balance de blancos cuando guarde imágenes para crear perfiles ICC, y no aplique el balance de blancos para crear perfiles DCP. TP_ICM_SAVEREFERENCE_TOOLTIP;Guardar la imagen TIFF lineal antes de aplicar el perfil de entrada. El resultado puede ser utilizado para fines de calibración y la generación de un perfil de cámara. TP_ICM_TONECURVE;Usar la curva tonal en DCP TP_ICM_TONECURVE_TOOLTIP;Activa el uso de las curvas de tono que pueden contener los perfiles DCP. Este ajuste es posible solo si el DCP seleccionado contiene una curva tonal. @@ -1224,9 +1712,9 @@ TP_ICM_WORKINGPROFILE;Perfil de trabajo TP_IMPULSEDENOISE_LABEL;Impulsar Reducc. ruido TP_IMPULSEDENOISE_THRESH;Umbral TP_LABCURVE_AVOIDCOLORSHIFT;Evitar desplazamiento de colores -TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Encaja los colores dentro de la gama del espacio de color de trabajo y aplica la corrección de Munsell +TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Encaja los colores dentro de la gamma del espacio de color de trabajo y aplica la corrección de Munsell TP_LABCURVE_BRIGHTNESS;Brillo -TP_LABCURVE_CHROMATICITY;Cromaticidad +TP_LABCURVE_CHROMATICITY;Cromaticidad (Saturación) TP_LABCURVE_CHROMA_TOOLTIP;Para aplicar mapeo tonal en blanco y negro, establezca la Cromaticidad a -100 TP_LABCURVE_CONTRAST;Contraste TP_LABCURVE_CURVEEDITOR;Curva de luminancia @@ -1238,6 +1726,7 @@ TP_LABCURVE_CURVEEDITOR_B_RANGE1;Azul saturado TP_LABCURVE_CURVEEDITOR_B_RANGE2;Azul pastel TP_LABCURVE_CURVEEDITOR_B_RANGE3;Amarillo pastel TP_LABCURVE_CURVEEDITOR_B_RANGE4;Amarillo saturado +TP_LABCURVE_CURVEEDITOR_CC;CC TP_LABCURVE_CURVEEDITOR_CC_RANGE1;Neutros TP_LABCURVE_CURVEEDITOR_CC_RANGE2;Mates TP_LABCURVE_CURVEEDITOR_CC_RANGE3;Pastel @@ -1263,6 +1752,19 @@ TP_LENSGEOM_AUTOCROP;Auto recorte TP_LENSGEOM_FILL;Auto relleno TP_LENSGEOM_LABEL;Lente / Geometría TP_LENSPROFILE_LABEL;Perfil de corrección de lente +TP_LENSPROFILE_USECA;Corrección de AC +TP_LENSPROFILE_USEDIST;Corrección de distorsión +TP_LENSPROFILE_USEVIGN;Corrección de viñeteo +TP_LOCALCONTRAST_AMOUNT;Cantidad +TP_LOCALCONTRAST_DARKNESS;Nivel de sombras +TP_LOCALCONTRAST_LABEL;Contraste local +TP_LOCALCONTRAST_LIGHTNESS;Nivel de luminosidad +TP_LOCALCONTRAST_RADIUS;Radio +TP_METADATA_EDIT;Aplicar modificaciones +TP_METADATA_MODE;Modo de copia de metadatos +TP_METADATA_STRIP;Eliminar todos los metadatos +TP_METADATA_TUNNEL;Copiar sin cambios +TP_NEUTRAL;Reiniciar TP_NEUTRAL_TIP;Restablecer controles de exposición a valores neutros\nAplica a los mismos controles que son afectados por Niveles Automáticos, sin importar si usa o no Niveles Automáticos TP_PCVIGNETTE_FEATHER;Difuminado TP_PCVIGNETTE_FEATHER_TOOLTIP;Difuminación: \n0=Solo Esquinas\n50=Hasta medio camino al centro\n100=Hasta el Centro @@ -1284,9 +1786,12 @@ TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Trata de eliminar los píxeles calientes. TP_PREPROCESS_LABEL;Preprocesado TP_PREPROCESS_LINEDENOISE;Filtro de ruido de línea TP_PREPROCESS_NO_FOUND;No encontrado +TP_PRSHARPENING_LABEL;Enfocar después del cambio de tamaño +TP_PRSHARPENING_TOOLTIP;Enfoca la imagen después de cambiar el tamaño. Solo funciona cuando se utiliza el método de cambio de tamaño "Lanczos". Es imposible previsualizar los efectos de esta herramienta. Ver RawPedia para instrucciones de uso. TP_RAWCACORR_AUTO;Auto corrección TP_RAWCACORR_CABLUE;Azul TP_RAWCACORR_CARED;Rojo +TP_RAWCACORR_CASTR;Fuerza TP_RAWEXPOS_BLACKS;Niveles de negro TP_RAWEXPOS_BLACK_0;Verde 1 (principal) TP_RAWEXPOS_BLACK_1;Rojo @@ -1299,19 +1804,85 @@ TP_RAWEXPOS_LINEAR;Corrección de punto blanco TP_RAWEXPOS_PRESER;Preservación de Luces Altas TP_RAWEXPOS_RGB;Rojo, Verde, Azul TP_RAWEXPOS_TWOGREEN;Vincular verdes +TP_RAW_1PASSMEDIUM;1-pasaje (medio) +TP_RAW_3PASSBEST;3-Pasaje (Mejor) +TP_RAW_AHD;AHD +TP_RAW_AMAZE;AMaZE +TP_RAW_DCB;DCB TP_RAW_DCBENHANCE;Aplicar paso de mejora DCB TP_RAW_DCBITERATIONS;Número de iteraciones DCB TP_RAW_DMETHOD;Método TP_RAW_DMETHOD_PROGRESSBAR;%1 interpolando mosaico... TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Refinando la interpolación del mosaico... TP_RAW_DMETHOD_TOOLTIP;Nota: IGV y LMMSE están dedicados a imágenes tomadas con grandes velocidades ISO +TP_RAW_EAHD;EAHD TP_RAW_FALSECOLOR;Pasos de supresión de color falso +TP_RAW_FAST;Fast +TP_RAW_HD;Límite +TP_RAW_HD_TOOLTIP;Los valores más bajos hacen que la detección de píxeles muertos/vivos sea más agresiva, pero los falsos positivos pueden llevar a producir elementos extraños. Si observa que aparecen elementos extraños al habilitar los filtros de píxeles calientes/muertos, aumente gradualmente el valor del umbral hasta que desaparezcan. +TP_RAW_HPHD;HPHD +TP_RAW_IGV;IGV +TP_RAW_IMAGENUM;Sub-imagen +TP_RAW_IMAGENUM_TOOLTIP;Algunos archivos en bruto constan de varias sub-imágenes (Pentax / Sony Pixel Shift, Pentax 3-en-1 HDR, Canon Dual Pixel). \nAl usar cualquier método de demostración que no sea Pixel Shift, esto selecciona qué sub-imagen se usa . \nCuando se usa el método de demostración Pixel Shift en un Pixel Shift sin procesar, se usan todas las subimágenes, y esto selecciona qué subimagen se debe usar para mover partes. TP_RAW_LABEL;Desmosaicado +TP_RAW_LMMSE;LMMSE TP_RAW_LMMSEITERATIONS;Pasos de mejora LMMSE TP_RAW_LMMSE_TOOLTIP;Agregar gamma (paso 1)\n Agregar mediana (pasos 2,3,4)\nAgregar refinamientos (pasos 5,6) para reducir objetos espurios y mejorar la relación señal a ruido +TP_RAW_MONO;Mono +TP_RAW_NONE;Ninguno (muestra el patrón del sensor) +TP_RAW_PIXELSHIFT;Cambio de píxel +TP_RAW_PIXELSHIFTADAPTIVE;Detección adaptativa +TP_RAW_PIXELSHIFTBLUR;Máscara de movimiento de desenfoque +TP_RAW_PIXELSHIFTEPERISO;ISO adaptación +TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;El valor predeterminado de 0 debería funcionar bien para la base ISO. \nAumente el valor para mejorar la detección del movimiento para una ISO más alta. \nAumente en pequeños pasos y observe la máscara de movimiento mientras aumenta. +TP_RAW_PIXELSHIFTEQUALBRIGHT;Ecualiza el brillo de los cuadros. +TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Igualar por canal +TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Activado: ecualice los canales RGB individualmente. \nDeshabilitado: use el mismo factor de ecualización para todos los canales. +TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Ecualice el brillo de los cuadros con el brillo del cuadro seleccionado. \nSi hay áreas sobreexpuestas en los cuadros, seleccione el cuadro más brillante para evitar la aparición de colores magenta en áreas sobreexpuestas o habilite la corrección de movimiento. +TP_RAW_PIXELSHIFTEXP0;Experimental +TP_RAW_PIXELSHIFTGREEN;Compruebe el canal verde para el movimiento +TP_RAW_PIXELSHIFTHOLEFILL;Rellene los fallos en la máscara de movimiento +TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Rellene los fallos en la máscara de movimiento +TP_RAW_PIXELSHIFTLMMSE;Utilice LMMSE para regiones móviles +TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use LMMSE en lugar de AMaZE para las áreas de movimiento. \nÚtil para imágenes de alta ISO. +TP_RAW_PIXELSHIFTMASKTHRESHOLD;3x3 nuevo umbral +TP_RAW_PIXELSHIFTMEDIAN;Usa la mediana pa3x3 nuevo umbral parara las regiones móviles. +TP_RAW_PIXELSHIFTMEDIAN3;Excluir el cuadro seleccionado de la mediana +TP_RAW_PIXELSHIFTMEDIAN3_TOOLTIP;Excluye el cuadro seleccionado de la mediana. \nUtilícelo si los objetos en movimiento se superponen en el cuadro 2 y 3 +TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP;Use la mediana de todos los cuadros en lugar del cuadro seleccionado para las regiones con movimiento. \nElimina los objetos que se encuentran en diferentes lugares en todos los cuadros. \nBrinda efecto de movimiento en objetos de movimiento lento (superpuestos). +TP_RAW_PIXELSHIFTMM_AUTO;Automático +TP_RAW_PIXELSHIFTMM_CUSTOM;Personalizado +TP_RAW_PIXELSHIFTMM_OFF;Apagado +TP_RAW_PIXELSHIFTMOTION;Nivel de detección de movimiento (en desuso) +TP_RAW_PIXELSHIFTMOTIONCORRECTION;Magnitudo de la corrección del movimiento verde +TP_RAW_PIXELSHIFTMOTIONMETHOD;Corrección del movimiento +TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 significa que no hay detección de movimiento. \n1 - 99 significa que el movimiento se detectará de acuerdo con este valor. Aumente el valor para aumentar la tasa de detección. \n100 significa que se utilizará el marco de demostración AMaZE.ción de movimiento. \n1 - 99 significa que el movimiento se detectará de acuerdo con este valor. Aumente el valor para aumentar la tasa de detección. \n100 significa que se utilizará el marco de demostración AMaZE.no motion detection.\n1 - 99 means motion will be detected according to this value. Increase value to increase detection rate.\n100 means the AMaZE-demosaiced frame will be used. +TP_RAW_PIXELSHIFTNONGREENAMAZE;Compruebe AMaZE rojo / azul +TP_RAW_PIXELSHIFTNONGREENCROSS;Compruebe los canales rojos/azules para el movimiento +TP_RAW_PIXELSHIFTNONGREENCROSS2;Compruebe verde AMaZE +TP_RAW_PIXELSHIFTNONGREENHORIZONTAL;Compruebe rojo/azul horizontal +TP_RAW_PIXELSHIFTNONGREENVERTICAL;Compruebe rojo/azul vertical +TP_RAW_PIXELSHIFTNREADISO;nLeer +TP_RAW_PIXELSHIFTONEGREEN;Utilice un verde en lugar de media +TP_RAW_PIXELSHIFTONEGREEN_TOOLTIP;Use un verde en lugar de promediar dos verdes para regiones sin movimiento. +TP_RAW_PIXELSHIFTPRNU;PRNU (%) +TP_RAW_PIXELSHIFTREDBLUEWEIGHT;Fuerza Rojo&Azul +TP_RAW_PIXELSHIFTSHOWMOTION;Mostrar máscara de movimiento +TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Mostrar solo máscara de movimiento +TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Muestra la máscara de movimiento sin la imagen. +TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Superpone la imagen con una máscara que muestra las regiones con movimiento. +TP_RAW_PIXELSHIFTSIGMA;Radio de desenfoque +TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;El radio predeterminado de 1.0 por lo general se ajusta bien a la base ISO. \nAumente el valor para tomas con ISO alto, 5.0 es un buen punto de partida. \nMire la máscara de movimiento mientras cambia el valor. +TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions +TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Transiciones suaves entre áreas con movimiento y áreas sin movimiento. \nConfigure en 0 para deshabilitar el suavizado en la transición. \nConfigure en 1 para obtener el resultado AMaZE / LMMSE del marco seleccionado (dependiendo de si se selecciona "Usar LMMSE") o la mediana de los cuatro cuadros si se selecciona "Usar mediana". +TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;Factor de StdDev Azul +TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;Factor de StdDev Verde +TP_RAW_PIXELSHIFTSTDDEVFACTORRED;Factor de StdDev Rojo +TP_RAW_RCD;RCD TP_RAW_SENSOR_BAYER_LABEL;Sensor con matriz Bayer TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pases da mejores resultados (recomendado para imágenes de ISO bajo).\n1-pase es más rápido y es casi indistinguible del modo 3-pases para imágenes de ISO altas. TP_RAW_SENSOR_XTRANS_LABEL;Sensor con matriz X-Trans +TP_RAW_VNG4;VNG4 TP_RESIZE_APPLIESTO;Aplica a: TP_RESIZE_CROPPEDAREA;Área recortada TP_RESIZE_FITBOX;Rectángulo límite @@ -1326,6 +1897,86 @@ TP_RESIZE_SCALE;Escala TP_RESIZE_SPECIFY;Especificar: TP_RESIZE_W;An: TP_RESIZE_WIDTH;Anchura +TP_RETINEX_CONTEDIT_HSL;Ecualizador HSL del histograma +TP_RETINEX_CONTEDIT_LAB;Ecualizador L * a * b * del histograma +TP_RETINEX_CONTEDIT_LH;Ecualizador de tono +TP_RETINEX_CONTEDIT_MAP;Ecualizador de máscara +TP_RETINEX_CURVEEDITOR_CD;L=f(L) +TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminancia según luminancia L = f (L) \nCorregir datos sin procesar para reducir halos y elementos extraños. +TP_RETINEX_CURVEEDITOR_LH;Fuerza=f(H) +TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Fuerza según el tono Fuerza = f (H) \nEsta curva también actúa sobre el croma cuando se usa el método 'Resaltar' retinex. +TP_RETINEX_CURVEEDITOR_MAP;L=f(L) +TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;Esta curva se puede aplicar sola o con una máscara gaussiana o una máscara wavelet. \n¡Cuidado con los elementos extraños! +TP_RETINEX_EQUAL;Equalizador +TP_RETINEX_FREEGAMMA;Gamma libre +TP_RETINEX_GAIN;Aumentar +TP_RETINEX_GAINOFFS;Aumentar y Offset (brillo) +TP_RETINEX_GAINTRANSMISSION;Aumentar transmisión +TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplifique o reduzca el mapa de transmisión para lograr la luminancia. \nAbscisa: transmisión -min desde 0, media y valores (máx.). \nOrdena: ganancia. +TP_RETINEX_GAIN_TOOLTIP;Actúa sobre la imagen restaurada. \nÉsta es muy diferente de las otras configuraciones. Se utiliza para píxeles blancos o negros, y para ayudar a equilibrar el histograma. +TP_RETINEX_GAMMA;Gamma +TP_RETINEX_GAMMA_FREE;Libre +TP_RETINEX_GAMMA_HIGH;Alta +TP_RETINEX_GAMMA_LOW;Baja +TP_RETINEX_GAMMA_MID;Media +TP_RETINEX_GAMMA_NONE;Ninguna +TP_RETINEX_GAMMA_TOOLTIP;Restaura los tonos aplicando gamma antes y después de Retinex. Diferente de las curvas de Retinex u otras curvas (Lab, Exposición, etc.). +TP_RETINEX_GRAD;Gradiente de transmisión +TP_RETINEX_GRADS;Fuerza del Gradiente +TP_RETINEX_GRADS_TOOLTIP;Si el control deslizante está en 0, todas las iteraciones son idénticas. \nSi es mayor a 0, la fuerza se reduce cuando las iteraciones aumentan, y viceversa. +TP_RETINEX_GRAD_TOOLTIP;Si el control deslizante está en 0, todas las iteraciones son idénticas. \nSi es mayor a 0, la variación y el umbral se reducen cuando las iteraciones aumentan, y viceversa. +TP_RETINEX_HIGH;Alto +TP_RETINEX_HIGHLIG;Luces Altas +TP_RETINEX_HIGHLIGHT;Umbral de resaltado +TP_RETINEX_HIGHLIGHT_TOOLTIP;Aumente la acción del algoritmo alto. \nPuede requerir que vuelva a ajustar "Píxeles adyacentes" y aumentar la "Corrección de punto blanco" en la pestaña Sin formato -> Herramienta Puntos blancos sin procesar. +TP_RETINEX_HSLSPACE_LIN;HSL-Lineal +TP_RETINEX_HSLSPACE_LOG;HSL-Logarítmica +TP_RETINEX_ITER;Iteracciones (mapeo-tonos) +TP_RETINEX_ITERF;Mapeo de tonos +TP_RETINEX_ITER_TOOLTIP;Simule un operador de mapeo de tonos. \nLos valores altos aumentan el tiempo de procesamiento. +TP_RETINEX_LABEL;Retinex +TP_RETINEX_LABEL_MASK;Máscara +TP_RETINEX_LABSPACE;L*a*b* +TP_RETINEX_LOW;Bajo +TP_RETINEX_MAP;Método de máscara +TP_RETINEX_MAP_GAUS;Máscara Gaussian +TP_RETINEX_MAP_MAPP;Máscara de enfoque (wavelet partial) +TP_RETINEX_MAP_MAPT;Máscara de enfoque(wavelet total) +TP_RETINEX_MAP_METHOD_TOOLTIP;Use la máscara generada por la función gaussiana anterior (Radio, Método) para reducir los halos y los elementos extraños. \nCortar solo: aplique una curva de contraste diagonal en la máscara. \n¡Cuidado con los elementos extraños! \nMáscara gaussiana: genere y use un Desenfoque gaussiano de la máscara original. \nRápido. \nMáscara de corte: genere y use un wavelet en la máscara original. \nBajo. +TP_RETINEX_MAP_NONE;Ninguno +TP_RETINEX_MEDIAN;filtro de transmision mediana +TP_RETINEX_METHOD;Método +TP_RETINEX_METHOD_TOOLTIP;Baja = Reforzar la luz baja. \nUniforme = Ecualizar la acción. \nAlta = Reforzar la luz alta. \nLuces Altas = Eliminar magenta en las partes altas +TP_RETINEX_MLABEL;Restaurado sin turbidez Min. =% 1 Max =% 2. +TP_RETINEX_MLABEL_TOOLTIP;Debe estar cerca del mín = 0 máx = 32768 \nImagen restaurada sin mezcla. +TP_RETINEX_NEIGHBOR;Radio +TP_RETINEX_NEUTRAL;Restablecer +TP_RETINEX_NEUTRAL_TIP;Restablecer todos los controles deslizantes y curvas a sus valores predeterminados. +TP_RETINEX_OFFSET;compensar(brillo) +TP_RETINEX_SCALES;Gradiente gaussiano +TP_RETINEX_SCALES_TOOLTIP;Si el control deslizante está en 0, todas las iteraciones son idénticas. \nSi es mayor a 0 la escala y el radio se reducen cuando aumentan las iteraciones, y viceversa. +TP_RETINEX_SETTINGS;Ajustes +TP_RETINEX_SKAL;Escala +TP_RETINEX_SLOPE;Gamma Libre al bajarla +TP_RETINEX_STRENGTH;Fuerza +TP_RETINEX_THRESHOLD;Límite +TP_RETINEX_THRESHOLD_TOOLTIP; Límites de entrada/salida. \nEn = fuente de imagen,\nhacia afuera = imagen gauss. +TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4 +TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2 +TP_RETINEX_TLABEL_TOOLTIP;Resultado del mapa de transmisión. \nMin y Max son utilizados por diferencia.\nMean y Sigma. \nTm = Min TM = Max de mapa de transmisión. +TP_RETINEX_TRANF;transmisión +TP_RETINEX_TRANSMISSION;Mapa de transmisión +TP_RETINEX_TRANSMISSION_TOOLTIP;Transmisión según la transmisión. \nAbscisa: transmisión desde valores negativos (mín.), Media y valores positivos (máx.). \nDerecha: amplificación o reducción. +TP_RETINEX_UNIFORM;Uniforme +TP_RETINEX_VARIANCE;Contraste +TP_RETINEX_VARIANCE_TOOLTIP;La varianza baja aumenta el contraste y la saturación locales, pero puede producir elementos extraños. +TP_RETINEX_VIEW;Proceso +TP_RETINEX_VIEW_MASK;Máscara +TP_RETINEX_VIEW_METHOD_TOOLTIP;Estándar - Visualización normal. \nMascara - Muestra la máscara. \nUna máscara de enfoque - Muestra la imagen con una máscara de desenfoque de radio alto. \nTransmisión - Automática \nFija - Muestra el mapa de transmisión del archivo, antes de cualquier acción sobre contraste y brillo. \nAtención: la máscara no corresponde a la realidad, pero se amplifica para hacerla más visible. +TP_RETINEX_VIEW_NONE;Estandard +TP_RETINEX_VIEW_TRAN;Transmisión - Auto +TP_RETINEX_VIEW_TRAN2;Transmisión - Fija +TP_RETINEX_VIEW_UNSHARP;Máscara de enfoque TP_RGBCURVES_BLUE;B TP_RGBCURVES_CHANNEL;Canal TP_RGBCURVES_GREEN;G @@ -1368,6 +2019,10 @@ TP_SHARPENMICRO_AMOUNT;Cantidad TP_SHARPENMICRO_LABEL;Microcontraste TP_SHARPENMICRO_MATRIX;Matriz 3×3 en lugar de 5×5 TP_SHARPENMICRO_UNIFORMITY;Uniformidad +TP_TM_FATTAL_AMOUNT;Cantidad +TP_TM_FATTAL_ANCHORAncla +TP_TM_FATTAL_LABEL;HDR Mapeo de tonos +TP_TM_FATTAL_THRESHOLD;Límite TP_VIBRANCE_AVOIDCOLORSHIFT;Evitar desplazamiento de color TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tonos de piel @@ -1392,6 +2047,169 @@ TP_VIGNETTING_CENTER_Y;Centro Y TP_VIGNETTING_LABEL;Corrección de viñeteo TP_VIGNETTING_RADIUS;Radio TP_VIGNETTING_STRENGTH;Intensidad +TP_WAVELET_1;Nivel 1 +TP_WAVELET_2;Nivel 2 +TP_WAVELET_3;Nivel 3 +TP_WAVELET_4;Nivel 4 +TP_WAVELET_5;Nivel 5 +TP_WAVELET_6;Nivel 6 +TP_WAVELET_7;Nivel 7 +TP_WAVELET_8;Nivel 8 +TP_WAVELET_9;Nivel 9 +TP_WAVELET_APPLYTO;Aplicar para +TP_WAVELET_AVOID;Evitar el cambio de color +TP_WAVELET_B0;negro +TP_WAVELET_B1;Gris +TP_WAVELET_B2;Residual +TP_WAVELET_BACKGROUND;Fondo +TP_WAVELET_BACUR;Curva +TP_WAVELET_BALANCE;Balance de contraste d/v-h +TP_WAVELET_BALANCE_TOOLTIP;Altera el balance entre las direcciones wavelet: vertical-horizontal y diagonal. \nSi se activa el contraste, en el color o el mapeo de tonos residuales, el efecto debido al balance se amplifica. +TP_WAVELET_BALCHRO;Balance del color +TP_WAVELET_BALCHRO_TOOLTIP;Si está habilitado, la curva o el control deslizante 'Balance de contraste' también modifica el balance del color. +TP_WAVELET_BANONE;Ninguno +TP_WAVELET_BASLI;Deslizador +TP_WAVELET_BATYPE;Método de balance de contraste +TP_WAVELET_CBENAB;Tonificación y balance de color +TP_WAVELET_CB_TOOLTIP;Para valores fuertes, el tono del color del producto se combina o no con la descomposición de niveles 'tonificación' \nPara valores bajos, puede cambiar el balance de blancos del fondo (cielo, ...) sin cambiar el del plano frontal, generalmente más contrastado +TP_WAVELET_CCURVE;Contraste local +TP_WAVELET_CH1;gamma completa del color +TP_WAVELET_CH2;Saturado/pastel +TP_WAVELET_CH3;Enlazar con los niveles de contraste +TP_WAVELET_CHCU;Curva +TP_WAVELET_CHR;Fuerza de enlace con el contraste del color +TP_WAVELET_CHRO;Umbral saturado/pastel +TP_WAVELET_CHRO_TOOLTIP;Establece el nivel de wavelet que será el umbral entre los colores saturados y pastel. \n1-x: saturado \nx-9: pastel \nSi el valor supera la cantidad de niveles de wavelet que está utilizando, se ignorará. +TP_WAVELET_CHR_TOOLTIP;Ajusta el color en función de los "niveles de contraste" y la "fuerza de enlace del contraste de croma" +TP_WAVELET_CHSL;Deslizadores +TP_WAVELET_CHTYPE;Método de crominancia +TP_WAVELET_COLORT;Opacidad rojo-verde +TP_WAVELET_COMPCONT;Contraste +TP_WAVELET_COMPGAMMA;Gamma de compresión +TP_WAVELET_COMPGAMMA_TOOLTIP;Ajustar la gamma de la imagen residual le permite equilibrar los datos y el histograma. +TP_WAVELET_COMPTM;Mapeo de tonos +TP_WAVELET_CONTEDIT;'Después',Curva de contraste +TP_WAVELET_CONTR;Gamma +TP_WAVELET_CONTRA;Contraste +TP_WAVELET_CONTRAST_MINUS;Contraste - +TP_WAVELET_CONTRAST_PLUS;Contraste + +TP_WAVELET_CONTRA_TOOLTIP;Cambia el contraste de la imagen residual. +TP_WAVELET_CTYPE;Control de crominancia +TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifica el contraste local como una función del contraste local original (abscisa). \nLos valores bajos de abscisa representan un contraste local pequeño (valores reales aproximadamente 10 ... 20). \n50% de abscisa representa el contraste local promedio (valor real aproximadamente 100..300) . \n66% de abscisas representa la desviación estándar del contraste local (valor real de aproximadamente 300 ... 800). \n100% de abscisa representa el máximo contraste local (valor real de aproximadamente 3000 ... 8000). +TP_WAVELET_CURVEEDITOR_CH;Niveles de contrate=f(Matiz) +TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifica el contraste de cada nivel en función del tono. \nTenga cuidado de no sobrescribir los cambios realizados con los controles de tono de la subherramienta Gamut. \nLa curva solo tendrá efecto cuando los controles deslizantes del nivel de contraste de wavelets no sean cero. +TP_WAVELET_CURVEEDITOR_CL;L +TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Aplica una curva de luminancia de contraste definitiva al final del tratamiento con wavelets. +TP_WAVELET_CURVEEDITOR_HH;HH +TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifica el matiz de la imagen residual en función del matiz. +TP_WAVELET_DALL;Todas las direcciones +TP_WAVELET_DAUB;Cualidad del borde +TP_WAVELET_DAUB2;D2 - bajo +TP_WAVELET_DAUB4;D4 - estandar +TP_WAVELET_DAUB6;D6 - estándar mayor +TP_WAVELET_DAUB10;D10 - medio +TP_WAVELET_DAUB14;D14 - alto +TP_WAVELET_DAUB_TOOLTIP;Cambios en los coeficientes de Daubechies: \nD4 = Estándar, \nD14 = A menudo, el mejor rendimiento, un 10% más de tiempo. \nAfecta la detección de bordes, así como la calidad general de los primeros niveles. Sin embargo, la calidad no está estrictamente relacionada con este coeficiente y puede variar con las imágenes y los usos. +TP_WAVELET_DONE;Vertical +TP_WAVELET_DTHR;Diagonal +TP_WAVELET_DTWO;Horizontal +TP_WAVELET_EDCU;Curva +TP_WAVELET_EDGCONT;Contraste local +TP_WAVELET_EDGCONT_TOOLTIP;El ajuste de los puntos a la izquierda disminuye el contraste, y a la derecha lo aumenta. \nAbajo-izquierda, Arriba-Izquierda, Arriba-Derecha, Abajo-derecha \nRepresenta respectivamente el contraste local para valores bajos, media, mean + stdev, máxima +TP_WAVELET_EDGE;Nitidez del borde +TP_WAVELET_EDGEAMPLI;Amplificación de base +TP_WAVELET_EDGEDETECT;Sensibilidad de gradiente +TP_WAVELET_EDGEDETECTTHR;Umbral bajo (ruido) +TP_WAVELET_EDGEDETECTTHR2;Umbral alto (detección) +TP_WAVELET_EDGEDETECTTHR_TOOLTIP;Este ajustador le permite trabajar la detección de bordes, por ejemplo, para evitar aplicar la nitidez de los bordes a detalles finos, como el ruido en el cielo. +TP_WAVELET_EDGEDETECT_TOOLTIP;Al mover el control deslizante hacia la derecha aumenta la sensibilidad del borde. Esto afecta el contraste local, la configuración de borde y el ruido. +TP_WAVELET_EDGESENSI;Sensibilidad del borde +TP_WAVELET_EDGREINF_TOOLTIP;Refuerza o reduce la acción del primer nivel, hace lo contrario con el segundo nivel y deja el resto sin cambios. +TP_WAVELET_EDGTHRESH;Detalle +TP_WAVELET_EDGTHRESH_TOOLTIP;Cambiar el reparto entre los primeros niveles y los demás. Cuanto más alto sea el umbral, más se centrará la acción en los primeros niveles. Tenga cuidado con los valores negativos, aumentan la acción de los niveles altos y pueden producir elementos extraños +TP_WAVELET_EDRAD;Radio +TP_WAVELET_EDRAD_TOOLTIP;Este ajuste de radio es muy diferente de aquellos en otras herramientas de enfoque. Su valor se compara con cada nivel a través de una función compleja. En este sentido, un valor de cero todavía tiene un efecto +TP_WAVELET_EDSL;Deslizadores de umbral +TP_WAVELET_EDTYPE;Método de contraste local +TP_WAVELET_EDVAL;Fuerza +TP_WAVELET_FINAL;Retoque final +TP_WAVELET_FINEST;Mejor +TP_WAVELET_HIGHLIGHT;Rango de luminancia +TP_WAVELET_HS1;Rango de luminancia total +TP_WAVELET_HS2;Sombras/Luces altas +TP_WAVELET_HUESKIN;Tono de piel +TP_WAVELET_HUESKIN_TOOLTIP;Los puntos inferiores establecen el comienzo de la zona de transición, y los puntos superiores el final de la misma, donde el efecto es máximo.\nSi necesita mover el área significativamente, o si hay elementos extraños, es porque el balance de blancos es incorrecto +TP_WAVELET_HUESKY;Tono del cielo +TP_WAVELET_HUESKY_TOOLTIP;Los puntos inferiores establecen el comienzo de la zona de transición, y los puntos superiores el final de la misma, donde el efecto es máximo. \nSi necesita mover el área significativamente, o si hay elementos extraños, entonces el balance de blancos es incorrecto . +TP_WAVELET_ITER;Niveles de equilibrio delta +TP_WAVELET_ITER_TOOLTIP;Izquierda: aumenta los niveles bajos y reduce los niveles altos, \nDerecha: reduce los niveles bajos y aumenta los niveles altos. +TP_WAVELET_LABEL;Niveles wavelet +TP_WAVELET_LARGEST;Más grueso +TP_WAVELET_LEVCH;Cromaticidad(Color): saturación ó pureza +TP_WAVELET_LEVDIR_ALL;Todos los nivels en todas las direcciones. +TP_WAVELET_LEVDIR_INF;Por debajo o igual al nivel +TP_WAVELET_LEVDIR_ONE;Un solo nivel +TP_WAVELET_LEVDIR_SUP;Por encima del nivel +TP_WAVELET_LEVELS;Niveles wavelet +TP_WAVELET_LEVELS_TOOLTIP;Elija la cantidad de niveles de detalle en que se descompondrá la imagen. Más niveles requieren más RAM y más tiempo de procesamiento. +TP_WAVELET_LEVF;Contraste +TP_WAVELET_LEVLABEL;Vista previa de los niveles máximos posibles = %1 +TP_WAVELET_LEVONE;Nivel 2 +TP_WAVELET_LEVTHRE;Nivel 4 +TP_WAVELET_LEVTWO;Nivel 3 +TP_WAVELET_LEVZERO;Nivel 1 +TP_WAVELET_LINKEDG;Enlaza con la fuerza de la nitidez de los bordes +TP_WAVELET_LIPST;Algoritmo mejorado +TP_WAVELET_LOWLIGHT;Rango de luminancia de la sombra +TP_WAVELET_MEDGREINF;Primer nivel +TP_WAVELET_MEDI;Reduce los elementos extraños en el cielo azul +TP_WAVELET_MEDILEV;Detección de bordes +TP_WAVELET_MEDILEV_TOOLTIP;Cuando habilita la detección de bordes, se recomienda: \nTener los niveles de bajo contraste deshabilitados para evitar elementos extraños, \nusar para valores altos de sensibilidad de gradiente. \nPuede modular la fuerza con 'enfocar' desde quitar ruido y enfocar. +TP_WAVELET_NEUTRAL;Neutral +TP_WAVELET_NOIS;Quitar ruido +TP_WAVELET_NOISE;Quitar ruido y clarificar +TP_WAVELET_NPHIGH;Alto +TP_WAVELET_NPLOW;Bajo +TP_WAVELET_NPNONE;Ninguno +TP_WAVELET_NPTYPE;Píxeles vecinos +TP_WAVELET_NPTYPE_TOOLTIP;Este algoritmo utiliza la proximidad de un píxel y ocho de sus vecinos. Si hay una diferencia menor, los bordes se refuerzan. +TP_WAVELET_OPACITY;Opacidad Azul-Amarillo +TP_WAVELET_OPACITYW; Curva de balance d/v-h para contrast +TP_WAVELET_OPACITYWL;Contraste local final +TP_WAVELET_OPACITYWL_TOOLTIP;Modifica el contraste local definitivo al final del tratamiento wavelet \ nEl lado izquierdo representa el contraste local más pequeño, avanzando hacia la derecha el contraste local más grande +TP_WAVELET_PASTEL;Cromaticidad(colores) pastel +TP_WAVELET_PROC;Proceso +TP_WAVELET_RE1;Reforzado +TP_WAVELET_RE2;Sin alterar +TP_WAVELET_RE3;Reducir +TP_WAVELET_RESCHRO;Cromaticidad(aquí saturación) +TP_WAVELET_RESCON;Sombras +TP_WAVELET_RESCONH;Luces altas(Reflejos) +TP_WAVELET_RESID;Imagen residual +TP_WAVELET_SAT;Saturar la cromaticidad(color) +TP_WAVELET_SETTINGS;Configuraciones Wavelet +TP_WAVELET_SKIN;Enfocar piel/proteción +TP_WAVELET_SKIN_TOOLTIP;A (menos)-100 los tonos de piel están afectados. \nA 0 todos los tonos se tratan por igual. \nA +100 los tonos de piel están protegidos, mientras que todos los demás tonos están afectados. +TP_WAVELET_SKY;protección del cielo al enfocar +TP_WAVELET_SKY_TOOLTIPEn (menos)-100se afecta a los tonos del cielo. \nEn 0 todos los tonos se tratan por igual. \nen +100 los tonos del cielo están protegidos, mientras que todos los demás tonos están afectados. +TP_WAVELET_STREN;Fuerza +TP_WAVELET_STRENGTH;Fuerza +TP_WAVELET_SUPE;Extra +TP_WAVELET_THR;Límite de la sombra +TP_WAVELET_THRESHOLD;Niveles de luces altas +TP_WAVELET_THRESHOLD2;Niveles de sombra +TP_WAVELET_THRESHOLD2_TOOLTIP;Solo los niveles entre 9 y 9 menos el valor se verán afectados por el rango de luminancia de la sombra. Otros niveles serán tratados completamente. El nivel más alto posible está limitado por el valor del nivel de resaltado (9 menos el valor del nivel de resaltado) +TP_WAVELET_THRESHOLD_TOOLTIP;Solo los niveles más allá del valor elegido se verán afectados por el rango de luminancia de resaltado. Otros niveles serán tratados completamente. El valor elegido aquí limita el valor más alto posible de la sombra.niveles +TP_WAVELET_THRH;Umbral de luces altas +TP_WAVELET_TILESBIG;Mosaicos grandes +TP_WAVELET_TILESFULL;Imagen completa +TP_WAVELET_TILESIZE;Método de mosaico +TP_WAVELET_TILESLIT;Mosaicos pequeños +TP_WAVELET_TILES_TOOLTIP;El procesamiento de la imagen completa conduce a una mejor calidad y es la opción recomendada, mientras que el uso de mosaicos es una solución alternativa para los usuarios con poca memoria RAM. Consulte RawPedia para los requisitos de memoria. +TP_WAVELET_TMSTRENGTH;Fuerza comprensiva +TP_WAVELET_TMSTRENGTH_TOOLTIP;Controle la intensidad del mapeo de tonos o la compresión de contraste de la imagen residual. Cuando el valor es diferente de 0 , los controles deslizantes Fuerza y ​​Gamma de la herramienta de asignación de tonos en la pestaña Exposición se atenuarán. +TP_WAVELET_TMTYPE;Método de compresión +TP_WAVELET_TON;Viraje TP_WBALANCE_AUTO;Auto TP_WBALANCE_CAMERA;Cámara TP_WBALANCE_CLOUDY;Nublado @@ -1433,6 +2251,8 @@ TP_WBALANCE_SOLUX41;Solux 4100K TP_WBALANCE_SOLUX47;Solux 4700K (proveedor) TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery) TP_WBALANCE_SPOTWB;Muestra bal. blancos +TP_WBALANCE_TEMPBIAS;Sesgo de temperatura AWB +TP_WBALANCE_TEMPBIAS_TOOLTIP;Permite alterar el cálculo del "balance de blancos automático" \ndirigiéndolo hacia temperaturas más cálidas o más bajas. \nEl sesgo se expresa como un porcentaje de la temperatura calculada, por lo que el resultado viene dado por "computedTemp + computedTemp * bias". TP_WBALANCE_TEMPERATURE;Temperatura TP_WBALANCE_TUNGSTEN;Tungsteno TP_WBALANCE_WATER1;Subacuático 1 @@ -1441,6 +2261,7 @@ TP_WBALANCE_WATER_HEADER;Subacuático ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Abrir (nueva) ventana de detalle ZOOMPANEL_ZOOM100;Zoom al 100%\nAtajo: z +ZOOMPANEL_ZOOMFITCROPSCREEN;Ajustar el recorte a la pantalla \nCorte corto: f ZOOMPANEL_ZOOMFITSCREEN;Ajustar a pantalla\nAtajo: Alt-f ZOOMPANEL_ZOOMIN;Aumentar Zoom\nAtajo: + ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - @@ -1449,246 +2270,16 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - ! 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. -!BATCHQUEUE_STARTSTOPHINT;Start or stop processing the images in the queue.\n\nShortcut: Ctrl+s -!CURVEEDITOR_AXIS_IN;I: -!CURVEEDITOR_AXIS_LEFT_TAN;LT: -!CURVEEDITOR_AXIS_OUT;O: -!CURVEEDITOR_AXIS_RIGHT_TAN;RT: -!CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. -!DONT_SHOW_AGAIN;Don't show this message again. -!DYNPROFILEEDITOR_DELETE;Delete -!DYNPROFILEEDITOR_EDIT;Edit -!DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule -!DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression. !DYNPROFILEEDITOR_IMGTYPE_ANY;Any !DYNPROFILEEDITOR_IMGTYPE_HDR;HDR !DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift !DYNPROFILEEDITOR_IMGTYPE_STD;Standard -!DYNPROFILEEDITOR_MOVE_DOWN;Move Down -!DYNPROFILEEDITOR_MOVE_UP;Move Up -!DYNPROFILEEDITOR_NEW;New -!DYNPROFILEEDITOR_NEW_RULE;New Dynamic Profile Rule -!DYNPROFILEEDITOR_PROFILE;Processing Profile !EXIFFILTER_IMAGETYPE;Image type -!EXIFPANEL_SHOWALL;Show all -!EXPORT_BYPASS;Processing steps to bypass -!EXPORT_BYPASS_EQUALIZER;Bypass Wavelet Levels -!EXPORT_PIPELINE;Processing pipeline -!EXPORT_USE_FAST_PIPELINE;Dedicated (full processing on resized image) -!EXPORT_USE_FAST_PIPELINE_TIP;Use a dedicated processing pipeline for images in Fast Export mode, that trades speed for quality. Resizing of the image is done as early as possible, instead of doing it at the end like in the normal pipeline. The speedup can be significant, but be prepared to see artifacts and a general degradation of output quality. -!EXPORT_USE_NORMAL_PIPELINE;Standard (bypass some steps, resize at the end) -!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles -!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles -!FILEBROWSER_POPUPCOLORLABEL0;Label: None -!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default -!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images. -!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. -!FILECHOOSER_FILTER_ANY;All files -!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc) -!FILECHOOSER_FILTER_CURVE;Curve files -!FILECHOOSER_FILTER_LCP;Lens correction profiles -!FILECHOOSER_FILTER_PP;Processing profiles -!FILECHOOSER_FILTER_SAME;Same format as current photo -!FILECHOOSER_FILTER_TIFF;TIFF files -!GENERAL_APPLY;Apply -!GENERAL_ASIMAGE;As Image !GENERAL_CURRENT;Current -!GENERAL_OPEN;Open !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... -!GENERAL_SLIDER;Slider -!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP. !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram. -!HISTORY_MSG_166;Exposure - Reset -!HISTORY_MSG_173;NR - Detail recovery -!HISTORY_MSG_203;NR - Color space -!HISTORY_MSG_235;B&W - CM - Auto -!HISTORY_MSG_237;B&W - CM -!HISTORY_MSG_256;NR - Median - Type -!HISTORY_MSG_273;CT - Color Balance SMH -!HISTORY_MSG_297;NR - Mode -!HISTORY_MSG_299;NR - Chrominance curve -!HISTORY_MSG_300;- -!HISTORY_MSG_301;NR - Luma control -!HISTORY_MSG_302;NR - Chroma method -!HISTORY_MSG_303;NR - Chroma method -!HISTORY_MSG_304;W - Contrast levels -!HISTORY_MSG_305;Wavelet Levels -!HISTORY_MSG_306;W - Process -!HISTORY_MSG_307;W - Process -!HISTORY_MSG_308;W - Process direction -!HISTORY_MSG_309;W - ES - Detail -!HISTORY_MSG_310;W - Residual - Sky tar/prot -!HISTORY_MSG_311;W - Wavelet levels -!HISTORY_MSG_312;W - Residual - Shadows threshold -!HISTORY_MSG_313;W - Chroma - Sat/past -!HISTORY_MSG_314;W - Gamut - Reduce artifacts -!HISTORY_MSG_315;W - Residual - Contrast -!HISTORY_MSG_316;W - Gamut - Skin tar/prot -!HISTORY_MSG_317;W - Gamut - Skin hue -!HISTORY_MSG_318;W - Contrast - Highlight levels -!HISTORY_MSG_319;W - Contrast - Highlight range -!HISTORY_MSG_320;W - Contrast - Shadow range -!HISTORY_MSG_321;W - Contrast - Shadow levels -!HISTORY_MSG_322;W - Gamut - Avoid color shift -!HISTORY_MSG_323;W - ES - Local contrast -!HISTORY_MSG_324;W - Chroma - Pastel -!HISTORY_MSG_325;W - Chroma - Saturated -!HISTORY_MSG_326;W - Chroma - Method -!HISTORY_MSG_327;W - Contrast - Apply to -!HISTORY_MSG_328;W - Chroma - Link strength -!HISTORY_MSG_329;W - Toning - Opacity RG -!HISTORY_MSG_330;W - Toning - Opacity BY -!HISTORY_MSG_331;W - Contrast levels - Extra -!HISTORY_MSG_332;W - Tiling method -!HISTORY_MSG_333;W - Residual - Shadows -!HISTORY_MSG_334;W - Residual - Chroma -!HISTORY_MSG_335;W - Residual - Highlights -!HISTORY_MSG_336;W - Residual - Highlights threshold -!HISTORY_MSG_337;W - Residual - Sky hue -!HISTORY_MSG_338;W - ES - Radius -!HISTORY_MSG_339;W - ES - Strength -!HISTORY_MSG_340;W - Strength -!HISTORY_MSG_341;W - Edge performance -!HISTORY_MSG_342;W - ES - First level -!HISTORY_MSG_343;W - Chroma levels -!HISTORY_MSG_344;W - Meth chroma sl/cur -!HISTORY_MSG_345;W - ES - Local contrast -!HISTORY_MSG_346;W - ES - Local contrast method -!HISTORY_MSG_347;W - Denoise - Level 1 -!HISTORY_MSG_348;W - Denoise - Level 2 -!HISTORY_MSG_349;W - Denoise - Level 3 -!HISTORY_MSG_350;W - ES - Edge detection -!HISTORY_MSG_351;W - Residual - HH curve -!HISTORY_MSG_352;W - Background -!HISTORY_MSG_353;W - ES - Gradient sensitivity -!HISTORY_MSG_354;W - ES - Enhanced -!HISTORY_MSG_355;W - ES - Threshold low -!HISTORY_MSG_356;W - ES - Threshold high -!HISTORY_MSG_357;W - Denoise - Link with ES -!HISTORY_MSG_358;W - Gamut - CH -!HISTORY_MSG_359;Hot/Dead - Threshold -!HISTORY_MSG_360;TM - Gamma -!HISTORY_MSG_361;W - Final - Chroma balance -!HISTORY_MSG_362;W - Residual - Compression method -!HISTORY_MSG_363;W - Residual - Compression strength -!HISTORY_MSG_364;W - Final - Contrast balance -!HISTORY_MSG_365;W - Final - Delta balance -!HISTORY_MSG_366;W - Residual - Compression gamma -!HISTORY_MSG_367;W - Final - 'After' contrast curve -!HISTORY_MSG_368;W - Final - Contrast balance -!HISTORY_MSG_369;W - Final - Balance method -!HISTORY_MSG_370;W - Final - Local contrast curve -!HISTORY_MSG_371;Post-Resize Sharpening -!HISTORY_MSG_372;PRS USM - Radius -!HISTORY_MSG_373;PRS USM - Amount -!HISTORY_MSG_374;PRS USM - Threshold -!HISTORY_MSG_375;PRS USM - Sharpen only edges -!HISTORY_MSG_376;PRS USM - Edge detection radius -!HISTORY_MSG_377;PRS USM - Edge tolerance -!HISTORY_MSG_378;PRS USM - Halo control -!HISTORY_MSG_379;PRS USM - Halo control amount -!HISTORY_MSG_380;PRS - Method -!HISTORY_MSG_381;PRS RLD - Radius -!HISTORY_MSG_382;PRS RLD - Amount -!HISTORY_MSG_383;PRS RLD - Damping -!HISTORY_MSG_384;PRS RLD - Iterations -!HISTORY_MSG_385;W - Residual - Color Balance -!HISTORY_MSG_386;W - Residual - CB green high -!HISTORY_MSG_387;W - Residual - CB blue high -!HISTORY_MSG_388;W - Residual - CB green mid -!HISTORY_MSG_389;W - Residual - CB blue mid -!HISTORY_MSG_390;W - Residual - CB green low -!HISTORY_MSG_391;W - Residual - CB blue low -!HISTORY_MSG_392;W - Residual - Color Balance -!HISTORY_MSG_393;DCP - Look table -!HISTORY_MSG_394;DCP - Baseline exposure -!HISTORY_MSG_395;DCP - Base table -!HISTORY_MSG_396;W - Contrast sub-tool -!HISTORY_MSG_397;W - Chroma sub-tool -!HISTORY_MSG_398;W - ES sub-tool -!HISTORY_MSG_399;W - Residual sub-tool -!HISTORY_MSG_400;W - Final sub-tool -!HISTORY_MSG_401;W - Toning sub-tool -!HISTORY_MSG_402;W - Denoise sub-tool -!HISTORY_MSG_403;W - ES - Edge sensitivity -!HISTORY_MSG_404;W - ES - Base amplification -!HISTORY_MSG_405;W - Denoise - Level 4 -!HISTORY_MSG_406;W - ES - Neighboring pixels -!HISTORY_MSG_407;Retinex - Method -!HISTORY_MSG_408;Retinex - Radius -!HISTORY_MSG_409;Retinex - Contrast -!HISTORY_MSG_410;Retinex - Offset -!HISTORY_MSG_411;Retinex - Strength -!HISTORY_MSG_412;Retinex - Gaussian gradient -!HISTORY_MSG_413;Retinex - Contrast -!HISTORY_MSG_414;Retinex - Histogram - Lab -!HISTORY_MSG_415;Retinex - Transmission -!HISTORY_MSG_416;Retinex -!HISTORY_MSG_417;Retinex - Transmission median -!HISTORY_MSG_418;Retinex - Threshold -!HISTORY_MSG_419;Retinex - Color space -!HISTORY_MSG_420;Retinex - Histogram - HSL -!HISTORY_MSG_421;Retinex - Gamma -!HISTORY_MSG_422;Retinex - Gamma -!HISTORY_MSG_423;Retinex - Gamma slope -!HISTORY_MSG_424;Retinex - HL threshold -!HISTORY_MSG_425;Retinex - Log base -!HISTORY_MSG_426;Retinex - Hue equalizer -!HISTORY_MSG_427;Output rendering intent -!HISTORY_MSG_428;Monitor rendering intent -!HISTORY_MSG_429;Retinex - Iterations -!HISTORY_MSG_430;Retinex - Transmission gradient -!HISTORY_MSG_431;Retinex - Strength gradient -!HISTORY_MSG_432;Retinex - M - Highlights -!HISTORY_MSG_433;Retinex - M - Highlights TW -!HISTORY_MSG_434;Retinex - M - Shadows -!HISTORY_MSG_435;Retinex - M - Shadows TW -!HISTORY_MSG_436;Retinex - M - Radius -!HISTORY_MSG_437;Retinex - M - Method -!HISTORY_MSG_438;Retinex - M - Equalizer -!HISTORY_MSG_439;Retinex - Process -!HISTORY_MSG_440;CbDL - Method -!HISTORY_MSG_441;Retinex - Gain transmission -!HISTORY_MSG_442;Retinex - Scale -!HISTORY_MSG_443;Output black point compensation -!HISTORY_MSG_444;WB - Temp bias -!HISTORY_MSG_445;Raw sub-image -!HISTORY_MSG_449;PS - ISO adaption -!HISTORY_MSG_452;PS - Show motion -!HISTORY_MSG_453;PS - Show mask only -!HISTORY_MSG_457;PS - Check red/blue -!HISTORY_MSG_462;PS - Check green -!HISTORY_MSG_464;PS - Blur motion mask -!HISTORY_MSG_465;PS - Blur radius -!HISTORY_MSG_468;PS - Fill holes -!HISTORY_MSG_469;PS - Median -!HISTORY_MSG_471;PS - Motion correction -!HISTORY_MSG_472;PS - Smooth transitions -!HISTORY_MSG_473;PS - Use LMMSE -!HISTORY_MSG_474;PS - Equalize -!HISTORY_MSG_475;PS - Equalize channel -!HISTORY_MSG_476;CAM02 - Temp out -!HISTORY_MSG_477;CAM02 - Green out -!HISTORY_MSG_478;CAM02 - Yb out -!HISTORY_MSG_479;CAM02 - CAT02 adaptation out -!HISTORY_MSG_480;CAM02 - Automatic CAT02 out -!HISTORY_MSG_481;CAM02 - Temp scene -!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_488;Dynamic Range Compression -!HISTORY_MSG_489;DRC - Detail -!HISTORY_MSG_490;DRC - Amount -!HISTORY_MSG_491;White Balance -!HISTORY_MSG_492;RGB Curves -!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors -!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction !HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel !HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;CT - region C mask @@ -1708,19 +2299,12 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !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_HISTMATCHING;Auto-matched tone curve !HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries !HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D !HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type !HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma !HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope !HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method -!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount -!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness -!HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast -!HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Local Contrast - Lightness -!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius -!HISTORY_MSG_METADATA_MODE;Metadata copy mode !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction @@ -1734,7 +2318,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !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 @@ -1776,174 +2359,41 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... !ICCPROFCREATOR_SLOPE;Slope !ICCPROFCREATOR_TRC_PRESET;Tone response curve: -!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. -!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. -!IPTCPANEL_COPYRIGHT;Copyright notice -!IPTCPANEL_COPYRIGHTHINT;Enter a Notice on the current owner of the Copyright for this image, such as ©2008 Jane Doe. -!IPTCPANEL_COUNTRYHINT;Enter the name of the country pictured in this image. -!IPTCPANEL_CREATOR;Creator -!IPTCPANEL_CREATORHINT;Enter the name of the person that created this image. -!IPTCPANEL_CREATORJOBTITLE;Creator's job title -!IPTCPANEL_CREATORJOBTITLEHINT;Enter the Job Title of the person listed in the Creator field. -!IPTCPANEL_DATECREATEDHINT;Enter the Date the image was taken. -!IPTCPANEL_DESCRIPTION;Description -!IPTCPANEL_DESCRIPTIONHINT;Enter a "caption" describing the who, what, and why of what is happening in this image, this might include names of people, and/or their role in the action that is taking place within the image. -!IPTCPANEL_DESCRIPTIONWRITER;Description writer -!IPTCPANEL_DESCRIPTIONWRITERHINT;Enter the name of the person involved in writing, editing or correcting the description of the image. -!IPTCPANEL_HEADLINEHINT;Enter a brief publishable synopsis or summary of the contents of the image. -!IPTCPANEL_INSTRUCTIONSHINT;Enter information about embargoes, or other restrictions not covered by the Copyright field. -!IPTCPANEL_KEYWORDSHINT;Enter any number of keywords, terms or phrases used to express the subject matter in the image. -!IPTCPANEL_PROVINCE;Province or state -!IPTCPANEL_PROVINCEHINT;Enter the name of the province or state pictured in this image. -!IPTCPANEL_SOURCEHINT;Enter or edit the name of a person or party who has a role in the content supply chain, such as a person or entity from whom you received this image from. -!IPTCPANEL_SUPPCATEGORIES;Supplemental categories -!IPTCPANEL_SUPPCATEGORIESHINT;Further refines the subject of the image. -!IPTCPANEL_TITLEHINT;Enter a short verbal and human readable name for the image, this may be the file name. -!IPTCPANEL_TRANSREFERENCE;Job ID -!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking. !MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue. -!MAIN_TAB_ADVANCED;Advanced -!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w -!MAIN_TAB_INSPECT; Inspect -!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: middle grey\nShortcut: 9 !MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the sharpening contrast mask.\nShortcut: p\n\nOnly works when sharpening is enabled and zoom >= 100%. -!MONITOR_PROFILE_SYSTEM;System default -!NAVIGATOR_B;B: -!NAVIGATOR_G;G: -!NAVIGATOR_H;H: -!NAVIGATOR_LAB_A;a*: -!NAVIGATOR_LAB_B;b*: -!NAVIGATOR_LAB_L;L*: -!NAVIGATOR_R;R: -!NAVIGATOR_S;S: -!NAVIGATOR_V;V: -!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. -!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. -!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. -!PARTIALPASTE_ADVANCEDGROUP;Advanced Settings !PARTIALPASTE_DEHAZE;Haze removal -!PARTIALPASTE_EQUALIZER;Wavelet levels -!PARTIALPASTE_GRADIENT;Graduated filter -!PARTIALPASTE_LOCALCONTRAST;Local contrast -!PARTIALPASTE_METADATA;Metadata mode !PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA avoid color shift -!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_BORDER;Raw border -!PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift -!PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_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_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_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_CURVEBBOXPOS;Position of curve copy & paste buttons -!PREFERENCES_CURVEBBOXPOS_ABOVE;Above -!PREFERENCES_CURVEBBOXPOS_BELOW;Below -!PREFERENCES_CURVEBBOXPOS_LEFT;Left -!PREFERENCES_CURVEBBOXPOS_RIGHT;Right !PREFERENCES_D50_OLD;5000K -!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 -!PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser. -!PREFERENCES_GREY18_OLD;Yb=18 CIE L#50 -!PREFERENCES_GREYSC;Scene Yb luminance (%) -!PREFERENCES_GREYSC18;Yb=18 CIE L#50 -!PREFERENCES_GREYSCA;Automatic -!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_LANG;Language -!PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders -!PREFERENCES_MONINTENT;Default rendering intent -!PREFERENCES_MONITOR;Monitor -!PREFERENCES_MONPROFILE;Default color profile -!PREFERENCES_MONPROFILE_WARNOSX;Due to MacOS limitations, only sRGB is supported. -!PREFERENCES_NAVIGATIONFRAME;Navigation -!PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP;Overlay filenames on thumbnails in the editor pannel -!PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list. -!PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list. !PREFERENCES_PERFORMANCE_THREADS;Threads !PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic) -!PREFERENCES_PREVDEMO;Preview Demosaic Method -!PREFERENCES_PREVDEMO_FAST;Fast -!PREFERENCES_PREVDEMO_LABEL;Demosaicing method used for the preview at <100% zoom: -!PREFERENCES_PREVDEMO_SIDECAR;As in PP3 -!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_DYNAMICPROFILE;Dynamic Profile Rules -!PREFERENCES_TAB_PERFORMANCE;Performance +!PREFERENCES_SND_THRESHOLDSECS;After seconds !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 -!QINFO_FRAMECOUNT;%2 frames -!QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) -!SAMPLEFORMAT_0;Unknown data format -!SAMPLEFORMAT_1;8-bit unsigned -!SAMPLEFORMAT_2;16-bit unsigned !SAMPLEFORMAT_4;24-bit LogLuv !SAMPLEFORMAT_8;32-bit LogLuv -!SAMPLEFORMAT_16;16-bit floating-point !SAMPLEFORMAT_32;24-bit floating-point !SAMPLEFORMAT_64;32-bit floating-point !SAVEDLG_FILEFORMAT_FLOAT; floating-point -!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. -!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. -!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!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 -!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_ABSOLUTELUMINANCE;Absolute luminance !TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;When setting manually, values above 65 are recommended. -!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output] !TP_COLORAPP_MEANLUMINANCE;Mean luminance (Yb%) -!TP_COLORAPP_NEUTRAL;Reset -!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values -!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504 -!TP_COLORTONING_LABGRID;L*a*b* color correction grid -!TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nS: a=%3 b=%4 +!TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Absolute luminance of the viewing environment\n(usually 16 cd/m²). !TP_COLORTONING_LABREGIONS;Color correction regions !TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2 !TP_COLORTONING_LABREGION_CHANNEL;Channel @@ -1963,74 +2413,18 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_COLORTONING_LABREGION_SATURATION;Saturation !TP_COLORTONING_LABREGION_SHOWMASK;Show mask !TP_COLORTONING_LABREGION_SLOPE;Slope -!TP_CROP_GTHARMMEANS;Harmonic Means -!TP_CROP_GTTRIANGLE1;Golden Triangles 1 -!TP_CROP_GTTRIANGLE2;Golden Triangles 2 !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_DIRPYRDENOISE_CHROMINANCE_AMZ;Auto multi-zones -!TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;Automatic global -!TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Try to evaluate chroma noise\nBe careful, this calculation is average, and is quite subjective ! -!TP_DIRPYRDENOISE_CHROMINANCE_CURVE;Chrominance curve -!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. -!TP_DIRPYRDENOISE_CHROMINANCE_FRAME;Chrominance -!TP_DIRPYRDENOISE_CHROMINANCE_MANUAL;Manual -!TP_DIRPYRDENOISE_CHROMINANCE_METHOD;Method -!TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings. -!TP_DIRPYRDENOISE_CHROMINANCE_METHOD_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nAutomatic multi-zones\nNo preview - works only during saving, but using the "Preview" method by matching the tile size and center to the preview size and center you can get an idea of the expected results.\nThe image is divided into tiles (about 10 to 70 depending on image size) and each tile receives its own chrominance noise reduction settings.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings. -!TP_DIRPYRDENOISE_CHROMINANCE_PMZ;Preview multi-zones -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW;Preview -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;Displays the remaining noise levels of the part of the image visible in the preview after wavelet.\n\n>300 Very noisy\n100-300 Noisy\n50-100 A little noisy\n<50 Very low noise\n\nBeware, the values will differ between RGB and L*a*b* mode. The RGB values are less accurate because the RGB mode does not completely separate luminance and chrominance. -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO;Preview size=%1, Center: Px=%2 Py=%3 -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO;Preview noise: Mean=%1 High=%2 -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO_EMPTY;Preview noise: Mean= - High= - -!TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_TILEINFO;Tile size=%1, Center: Tx=%2 Ty=%3 -!TP_DIRPYRDENOISE_LABEL;Noise Reduction -!TP_DIRPYRDENOISE_LUMINANCE_CONTROL;Luminance control -!TP_DIRPYRDENOISE_LUMINANCE_FRAME;Luminance -!TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;L*a*b* -!TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;Chroma only -!TP_DIRPYRDENOISE_MEDIAN_METHOD_WEIGHTED;Weighted L* (little) + a*b* (normal) -!TP_DIRPYRDENOISE_MEDIAN_PASSES_TOOLTIP;Applying three median filter iterations with a 3×3 window size often leads to better results than using one median filter iteration with a 7×7 window size. -!TP_DIRPYRDENOISE_MEDIAN_TYPE_TOOLTIP;Apply a median filter of the desired window size. The larger the window's size, the longer it takes.\n\n3×3 soft: treats 5 pixels in a 3×3 pixel window.\n3×3: treats 9 pixels in a 3×3 pixel window.\n5×5 soft: treats 13 pixels in a 5×5 pixel window.\n5×5: treats 25 pixels in a 5×5 pixel window.\n7×7: treats 49 pixels in a 7×7 pixel window.\n9×9: treats 81 pixels in a 9×9 pixel window.\n\nSometimes it is possible to achieve higher quality running several iterations with a smaller window size than one iteration with a larger one. -!TP_DIRPYRDENOISE_SLI;Slider -!TP_DIRPYRDENOISE_TYPE_3X3;3×3 -!TP_DIRPYRDENOISE_TYPE_3X3SOFT;3×3 soft -!TP_DIRPYRDENOISE_TYPE_5X5;5×5 -!TP_DIRPYRDENOISE_TYPE_5X5SOFT;5×5 soft -!TP_DIRPYRDENOISE_TYPE_7X7;7×7 -!TP_DIRPYRDENOISE_TYPE_9X9;9×9 -!TP_DIRPYREQUALIZER_ARTIF;Reduce artifacts -!TP_DISTORTION_AUTO_TIP;Automatically corrects lens distortion in raw files by matching it against the embedded JPEG image if one exists and has had its lens disortion auto-corrected by the camera. -!TP_EPD_GAMMA;Gamma !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors -!TP_EXPOSURE_HISTMATCHING;Auto-Matched Tone Curve -!TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail. -!TP_EXPOSURE_TCMODE_LUMINANCE;Luminance -!TP_EXPOSURE_TCMODE_PERCEPTUAL;Perceptual -!TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? -!TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Baseline exposure -!TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Employ the embedded DCP baseline exposure offset. The setting is only available if the selected DCP has one. -!TP_ICM_APPLYHUESATMAP;Base table -!TP_ICM_APPLYHUESATMAP_TOOLTIP;Employ the embedded DCP base table (HueSatMap). The setting is only available if the selected DCP has one. -!TP_ICM_APPLYLOOKTABLE;Look table -!TP_ICM_APPLYLOOKTABLE_TOOLTIP;Employ the embedded DCP look table. The setting is only available if the selected DCP has one. -!TP_ICM_BPC;Black Point Compensation -!TP_ICM_PROFILEINTENT;Rendering Intent -!TP_ICM_SAVEREFERENCE;Save Reference Image -!TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance -!TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. !TP_ICM_WORKING_TRC;Tone response curve: !TP_ICM_WORKING_TRC_CUSTOM;Custom !TP_ICM_WORKING_TRC_GAMMA;Gamma !TP_ICM_WORKING_TRC_NONE;None !TP_ICM_WORKING_TRC_SLOPE;Slope !TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. -!TP_LABCURVE_CURVEEDITOR_CC;CC !TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically !TP_LENSPROFILE_CORRECTION_LCPFILE;LCP file !TP_LENSPROFILE_CORRECTION_MANUAL;Manually @@ -2040,16 +2434,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_LENSPROFILE_USE_GEOMETRIC;Geometric !TP_LENSPROFILE_USE_HEADER;Select distortions to correct: !TP_LENSPROFILE_USE_VIGNETTING;Vignetting -!TP_LOCALCONTRAST_AMOUNT;Amount -!TP_LOCALCONTRAST_DARKNESS;Darkness level -!TP_LOCALCONTRAST_LABEL;Local Contrast -!TP_LOCALCONTRAST_LIGHTNESS;Lightness level -!TP_LOCALCONTRAST_RADIUS;Radius -!TP_METADATA_EDIT;Apply modifications -!TP_METADATA_MODE;Metadata copy mode -!TP_METADATA_STRIP;Strip all metadata -!TP_METADATA_TUNNEL;Copy unchanged -!TP_NEUTRAL;Reset !TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction !TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both !TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal @@ -2057,322 +2441,24 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. -!TP_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_RAWCACORR_CASTR;Strength -!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) !TP_RAW_2PASS;1-pass+fast -!TP_RAW_3PASSBEST;3-pass (Markesteijn) !TP_RAW_4PASS;3-pass+fast -!TP_RAW_AHD;AHD -!TP_RAW_AMAZE;AMaZE !TP_RAW_AMAZEVNG4;AMaZE+VNG4 !TP_RAW_BORDER;Border -!TP_RAW_DCB;DCB !TP_RAW_DCBVNG4;DCB+VNG4 !TP_RAW_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_EAHD;EAHD -!TP_RAW_FAST;Fast -!TP_RAW_HD;Threshold -!TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear. -!TP_RAW_HPHD;HPHD -!TP_RAW_IGV;IGV -!TP_RAW_IMAGENUM;Sub-image -!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts. -!TP_RAW_LMMSE;LMMSE -!TP_RAW_MONO;Mono -!TP_RAW_NONE;None (Shows sensor pattern) -!TP_RAW_PIXELSHIFT;Pixel Shift -!TP_RAW_PIXELSHIFTBLUR;Blur motion mask !TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion -!TP_RAW_PIXELSHIFTEPERISO;Sensitivity -!TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nHigher values increase sensitivity of motion detection.\nChange in small steps and watch the motion mask while changing.\nIncrease sensitivity for underexposed or high ISO images. -!TP_RAW_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames -!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Equalize per channel -!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels. -!TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Equalize the brightness of the frames to the brightness of the selected frame.\nIf there are overexposed areas in the frames select the brightest frame to avoid magenta color cast in overexposed areas or enable motion correction. -!TP_RAW_PIXELSHIFTGREEN;Check green channel for motion -!TP_RAW_PIXELSHIFTHOLEFILL;Fill holes in motion mask -!TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Fill holes in motion mask -!TP_RAW_PIXELSHIFTLMMSE;Use LMMSE for moving parts -!TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use LMMSE instead of AMaZE for areas of motion.\nUseful for high ISO images. -!TP_RAW_PIXELSHIFTMEDIAN;Use median for moving parts -!TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP;Use median of all frames instead of selected frame for regions with motion.\nRemoves objects which are at different places in all frames.\nGives motion effect on slow moving (overlapping) objects. -!TP_RAW_PIXELSHIFTMM_AUTO;Automatic -!TP_RAW_PIXELSHIFTMM_CUSTOM;Custom -!TP_RAW_PIXELSHIFTMM_OFF;Off -!TP_RAW_PIXELSHIFTMOTIONMETHOD;Motion Correction -!TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 means no motion detection.\n1 - 99 means motion will be detected according to this value. Increase value to increase detection rate.\n100 means the AMaZE-demosaiced frame will be used. -!TP_RAW_PIXELSHIFTNONGREENCROSS;Check red/blue channels for motion -!TP_RAW_PIXELSHIFTSHOWMOTION;Show motion mask -!TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Show only motion mask -!TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Shows the motion mask without the image. -!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion. -!TP_RAW_PIXELSHIFTSIGMA;Blur radius -!TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for base ISO.\nIncrease the value for high ISO shots, 5.0 is a good starting point.\nWatch the motion mask while changing the value. -!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions -!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected. -!TP_RAW_RCD;RCD !TP_RAW_RCDVNG4;RCD+VNG4 -!TP_RAW_VNG4;VNG4 !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 -!TP_RETINEX_CONTEDIT_MAP;Equalizer -!TP_RETINEX_CURVEEDITOR_CD;L=f(L) -!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts. -!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H) -!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method. -!TP_RETINEX_CURVEEDITOR_MAP;L=f(L) -!TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts! -!TP_RETINEX_EQUAL;Equalizer -!TP_RETINEX_FREEGAMMA;Free gamma -!TP_RETINEX_GAIN;Gain -!TP_RETINEX_GAINOFFS;Gain and Offset (brightness) -!TP_RETINEX_GAINTRANSMISSION;Gain transmission -!TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce the transmission map to achieve the desired luminance.\nThe x-axis is the transmission.\nThe y-axis is the gain. -!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram. -!TP_RETINEX_GAMMA;Gamma -!TP_RETINEX_GAMMA_FREE;Free -!TP_RETINEX_GAMMA_HIGH;High -!TP_RETINEX_GAMMA_LOW;Low -!TP_RETINEX_GAMMA_MID;Middle -!TP_RETINEX_GAMMA_NONE;None -!TP_RETINEX_GAMMA_TOOLTIP;Restore tones by applying gamma before and after Retinex. Different from Retinex curves or others curves (Lab, Exposure, etc.). -!TP_RETINEX_GRAD;Transmission gradient -!TP_RETINEX_GRADS;Strength gradient -!TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely. -!TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Variance and Threshold are reduced when iterations increase, and conversely. -!TP_RETINEX_HIGH;High -!TP_RETINEX_HIGHLIG;Highlight -!TP_RETINEX_HIGHLIGHT;Highlight threshold -!TP_RETINEX_HIGHLIGHT_TOOLTIP;Increase action of High algorithm.\nMay require you to re-adjust "Neighboring pixels" and to increase the "White-point correction" in the Raw tab -> Raw White Points tool. -!TP_RETINEX_HSLSPACE_LIN;HSL-Linear -!TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmic -!TP_RETINEX_ITER;Iterations (Tone-mapping) -!TP_RETINEX_ITERF;Tone mapping -!TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time. -!TP_RETINEX_LABEL;Retinex -!TP_RETINEX_LABEL_MASK;Mask -!TP_RETINEX_LABSPACE;L*a*b* -!TP_RETINEX_LOW;Low -!TP_RETINEX_MAP;Method -!TP_RETINEX_MAP_GAUS;Gaussian mask -!TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) -!TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) -!TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above (Radius, Method) to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. -!TP_RETINEX_MAP_NONE;None -!TP_RETINEX_MEDIAN;Transmission median filter -!TP_RETINEX_METHOD;Method -!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light.\nUniform = Equalize action.\nHigh = Reinforce high light.\nHighlights = Remove magenta in highlights. -!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2 -!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture. -!TP_RETINEX_NEIGHBOR;Radius -!TP_RETINEX_NEUTRAL;Reset -!TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values. -!TP_RETINEX_OFFSET;Offset (brightness) -!TP_RETINEX_SCALES;Gaussian gradient -!TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and radius are reduced when iterations increase, and conversely. -!TP_RETINEX_SETTINGS;Settings -!TP_RETINEX_SKAL;Scale -!TP_RETINEX_SLOPE;Free gamma slope -!TP_RETINEX_STRENGTH;Strength -!TP_RETINEX_THRESHOLD;Threshold -!TP_RETINEX_THRESHOLD_TOOLTIP;Limits in/out.\nIn = image source,\nOut = image gauss. -!TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4 -!TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2 -!TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma.\nTm=Min TM=Max of transmission map. -!TP_RETINEX_TRANF;Transmission -!TP_RETINEX_TRANSMISSION;Transmission map -!TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction. -!TP_RETINEX_UNIFORM;Uniform -!TP_RETINEX_VARIANCE;Contrast -!TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts. -!TP_RETINEX_VIEW;Process -!TP_RETINEX_VIEW_MASK;Mask -!TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normal display.\nMask - Displays the mask.\nUnsharp mask - Displays the image with a high radius unsharp mask.\nTransmission - Auto/Fixed - Displays the file transmission-map, before any action on contrast and brightness.\n\nAttention: the mask does not correspond to reality, but is amplified to make it more visible. -!TP_RETINEX_VIEW_NONE;Standard -!TP_RETINEX_VIEW_TRAN;Transmission - Auto -!TP_RETINEX_VIEW_TRAN2;Transmission - Fixed -!TP_RETINEX_VIEW_UNSHARP;Unsharp mask !TP_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_WAVELET_1;Level 1 -!TP_WAVELET_2;Level 2 -!TP_WAVELET_3;Level 3 -!TP_WAVELET_4;Level 4 -!TP_WAVELET_5;Level 5 -!TP_WAVELET_6;Level 6 -!TP_WAVELET_7;Level 7 -!TP_WAVELET_8;Level 8 -!TP_WAVELET_9;Level 9 -!TP_WAVELET_APPLYTO;Apply To -!TP_WAVELET_AVOID;Avoid color shift -!TP_WAVELET_B0;Black -!TP_WAVELET_B1;Grey -!TP_WAVELET_B2;Residual -!TP_WAVELET_BACKGROUND;Background -!TP_WAVELET_BACUR;Curve -!TP_WAVELET_BALANCE;Contrast balance d/v-h -!TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chroma or residual tone mapping are activated, the effect due to balance is amplified. -!TP_WAVELET_BALCHRO;Chroma balance -!TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chroma balance. -!TP_WAVELET_BANONE;None -!TP_WAVELET_BASLI;Slider -!TP_WAVELET_BATYPE;Contrast balance method -!TP_WAVELET_CBENAB;Toning and Color Balance -!TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted -!TP_WAVELET_CCURVE;Local contrast -!TP_WAVELET_CH1;Whole chroma range -!TP_WAVELET_CH2;Saturated/pastel -!TP_WAVELET_CH3;Link contrast levels -!TP_WAVELET_CHCU;Curve -!TP_WAVELET_CHR;Chroma-contrast link strength -!TP_WAVELET_CHRO;Saturated/pastel threshold -!TP_WAVELET_CHRO_TOOLTIP;Sets the wavelet level which will be the threshold between saturated and pastel colors.\n1-x: saturated\nx-9: pastel\n\nIf the value exceeds the amount of wavelet levels you are using then it will be ignored. -!TP_WAVELET_CHR_TOOLTIP;Adjusts chroma as a function of "contrast levels" and "chroma-contrast link strength" -!TP_WAVELET_CHSL;Sliders -!TP_WAVELET_CHTYPE;Chrominance method -!TP_WAVELET_COLORT;Opacity Red-Green -!TP_WAVELET_COMPCONT;Contrast -!TP_WAVELET_COMPGAMMA;Compression gamma -!TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram. -!TP_WAVELET_COMPTM;Tone mapping -!TP_WAVELET_CONTEDIT;'After' contrast curve -!TP_WAVELET_CONTR;Gamut -!TP_WAVELET_CONTRA;Contrast -!TP_WAVELET_CONTRAST_MINUS;Contrast - -!TP_WAVELET_CONTRAST_PLUS;Contrast + -!TP_WAVELET_CONTRA_TOOLTIP;Changes contrast of the residual image. -!TP_WAVELET_CTYPE;Chrominance control -!TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifies local contrast as a function of the original local contrast (abscissa).\nLow abscissa values represent small local contrast (real values about 10..20).\n50% abscissa represents average local contrast (real value about 100..300).\n66% abscissa represents standard deviation of local contrast (real value about 300..800).\n100% abscissa represents maximum local contrast (real value about 3000..8000). -!TP_WAVELET_CURVEEDITOR_CH;Contrast levels=f(Hue) -!TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifies each level's contrast as a function of hue.\nTake care not to overwrite changes made with the Gamut sub-tool's hue controls.\nThe curve will only have an effect when wavelet contrast level sliders are non-zero. -!TP_WAVELET_CURVEEDITOR_CL;L -!TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applies a final contrast luminance curve at the end of the wavelet treatment. -!TP_WAVELET_CURVEEDITOR_HH;HH -!TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifies the residual image's hue as a function of hue. -!TP_WAVELET_DALL;All directions -!TP_WAVELET_DAUB;Edge performance -!TP_WAVELET_DAUB2;D2 - low -!TP_WAVELET_DAUB4;D4 - standard -!TP_WAVELET_DAUB6;D6 - standard plus -!TP_WAVELET_DAUB10;D10 - medium -!TP_WAVELET_DAUB14;D14 - high -!TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses. -!TP_WAVELET_DONE;Vertical -!TP_WAVELET_DTHR;Diagonal -!TP_WAVELET_DTWO;Horizontal -!TP_WAVELET_EDCU;Curve -!TP_WAVELET_EDGCONT;Local contrast -!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima. -!TP_WAVELET_EDGE;Edge Sharpness -!TP_WAVELET_EDGEAMPLI;Base amplification -!TP_WAVELET_EDGEDETECT;Gradient sensitivity -!TP_WAVELET_EDGEDETECTTHR;Threshold low (noise) -!TP_WAVELET_EDGEDETECTTHR2;Threshold high (detection) -!TP_WAVELET_EDGEDETECTTHR_TOOLTIP;This adjuster lets you target edge detection for example to avoid applying edge sharpness to fine details, such as noise in the sky. -!TP_WAVELET_EDGEDETECT_TOOLTIP;Moving the slider to the right increases edge sensitivity. This affects local contrast, edge settings and noise. -!TP_WAVELET_EDGESENSI;Edge sensitivity -!TP_WAVELET_EDGREINF_TOOLTIP;Reinforce or reduce the action of the first level, do the opposite to the second level, and leave the rest unchanged. -!TP_WAVELET_EDGTHRESH;Detail -!TP_WAVELET_EDGTHRESH_TOOLTIP;Change the repartition between the first levels and the others. The higher the threshold the more the action is centered on the first levels. Be careful with negative values, they increase the action of high levels and can introduce artifacts. -!TP_WAVELET_EDRAD;Radius -!TP_WAVELET_EDRAD_TOOLTIP;This radius adjustment is very different from those in other sharpening tools. Its value is compared to each level through a complex function. In this sense, a value of zero still has an effect. -!TP_WAVELET_EDSL;Threshold Sliders -!TP_WAVELET_EDTYPE;Local contrast method -!TP_WAVELET_EDVAL;Strength -!TP_WAVELET_FINAL;Final Touchup -!TP_WAVELET_FINEST;Finest -!TP_WAVELET_HIGHLIGHT;Highlight luminance range -!TP_WAVELET_HS1;Whole luminance range -!TP_WAVELET_HS2;Shadows/Highlights -!TP_WAVELET_HUESKIN;Skin hue -!TP_WAVELET_HUESKIN_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the white balance is incorrect. -!TP_WAVELET_HUESKY;Sky hue -!TP_WAVELET_HUESKY_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the white balance is incorrect. -!TP_WAVELET_ITER;Delta balance levels -!TP_WAVELET_ITER_TOOLTIP;Left: increase low levels and reduce high levels,\nRight: reduce low levels and increase high levels. -!TP_WAVELET_LABEL;Wavelet Levels -!TP_WAVELET_LARGEST;Coarsest -!TP_WAVELET_LEVCH;Chroma -!TP_WAVELET_LEVDIR_ALL;All levels in all directions -!TP_WAVELET_LEVDIR_INF;Below or equal the level -!TP_WAVELET_LEVDIR_ONE;One level -!TP_WAVELET_LEVDIR_SUP;Above the level -!TP_WAVELET_LEVELS;Wavelet levels -!TP_WAVELET_LEVELS_TOOLTIP;Choose the number of detail levels the image is to be decomposed into. More levels require more RAM and require a longer processing time. -!TP_WAVELET_LEVF;Contrast -!TP_WAVELET_LEVLABEL;Preview maximum possible levels = %1 -!TP_WAVELET_LEVONE;Level 2 -!TP_WAVELET_LEVTHRE;Level 4 -!TP_WAVELET_LEVTWO;Level 3 -!TP_WAVELET_LEVZERO;Level 1 -!TP_WAVELET_LINKEDG;Link with Edge Sharpness' Strength -!TP_WAVELET_LIPST;Enhanced algoritm -!TP_WAVELET_LOWLIGHT;Shadow luminance range -!TP_WAVELET_MEDGREINF;First level -!TP_WAVELET_MEDI;Reduce artifacts in blue sky -!TP_WAVELET_MEDILEV;Edge detection -!TP_WAVELET_MEDILEV_TOOLTIP;When you enable Edge Detection, it is recommanded:\n- to disabled low contrast levels to avoid artifacts,\n- to use high values of gradient sensitivity.\n\nYou can modulate the strength with 'refine' from Denoise and Refine. -!TP_WAVELET_NEUTRAL;Neutral -!TP_WAVELET_NOIS;Denoise -!TP_WAVELET_NOISE;Denoise and Refine -!TP_WAVELET_NPHIGH;High -!TP_WAVELET_NPLOW;Low -!TP_WAVELET_NPNONE;None -!TP_WAVELET_NPTYPE;Neighboring pixels -!TP_WAVELET_NPTYPE_TOOLTIP;This algorithm uses the proximity of a pixel and eight of its neighbors. If less difference, edges are reinforced. -!TP_WAVELET_OPACITY;Opacity Blue-Yellow -!TP_WAVELET_OPACITYW;Contrast balance d/v-h curve -!TP_WAVELET_OPACITYWL;Final local contrast -!TP_WAVELET_OPACITYWL_TOOLTIP;Modify the final local contrast at the end of the wavelet treatment.\n\nThe left side represents the smallest local contrast, progressing to the largest local contrast on the right. -!TP_WAVELET_PASTEL;Pastel chroma -!TP_WAVELET_PROC;Process -!TP_WAVELET_RE1;Reinforced -!TP_WAVELET_RE2;Unchanged -!TP_WAVELET_RE3;Reduced -!TP_WAVELET_RESCHRO;Chroma -!TP_WAVELET_RESCON;Shadows -!TP_WAVELET_RESCONH;Highlights -!TP_WAVELET_RESID;Residual Image -!TP_WAVELET_SAT;Saturated chroma -!TP_WAVELET_SETTINGS;Wavelet Settings -!TP_WAVELET_SKIN;Skin targetting/protection -!TP_WAVELET_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected. -!TP_WAVELET_SKY;Sky targetting/protection !TP_WAVELET_SKY_TOOLTIP;At -100 sky-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 sky-tones are protected while all other tones are affected. -!TP_WAVELET_STREN;Strength -!TP_WAVELET_STRENGTH;Strength -!TP_WAVELET_SUPE;Extra -!TP_WAVELET_THR;Shadows threshold -!TP_WAVELET_THRESHOLD;Highlight levels -!TP_WAVELET_THRESHOLD2;Shadow levels -!TP_WAVELET_THRESHOLD2_TOOLTIP;Only levels between 9 and 9 minus the value will be affected by the shadow luminance range. Other levels will be fully treated. The highest level possible is limited by the highlight level value (9 minus highlight level value). -!TP_WAVELET_THRESHOLD_TOOLTIP;Only levels beyond the chosen value will be affected by the highlight luminance range. Other levels will be fully treated. The chosen value here limits the highest possible value of the shadow levels. -!TP_WAVELET_THRH;Highlights threshold -!TP_WAVELET_TILESBIG;Big tiles -!TP_WAVELET_TILESFULL;Full image -!TP_WAVELET_TILESIZE;Tiling method -!TP_WAVELET_TILESLIT;Little tiles -!TP_WAVELET_TILES_TOOLTIP;Processing the full image leads to better quality and is the recommended option, while using tiles is a fall-back solution for users with little RAM. Refer to RawPedia for memory requirements. -!TP_WAVELET_TMSTRENGTH;Compression strength -!TP_WAVELET_TMSTRENGTH_TOOLTIP;Control the strength of tone mapping or contrast compression of the residual image. When the value is different from 0, the Strength and Gamma sliders of the Tone Mapping tool in the Exposure tab will become grayed out. -!TP_WAVELET_TMTYPE;Compression method -!TP_WAVELET_TON;Toning !TP_WBALANCE_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". -!ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: f From 5eed91fec812ab6cc0cd70a646332954fa61ea4c Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 9 Dec 2018 21:45:27 +0100 Subject: [PATCH 38/75] Small fix for Espanol locale translation --- rtdata/languages/Espanol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 54995f678..042d92966 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -62,7 +62,6 @@ #62 2014-10-10 fotger #63 2018-12-09 Faber777 -;PREFERENCES_D50_OLD;5000K ABOUT_TAB_BUILD;Versión ABOUT_TAB_CREDITS;Créditos ABOUT_TAB_LICENSE;Licencia @@ -1060,6 +1059,7 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;ID Etiqueta PREFERENCES_CUSTPROFBUILDPATH;Ruta al programa ejecutable PREFERENCES_CUTOVERLAYBRUSH;Recortar máscara de color/transparencia PREFERENCES_D50;5000ºK +PREFERENCES_D50_OLD;5000K PREFERENCES_D55;5500ºK PREFERENCES_D60;6000ºK PREFERENCES_D65;6500ºK @@ -2377,7 +2377,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !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_D50_OLD;5000K !PREFERENCES_PERFORMANCE_THREADS;Threads !PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic) !PREFERENCES_SND_THRESHOLDSECS;After seconds From 872279ae97a34a9290d42f080007e7c3c34f0cff Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 9 Dec 2018 22:39:00 +0100 Subject: [PATCH 39/75] Remove some console output before merge --- rtengine/rt_algo.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index 60042cba4..1011ae7b7 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -32,7 +32,7 @@ #include "rt_algo.h" #include "rt_math.h" #include "sleef.c" -#include + namespace { float calcBlendFactor(float val, float threshold) { // sigmoid function @@ -343,7 +343,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } - std::cout << pass + 1 << " : " << minvar << std::endl; + if (minvar <= 1.f || pass == 1) { const int minY = skip * minI; const int minX = skip * minJ; @@ -393,7 +393,7 @@ void buildBlendMask(float** luminance, float **blend, int W, int H, float &contr } } } - std::cout << 3 << " : " << minvar << std::endl; + contrastThreshold = minvar <= 4.f ? calcContrastThreshold(luminance, topLeftYStart + minI, topLeftXStart + minJ, tilesize) : 0.f; } } From 91f68e5e3102e193cd339a00667361eb1bd84c87 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 9 Dec 2018 22:45:19 +0100 Subject: [PATCH 40/75] Added centripetal Catmull-Rom spline curve icons #5068 --- .../png/dark/curve-catmullrom-small.png | Bin 0 -> 430 bytes .../themed/png/dark/curve-catmullrom.png | Bin 0 -> 463 bytes .../png/light/curve-catmullrom-small.png | Bin 0 -> 437 bytes .../themed/png/light/curve-catmullrom.png | Bin 0 -> 490 bytes .../themed/svg/curve-catmullrom-small.svg | 159 ++++++++++++++++++ rtdata/images/themed/svg/curve-catmullrom.svg | 131 +++++++++++++++ 6 files changed, 290 insertions(+) create mode 100644 rtdata/images/themed/png/dark/curve-catmullrom-small.png create mode 100644 rtdata/images/themed/png/dark/curve-catmullrom.png create mode 100644 rtdata/images/themed/png/light/curve-catmullrom-small.png create mode 100644 rtdata/images/themed/png/light/curve-catmullrom.png create mode 100644 rtdata/images/themed/svg/curve-catmullrom-small.svg create mode 100644 rtdata/images/themed/svg/curve-catmullrom.svg diff --git a/rtdata/images/themed/png/dark/curve-catmullrom-small.png b/rtdata/images/themed/png/dark/curve-catmullrom-small.png new file mode 100644 index 0000000000000000000000000000000000000000..d3fb3188dd14ff427ef21861b4b8f0bd37a44089 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D13z$e7@%$YOp1wKF$2+o~5clz{c z2>as2i)YWCb+|g;4XBc|u)^Si}HDLp)s^LpZJ{3$!q?aZFvu zk!CT|*g=AeXHIWI8)NfAg%A~iLmUQ0EXFE4GK#m3&RFn_W22*lADftf8-ugrjE8JS rtS1DL5)uMfjD40f`8M9x)8Js3yOme*ERK!`}5n0T@z;^_M8K-LVNdpB{0(?ST-3xrqAc3=B02DxGv@O@4 z094OY666=musL@AvL44ee$B$*tgk+jK=E8p7sn8Z%gG4`_?C$&+<4o>SYS4Lu|Uts z6d{d!439Oqx>OE`N^)@-Cp_2S;!-SZ5uGr_*I|RD>x7s?x~)eNMV%j+cqtSLO_Vt! z&{4oWxszkl*Ps)8&8JJ!I1gE_X>wpFR$cx2mFF?8h(qiQtsFcToKH=C3AC8O)78&q Iol`;+06)v9T>t<8 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/curve-catmullrom-small.png b/rtdata/images/themed/png/light/curve-catmullrom-small.png new file mode 100644 index 0000000000000000000000000000000000000000..1654d10eaa8cffce10894eace37620053734a6be GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D0_z$e62RaMo!zz0YIfr^R>grNoo zGBPp{LARKnlYr`ZN`m}?H#4-X7OwA}>dYBtvOCUh6Hq+Z)5S4_<9f0{3lkg1)>y$a z1xD!&1|kwW6oS}z+L{6;I&dgAoD@7W!K9!iV|qfERK!`}5n0T@z;^_M8K-LVNdpCS1AIbURaI5p3w%_-0LV5oGXs)p zU;q>Y(m*Z{C@Co^D=Ry^$hQP)JB!zh?O)m(CXJ-29KXdVx|ko-U3d z5|@(&T$p$Yre!>JWKnNsJUFqmfUBjb$;Yff<{1CEhvtK--bX0)bBBM8!G6DNKeuX95!*IQ+QM(8zksGyXV3 tnQDjfSq2s#gTD0Oi5s=5UNA5+Ok + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/curve-catmullrom.svg b/rtdata/images/themed/svg/curve-catmullrom.svg new file mode 100644 index 000000000..b59954885 --- /dev/null +++ b/rtdata/images/themed/svg/curve-catmullrom.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + From fd48b34cd52d6275e46403ba11ae3c530264ff1f Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Thu, 6 Dec 2018 14:11:49 +0100 Subject: [PATCH 41/75] curves: restored the old DCT_Spline implementation (cubic splines), and added new DCT_CatumullRom curve type --- rtdata/languages/default | 3 +- rtengine/diagonalcurves.cc | 29 +++++++------- rtengine/histmatching.cc | 54 ++----------------------- rtgui/curveeditor.cc | 59 ++++++++++++++++++++++++++-- rtgui/curveeditor.h | 2 + rtgui/diagonalcurveeditorsubgroup.cc | 45 +++++++++++++++++++-- rtgui/mydiagonalcurve.cc | 7 +++- rtgui/mydiagonalcurve.h | 1 + rtgui/popupcommon.cc | 13 +++--- rtgui/popupcommon.h | 5 ++- 10 files changed, 138 insertions(+), 80 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index da79ec3ac..e53550a0d 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -17,9 +17,10 @@ CURVEEDITOR_AXIS_IN;I: CURVEEDITOR_AXIS_LEFT_TAN;LT: CURVEEDITOR_AXIS_OUT;O: CURVEEDITOR_AXIS_RIGHT_TAN;RT: +CURVEEDITOR_CATMULLROM;Flexible CURVEEDITOR_CURVE;Curve CURVEEDITOR_CURVES;Curves -CURVEEDITOR_CUSTOM;Custom +CURVEEDITOR_CUSTOM;Standard CURVEEDITOR_DARKS;Darks CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtengine/diagonalcurves.cc b/rtengine/diagonalcurves.cc index f478ba719..c81d48f16 100644 --- a/rtengine/diagonalcurves.cc +++ b/rtengine/diagonalcurves.cc @@ -48,7 +48,7 @@ DiagonalCurve::DiagonalCurve (const std::vector& p, int poly_pn) bool identity = true; kind = (DiagonalCurveType)p[0]; - if (kind == DCT_Linear || kind == DCT_Spline || kind == DCT_NURBS) { + if (kind == DCT_Linear || kind == DCT_Spline || kind == DCT_NURBS || kind == DCT_CatumullRom) { N = (p.size() - 1) / 2; x = new double[N]; y = new double[N]; @@ -86,11 +86,12 @@ DiagonalCurve::DiagonalCurve (const std::vector& p, int poly_pn) if (!identity) { if (kind == DCT_Spline && N > 2) { - //spline_cubic_set (); - catmull_rom_set(); + spline_cubic_set (); } else if (kind == DCT_NURBS && N > 2) { NURBS_set (); fillHash(); + } else if (kind == DCT_CatumullRom && N > 2) { + catmull_rom_set(); } else { kind = DCT_Linear; } @@ -459,7 +460,7 @@ double DiagonalCurve::getVal (double t) const } case DCT_Linear : - // case DCT_Spline : + case DCT_Spline : { // values under and over the first and last point if (t > x[N - 1]) { @@ -484,21 +485,21 @@ double DiagonalCurve::getVal (double t) const double h = x[k_hi] - x[k_lo]; // linear - // if (kind == DCT_Linear) { + if (kind == DCT_Linear) { return y[k_lo] + (t - x[k_lo]) * ( y[k_hi] - y[k_lo] ) / h; - // } - // // spline curve - // else { // if (kind==Spline) { - // double a = (x[k_hi] - t) / h; - // double b = (t - x[k_lo]) / h; - // double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666; - // return CLIPD(r); - // } + } + // spline curve + else { // if (kind==Spline) { + double a = (x[k_hi] - t) / h; + double b = (t - x[k_lo]) / h; + double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666; + return CLIPD(r); + } break; } - case DCT_Spline: { + case DCT_CatumullRom: { auto it = std::lower_bound(poly_x.begin(), poly_x.end(), t); if (it == poly_x.end()) { return poly_y.back(); diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc index da95946e7..1b6dd133f 100644 --- a/rtengine/histmatching.cc +++ b/rtengine/histmatching.cc @@ -97,55 +97,6 @@ int findMatch(int val, const std::vector &cdf, int j) } -class CubicSplineCurve: public DiagonalCurve { -public: - CubicSplineCurve(const std::vector &points): - DiagonalCurve({DCT_Linear}) - { - N = points.size() / 2; - x = new double[N]; - y = new double[N]; - - for (int i = 0; i < N; ++i) { - x[i] = points[2*i]; - y[i] = points[2*i+1]; - } - kind = DCT_Spline; - spline_cubic_set(); - } - - double getVal(double t) const override - { - // values under and over the first and last point - if (t > x[N - 1]) { - return y[N - 1]; - } else if (t < x[0]) { - return y[0]; - } - - // do a binary search for the right interval: - unsigned int k_lo = 0, k_hi = N - 1; - - while (k_hi > 1 + k_lo) { - unsigned int k = (k_hi + k_lo) / 2; - - if (x[k] > t) { - k_hi = k; - } else { - k_lo = k; - } - } - - double h = x[k_hi] - x[k_lo]; - - double a = (x[k_hi] - t) / h; - double b = (t - x[k_lo]) / h; - double r = a * y[k_lo] + b * y[k_hi] + ((a * a * a - a) * ypp[k_lo] + (b * b * b - b) * ypp[k_hi]) * (h * h) * 0.1666666666666666666666666666666; - return LIM01(r); - } -}; - - void mappingToCurve(const std::vector &mapping, std::vector &curve) { curve.clear(); @@ -259,10 +210,11 @@ void mappingToCurve(const std::vector &mapping, std::vector &curve) if (curve.size() < 4) { curve = { DCT_Linear }; // not enough points, fall back to linear } else { - CubicSplineCurve c(curve); + curve.insert(curve.begin(), DCT_Spline); + DiagonalCurve c(curve); double gap = 0.05; double x = 0.0; - curve = { DCT_Spline }; + curve = { DCT_CatumullRom }; while (x < 1.0) { curve.push_back(x); curve.push_back(c.getVal(x)); diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc index 995dafa4e..3d1223bdf 100644 --- a/rtgui/curveeditor.cc +++ b/rtgui/curveeditor.cc @@ -25,6 +25,47 @@ #include +namespace { + +class CurveTypePopUpButton: public PopUpToggleButton { +public: + CurveTypePopUpButton(const Glib::ustring &label=""): + PopUpToggleButton(label) {} + + void setPosIndexMap(const std::vector &pmap) + { + posidxmap_ = pmap; + } + +protected: + int posToIndex(int pos) const override + { + if (pos < 0 || size_t(pos) >= posidxmap_.size()) { + return pos; + } + return posidxmap_[pos]; + } + + int indexToPos(int index) const override + { + if (index < 0 || size_t(index) >= posidxmap_.size()) { + return index; + } + for (int i = 0, n = int(posidxmap_.size()); i < n; ++i) { + if (posidxmap_[i] == index) { + return i; + } + } + return -1; + } + +private: + std::vector posidxmap_; +}; + +} // namespace + + bool CurveEditor::reset() { return subGroup->curveReset(this); @@ -33,12 +74,14 @@ bool CurveEditor::reset() DiagonalCurveEditor::DiagonalCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup) : CurveEditor::CurveEditor(text, static_cast(ceGroup), ceSubGroup) { - // Order set in the same order than "enum DiagonalCurveType". Shouldn't change, for compatibility reason curveType->addEntry("curve-linear-small.png", M("CURVEEDITOR_LINEAR")); // 0 Linear curveType->addEntry("curve-spline-small.png", M("CURVEEDITOR_CUSTOM")); // 1 Spline + curveType->addEntry("curve-catmullrom-small.png", M("CURVEEDITOR_CATMULLROM")); // 4 CatmullRom curveType->addEntry("curve-parametric-small.png", M("CURVEEDITOR_PARAMETRIC")); // 2 Parametric curveType->addEntry("curve-nurbs-small.png", M("CURVEEDITOR_NURBS")); // 3 NURBS + static_cast(curveType)->setPosIndexMap({ 0, 1, 4, 2, 3 }); curveType->setSelected(DCT_Linear); + curveType->show(); rangeLabels[0] = M("CURVEEDITOR_SHADOWS"); @@ -65,6 +108,9 @@ std::vector DiagonalCurveEditor::getCurve () case (DCT_NURBS): return curve = NURBSCurveEd; + case (DCT_CatumullRom): + return curve = catmullRomCurveEd; + default: // returning Linear or Unchanged curve.push_back((double)(selected)); @@ -96,6 +142,13 @@ void DiagonalCurveEditor::setResetCurve(DiagonalCurveType cType, const std::vect break; + case (DCT_CatumullRom): + if (resetCurve.size() && DiagonalCurveType(resetCurve.at(0)) == cType) { + catmullRomResetCurve = resetCurve; + } + + break; + default: break; } @@ -209,9 +262,9 @@ CurveEditor::CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEd subGroup = ceSubGroup; if (group && text.size()) { - curveType = new PopUpToggleButton(text + ":"); + curveType = new CurveTypePopUpButton(text + ":"); } else { - curveType = new PopUpToggleButton(); + curveType = new CurveTypePopUpButton(); } curveType->set_tooltip_text(M("CURVEEDITOR_TYPE")); diff --git a/rtgui/curveeditor.h b/rtgui/curveeditor.h index 14699b42a..4cf49a377 100644 --- a/rtgui/curveeditor.h +++ b/rtgui/curveeditor.h @@ -156,6 +156,8 @@ protected: std::vector paramResetCurve; std::vector NURBSCurveEd; std::vector NURBSResetCurve; + std::vector catmullRomCurveEd; + std::vector catmullRomResetCurve; Glib::ustring rangeLabels[4]; double rangeMilestones[3]; diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc index 4cbde55cc..e8b92062a 100644 --- a/rtgui/diagonalcurveeditorsubgroup.cc +++ b/rtgui/diagonalcurveeditorsubgroup.cc @@ -393,6 +393,7 @@ DiagonalCurveEditor* DiagonalCurveEditorSubGroup::addCurve(Glib::ustring curveLa storeCurveValues(newCE, getCurveFromGUI(DCT_Spline)); storeCurveValues(newCE, getCurveFromGUI(DCT_Parametric)); storeCurveValues(newCE, getCurveFromGUI(DCT_NURBS)); + storeCurveValues(newCE, getCurveFromGUI(DCT_CatumullRom)); return newCE; } @@ -437,6 +438,7 @@ void DiagonalCurveEditorSubGroup::pipetteMouseOver(EditDataProvider *provider, i switch((DiagonalCurveType)(curveEditor->curveType->getSelected())) { case (DCT_Spline): + case (DCT_CatumullRom): customCurve->pipetteMouseOver(curveEditor, provider, modifierKey); customCurve->setDirty(true); break; @@ -511,6 +513,7 @@ bool DiagonalCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provid switch((DiagonalCurveType)(curveEditor->curveType->getSelected())) { case (DCT_Spline): + case (DCT_CatumullRom): isDragging = customCurve->pipetteButton1Pressed(provider, modifierKey); break; @@ -539,6 +542,7 @@ void DiagonalCurveEditorSubGroup::pipetteButton1Released(EditDataProvider *provi switch((DiagonalCurveType)(curveEditor->curveType->getSelected())) { case (DCT_Spline): + case (DCT_CatumullRom): customCurve->pipetteButton1Released(provider); break; @@ -562,6 +566,7 @@ void DiagonalCurveEditorSubGroup::pipetteDrag(EditDataProvider *provider, int mo switch((DiagonalCurveType)(curveEditor->curveType->getSelected())) { case (DCT_Spline): + case (DCT_CatumullRom): customCurve->pipetteDrag(provider, modifierKey); break; @@ -615,6 +620,7 @@ void DiagonalCurveEditorSubGroup::refresh(CurveEditor *curveToRefresh) if (curveToRefresh != nullptr && curveToRefresh == static_cast(parent->displayedCurve)) { switch((DiagonalCurveType)(curveToRefresh->curveType->getSelected())) { case (DCT_Spline): + case (DCT_CatumullRom): customCurve->refresh(); break; @@ -703,9 +709,10 @@ void DiagonalCurveEditorSubGroup::switchGUI() } } - switch((DiagonalCurveType)(dCurve->curveType->getSelected())) { + switch(auto tp = (DiagonalCurveType)(dCurve->curveType->getSelected())) { case (DCT_Spline): - customCurve->setPoints (dCurve->customCurveEd); + case (DCT_CatumullRom): + customCurve->setPoints(tp == DCT_Spline ? dCurve->customCurveEd : dCurve->catmullRomCurveEd); customCurve->setColorProvider(dCurve->getCurveColorProvider(), dCurve->getCurveCallerId()); customCurve->setColoredBar(leftBar, bottomBar); customCurve->queue_resize_no_redraw(); @@ -776,6 +783,7 @@ void DiagonalCurveEditorSubGroup::savePressed () switch (parent->displayedCurve->selected) { case DCT_Spline: // custom + case DCT_CatumullRom: p = customCurve->getPoints (); break; @@ -797,6 +805,8 @@ void DiagonalCurveEditorSubGroup::savePressed () f << "Linear" << std::endl; } else if (p[ix] == (double)(DCT_Spline)) { f << "Spline" << std::endl; + } else if (p[ix] == (double)(DCT_CatumullRom)) { + f << "CatmullRom" << std::endl; } else if (p[ix] == (double)(DCT_NURBS)) { f << "NURBS" << std::endl; } else if (p[ix] == (double)(DCT_Parametric)) { @@ -838,6 +848,8 @@ void DiagonalCurveEditorSubGroup::loadPressed () p.push_back ((double)(DCT_Linear)); } else if (s == "Spline") { p.push_back ((double)(DCT_Spline)); + } else if (s == "CatmullRom") { + p.push_back ((double)(DCT_CatumullRom)); } else if (s == "NURBS") { p.push_back ((double)(DCT_NURBS)); } else if (s == "Parametric") { @@ -858,7 +870,7 @@ void DiagonalCurveEditorSubGroup::loadPressed () rtengine::sanitizeCurve(p); - if (p[0] == (double)(DCT_Spline)) { + if (p[0] == (double)(DCT_Spline) || p[0] == (double)(DCT_CatumullRom)) { customCurve->setPoints (p); customCurve->queue_draw (); customCurve->notifyListener (); @@ -903,6 +915,12 @@ void DiagonalCurveEditorSubGroup::copyPressed () clipboard.setDiagonalCurveData (curve, DCT_NURBS); break; + case DCT_CatumullRom: + curve = customCurve->getPoints (); + curve[0] = DCT_CatumullRom; + clipboard.setDiagonalCurveData (curve, DCT_CatumullRom); + break; + default: // (DCT_Linear, DCT_Unchanged) // ... do nothing break; @@ -923,6 +941,7 @@ void DiagonalCurveEditorSubGroup::pastePressed () switch (type) { case DCT_Spline: // custom + case DCT_CatumullRom: customCurve->setPoints (curve); customCurve->queue_draw (); customCurve->notifyListener (); @@ -1060,6 +1079,10 @@ void DiagonalCurveEditorSubGroup::storeDisplayedCurve() storeCurveValues(parent->displayedCurve, getCurveFromGUI(DCT_NURBS)); break; + case (DCT_CatumullRom): + storeCurveValues(parent->displayedCurve, getCurveFromGUI(DCT_CatumullRom)); + break; + default: break; } @@ -1097,6 +1120,10 @@ void DiagonalCurveEditorSubGroup::storeCurveValues (CurveEditor* ce, const std:: (static_cast(ce))->NURBSCurveEd = p; break; + case (DCT_CatumullRom): + (static_cast(ce))->catmullRomCurveEd = p; + break; + default: break; } @@ -1126,6 +1153,14 @@ const std::vector DiagonalCurveEditorSubGroup::getCurveFromGUI (int type case (DCT_NURBS): return NURBSCurve->getPoints (); + case (DCT_CatumullRom): { + auto ret = customCurve->getPoints(); + if (!ret.empty()) { + ret[0] = DCT_CatumullRom; + } + return ret; + } + default: { // linear and other solutions std::vector lcurve (1); @@ -1162,6 +1197,10 @@ bool DiagonalCurveEditorSubGroup::curveReset(CurveEditor *ce) customCurve->reset (dce->customResetCurve, dce->getIdentityValue()); return true; + case (DCT_CatumullRom) : + customCurve->reset (dce->catmullRomResetCurve, dce->getIdentityValue()); + return true; + case (DCT_Parametric) : { DiagonalCurveEditor* dCurve = static_cast(parent->displayedCurve); double mileStone[3]; diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc index 5eacdcc46..f70f4af0f 100644 --- a/rtgui/mydiagonalcurve.cc +++ b/rtgui/mydiagonalcurve.cc @@ -775,7 +775,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event) case GDK_MOTION_NOTIFY: snapToElmt = -100; - if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS) { + if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS || curve.type == DCT_CatumullRom) { snapToMinDistY = snapToMinDistX = 10.; snapToValY = snapToValX = 0.; @@ -1026,7 +1026,7 @@ void MyDiagonalCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provi double minDistanceX = double(MIN_DISTANCE) / double(graphW - 1); - if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS) { + if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS || curve.type == DCT_CatumullRom) { // get the pointer position getCursorPositionFromCurve(pipetteVal); @@ -1415,6 +1415,8 @@ std::vector MyDiagonalCurve::getPoints () result.push_back (double(DCT_Spline)); } else if (curve.type == DCT_NURBS) { result.push_back (double(DCT_NURBS)); + } else if (curve.type == DCT_CatumullRom) { + result.push_back (double(DCT_CatumullRom)); } // then we push all the points coordinate @@ -1552,6 +1554,7 @@ void MyDiagonalCurve::reset(const std::vector &resetCurve, double identi switch (curve.type) { case DCT_Spline : case DCT_NURBS : + case DCT_CatumullRom: curve.x.resize(2); curve.y.resize(2); curve.x.at(0) = 0.; diff --git a/rtgui/mydiagonalcurve.h b/rtgui/mydiagonalcurve.h index 9433c42b5..5b0f6f01e 100644 --- a/rtgui/mydiagonalcurve.h +++ b/rtgui/mydiagonalcurve.h @@ -34,6 +34,7 @@ enum DiagonalCurveType { DCT_Spline, // 1 DCT_Parametric, // 2 DCT_NURBS, // 3 + DCT_CatumullRom, // 4 // Insert new curve type above this line DCT_Unchanged // Must remain the last of the enum }; diff --git a/rtgui/popupcommon.cc b/rtgui/popupcommon.cc index b7d08721e..c5a5a03e3 100644 --- a/rtgui/popupcommon.cc +++ b/rtgui/popupcommon.cc @@ -103,17 +103,18 @@ bool PopUpCommon::addEntry (const Glib::ustring& fileName, const Glib::ustring& void PopUpCommon::entrySelected (int i) { // Emit a signal if the selected item has changed - if (setSelected (i)) - messageChanged (selected); + if (setSelected (posToIndex(i))) + messageChanged (posToIndex(selected)); // Emit a signal in all case (i.e. propagate the signal_activate event) - messageItemSelected (selected); + messageItemSelected (posToIndex(selected)); } void PopUpCommon::setItemSensitivity (int index, bool isSensitive) { const auto items = menu->get_children (); - if (size_t(index) < items.size ()) { - items[size_t(index)]->set_sensitive (isSensitive); + size_t pos = indexToPos(index); + if (pos < items.size ()) { + items[pos]->set_sensitive (isSensitive); } } @@ -123,6 +124,8 @@ void PopUpCommon::setItemSensitivity (int index, bool isSensitive) { */ bool PopUpCommon::setSelected (int entryNum) { + entryNum = indexToPos(entryNum); + if (entryNum < 0 || entryNum > ((int)images.size() - 1) || (int)entryNum == selected) { return false; } else { diff --git a/rtgui/popupcommon.h b/rtgui/popupcommon.h index f4bdb581f..f939dbe96 100644 --- a/rtgui/popupcommon.h +++ b/rtgui/popupcommon.h @@ -75,6 +75,9 @@ private: void showMenu(GdkEventButton* event); protected: + virtual int posToIndex(int p) const { return p; } + virtual int indexToPos(int i) const { return i; } + void entrySelected (int i); }; @@ -96,7 +99,7 @@ inline int PopUpCommon::getEntryCount () const inline int PopUpCommon::getSelected () const { - return selected; + return posToIndex(selected); } #endif From 7a918fa373af0392f6dde1eee79f2377f0c9f4cf Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Mon, 10 Dec 2018 17:26:22 +0100 Subject: [PATCH 42/75] Fixed bug in evaluating catmull-rom curves with straight segments at 0 or 1 Fixes #5072 --- rtengine/diagonalcurves.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rtengine/diagonalcurves.cc b/rtengine/diagonalcurves.cc index c81d48f16..b4c88fd68 100644 --- a/rtengine/diagonalcurves.cc +++ b/rtengine/diagonalcurves.cc @@ -326,6 +326,9 @@ inline void catmull_rom_spline(int n_points, if (p1_y == p2_y && (p1_y == 0 || p1_y == 1)) { for (i = 1; i < n_points-1; ++i) { t = p1_x + space * i; + if (t >= p2_x) { + break; + } res_x.push_back(t); res_y.push_back(p1_y); } From 773b55b35ec96f63a1bcf822264c5dc033f9d41d Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Mon, 10 Dec 2018 17:29:21 +0100 Subject: [PATCH 43/75] restored old behaviour of the WB tint slider Fixes #5077 --- rtgui/whitebalance.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 50cfdbc29..6cbca5637 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -322,7 +322,6 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB temp = Gtk::manage (new Adjuster (M("TP_WBALANCE_TEMPERATURE"), MINTEMP, MAXTEMP, 5, CENTERTEMP, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider)); green = Gtk::manage (new Adjuster (M("TP_WBALANCE_GREEN"), MINGREEN, MAXGREEN, 0.001, 1.0, igreenL, igreenR)); - green->setLogScale(10, 1, true); equal = Gtk::manage (new Adjuster (M("TP_WBALANCE_EQBLUERED"), MINEQUAL, MAXEQUAL, 0.001, 1.0, iblueredL, iblueredR)); tempBias = Gtk::manage (new Adjuster(M("TP_WBALANCE_TEMPBIAS"), -0.5, 0.5, 0.01, 0.0, itempbiasL, itempbiasR)); cache_customTemp (0); @@ -701,7 +700,6 @@ void WhiteBalance::read (const ProcParams* pp, const ParamsEdited* pedited) set_inconsistent(multiImage && !pedited->wb.enabled); } - green->setLogScale(10, green->getValue(), true); methconn.block (false); enableListener (); @@ -809,7 +807,6 @@ void WhiteBalance::setWB (int vtemp, double vgreen) listener->panelChanged (EvWBTemp, Glib::ustring::compose("%1, %2", (int)temp->getValue(), Glib::ustring::format (std::setw(4), std::fixed, std::setprecision(3), green->getValue()))); } - green->setLogScale(10, vgreen, true); } void WhiteBalance::setAdjusterBehavior (bool tempadd, bool greenadd, bool equaladd, bool tempbiasadd) From 516be46550ace065a96aee0a4f76214b5ecf8e29 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 11 Dec 2018 00:09:36 +0100 Subject: [PATCH 44/75] Reintroduce silencing of unused-result warnings --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff221ffef..72c6a510b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,7 +373,7 @@ if(WITH_PROF) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations -Wno-unused-result") if(OPTION_OMP) find_package(OpenMP) if(OPENMP_FOUND) From c9213a49a0a4db4e893b268868f5f06f76289055 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 09:21:12 +0100 Subject: [PATCH 45/75] Spanish translation updated by Faber777, closes #5085 --- rtdata/languages/Espanol | 518 +++++++++++++++++++-------------------- 1 file changed, 259 insertions(+), 259 deletions(-) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 042d92966..c899922b6 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -71,7 +71,7 @@ ADJUSTER_RESET_TO_DEFAULT;Restablece los valores predeterminados BATCHQUEUE_AUTOSTART;Inicio automático BATCHQUEUE_AUTOSTARTHINT;Iniciar automáticamente el procesamiento en cuanto llega un nuevo trabajo BATCHQUEUE_DESTFILENAME;Ruta y nombre del archivo -BATCHQUEUE_STARTSTOPHINT;Iniciar o detener el procesamiento de las imágenes en la cola.\nAtajo: Ctrl + s +BATCHQUEUE_STARTSTOPHINT;Iniciar o detener el procesamiento de las imágenes en la cola.\nTecla de Atajo: Ctrl + s BATCH_PROCESSING;Proceso por lotes CURVEEDITOR_AXIS_IN;I: CURVEEDITOR_AXIS_LEFT_TAN;LT: @@ -103,6 +103,10 @@ DYNPROFILEEDITOR_DELETE;Borrar DYNPROFILEEDITOR_EDIT;Editar DYNPROFILEEDITOR_EDIT_RULE;Editar regla de perfil dinámico DYNPROFILEEDITOR_ENTRY_TOOLTIP;La coincidencia no distingue entre mayúsculas y minúsculas. \nUtilice el prefijo "re:" para ingresar \nUna expresión regular. +DYNPROFILEEDITOR_IMGTYPE_ANY;Cualquier +DYNPROFILEEDITOR_IMGTYPE_HDR;HDR +DYNPROFILEEDITOR_IMGTYPE_PS;Cambio de píxel +DYNPROFILEEDITOR_IMGTYPE_STD;Estándar DYNPROFILEEDITOR_MOVE_DOWN;Mover hacia abajo DYNPROFILEEDITOR_MOVE_UP;Mover hacia arriba DYNPROFILEEDITOR_NEW;Nuevo @@ -116,6 +120,7 @@ EXIFFILTER_CAMERA;Cámara EXIFFILTER_EXPOSURECOMPENSATION;Compensación de exposición (EV) EXIFFILTER_FILETYPE;Tipo de archivo EXIFFILTER_FOCALLEN;Distancia focal +EXIFFILTER_IMAGETYPE;Tipo de imagen EXIFFILTER_ISO;ISO EXIFFILTER_LENS;Lente EXIFFILTER_METADATAFILTER;Activar filtros de metadatos @@ -229,11 +234,11 @@ FILEBROWSER_POPUPUNTRASH;Sacar de la papelera FILEBROWSER_QUERYBUTTONHINT;Borrar la búsqueda FILEBROWSER_QUERYHINT;Escriba parte del nombre del archivo a buscar, o una lista separada con comas.\nP.ej. 1001,1004,1199\n\nCtrl-F Para poner el foco en el campo Buscar.\nEnter Para iniciar la búsqueda.\nEsc Para limpiar.\nShift-Esc Para quitar el foco. FILEBROWSER_QUERYLABEL; Buscar: -FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nAtajoShift-1 -FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nAtajoShift-2 -FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nAtajoShift-3 -FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nAtajoShift-4 -FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nAtajoShift-5 +FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nTecla de AtajoShift-1 +FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nTecla de AtajoShift-2 +FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nTecla de AtajoShift-3 +FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nTecla de AtajoShift-4 +FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nTecla de AtajoShift-5 FILEBROWSER_RENAMEDLGLABEL;Renombrar archivo FILEBROWSER_RESETDEFAULTPROFILE;Restablecen a los predeterminados FILEBROWSER_SELECTDARKFRAME;Seleccionar Toma Negra… @@ -243,26 +248,26 @@ FILEBROWSER_SHOWCOLORLABEL2HINT;Mostrar imágenes etiquetadas con Amarillo Al FILEBROWSER_SHOWCOLORLABEL3HINT;Mostrar imágenes etiquetadas con Verde Alt-3 FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imágenes etiquetadas con Azul Alt-4 FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imágenes etiquetadas con Púrpura Alt-5 -FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nAtajo: d -FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nAtajo: 7 -FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nAtajo: 6 -FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nAtajo: i\n\nAtajo en modo editor simple: Alt-I +FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nTecla de Atajo: d +FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nTecla de Atajo: 7 +FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nTecla de Atajo: 6 +FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nTecla de Atajo: i\n\nTecla de Atajo en modo editor simple: Alt-I FILEBROWSER_SHOWNOTTRASHHINT;Mostrar solo las imágenes no borradas. FILEBROWSER_SHOWORIGINALHINT;Muestre solo imágenes originales. \nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias> Explorador de archivos> Extensiones analizadas. -FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nAtajo: 1 -FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nAtajo: 2 -FILEBROWSER_SHOWRANK3HINT;Mostrar imágenes con 3 estrellas.\nAtajo: 3 -FILEBROWSER_SHOWRANK4HINT;Mostrar imágenes con 4 estrellas.\nAtajo: 4 -FILEBROWSER_SHOWRANK5HINT;Mostrar imágenes con 5 estrellas.\nAtajo: 5 -FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imágenes guardadas recientemente.\nAtajo: Alt-7 -FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imágenes no guardadas recientemente.\nAtajo: Alt-6 -FILEBROWSER_SHOWTRASHHINT;Mostrar el contenido de la papelera.\nAtajo: Ctrl-t -FILEBROWSER_SHOWUNCOLORHINT;Mostrar imágenes sin etiqueta de color.\nAtajo: Alt-0 -FILEBROWSER_SHOWUNRANKHINT;Mostrar imágenes sin rango.\nAtajo: 0 +FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nTecla de Atajo: 1 +FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nTecla de Atajo: 2 +FILEBROWSER_SHOWRANK3HINT;Mostrar imágenes con 3 estrellas.\nTecla de Atajo: 3 +FILEBROWSER_SHOWRANK4HINT;Mostrar imágenes con 4 estrellas.\nTecla de Atajo: 4 +FILEBROWSER_SHOWRANK5HINT;Mostrar imágenes con 5 estrellas.\nTecla de Atajo: 5 +FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imágenes guardadas recientemente.\nTecla de Atajo: Alt-7 +FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imágenes no guardadas recientemente.\nTecla de Atajo: Alt-6 +FILEBROWSER_SHOWTRASHHINT;Mostrar el contenido de la papelera.\nTecla de Atajo: Ctrl-t +FILEBROWSER_SHOWUNCOLORHINT;Mostrar imágenes sin etiqueta de color.\nTecla de Atajo: Alt-0 +FILEBROWSER_SHOWUNRANKHINT;Mostrar imágenes sin rango.\nTecla de Atajo: 0 FILEBROWSER_THUMBSIZE;Tamaño miniatura -FILEBROWSER_UNRANK_TOOLTIP;Sin Rango\nAtajoShift - 0 -FILEBROWSER_ZOOMINHINT;Agrandar miniatura.\nAtajo: +\n\nAtajo en modo editor simple: Alt-+ -FILEBROWSER_ZOOMOUTHINT;Reducir miniatura.\nAtajo: -\n\nAtajo en modo editor simple: Alt-- +FILEBROWSER_UNRANK_TOOLTIP;Sin Rango\nTecla de AtajoShift - 0 +FILEBROWSER_ZOOMINHINT;Agrandar miniatura.\nTecla de Atajo: +\n\nTecla de Atajo en modo editor simple: Alt-+ +FILEBROWSER_ZOOMOUTHINT;Reducir miniatura.\nTecla de Atajo: -\n\nTecla de Atajo en modo editor simple: Alt-- FILECHOOSER_FILTER_ANY;Todos los archivos FILECHOOSER_FILTER_COLPROF;Perfiles de color FILECHOOSER_FILTER_CURVE;Archivos de curva @@ -278,6 +283,7 @@ GENERAL_AUTO;Automático GENERAL_BEFORE;Antes GENERAL_CANCEL;Cancelar GENERAL_CLOSE;Cerrar +GENERAL_CURRENT;Actual GENERAL_DISABLE;Desactivar GENERAL_DISABLED;Desactivado GENERAL_ENABLE;Activar @@ -290,7 +296,9 @@ GENERAL_NONE;Ninguno GENERAL_OK;Aceptar GENERAL_OPEN;Abrir GENERAL_PORTRAIT;Retrato +GENERAL_RESET;Reiniciar GENERAL_SAVE;Guardar +GENERAL_SAVE_AS;Guardar como... GENERAL_SLIDER;Deslizador GENERAL_UNCHANGED;(Sin cambios) GENERAL_WARNING;Advertencia @@ -301,6 +309,7 @@ HISTOGRAM_TOOLTIP_CHRO;Mostrar/Ocultar Histograma de cromaticidad HISTOGRAM_TOOLTIP_FULL;Cambiar entre Histograma completo o escalado HISTOGRAM_TOOLTIP_G;Mostrar/Ocultar Histograma Verde HISTOGRAM_TOOLTIP_L;Mostrar/Ocultar Histograma de Luminancia CIELAB +HISTOGRAM_TOOLTIP_MODE;Alterne entre la escala lineal, log-linear y log-log del histograma. HISTOGRAM_TOOLTIP_R;Mostrar/Ocultar Histograma Rojo HISTOGRAM_TOOLTIP_RAW;Mostrar/ocultar Histograma Raw HISTORY_CHANGED;Cambiado @@ -442,7 +451,7 @@ HISTORY_MSG_132;Reducción de ruido de crominancia HISTORY_MSG_133;Gamma de salida HISTORY_MSG_134;Gamma libre HISTORY_MSG_135;Gamma libre -HISTORY_MSG_136;Pendiente de gamma +HISTORY_MSG_136;Pendiente de (la curva) gamma HISTORY_MSG_137;Nivel de negro - Verde 1 HISTORY_MSG_138;Nivel de negro - Rojo HISTORY_MSG_139;Nivel de negro - Azul @@ -783,19 +792,99 @@ HISTORY_MSG_490;HDR TM - Cantidad HISTORY_MSG_491;Balance de Blancos HISTORY_MSG_492;RGB Curvas HISTORY_MSG_493;L*a*b* Ajustes +HISTORY_MSG_CLAMPOOG;Recortar la gama de colores HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Corrección del color +HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Corrección de color +HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Canal +HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;CT - máscara de región C +HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;CT - Mascara h +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;CT - luminosidad +HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;CT - L máscara +HISTORY_MSG_COLORTONING_LABREGION_LIST;CT - Lista +HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;CT - desenfoque la máscara de región +HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - Compensar la region +HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - Poder de la región +HISTORY_MSG_COLORTONING_LABREGION_SATURATION;CT - Saturacion +HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;CT -Muetra la máscara de región +HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - Región de la pendiente +HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Profundidad +HISTORY_MSG_DEHAZE_ENABLED;Haze Eliminación +HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Mostrar mapa de profundidad +HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Fuerza +HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Doble demosaicado - Umbral automático +HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Doble demosaicado - Umbral de contraste HISTORY_MSG_HISTMATCHING;Curva de tono auto-emparejado +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Salida - Primaria +HISTORY_MSG_ICM_OUTPUT_TEMP;Salida - ICC-v4 iluminante D +HISTORY_MSG_ICM_OUTPUT_TYPE;Salida - Tipo +HISTORY_MSG_ICM_WORKING_GAMMA;Trabajando - Gamma +HISTORY_MSG_ICM_WORKING_SLOPE;Trabajando - pendiente +HISTORY_MSG_ICM_WORKING_TRC_METHOD;Trabajando - TRC método HISTORY_MSG_LOCALCONTRAST_AMOUNT;Contraste cantidad-local HISTORY_MSG_LOCALCONTRAST_DARKNESS;Contraste Oscuridad-local HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste local HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste luminosidad-local HISTORY_MSG_LOCALCONTRAST_RADIUS;Contraste radio-local HISTORY_MSG_METADATA_MODE;Modo de copia de metadatos +HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Umbral de contraste +HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaicado método para el movimiento. +HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Dirección del filtro de ruido de línea +HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF filtro de líneas +HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Umbral de contraste +HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Corrección - Iteraciones +HISTORY_MSG_RAWCACORR_COLORSHIFT;Raw Corrección de CA bruta - Evite el cambio de color +HISTORY_MSG_RAW_BORDER;Raw margen/borde +HISTORY_MSG_RESIZE_ALLOWUPSCALING;Redimensionar - Permitir escalado +HISTORY_MSG_SHARPENING_CONTRAST;Enfoque - Umbral de contraste +HISTORY_MSG_SH_COLORSPACE;S/H - Espacio de color +HISTORY_MSG_SOFTLIGHT_ENABLED;Luz tenue +HISTORY_MSG_SOFTLIGHT_STRENGTH;Luz tenue - Fuerza HISTORY_MSG_TM_FATTAL_ANCHOR;HDR TM - Ancla HISTORY_NEWSNAPSHOT;Agregar -HISTORY_NEWSNAPSHOT_TOOLTIP;Atajo: Alt-s +HISTORY_NEWSNAPSHOT_TOOLTIP;Tecla de Atajo: Alt-s HISTORY_SNAPSHOT;Instantánea HISTORY_SNAPSHOTS;Instantáneas +ICCPROFCREATOR_COPYRIGHT;Copyright: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Restablecer los derechos de autor predeterminados, otorgados a "RawTherapee, CC0" +ICCPROFCREATOR_CUSTOM;Personalizado +ICCPROFCREATOR_DESCRIPTION;Descripción: +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Anexar los valores de gamma y pendiente a la descripción. +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Deje vacío para establecer la descripción por defecto. +ICCPROFCREATOR_GAMMA;Gamma (curva) +ICCPROFCREATOR_ICCVERSION;ICC versión: +ICCPROFCREATOR_ILL;Illuminante: +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;Valor por defecto +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;Solo se puede configurar el iluminante para los perfiles ICC v4. +ICCPROFCREATOR_PRIMARIES;Primarios: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;MejorRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Azul X +ICCPROFCREATOR_PRIM_BLUY;Azul Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Verde X +ICCPROFCREATOR_PRIM_GREY;Verde Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Rojo X +ICCPROFCREATOR_PRIM_REDY;Rojo Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;Solo puede establecer (colores) primarios personalizados para los perfiles ICC v4. +ICCPROFCREATOR_PRIM_WIDEG;Gamma Amplia +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;Guardar el perfil ICC como ... +ICCPROFCREATOR_SLOPE;Pendiente de la curva gamma +ICCPROFCREATOR_TRC_PRESET;Curva de respuesta de tono: IPTCPANEL_CATEGORY;Categoría IPTCPANEL_CATEGORYHINT;Identifica el tema de la imagen en la opinión del proveedor. IPTCPANEL_CITY;Ciudad @@ -843,24 +932,25 @@ LENSPROFILE_CORRECTION_LCPFILE;LCP archivo LENSPROFILE_CORRECTION_MANUAL;Parámetros de corrección manual LENSPROFILE_LENS_WARNING;Advertencia: el factor de recorte utilizado para el perfilado de la lente es mayor que el factor de recorte de la cámara, los resultados pueden ser incorrectos. MAIN_BUTTON_FULLSCREEN;Pantalla completa +MAIN_BUTTON_ICCPROFCREATOR;Creador de perfiles ICC MAIN_BUTTON_NAVNEXT_TOOLTIP;Navegar hasta la imagen Siguiente a la que está abierta en el editor:\nShift-F4\n\nPara navegar hasta la imagen Siguiente a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\nF4 MAIN_BUTTON_NAVPREV_TOOLTIP;Navegar hasta la imagen Anterior a la que está abierta en el editor:\nShift-F3\n\nPara navegar hasta la imagen Anterior a aquella cuya miniatura está seleccionada en el Explorador de Archivos:\nF3 MAIN_BUTTON_NAVSYNC_TOOLTIP;Sincronizar el Navegador de Archivos con el Editor para mostrar la miniatura de la imagen actualmente abierta y quitar los filtros en el Navegador de Archivos:\nx\n\nPara hacer lo dicho anteriormente, pero sin quitar los filtros en el Navegador de Archivos:\ny\n(Note que la miniatura del archivo abierto no será mostrada si los filtros la excluyen). MAIN_BUTTON_PREFERENCES;Preferencias MAIN_BUTTON_PUTTOQUEUE;Poner en la cola -MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Añadir imagen actual a la cola de procesamiento.\nAtajo: Ctrl+B +MAIN_BUTTON_PUTTOQUEUE_TOOLTIP;Añadir imagen actual a la cola de procesamiento.\nTecla de Atajo: Ctrl+B MAIN_BUTTON_SAVE;Guardar imagen -MAIN_BUTTON_SAVE_TOOLTIP;Guardar imagen actual.\nAtajo: Ctrl+S +MAIN_BUTTON_SAVE_TOOLTIP;Guardar imagen actual.\nTecla de Atajo: Ctrl+S MAIN_BUTTON_SENDTOEDITOR;Abrir con editor -MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Editar imagen actual en editor externo.\nAtajo: Ctrl+E -MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Mostrar/ocultar todos los paneles laterales.\nAtajo: m +MAIN_BUTTON_SENDTOEDITOR_TOOLTIP;Editar imagen actual en editor externo.\nTecla de Atajo: Ctrl+E +MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Mostrar/ocultar todos los paneles laterales.\nTecla de Atajo: m MAIN_BUTTON_UNFULLSCREEN;Salir de Pantalla completa MAIN_FRAME_BATCHQUEUE;Cola de lotes -MAIN_FRAME_BATCHQUEUE_TOOLTIP; Cola de lotes.\nAtajo: Ctrl-F3 +MAIN_FRAME_BATCHQUEUE_TOOLTIP; Cola de lotes.\nTecla de Atajo: Ctrl-F3 MAIN_FRAME_EDITOR;Editor -MAIN_FRAME_EDITOR_TOOLTIP; Editor.\nAtajo: Ctrl-F4 +MAIN_FRAME_EDITOR_TOOLTIP; Editor.\nTecla de Atajo: Ctrl-F4 MAIN_FRAME_FILEBROWSER;Explorador de archivos -MAIN_FRAME_FILEBROWSER_TOOLTIP; Explorador de archivos.\nAtajo: Ctrl-F2 +MAIN_FRAME_FILEBROWSER_TOOLTIP; Explorador de archivos.\nTecla de Atajo: Ctrl-F2 MAIN_FRAME_PLACES;Ubicaciones MAIN_FRAME_PLACES_ADD;Añadir MAIN_FRAME_PLACES_DEL;Borrar @@ -880,44 +970,45 @@ MAIN_MSG_SETPATHFIRST;Para poder usar esta función, primero tiene que establece MAIN_MSG_TOOMANYOPENEDITORS;Demasiados editores abiertos.\nPor favor cierre un editor para continuar. MAIN_MSG_WRITEFAILED;Falla al escribir\n\n"%1"\n\nAsegurese de que el folder exista y que usted tenga permiso de escritura sobre él. MAIN_TAB_ADVANCED;Avanzado -MAIN_TAB_ADVANCED_TOOLTIP;Método rápido: Alt-w +MAIN_TAB_ADVANCED_TOOLTIP;Tecla de Atajo: Alt-w MAIN_TAB_COLOR;Color -MAIN_TAB_COLOR_TOOLTIP;Atajo: Alt-C +MAIN_TAB_COLOR_TOOLTIP;Tecla de Atajo: Alt-C MAIN_TAB_DETAIL;Detalle -MAIN_TAB_DETAIL_TOOLTIP;Atajo: Alt-D +MAIN_TAB_DETAIL_TOOLTIP;Tecla de Atajo: Alt-D MAIN_TAB_DEVELOP;Revelar MAIN_TAB_EXIF;Exif MAIN_TAB_EXPORT; Exportación Rápida MAIN_TAB_EXPOSURE;Exposición -MAIN_TAB_EXPOSURE_TOOLTIP;Atajo: Alt-E +MAIN_TAB_EXPOSURE_TOOLTIP;Tecla de Atajo: Alt-E MAIN_TAB_FILTER;Filtro MAIN_TAB_INSPECT; Inspeccionar MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Metadatos -MAIN_TAB_METADATA_TOOLTIP;Atajo: Alt-M +MAIN_TAB_METADATA_TOOLTIP;Tecla de Atajo: Alt-M MAIN_TAB_RAW;Raw -MAIN_TAB_RAW_TOOLTIP;Atajo: Alt-R +MAIN_TAB_RAW_TOOLTIP;Tecla de Atajo: Alt-R MAIN_TAB_TRANSFORM;Transformar -MAIN_TAB_TRANSFORM_TOOLTIP;Atajo: Alt-T -MAIN_TOOLTIP_BACKCOLOR0;Color de fondo de la previsualización: Color del tema\nAtajo: 8 -MAIN_TOOLTIP_BACKCOLOR1;Color de fondo de la previsualización: Negro\nAtajo: 9 -MAIN_TOOLTIP_BACKCOLOR2;Color de fondo de la previsualización: Blanco\nAtajo: 0 +MAIN_TAB_TRANSFORM_TOOLTIP;Tecla de Atajo: Alt-T +MAIN_TOOLTIP_BACKCOLOR0;Color de fondo de la previsualización: Color del tema\nTecla de Atajo: 8 +MAIN_TOOLTIP_BACKCOLOR1;Color de fondo de la previsualización: Negro\nTecla de Atajo: 9 +MAIN_TOOLTIP_BACKCOLOR2;Color de fondo de la previsualización: Blanco\nTecla de Atajo: 0 MAIN_TOOLTIP_BACKCOLOR3;Color de fondo de la vista previa: Medio gris \nMétodo rápido: 9 MAIN_TOOLTIP_BEFOREAFTERLOCK;Bloquear / Desbloquear la vista Antes\n\nBloquear: la vista Antes permanece inalterada - \nútil para evaluar el efecto acumulativo de varias herramientas.\nAdemás, se puede hacer una comparación con cualquier estado en el Historial\n\nDesbloquear: la vista Antes seguirá a la vista Después un paso por detrás, mostrando la imagen antes del efecto de la herramienta que se está usando -MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar panel izquierdo (incluyendo historial).\nAtajo: i -MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas.\nAtajo: < -MAIN_TOOLTIP_INDCLIPPEDS;Indicación de sombras recortadas.\nAtajo: > -MAIN_TOOLTIP_PREVIEWB;Previsualización Canal azul.\nAtajo: b -MAIN_TOOLTIP_PREVIEWFOCUSMASK;Previsualización Máscara de Foco.\nAtajo: Shift-F\n\nMás preciso en imágenes con poca profundidad de campo, bajo ruido y a mayores niveles de aumento\n\nPara mejorar la precisión en imágenes con ruido evalúe usando menor aumento (10%-30%)\n\nPreview es realizada más lentamente cuando la Máscara de Foco esta activa. -MAIN_TOOLTIP_PREVIEWG;Previsualización Canal verde.\nAtajo: g -MAIN_TOOLTIP_PREVIEWL;Previsualización Luminosidad.\nAtajo: v\n\n0.299*R + 0.587*G + 0.114*B -MAIN_TOOLTIP_PREVIEWR;Previsualización Canal rojo.\nAtajo: r -MAIN_TOOLTIP_QINFO; Información breve de la imagen.\nAtajo: i -MAIN_TOOLTIP_SHOWHIDELP1;Mostrar/ocultar el panel izquierdo.\nAtajo: l -MAIN_TOOLTIP_SHOWHIDERP1;Mostrar/ocultar el panel derecho.\nAtajo: Alt-L -MAIN_TOOLTIP_SHOWHIDETP1;Mostrar/ocultar el panel superior.\nAtajo: Shift-L +MAIN_TOOLTIP_HIDEHP;Mostrar/Ocultar panel izquierdo (incluyendo historial).\nTecla de Atajo: i +MAIN_TOOLTIP_INDCLIPPEDH;Indicación de luces altas recortadas.\nTecla de Atajo: < +MAIN_TOOLTIP_INDCLIPPEDS;Indicación de sombras recortadas.\nTecla de Atajo: > +MAIN_TOOLTIP_PREVIEWB;Previsualización Canal azul.\nTecla de Atajo: b +MAIN_TOOLTIP_PREVIEWFOCUSMASK;Previsualización Máscara de Foco.\nTecla de Atajo: Shift-F\n\nMás preciso en imágenes con poca profundidad de campo, bajo ruido y a mayores niveles de aumento\n\nPara mejorar la precisión en imágenes con ruido evalúe usando menor aumento (10%-30%)\n\nLa vista previa es realizada más lentamente cuando la Máscara de Foco esta activa. +MAIN_TOOLTIP_PREVIEWG;Previsualización Canal verde.\nTecla de Atajo: g +MAIN_TOOLTIP_PREVIEWL;Previsualización Luminosidad.\Tecla de Atajo: v\n\n0.299*R + 0.587*G + 0.114*B +MAIN_TOOLTIP_PREVIEWR;Previsualización Canal rojo.\nTecla de Atajo: r +MAIN_TOOLTIP_PREVIEWSHARPMASK;Obtenga una vista previa de la máscara de contraste de nitidez . \n Tecla de atajo: p \n\nSólo funciona cuando la nitidez está activada y el zoom> = 100%. +MAIN_TOOLTIP_QINFO; Información breve de la imagen.\nTecla de Atajo : i +MAIN_TOOLTIP_SHOWHIDELP1;Mostrar/ocultar el panel izquierdo.\nTecla de Atajo: l +MAIN_TOOLTIP_SHOWHIDERP1;Mostrar/ocultar el panel derecho.\nTecla de Atajo: Alt-L +MAIN_TOOLTIP_SHOWHIDETP1;Mostrar/ocultar el panel superior.\nTecla de Atajo: Shift-L MAIN_TOOLTIP_THRESHOLD;Umbral -MAIN_TOOLTIP_TOGGLE;Cambiar vista antes/después.\nAtajo: Shift-B +MAIN_TOOLTIP_TOGGLE;Cambiar vista antes/después.\nTecla de Atajo: Shift-B MONITOR_PROFILE_SYSTEM;Sistema por defecto NAVIGATOR_B;B: NAVIGATOR_G;G: @@ -949,6 +1040,7 @@ PARTIALPASTE_CROP;Recortar PARTIALPASTE_DARKFRAMEAUTOSELECT;Auto Selección de la Toma Negra PARTIALPASTE_DARKFRAMEFILE;Archivo con Toma negra PARTIALPASTE_DEFRINGE;Eliminar borde púrpura +PARTIALPASTE_DEHAZE;Remoción de neblina PARTIALPASTE_DETAILGROUP;Ajustes de detalle PARTIALPASTE_DIALOGLABEL;Pegar parcialmente perfil de procesamiento PARTIALPASTE_DIRPYRDENOISE;Reducción de ruido @@ -982,13 +1074,16 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Aplicar filtro Pixel Muerto PARTIALPASTE_PREPROCESS_GREENEQUIL;Equilibrio del verde PARTIALPASTE_PREPROCESS_HOTPIXFILT;Aplicar filtro Pixel Caliente PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtro de ruido de línea +PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF filtro de líneas PARTIALPASTE_PRSHARPENING;Enfocar después del cambio de tamaño PARTIALPASTE_RAWCACORR_AUTO;Auto corrección de Aberración Cromática +PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA evitar el cambio de color PARTIALPASTE_RAWCACORR_CAREDBLUE;CA Rojo & Azul PARTIALPASTE_RAWEXPOS_BLACK;Nivel de negro PARTIALPASTE_RAWEXPOS_LINEAR;Corrección de punto blanco PARTIALPASTE_RAWEXPOS_PRESER;Preservar Luces Altas PARTIALPASTE_RAWGROUP;Ajustes Raw +PARTIALPASTE_RAW_BORDER;Raw margen/borde PARTIALPASTE_RAW_DCBENHANCE;Aplicar paso de mejora DCB PARTIALPASTE_RAW_DCBITERATIONS;Número de iteraciones DCB PARTIALPASTE_RAW_DMETHOD;Método de interpolado @@ -1004,11 +1099,18 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Sombras/Luces altas PARTIALPASTE_SHARPENEDGE;Bordes PARTIALPASTE_SHARPENING;Enfoque PARTIALPASTE_SHARPENMICRO;Micro-contraste +PARTIALPASTE_SOFTLIGHT;Luz tenue PARTIALPASTE_TM_FATTAL;Mapeo de tonos HDR PARTIALPASTE_VIBRANCE;Vibranza PARTIALPASTE_VIGNETTING;Corrección de viñeteo PARTIALPASTE_WHITEBALANCE;Equilibrio de blancos PREFERENCES_ADD;Añadir +PREFERENCES_APPEARANCE;Apariencia +PREFERENCES_APPEARANCE_COLORPICKERFONT;Selector del color de la fuente +PREFERENCES_APPEARANCE_CROPMASKCOLOR;Recortar la máscara de color +PREFERENCES_APPEARANCE_MAINFONT;Fuente principal +PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Color de la guía del navegador +PREFERENCES_APPEARANCE_THEME;Tema PREFERENCES_APPLNEXTSTARTUP;requiere reinicio PREFERENCES_AUTLISLOW;Bajo PREFERENCES_AUTLISMAX;Max - Promedio de todos los mosaicos @@ -1025,9 +1127,14 @@ PREFERENCES_BEHAVIOR;Comportamiento PREFERENCES_BEHSETALL;Todo para 'Establecer' PREFERENCES_BEHSETALLHINT;Todos los parámetros para el modo Establecer.\nLos ajustes de parámetros en el panel de la herramienta de lotes serán serán absolutos, se mostrarán los valores vigentes PREFERENCES_BLACKBODY;Tungsteno +PREFERENCES_CACHECLEAR;Borrar PREFERENCES_CACHECLEARALL;Borrar todo PREFERENCES_CACHECLEARPROFILES;Borrar perfiles PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas +PREFERENCES_CACHECLEAR_ALL;Borrar todos los archivos en caché: +PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Borre todos los archivos en caché excepto los perfiles de procesamiento en caché: +PREFERENCES_CACHECLEAR_ONLYPROFILES;Borrar solo los perfiles de procesamiento en caché: +PREFERENCES_CACHECLEAR_SAFETY;Sólo se borran los archivos en el caché. Los perfiles de procesamiento almacenados junto con las imágenes de origen no se tocan. PREFERENCES_CACHEMAXENTRIES;Cantidad máxima de entradas en la memoria intermedia PREFERENCES_CACHEOPTS;Opciones de memoria intermedia PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas @@ -1110,7 +1217,7 @@ PREFERENCES_GREYSC18;Yb=18 CIE L#50 PREFERENCES_GREYSCA;Automático PREFERENCES_HISTOGRAMPOSITIONLEFT;Histograma en panel izquierdo PREFERENCES_HISTOGRAMWORKING;Usar perfil de trabajo para el histograma principal y el navegador -PREFERENCES_HISTOGRAM_TOOLTIP;Si está activado, el perfil de trabajo se utiliza para renderizar el histograma principal y el panel navegador, de lo contrario se utiliza el perfil de Gamma Corregida de salida. +PREFERENCES_HISTOGRAM_TOOLTIP;Si está activado, el perfil de trabajo se utiliza para renderizar el histograma principal y el panel navegador, de lo contrario se utiliza el perfil de Gamma de la Corrección de salida. PREFERENCES_HLTHRESHOLD;Umbral de luces altas cortadas PREFERENCES_ICCDIR;Carpeta con perfiles de color ICC PREFERENCES_IMG_RELOAD_NEEDED;Estos cambios requieren que la imagen se vuelva a cargar (o que se abra una nueva imagen) para que tenga efecto. @@ -1162,6 +1269,8 @@ PREFERENCES_PARSEDEXTADDHINT;Ingrese una extensión y pulse este botón para agr PREFERENCES_PARSEDEXTDELHINT;Borrar de la lista las extensiones seleccionadas PREFERENCES_PARSEDEXTDOWNHINT;Mueve la extensión seleccionada hacia abajo en la lista. PREFERENCES_PARSEDEXTUPHINT;Mueve la extensión seleccionada hacia arriba en la lista. +PREFERENCES_PERFORMANCE_THREADS;Hilos(Procesos) +PREFERENCES_PERFORMANCE_THREADS_LABEL;Número máximo de subprocesos para reducción de ruido y niveles de wavelet (0 = automático) PREFERENCES_PREVDEMO;Vista previa del método Desmosaicado PREFERENCES_PREVDEMO_FAST;Rápido PREFERENCES_PREVDEMO_LABEL;Método de desmosaicado utilizado para la vista previa al <100% de zoom: @@ -1205,6 +1314,7 @@ PREFERENCES_SMA;A una escala pequeña(250x287) PREFERENCES_SND_BATCHQUEUEDONE;Trabajos en cola finalizados PREFERENCES_SND_HELP;Introducir el path o dejar en blanco (sin sonido). En Windows, usar "SystemDefault", "SystemAsterisk" etc. para los sonidos del sistema\nEn Linux use "complete", "window-attention" etc. para los sonidos del sistema. PREFERENCES_SND_LNGEDITPROCDONE;Procesado del editor terminado +PREFERENCES_SND_THRESHOLDSECS;Despues de segundos PREFERENCES_SND_TRESHOLDSECS;después de seg. PREFERENCES_STARTUPIMDIR;Carpeta de imágenes en el arranque PREFERENCES_STDAUT;Estándar @@ -1216,6 +1326,10 @@ PREFERENCES_TAB_IMPROC;Procesamiento de imágenes PREFERENCES_TAB_PERFORMANCE;Rendimiento PREFERENCES_TAB_SOUND;Sonidos PREFERENCES_THEME;Tema +PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Vista previa de JPEG incrustado +PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Imagen para mostrar +PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Representación (Render) Raw neutral +PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;JPEG incrustado si es de tamaño completo, de lo contrario es neutral sin formato PREFERENCES_TIMAX;Alto PREFERENCES_TINB;Número de mosaicos PREFERENCES_TISTD;Estándar @@ -1271,9 +1385,14 @@ QINFO_PIXELSHIFT;Pixel variación /% 2 cuadro(s) SAMPLEFORMAT_0;Formato de datos desconocido SAMPLEFORMAT_1;Sin firma 8 bits SAMPLEFORMAT_2;Sin firma 16 bits +SAMPLEFORMAT_4;24-bit LogLuv +SAMPLEFORMAT_8;32-bit LogLuv SAMPLEFORMAT_16;Punto flotante de 32 bits +SAMPLEFORMAT_32;24-bit punto flotante +SAMPLEFORMAT_64;32-bit punto flotante SAVEDLG_AUTOSUFFIX;Automáticamente añade un sufijo cuando el archivo ya existe SAVEDLG_FILEFORMAT;Formato de archivo +SAVEDLG_FILEFORMAT_FLOAT; punto flotante SAVEDLG_FORCEFORMATOPTS;Opciones de guardar forzado SAVEDLG_JPEGQUAL;Calidad JPEG SAVEDLG_PNGCOMPR;Compresión PNG @@ -1299,11 +1418,11 @@ THRESHOLDSELECTOR_HINT;Mantenga la tecla Mayús presionada para mover pun THRESHOLDSELECTOR_T;Superior THRESHOLDSELECTOR_TL;Superior izquierdo THRESHOLDSELECTOR_TR;Superior derecho -TOOLBAR_TOOLTIP_COLORPICKER;Selector de color bloqueable \nCuando esté habilitado: \nHaga clic en la vista previa con el botón izquierdo del ratón para agregar un selector de color \nArrastre alrededor mientras presiona el botón izquierdo del mouse \ nElimine el selector de color con el botón derecho del mouse haga clic en \nEliminar todos los selectores de color con Mayús + clic con el botón derecho del mouse \nHaz clic derecho para alejarse de cualquier selector de color y volver a la herramienta Mano -TOOLBAR_TOOLTIP_CROP;Selección de recorte.\nAtajo: c -TOOLBAR_TOOLTIP_HAND;Herramienta mano.\nAtajo: h -TOOLBAR_TOOLTIP_STRAIGHTEN;Enderezado / Rotación Fina.\nAtajo: s\n\nIndique la vertical u horizontal trazando una línea guía sobre la vista previa de la imagen. El ángulo de rotación será mostrado al continuación de la línea guía. El centro de la imagen es el centro de rotación. -TOOLBAR_TOOLTIP_WB;Muestrea equilibrio de blancos.\nAtajo: w +TOOLBAR_TOOLTIP_COLORPICKER;Selector de color bloqueable \nCuando esté habilitado: \nHaga clic en la vista previa con el botón izquierdo del ratón para agregar un selector de color \nArrastre alrededor mientras presiona el botón izquierdo del mouse \nElimine el selector de color con el botón derecho del mouse haga clic en \nEliminar todos los selectores de color con Mayús + clic con el botón derecho del mouse \nHaz clic derecho para alejarse de cualquier selector de color y volver a la herramienta Mano +TOOLBAR_TOOLTIP_CROP;Selección de recorte.\nTecla de Atajo: c +TOOLBAR_TOOLTIP_HAND;Herramienta mano.\nTecla de Atajo: h +TOOLBAR_TOOLTIP_STRAIGHTEN;Enderezado / Rotación Fina.\nTecla de Atajo: s\n\nIndique la vertical u horizontal trazando una línea guía sobre la vista previa de la imagen. El ángulo de rotación será mostrado al continuación de la línea guía. El centro de la imagen es el centro de rotación. +TOOLBAR_TOOLTIP_WB;Muestrea equilibrio de blancos.\nTecla de Atajo: w TP_BWMIX_ALGO;Algoritmo OYCPM TP_BWMIX_ALGO_LI;Lineal TP_BWMIX_ALGO_SP;Efectos especiales @@ -1376,10 +1495,11 @@ TP_CHMIXER_GREEN;Canal Verde TP_CHMIXER_LABEL;Mezclador de canales TP_CHMIXER_RED;Canal Rojo TP_CHROMATABERR_LABEL;Aberración cromática (AC) -TP_COARSETRAF_TOOLTIP_HFLIP;Voltear horizontalmente.\nAtajo: '[' -TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotar a la izquierda.\nAtajo: ']' +TP_COARSETRAF_TOOLTIP_HFLIP;Voltear horizontalmente.\nTecla de Atajo: '[' +TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotar a la izquierda.\nTecla de Atajo: ']' TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotar a la derecha TP_COARSETRAF_TOOLTIP_VFLIP;Voltear verticalmente +TP_COLORAPP_ABSOLUTELUMINANCE;Luminancia absoluta TP_COLORAPP_ADAPTSCENE;Adaptación a la luminosidad de la escena TP_COLORAPP_ADAPTSCENE_TOOLTIP;Luminancia absoluta del entorno de la escena (cd/m²).\n1) Calculado en base a datos Exif: \nTiempo de Exposición - Velocidad ISO - Número F de apertura - Corrección de exposición\n2) Calculado a partir del Punto Blanco raw y Compensación de Exposición RT. TP_COLORAPP_ADAPTVIEWING;Luminosidad de visualización (cd/m²) @@ -1395,6 +1515,7 @@ TP_COLORAPP_BADPIXSL;Filtro de píxeles calientes/muertos TP_COLORAPP_BADPIXSL_TOOLTIP;Supresión de píxeles calientes/muertos (con coloreado brillante).\n 0 = Sin efecto \n 1 = Mediana \n 2 = Gaussiano.\n\nEstos elementos extraños son causados por limitaciones de CIECAM02. Como alternativa, ajuste la imagen para evitar sombras muy oscuras. TP_COLORAPP_BRIGHT;Brillo (Q) TP_COLORAPP_BRIGHT_TOOLTIP;En CIECAM02 el Brillo tiene en cuenta la luminosidad de los blancos y es diferente al de Lab y al de RGB +TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;Cuando se configura manualmente, se recomiendan valores por encima de 65. TP_COLORAPP_CHROMA;Crominancia (C) TP_COLORAPP_CHROMA_M;Colorido (M) TP_COLORAPP_CHROMA_M_TOOLTIP;El Colorido CIECAM02 es diferente al de Lab y al de RGB @@ -1427,6 +1548,7 @@ TP_COLORAPP_LABEL_SCENE;Condiciones de la escena TP_COLORAPP_LABEL_VIEWING;Condiciones de visualización TP_COLORAPP_LIGHT;Claridad (J) TP_COLORAPP_LIGHT_TOOLTIP;Claridad en CIECAM02 es diferente a la de Lab y a la de RGB +TP_COLORAPP_MEANLUMINANCE;Luminancia media (Yb%) TP_COLORAPP_MODEL;Modelo de Punto Blanco TP_COLORAPP_MODEL_TOOLTIP;Modelo de Punto Blanco\n\nWB [RT] + [salida]:\nEl Balance de Blancos de RT es usado para la escena, CIECAM02 es establecido a D50, y el Balance de Blancos del dispositivo de salida es el establecido en Preferencias > Gestión de Color\n\nWB [RT+CAT02] + [salida]:\nEl Balance de Blancos de RT es usado por CAT02 y el del dispositivo de salida es el establecido en preferencias TP_COLORAPP_NEUTRAL;Restablecer @@ -1454,6 +1576,7 @@ TP_COLORAPP_TCMODE_SATUR;Saturación TP_COLORAPP_TEMP_TOOLTIP;Para seleccionar un iluminante, configure siempre Tinte = 1. \nA temperatura = 2856 \nD50 temperatura = 5003 \nD55 temperatura = 5503 \nD65 temperatura = 6504 \nD75 temperatura = 7504 TP_COLORAPP_TONECIE;Mapeo tonal usando Brillo (Q) CIECAM02. TP_COLORAPP_TONECIE_TOOLTIP;Si esta opción no está seleccionada, el mapeo tonal se hace usando el espacio de color Lab.\nSi esta opción está seleccionada, el mapeo tonal se hace usando CIECAM02.\nLa herramienta de mapeo tonal debe de estar habilitada para que esta selección tenga efecto +TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Luminancia absoluta del entorno de visualización \ n (normalmente 16 cd / m²). TP_COLORAPP_WBCAM;BalBlanco [RT+CAT02] + [salida] TP_COLORAPP_WBRT;BalBlanco [RT] + [salida] TP_COLORAPP_YB;Yb% (luminancia media) @@ -1472,6 +1595,25 @@ TP_COLORTONING_LAB;Mezcla Lab TP_COLORTONING_LABEL;Tonificación de Color TP_COLORTONING_LABGRID;L*a*b* cuadrícula de corrección del color TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nS: a=%3 b=%4 +TP_COLORTONING_LABREGIONS;Regiones de corrección de color +TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2 +TP_COLORTONING_LABREGION_CHANNEL;Canal +TP_COLORTONING_LABREGION_CHANNEL_ALL;Todos +TP_COLORTONING_LABREGION_CHANNEL_B;Azul +TP_COLORTONING_LABREGION_CHANNEL_G;Verde +TP_COLORTONING_LABREGION_CHANNEL_R;Rojo +TP_COLORTONING_LABREGION_CHROMATICITYMASK;C +TP_COLORTONING_LABREGION_HUEMASK;H +TP_COLORTONING_LABREGION_LIGHTNESS;Luminosidad +TP_COLORTONING_LABREGION_LIGHTNESSMASK;L +TP_COLORTONING_LABREGION_LIST_TITLE;Corrección +TP_COLORTONING_LABREGION_MASK;Máscara +TP_COLORTONING_LABREGION_MASKBLUR;Desenfoque de la máscara +TP_COLORTONING_LABREGION_OFFSET;Compensar +TP_COLORTONING_LABREGION_POWER;Potencia +TP_COLORTONING_LABREGION_SATURATION;Saturación +TP_COLORTONING_LABREGION_SHOWMASK;Mostrar máscara +TP_COLORTONING_LABREGION_SLOPE;Bajar TP_COLORTONING_LUMA;Luminancia TP_COLORTONING_LUMAMODE;Preservar luminancia TP_COLORTONING_LUMAMODE_TOOLTIP;Si está activado, cuando se cambia el color(rojo, verde, cian, azul, etc.) la luminancia de cada pixel es preservada. @@ -1511,6 +1653,7 @@ TP_CROP_GUIDETYPE;Clase de guía: TP_CROP_H;Al TP_CROP_LABEL;Recortar TP_CROP_PPI;Ptos/Pulgada= +TP_CROP_RESETCROP;Reiniciar TP_CROP_SELECTCROP;Seleccionar recorte TP_CROP_W;Ancho TP_CROP_X;x @@ -1520,6 +1663,10 @@ TP_DARKFRAME_LABEL;Toma Negra TP_DEFRINGE_LABEL;Quitar borde púrpura TP_DEFRINGE_RADIUS;Radio TP_DEFRINGE_THRESHOLD;Umbral +TP_DEHAZE_DEPTH;Profundidad +TP_DEHAZE_LABEL;Eliminación de neblina +TP_DEHAZE_SHOW_DEPTH_MAP;Mostrar mapa de profundidad +TP_DEHAZE_STRENGTH;Fuerza TP_DIRPYRDENOISE_CHROMINANCE_AMZ;Control automático de multi-zonas TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;Control automático global TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;Trate de evaluar el ruido del color \nTenga cuidado, este cálculo es promedio y es bastante subjetivo. @@ -1607,6 +1754,7 @@ 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 TP_EXPOSURE_BRIGHTNESS;Brillo +TP_EXPOSURE_CLAMPOOG;Corte fuera de la gama de colores TP_EXPOSURE_CLIP;Recorte % TP_EXPOSURE_CLIP_TIP;Fracción de los píxeles que se recortará en una operación de Niveles Automáticos TP_EXPOSURE_COMPRHIGHLIGHTS;Compresión de luces altas @@ -1709,6 +1857,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Guardar la imagen TIFF lineal antes de aplicar el p TP_ICM_TONECURVE;Usar la curva tonal en DCP TP_ICM_TONECURVE_TOOLTIP;Activa el uso de las curvas de tono que pueden contener los perfiles DCP. Este ajuste es posible solo si el DCP seleccionado contiene una curva tonal. TP_ICM_WORKINGPROFILE;Perfil de trabajo +TP_ICM_WORKING_TRC;Curva de respuesta de tono: +TP_ICM_WORKING_TRC_CUSTOM;Personalizado +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;Ninguna/o +TP_ICM_WORKING_TRC_SLOPE;Bajar +TP_ICM_WORKING_TRC_TOOLTIP;Solo para perfiles incorporados. TP_IMPULSEDENOISE_LABEL;Impulsar Reducc. ruido TP_IMPULSEDENOISE_THRESH;Umbral TP_LABCURVE_AVOIDCOLORSHIFT;Evitar desplazamiento de colores @@ -1751,10 +1905,19 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Puede usarse con el deslizador Cromaticidad y con la TP_LENSGEOM_AUTOCROP;Auto recorte TP_LENSGEOM_FILL;Auto relleno TP_LENSGEOM_LABEL;Lente / Geometría +TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automáticamente +TP_LENSPROFILE_CORRECTION_LCPFILE;LCP archivo +TP_LENSPROFILE_CORRECTION_MANUAL;Manual TP_LENSPROFILE_LABEL;Perfil de corrección de lente +TP_LENSPROFILE_LENS_WARNING;Advertencia: el factor de recorte utilizado para el perfilado de la lente es mayor que el factor de recorte de la cámara, los resultados pueden ser incorrectos. +TP_LENSPROFILE_MODE_HEADER;Seleccione el perfil de la lente: TP_LENSPROFILE_USECA;Corrección de AC TP_LENSPROFILE_USEDIST;Corrección de distorsión TP_LENSPROFILE_USEVIGN;Corrección de viñeteo +TP_LENSPROFILE_USE_CA;Aberración cromática +TP_LENSPROFILE_USE_GEOMETRIC;Geométrico +TP_LENSPROFILE_USE_HEADER;Seleccione distorsiones para corregir: +TP_LENSPROFILE_USE_VIGNETTING;Viñeteado TP_LOCALCONTRAST_AMOUNT;Cantidad TP_LOCALCONTRAST_DARKNESS;Nivel de sombras TP_LOCALCONTRAST_LABEL;Contraste local @@ -1785,10 +1948,19 @@ TP_PREPROCESS_HOTPIXFILT;Filtro Pixel Caliente TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Trata de eliminar los píxeles calientes. TP_PREPROCESS_LABEL;Preprocesado TP_PREPROCESS_LINEDENOISE;Filtro de ruido de línea +TP_PREPROCESS_LINEDENOISE_DIRECTION;Dirección +TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Ambos +TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal +TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal solo en filas PDAF +TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical TP_PREPROCESS_NO_FOUND;No encontrado +TP_PREPROCESS_PDAFLINESFILTER;PDAF filtro de líneas TP_PRSHARPENING_LABEL;Enfocar después del cambio de tamaño TP_PRSHARPENING_TOOLTIP;Enfoca la imagen después de cambiar el tamaño. Solo funciona cuando se utiliza el método de cambio de tamaño "Lanczos". Es imposible previsualizar los efectos de esta herramienta. Ver RawPedia para instrucciones de uso. TP_RAWCACORR_AUTO;Auto corrección +TP_RAWCACORR_AUTOIT;Iterations +TP_RAWCACORR_AUTOIT_TOOLTIP;Esta configuración está disponible si se marca "Corrección automática". \nLa autocorrección es conservadora, lo que significa que a menudo no corrige toda la aberración cromática. \nPara corregir la aberración cromática restante, puede usar hasta cinco iteraciones de aberración cromática automática. corrección. \nCada iteración reducirá la aberración cromática restante de la última iteración al costo de un tiempo de procesamiento adicional. +TP_RAWCACORR_AVOIDCOLORSHIFT;Evitar el cambio de color TP_RAWCACORR_CABLUE;Azul TP_RAWCACORR_CARED;Rojo TP_RAWCACORR_CASTR;Fuerza @@ -1805,16 +1977,24 @@ TP_RAWEXPOS_PRESER;Preservación de Luces Altas TP_RAWEXPOS_RGB;Rojo, Verde, Azul TP_RAWEXPOS_TWOGREEN;Vincular verdes TP_RAW_1PASSMEDIUM;1-pasaje (medio) +TP_RAW_2PASS;1-paso+rápido TP_RAW_3PASSBEST;3-Pasaje (Mejor) +TP_RAW_4PASS;3-paso+rápido TP_RAW_AHD;AHD TP_RAW_AMAZE;AMaZE +TP_RAW_AMAZEVNG4;AMaZE+VNG4 +TP_RAW_BORDER;Borde TP_RAW_DCB;DCB TP_RAW_DCBENHANCE;Aplicar paso de mejora DCB TP_RAW_DCBITERATIONS;Número de iteraciones DCB +TP_RAW_DCBVNG4;DCB+VNG4 TP_RAW_DMETHOD;Método TP_RAW_DMETHOD_PROGRESSBAR;%1 interpolando mosaico... TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Refinando la interpolación del mosaico... TP_RAW_DMETHOD_TOOLTIP;Nota: IGV y LMMSE están dedicados a imágenes tomadas con grandes velocidades ISO +TP_RAW_DUALDEMOSAICAUTOCONTRAST;Umbral automático +TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP;Si la casilla está marcada (recomendado), RawTherapee calcula un valor óptimo según las regiones planas de la imagen. \nSi no hay una región plana en la imagen o la imagen es demasiado ruidosa, el valor se establecerá en 0. \nPara establecer manualmente el valor, desmarque la casilla de verificación primero (los valores razonables dependen de la imagen). +TP_RAW_DUALDEMOSAICCONTRAST;Umbral de contraste TP_RAW_EAHD;EAHD TP_RAW_FALSECOLOR;Pasos de supresión de color falso TP_RAW_FAST;Fast @@ -1833,6 +2013,7 @@ TP_RAW_NONE;Ninguno (muestra el patrón del sensor) TP_RAW_PIXELSHIFT;Cambio de píxel TP_RAW_PIXELSHIFTADAPTIVE;Detección adaptativa TP_RAW_PIXELSHIFTBLUR;Máscara de movimiento de desenfoque +TP_RAW_PIXELSHIFTDMETHOD;Demosaicado, método para el movimiento TP_RAW_PIXELSHIFTEPERISO;ISO adaptación TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;El valor predeterminado de 0 debería funcionar bien para la base ISO. \nAumente el valor para mejorar la detección del movimiento para una ISO más alta. \nAumente en pequeños pasos y observe la máscara de movimiento mientras aumenta. TP_RAW_PIXELSHIFTEQUALBRIGHT;Ecualiza el brillo de los cuadros. @@ -1879,10 +2060,12 @@ TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;Factor de StdDev Azul TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;Factor de StdDev Verde TP_RAW_PIXELSHIFTSTDDEVFACTORRED;Factor de StdDev Rojo TP_RAW_RCD;RCD +TP_RAW_RCDVNG4;RCD+VNG4 TP_RAW_SENSOR_BAYER_LABEL;Sensor con matriz Bayer TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pases da mejores resultados (recomendado para imágenes de ISO bajo).\n1-pase es más rápido y es casi indistinguible del modo 3-pases para imágenes de ISO altas. TP_RAW_SENSOR_XTRANS_LABEL;Sensor con matriz X-Trans TP_RAW_VNG4;VNG4 +TP_RESIZE_ALLOW_UPSCALING;Permitir escalado TP_RESIZE_APPLIESTO;Aplica a: TP_RESIZE_CROPPEDAREA;Área recortada TP_RESIZE_FITBOX;Rectángulo límite @@ -1987,7 +2170,7 @@ TP_RGBCURVES_RED;R TP_ROTATE_DEGREE;Grados TP_ROTATE_LABEL;Rotar TP_ROTATE_SELECTLINE;Seleccionar línea recta -TP_SAVEDIALOG_OK_TIP;Atajo Ctrl-Enter +TP_SAVEDIALOG_OK_TIP;Tecla de Atajo Ctrl-Enter TP_SHADOWSHLIGHTS_HIGHLIGHTS;Luces altas TP_SHADOWSHLIGHTS_HLTONALW;Ancho tonal de Luces Altas TP_SHADOWSHLIGHTS_LABEL;Sombras/Luces altas @@ -2001,6 +2184,7 @@ TP_SHARPENEDGE_LABEL;Bordes TP_SHARPENEDGE_PASSES;Iteraciones TP_SHARPENEDGE_THREE;Sólo luminancia TP_SHARPENING_AMOUNT;Cantidad +TP_SHARPENING_CONTRAST;Umbral de contraste TP_SHARPENING_EDRADIUS;Radio TP_SHARPENING_EDTOLERANCE;Tolerancia de bordes TP_SHARPENING_HALOCONTROL;Control de halo @@ -2016,11 +2200,14 @@ TP_SHARPENING_RLD_ITERATIONS;Iteraciones TP_SHARPENING_THRESHOLD;Umbral TP_SHARPENING_USM;Máscara de enfoque TP_SHARPENMICRO_AMOUNT;Cantidad +TP_SHARPENMICRO_CONTRAST;Umbral de contraste TP_SHARPENMICRO_LABEL;Microcontraste TP_SHARPENMICRO_MATRIX;Matriz 3×3 en lugar de 5×5 TP_SHARPENMICRO_UNIFORMITY;Uniformidad +TP_SOFTLIGHT_LABEL;Luz tenue +TP_SOFTLIGHT_STRENGTH;Fuerza TP_TM_FATTAL_AMOUNT;Cantidad -TP_TM_FATTAL_ANCHORAncla +TP_TM_FATTAL_ANCHOR;Ancla TP_TM_FATTAL_LABEL;HDR Mapeo de tonos TP_TM_FATTAL_THRESHOLD;Límite TP_VIBRANCE_AVOIDCOLORSHIFT;Evitar desplazamiento de color @@ -2191,6 +2378,7 @@ TP_WAVELET_SETTINGS;Configuraciones Wavelet TP_WAVELET_SKIN;Enfocar piel/proteción TP_WAVELET_SKIN_TOOLTIP;A (menos)-100 los tonos de piel están afectados. \nA 0 todos los tonos se tratan por igual. \nA +100 los tonos de piel están protegidos, mientras que todos los demás tonos están afectados. TP_WAVELET_SKY;protección del cielo al enfocar +TP_WAVELET_SKY_TOOLTIP;A -100 se apuntan los tonos del cielo. \nEn 0 todos los tonos se tratan por igual. \nEn +100 los tonos del cielo están protegidos, mientras que todos los demás tonos están afectados. TP_WAVELET_SKY_TOOLTIPEn (menos)-100se afecta a los tonos del cielo. \nEn 0 todos los tonos se tratan por igual. \nen +100 los tonos del cielo están protegidos, mientras que todos los demás tonos están afectados. TP_WAVELET_STREN;Fuerza TP_WAVELET_STRENGTH;Fuerza @@ -2244,6 +2432,7 @@ TP_WBALANCE_LED_CRS;CRS SP12 WWMR16 TP_WBALANCE_LED_HEADER;LED TP_WBALANCE_LED_LSI;LSI Lumelex 2040 TP_WBALANCE_METHOD;Método +TP_WBALANCE_PICKER;Seleccionar TP_WBALANCE_SHADE;Sombra TP_WBALANCE_SIZE;Tamaño: TP_WBALANCE_SOLUX35;Solux 3500K @@ -2260,204 +2449,15 @@ TP_WBALANCE_WATER2;Subacuático 2 TP_WBALANCE_WATER_HEADER;Subacuático ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Abrir (nueva) ventana de detalle -ZOOMPANEL_ZOOM100;Zoom al 100%\nAtajo: z +ZOOMPANEL_ZOOM100;Zoom al 100%\nTecla de Atajo: z ZOOMPANEL_ZOOMFITCROPSCREEN;Ajustar el recorte a la pantalla \nCorte corto: f -ZOOMPANEL_ZOOMFITSCREEN;Ajustar a pantalla\nAtajo: Alt-f -ZOOMPANEL_ZOOMIN;Aumentar Zoom\nAtajo: + -ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - +ZOOMPANEL_ZOOMFITSCREEN;Ajustar a pantalla\nTecla de Atajo: Alt-f +ZOOMPANEL_ZOOMIN;Aumentar Zoom\nTecla de Atajo: + +ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: - !!!!!!!!!!!!!!!!!!!!!!!!! ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!DYNPROFILEEDITOR_IMGTYPE_ANY;Any -!DYNPROFILEEDITOR_IMGTYPE_HDR;HDR -!DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift -!DYNPROFILEEDITOR_IMGTYPE_STD;Standard -!EXIFFILTER_IMAGETYPE;Image type -!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_CLAMPOOG;Clip out-of-gamut colors -!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_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction -!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold -!HISTORY_MSG_RAWCACORR_AUTOIT;Raw CA Correction - Iterations -!HISTORY_MSG_RAWCACORR_COLORSHIFT;Raw CA Correction - Avoid color shift -!HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling -!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold -!HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace -!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light -!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength -!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 -!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_CACHECLEAR;Clear -!PREFERENCES_CACHECLEAR_ALL;Clear all cached files: -!PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles: -!PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles: -!PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched. -!PREFERENCES_PERFORMANCE_THREADS;Threads -!PREFERENCES_PERFORMANCE_THREADS_LABEL;Maximum number of threads for Noise Reduction and Wavelet Levels (0 = Automatic) -!PREFERENCES_SND_THRESHOLDSECS;After seconds -!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 -!SAMPLEFORMAT_4;24-bit LogLuv -!SAMPLEFORMAT_8;32-bit LogLuv -!SAMPLEFORMAT_32;24-bit floating-point -!SAMPLEFORMAT_64;32-bit floating-point -!SAVEDLG_FILEFORMAT_FLOAT; floating-point -!TP_COLORAPP_ABSOLUTELUMINANCE;Absolute luminance -!TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;When setting manually, values above 65 are recommended. -!TP_COLORAPP_MEANLUMINANCE;Mean luminance (Yb%) -!TP_COLORAPP_VIEWING_ABSOLUTELUMINANCE_TOOLTIP;Absolute luminance of the viewing environment\n(usually 16 cd/m²). -!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_DEHAZE_DEPTH;Depth -!TP_DEHAZE_LABEL;Haze Removal -!TP_DEHAZE_SHOW_DEPTH_MAP;Show Depth Map -!TP_DEHAZE_STRENGTH;Strength -!TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors -!TP_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_PREPROCESS_LINEDENOISE_DIRECTION;Direction -!TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both -!TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal -!TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows -!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical -!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter +!CURVEEDITOR_CATMULLROM;Flexible !TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. -!TP_RAWCACORR_AUTOIT;Iterations -!TP_RAWCACORR_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_SHARPENING_CONTRAST;Contrast threshold -!TP_SHARPENMICRO_CONTRAST;Contrast threshold -!TP_SOFTLIGHT_LABEL;Soft Light -!TP_SOFTLIGHT_STRENGTH;Strength -!TP_TM_FATTAL_ANCHOR;Anchor -!TP_WAVELET_SKY_TOOLTIP;At -100 sky-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 sky-tones are protected while all other tones are affected. -!TP_WBALANCE_PICKER;Pick From 95b1fb77a113d9093ce9331771981e6e2888a967 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 09:21:20 +0100 Subject: [PATCH 46/75] generateTranslationDiffs --- rtdata/languages/Catala | 1 + rtdata/languages/Chinese (Simplified) | 1 + rtdata/languages/Chinese (Traditional) | 3 ++- rtdata/languages/Czech | 1 + rtdata/languages/Dansk | 3 ++- rtdata/languages/Deutsch | 5 +++++ rtdata/languages/English (UK) | 3 ++- rtdata/languages/English (US) | 3 ++- rtdata/languages/Euskara | 3 ++- rtdata/languages/Francais | 5 +++++ rtdata/languages/Greek | 3 ++- rtdata/languages/Hebrew | 3 ++- rtdata/languages/Italiano | 1 + rtdata/languages/Japanese | 1 + rtdata/languages/Latvian | 3 ++- rtdata/languages/Magyar | 1 + rtdata/languages/Nederlands | 1 + rtdata/languages/Norsk BM | 3 ++- rtdata/languages/Polish | 1 + rtdata/languages/Polish (Latin Characters) | 1 + rtdata/languages/Portugues (Brasil) | 1 + rtdata/languages/Russian | 1 + rtdata/languages/Serbian (Cyrilic Characters) | 1 + rtdata/languages/Serbian (Latin Characters) | 1 + rtdata/languages/Slovak | 1 + rtdata/languages/Suomi | 3 ++- rtdata/languages/Swedish | 1 + rtdata/languages/Turkish | 3 ++- 28 files changed, 47 insertions(+), 11 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 97a973c02..4b763d770 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -940,6 +940,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index fcbaa3275..d95a61092 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -980,6 +980,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DYNPROFILEEDITOR_IMGTYPE_ANY;Any !DYNPROFILEEDITOR_IMGTYPE_HDR;HDR diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 2f04282e4..602c9ecfc 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -432,9 +432,10 @@ TP_WBALANCE_TEMPERATURE;色溫 !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 0d23d40c4..e630ba95d 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2162,6 +2162,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !!!!!!!!!!!!!!!!!!!!!!!!! !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 diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index acc41f01d..83289ba34 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -424,9 +424,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 33bec128f..dce8e1803 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -2407,3 +2407,8 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!CURVEEDITOR_CATMULLROM;Flexible diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 76103b42c..84ea433f3 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -138,9 +138,10 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index cbeccac41..c60c5d64b 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -18,9 +18,10 @@ !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index f1c1b3a3c..c3f519d96 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -425,9 +425,10 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 9779e4145..083686c00 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2334,3 +2334,8 @@ 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 diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index 1d5ee7fee..bf6de0f56 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -424,9 +424,10 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 2bb35e982..d87a3ce00 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -425,9 +425,10 @@ TP_WBALANCE_TEMPERATURE;מידת חום !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 14ac71ae7..e464017c0 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1291,6 +1291,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 3681fca15..477a1d4ed 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -2340,4 +2340,5 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! +!CURVEEDITOR_CATMULLROM;Flexible !GENERAL_CURRENT;Current diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 2b56c2937..8d552bed9 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -425,9 +425,10 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index a2a9afd96..b211b19f4 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -861,6 +861,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 24d50791d..14e0ebfc6 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2049,6 +2049,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value. !BATCHQUEUE_STARTSTOPHINT;Start or stop processing the images in the queue.\n\nShortcut: Ctrl+s +!CURVEEDITOR_CATMULLROM;Flexible !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_IMGTYPE_ANY;Any !DYNPROFILEEDITOR_IMGTYPE_HDR;HDR diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index aec6c8256..e4f2bc1cb 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -424,9 +424,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 72d35b7db..ac9a7c717 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1413,6 +1413,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 909154913..f161f0bb7 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1413,6 +1413,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index ccabad796..bc5316948 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -2219,6 +2219,7 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! +!CURVEEDITOR_CATMULLROM;Flexible !DYNPROFILEEDITOR_IMGTYPE_ANY;Any !DYNPROFILEEDITOR_IMGTYPE_HDR;HDR !DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 6c211244c..e40077acd 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1433,6 +1433,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !EDIT_OBJECT_TOOLTIP;Displays a widget on the preview window which lets you adjust this tool. !EDIT_PIPETTE_TOOLTIP;To add an adjustment point to the curve, hold the Ctrl key while left-clicking the desired spot in the image preview.\nTo adjust the point, hold the Ctrl key while left-clicking the corresponding area in the preview, then let go of Ctrl (unless you desire fine control) and while still holding the left mouse button move the mouse up or down to move that point up or down in the curve. diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index accfb139e..6b9769309 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1248,6 +1248,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DIRBROWSER_FOLDERS;Folders !DONT_SHOW_AGAIN;Don't show this message again. diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index f0ce781c3..45101faeb 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1248,6 +1248,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DIRBROWSER_FOLDERS;Folders !DONT_SHOW_AGAIN;Don't show this message again. diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 66debb12b..b8d3726a8 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -512,6 +512,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 8f6ebdc15..9fd0f37c5 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -426,9 +426,10 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 626afc38b..25504cd8f 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1801,6 +1801,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !BATCHQUEUE_STARTSTOPHINT;Start or stop processing the images in the queue.\n\nShortcut: Ctrl+s !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !DONT_SHOW_AGAIN;Don't show this message again. !DYNPROFILEEDITOR_DELETE;Delete diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index a62704a92..ff8c63d5e 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -425,9 +425,10 @@ TP_WBALANCE_TEMPERATURE;Isı !CURVEEDITOR_AXIS_LEFT_TAN;LT: !CURVEEDITOR_AXIS_OUT;O: !CURVEEDITOR_AXIS_RIGHT_TAN;RT: +!CURVEEDITOR_CATMULLROM;Flexible !CURVEEDITOR_CURVE;Curve !CURVEEDITOR_CURVES;Curves -!CURVEEDITOR_CUSTOM;Custom +!CURVEEDITOR_CUSTOM;Standard !CURVEEDITOR_DARKS;Darks !CURVEEDITOR_EDITPOINT_HINT;Enable edition of node in/out values.\n\nRight-click on a node to select it.\nRight-click on empty space to de-select the node. !CURVEEDITOR_HIGHLIGHTS;Highlights From 71dcf2ca1aab3f359e70b00fcbd4ecd9092e60c5 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 09:35:44 +0100 Subject: [PATCH 47/75] Updated TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP --- rtdata/languages/Catala | 2 +- rtdata/languages/Chinese (Simplified) | 2 +- rtdata/languages/Chinese (Traditional) | 2 +- rtdata/languages/Dansk | 2 +- rtdata/languages/English (UK) | 2 +- rtdata/languages/English (US) | 2 +- rtdata/languages/Espanol | 2 +- rtdata/languages/Euskara | 2 +- rtdata/languages/Greek | 2 +- rtdata/languages/Hebrew | 2 +- rtdata/languages/Italiano | 2 +- rtdata/languages/Latvian | 2 +- rtdata/languages/Magyar | 2 +- rtdata/languages/Nederlands | 2 +- rtdata/languages/Norsk BM | 2 +- rtdata/languages/Polish | 2 +- rtdata/languages/Polish (Latin Characters) | 2 +- rtdata/languages/Portugues (Brasil) | 2 +- rtdata/languages/Russian | 2 +- rtdata/languages/Serbian (Cyrilic Characters) | 2 +- rtdata/languages/Serbian (Latin Characters) | 2 +- rtdata/languages/Slovak | 2 +- rtdata/languages/Suomi | 2 +- rtdata/languages/Swedish | 2 +- rtdata/languages/Turkish | 2 +- rtdata/languages/default | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 4b763d770..7fe80f35d 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1969,7 +1969,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index d95a61092..ebf3ed441 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1933,7 +1933,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 602c9ecfc..d85d9e310 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1878,7 +1878,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 83289ba34..c5fd26a85 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1875,7 +1875,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 84ea433f3..d05f3e503 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -1839,7 +1839,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index c60c5d64b..0c23de3df 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -1825,7 +1825,7 @@ !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index c899922b6..b8bf09ef9 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -2460,4 +2460,4 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: - !!!!!!!!!!!!!!!!!!!!!!!!! !CURVEEDITOR_CATMULLROM;Flexible -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index c3f519d96..f55a1800e 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1876,7 +1876,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index bf6de0f56..ce910a515 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1875,7 +1875,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index d87a3ce00..80da66992 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1876,7 +1876,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index e464017c0..82d10a3bb 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1987,7 +1987,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 8d552bed9..0e13f8c87 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1876,7 +1876,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index b211b19f4..c60c315fb 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1961,7 +1961,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 14e0ebfc6..66563fa59 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2318,7 +2318,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index e4f2bc1cb..a079c7b78 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1875,7 +1875,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index ac9a7c717..3e7bde183 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -2004,7 +2004,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index f161f0bb7..a736d608e 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -2004,7 +2004,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index bc5316948..524ca0749 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1744,7 +1744,6 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal apenas em linhas PDAF TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical TP_PREPROCESS_NO_FOUND;Nenhum encontrado TP_PREPROCESS_PDAFLINESFILTER;Filtro de linhas PDAF -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tenta suprimir o ruído de faixas causado por pixels PDAF no sensor, ocorrendo com algumas câmeras mirrorless da Sony em algumas cenas em contraluz com "flare" visível. TP_PRSHARPENING_LABEL;Pós-Redimensionamento de Nitidez TP_PRSHARPENING_TOOLTIP;Focaliza a imagem após o redimensionamento. Funciona somente quando o método de redimensionamento "Lanczos" é usado. É impossível visualizar os efeitos dessa ferramenta. Veja RawPedia para instruções de uso. TP_RAWCACORR_AUTO;Auto correção @@ -2307,6 +2306,7 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - !TP_LENSPROFILE_USE_GEOMETRIC;Geometric !TP_LENSPROFILE_USE_HEADER;Select distortions to correct: !TP_LENSPROFILE_USE_VIGNETTING;Vignetting +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index e40077acd..2a165804e 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -2034,7 +2034,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 6b9769309..11a305f7d 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1988,7 +1988,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 45101faeb..8da1463a6 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1988,7 +1988,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index b8d3726a8..4ddfc9b16 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1891,7 +1891,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 9fd0f37c5..9ad36b161 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1876,7 +1876,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 25504cd8f..61a5a5d2a 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -2190,7 +2190,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index ff8c63d5e..f8ec2b768 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1875,7 +1875,7 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/default b/rtdata/languages/default index e53550a0d..f31ec4bec 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1824,7 +1824,7 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical TP_PREPROCESS_NO_FOUND;None found TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare. +TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. TP_PRSHARPENING_LABEL;Post-Resize Sharpening TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. TP_RAWCACORR_AUTO;Auto-correction From ad2fc472ef71ba5bb234ac0648153ce2459fbd65 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 11 Dec 2018 13:26:12 +0100 Subject: [PATCH 48/75] Do not show console window when started in remote mode (-R) --- rtgui/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index 7789b75ed..8996ee01d 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -536,7 +536,7 @@ int main (int argc, char **argv) bool Console = true; for (int i = 1; i < argc; i++) - if (!strcmp (argv[i], "-w")) { + if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R")) { Console = false; break; } From e91df4d59f6405f1e7b2da1e98704feb11c43596 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 11 Dec 2018 15:57:17 +0100 Subject: [PATCH 49/75] Closing RT is slow on Windows when cache folder contains a lot of files, fixes #5083 --- rtgui/cachemanager.cc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc index 5f73e9e0f..d86f6c41f 100644 --- a/rtgui/cachemanager.cc +++ b/rtgui/cachemanager.cc @@ -339,6 +339,25 @@ Glib::ustring CacheManager::getCacheFileName (const Glib::ustring& subDir, void CacheManager::applyCacheSizeLimitation () const { + // first count files without fetching file name and timestamp. + std::size_t numFiles = 0; + try { + + const auto dirName = Glib::build_filename (baseDir, "data"); + const auto dir = Gio::File::create_for_path (dirName); + + auto enumerator = dir->enumerate_children (""); + + while (numFiles <= options.maxCacheEntries && enumerator->next_file ()) { + ++numFiles; + } + + } catch (Glib::Exception&) {} + + if (numFiles <= options.maxCacheEntries) { + return; + } + using FNameMTime = std::pair; std::vector files; From 26720bdc2bf0e54471d2a87e5bc3f0001f0aaf41 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Tue, 11 Dec 2018 16:51:45 +0100 Subject: [PATCH 50/75] Update Deutsch locale --- rtdata/languages/Deutsch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index dce8e1803..8db0f4db3 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -74,6 +74,7 @@ #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 +#76 11.12.2018 Erweiterung (TooWaBoo) RT 5.5 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -92,7 +93,7 @@ CURVEEDITOR_AXIS_OUT;y: CURVEEDITOR_AXIS_RIGHT_TAN;RT: CURVEEDITOR_CURVE;Kurve CURVEEDITOR_CURVES;Kurven -CURVEEDITOR_CUSTOM;Angepasst +CURVEEDITOR_CUSTOM;Standard CURVEEDITOR_DARKS;Tiefen CURVEEDITOR_EDITPOINT_HINT;Bearbeitung der Kurvenpunkte über Zahlenwerte.\n\nRechtsklick auf einen Kurvenpunkt um ihn auszuwählen.\nRechtsklick in einen leeren Bereich um ihn abzuwählen. CURVEEDITOR_HIGHLIGHTS;Spitzlichter @@ -2411,4 +2412,4 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!CURVEEDITOR_CATMULLROM;Flexible +CURVEEDITOR_CATMULLROM;Flexibel From f72277bf4e52ceee8df821a207f951b1e19d91ae Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 20:46:50 +0100 Subject: [PATCH 51/75] Removed PDAF tooltip in favor of RawPedia --- rtdata/languages/Catala | 1 - rtdata/languages/Chinese (Simplified) | 1 - rtdata/languages/Chinese (Traditional) | 1 - rtdata/languages/Czech | 1 - rtdata/languages/Dansk | 1 - rtdata/languages/Deutsch | 1 - rtdata/languages/English (UK) | 1 - rtdata/languages/English (US) | 1 - rtdata/languages/Espanol | 1 - rtdata/languages/Euskara | 1 - rtdata/languages/Francais | 1 - rtdata/languages/Greek | 1 - rtdata/languages/Hebrew | 1 - rtdata/languages/Italiano | 1 - rtdata/languages/Japanese | 1 - rtdata/languages/Latvian | 1 - rtdata/languages/Magyar | 1 - rtdata/languages/Nederlands | 1 - rtdata/languages/Norsk BM | 1 - rtdata/languages/Polish | 1 - rtdata/languages/Polish (Latin Characters) | 1 - rtdata/languages/Portugues (Brasil) | 1 - rtdata/languages/Russian | 1 - rtdata/languages/Serbian (Cyrilic Characters) | 1 - rtdata/languages/Serbian (Latin Characters) | 1 - rtdata/languages/Slovak | 1 - rtdata/languages/Suomi | 1 - rtdata/languages/Swedish | 1 - rtdata/languages/Turkish | 1 - rtdata/languages/default | 1 - rtgui/bayerpreprocess.cc | 1 - 31 files changed, 31 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 7fe80f35d..a4bd8b069 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1969,7 +1969,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index ebf3ed441..e4d52b774 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1933,7 +1933,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index d85d9e310..45d00011d 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1878,7 +1878,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index e630ba95d..f7b7415d0 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -1702,7 +1702,6 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Vodorovně pouze PDAF řádky TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Svisle TP_PREPROCESS_NO_FOUND;Nic nenalezeno TP_PREPROCESS_PDAFLINESFILTER;Filtr PDAF linek -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Pokusí se potlačit proužkový šum způsobený PDAF pixely na sensoru, vznikající na některých bezzrcadlovkách Sony v některých scénách se záblesky v protisvětle. 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 diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index c5fd26a85..2813a4184 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1875,7 +1875,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 8db0f4db3..c893c5d55 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -1908,7 +1908,6 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal (nur PDAF-Zeilen) TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertikal TP_PREPROCESS_NO_FOUND;Nichts gefunden TP_PREPROCESS_PDAFLINESFILTER;PDAF-Zeilenfilter -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Minimiert Streifenrauschen, das bei Gegenlichtaufnahmen mit\nsichtbaren Flares einiger spiegellosen Sony-Kameras entsteht. TP_PRSHARPENING_LABEL;Nach Skalierung schärfen TP_PRSHARPENING_TOOLTIP;Schärft das Bild nach der Größenänderung.\nFunktioniert nur mit der Methode “Lanczos“.\nDas Ergebnis wird nicht in RawTherapee\nangezeigt.\n\nWeitere Informationen finden Sie auf “RawPedia“. TP_RAWCACORR_AUTO;Autokorrektur diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index d05f3e503..fbdb43b15 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -1839,7 +1839,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 0c23de3df..5a6c60fa6 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -1825,7 +1825,6 @@ !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index b8bf09ef9..0e4904677 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -2460,4 +2460,3 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: - !!!!!!!!!!!!!!!!!!!!!!!!! !CURVEEDITOR_CATMULLROM;Flexible -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index f55a1800e..b51e1c7a8 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1876,7 +1876,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 083686c00..c331bcb22 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -1834,7 +1834,6 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontale seulement sur les lig TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Verticale TP_PREPROCESS_NO_FOUND;Aucun trouvé TP_PREPROCESS_PDAFLINESFILTER;Filtre de ligne PDAF -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Essaie de supprimer les bandes de bruit causées par les pixel PDAF sur le capteur, arrivant sur certains mirrorless Sony cameras avec des scènes en contre-jour avec un flare visible. TP_PRSHARPENING_LABEL;Netteté post-redimensionnement TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimentionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisé. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation. TP_RAWCACORR_AUTO;Correction automatique diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index ce910a515..eb767c5b1 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1875,7 +1875,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 80da66992..4127c9088 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1876,7 +1876,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 82d10a3bb..e7570e7c4 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1987,7 +1987,6 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 477a1d4ed..683f9f24b 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -1855,7 +1855,6 @@ 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;自動補正 diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 0e13f8c87..97e37df3d 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1876,7 +1876,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index c60c315fb..70191d6ec 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1961,7 +1961,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 66563fa59..0f1fdff6e 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2318,7 +2318,6 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index a079c7b78..f88d154aa 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1875,7 +1875,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 3e7bde183..6ce13d6c8 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -2004,7 +2004,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index a736d608e..4ee26dde4 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -2004,7 +2004,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 524ca0749..f5a72cb4c 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -2306,7 +2306,6 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - !TP_LENSPROFILE_USE_GEOMETRIC;Geometric !TP_LENSPROFILE_USE_HEADER;Select distortions to correct: !TP_LENSPROFILE_USE_VIGNETTING;Vignetting -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 2a165804e..90bed5d14 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -2034,7 +2034,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 11a305f7d..99acdd920 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1988,7 +1988,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 8da1463a6..d42f9436d 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1988,7 +1988,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 4ddfc9b16..3721e9d5c 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1891,7 +1891,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTOIT;Iterations diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 9ad36b161..a40ff50d1 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1876,7 +1876,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 61a5a5d2a..868e609bb 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -2190,7 +2190,6 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !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 diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index f8ec2b768..c18b68216 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1875,7 +1875,6 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical !TP_PREPROCESS_NO_FOUND;None found !TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtdata/languages/default b/rtdata/languages/default index f31ec4bec..cba59b563 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1824,7 +1824,6 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical TP_PREPROCESS_NO_FOUND;None found TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter -TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Suppresses stripe noise caused by on-sensor PDAF pixels, known to occur on some Sony and Nikon cameras when shooting backlit scenes with visible flare. TP_PRSHARPENING_LABEL;Post-Resize Sharpening TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. TP_RAWCACORR_AUTO;Auto-correction diff --git a/rtgui/bayerpreprocess.cc b/rtgui/bayerpreprocess.cc index 7c9545b89..281271dbd 100644 --- a/rtgui/bayerpreprocess.cc +++ b/rtgui/bayerpreprocess.cc @@ -68,7 +68,6 @@ BayerPreProcess::BayerPreProcess () : FoldableToolPanel(this, "bayerpreprocess", pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4); pdafLinesFilter = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_PDAFLINESFILTER")))); - pdafLinesFilter->set_tooltip_markup(M("TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP")); pdafLinesFilter->show(); pdafLinesFilter->signal_toggled().connect(sigc::mem_fun(*this, &BayerPreProcess::pdafLinesFilterChanged), true); From aece987d5540ec60bf74152c266b71d8c3f430aa Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 20:47:50 +0100 Subject: [PATCH 52/75] astyled and removed whitespace from bayerpreprocess.cc --- rtgui/bayerpreprocess.cc | 73 ++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/rtgui/bayerpreprocess.cc b/rtgui/bayerpreprocess.cc index 281271dbd..0720612fe 100644 --- a/rtgui/bayerpreprocess.cc +++ b/rtgui/bayerpreprocess.cc @@ -24,14 +24,14 @@ using namespace rtengine; using namespace rtengine::procparams; -BayerPreProcess::BayerPreProcess () : FoldableToolPanel(this, "bayerpreprocess", M("TP_PREPROCESS_LABEL"), true) +BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, "bayerpreprocess", M("TP_PREPROCESS_LABEL"), true) { auto m = ProcEventMapper::getInstance(); EvLineDenoiseDirection = m->newEvent(DARKFRAME, "HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION"); EvPDAFLinesFilter = m->newEvent(DARKFRAME, "HISTORY_MSG_PREPROCESS_PDAFLINESFILTER"); - lineDenoise = Gtk::manage(new Adjuster (M("TP_PREPROCESS_LINEDENOISE"), 0, 1000, 1, 0)); - lineDenoise->setAdjusterListener (this); + lineDenoise = Gtk::manage(new Adjuster(M("TP_PREPROCESS_LINEDENOISE"), 0, 1000, 1, 0)); + lineDenoise->setAdjusterListener(this); if (lineDenoise->delay < options.adjusterMaxDelay) { lineDenoise->delay = options.adjusterMaxDelay; @@ -39,8 +39,8 @@ BayerPreProcess::BayerPreProcess () : FoldableToolPanel(this, "bayerpreprocess", lineDenoise->show(); - greenEqThreshold = Gtk::manage(new Adjuster (M("TP_PREPROCESS_GREENEQUIL"), 0, 100, 1, 0)); - greenEqThreshold->setAdjusterListener (this); + greenEqThreshold = Gtk::manage(new Adjuster(M("TP_PREPROCESS_GREENEQUIL"), 0, 100, 1, 0)); + greenEqThreshold->setAdjusterListener(this); if (greenEqThreshold->delay < options.adjusterMaxDelay) { greenEqThreshold->delay = options.adjusterMaxDelay; @@ -57,15 +57,15 @@ BayerPreProcess::BayerPreProcess () : FoldableToolPanel(this, "bayerpreprocess", lineDenoiseDirection->append(M("TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES")); lineDenoiseDirection->show(); lineDenoiseDirection->signal_changed().connect(sigc::mem_fun(*this, &BayerPreProcess::lineDenoiseDirectionChanged)); - + hb->pack_start(*lineDenoiseDirection); - pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4); + pack_start(*lineDenoise, Gtk::PACK_SHRINK, 4); pack_start(*hb, Gtk::PACK_SHRINK, 4); - pack_start( *Gtk::manage (new Gtk::HSeparator())); + pack_start(*Gtk::manage(new Gtk::HSeparator())); - pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4); + pack_start(*greenEqThreshold, Gtk::PACK_SHRINK, 4); pdafLinesFilter = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_PDAFLINESFILTER")))); pdafLinesFilter->show(); @@ -77,58 +77,64 @@ BayerPreProcess::BayerPreProcess () : FoldableToolPanel(this, "bayerpreprocess", void BayerPreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited) { - disableListener (); + disableListener(); + + if (pedited) { + lineDenoise->setEditedState(pedited->raw.bayersensor.linenoise ? Edited : UnEdited); + greenEqThreshold->setEditedState(pedited->raw.bayersensor.greenEq ? Edited : UnEdited); - if(pedited ) { - lineDenoise->setEditedState( pedited->raw.bayersensor.linenoise ? Edited : UnEdited ); - greenEqThreshold->setEditedState( pedited->raw.bayersensor.greenEq ? Edited : UnEdited ); if (!pedited->raw.bayersensor.linenoiseDirection) { lineDenoiseDirection->set_active(3); } + pdafLinesFilter->set_inconsistent(!pedited->raw.bayersensor.pdafLinesFilter); } - lineDenoise->setValue (pp->raw.bayersensor.linenoise); - int d = int(pp->raw.bayersensor.linenoiseDirection)-1; + lineDenoise->setValue(pp->raw.bayersensor.linenoise); + int d = int(pp->raw.bayersensor.linenoiseDirection) - 1; + if (d == 4) { --d; } + lineDenoiseDirection->set_active(d); - greenEqThreshold->setValue (pp->raw.bayersensor.greenthresh); + greenEqThreshold->setValue(pp->raw.bayersensor.greenthresh); pdafLinesFilter->set_active(pp->raw.bayersensor.pdafLinesFilter); - enableListener (); + enableListener(); } -void BayerPreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) +void BayerPreProcess::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) { pp->raw.bayersensor.linenoise = lineDenoise->getIntValue(); int d = lineDenoiseDirection->get_active_row_number() + 1; + if (d == 4) { ++d; } + pp->raw.bayersensor.linenoiseDirection = RAWParams::BayerSensor::LineNoiseDirection(d); pp->raw.bayersensor.greenthresh = greenEqThreshold->getIntValue(); pp->raw.bayersensor.pdafLinesFilter = pdafLinesFilter->get_active(); if (pedited) { - pedited->raw.bayersensor.linenoise = lineDenoise->getEditedState (); - pedited->raw.bayersensor.greenEq = greenEqThreshold->getEditedState (); + pedited->raw.bayersensor.linenoise = lineDenoise->getEditedState(); + pedited->raw.bayersensor.greenEq = greenEqThreshold->getEditedState(); pedited->raw.bayersensor.linenoise = lineDenoiseDirection->get_active_row_number() != 3; pedited->raw.bayersensor.pdafLinesFilter = !pdafLinesFilter->get_inconsistent(); } } -void BayerPreProcess::adjusterChanged (Adjuster* a, double newval) +void BayerPreProcess::adjusterChanged(Adjuster* a, double newval) { if (listener) { Glib::ustring value = a->getTextValue(); if (a == greenEqThreshold) { - listener->panelChanged (EvPreProcessGEquilThresh, value ); + listener->panelChanged(EvPreProcessGEquilThresh, value); } else if (a == lineDenoise) { - listener->panelChanged (EvPreProcessLineDenoise, value ); + listener->panelChanged(EvPreProcessLineDenoise, value); } } } @@ -139,9 +145,10 @@ void BayerPreProcess::adjusterAutoToggled(Adjuster* a, bool newval) void BayerPreProcess::setBatchMode(bool batchMode) { - ToolPanel::setBatchMode (batchMode); - lineDenoise->showEditedCB (); - greenEqThreshold->showEditedCB (); + ToolPanel::setBatchMode(batchMode); + lineDenoise->showEditedCB(); + greenEqThreshold->showEditedCB(); + if (batchMode) { lineDenoiseDirection->append(M("GENERAL_UNCHANGED")); } @@ -149,26 +156,26 @@ void BayerPreProcess::setBatchMode(bool batchMode) void BayerPreProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited) { - lineDenoise->setDefault( defParams->raw.bayersensor.linenoise); - greenEqThreshold->setDefault (defParams->raw.bayersensor.greenthresh); + lineDenoise->setDefault(defParams->raw.bayersensor.linenoise); + greenEqThreshold->setDefault(defParams->raw.bayersensor.greenthresh); if (pedited) { - lineDenoise->setDefaultEditedState( pedited->raw.bayersensor.linenoise ? Edited : UnEdited); + lineDenoise->setDefaultEditedState(pedited->raw.bayersensor.linenoise ? Edited : UnEdited); greenEqThreshold->setDefaultEditedState(pedited->raw.bayersensor.greenEq ? Edited : UnEdited); } else { - lineDenoise->setDefaultEditedState( Irrelevant ); - greenEqThreshold->setDefaultEditedState(Irrelevant ); + lineDenoise->setDefaultEditedState(Irrelevant); + greenEqThreshold->setDefaultEditedState(Irrelevant); } } -void BayerPreProcess::setAdjusterBehavior (bool linedenoiseadd, bool greenequiladd) +void BayerPreProcess::setAdjusterBehavior(bool linedenoiseadd, bool greenequiladd) { lineDenoise->setAddMode(linedenoiseadd); greenEqThreshold->setAddMode(greenequiladd); } -void BayerPreProcess::trimValues (rtengine::procparams::ProcParams* pp) +void BayerPreProcess::trimValues(rtengine::procparams::ProcParams* pp) { lineDenoise->trimValue(pp->raw.bayersensor.linenoise); From 8073c3dfde2d71f4c262b089c0294428b550bdf0 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 20:55:47 +0100 Subject: [PATCH 53/75] Capitalization correction and generateTranslationDiffs --- rtdata/languages/Catala | 2 +- rtdata/languages/Chinese (Traditional) | 2 +- rtdata/languages/Dansk | 2 +- rtdata/languages/Deutsch | 6 +----- rtdata/languages/English (UK) | 2 +- rtdata/languages/English (US) | 2 +- rtdata/languages/Euskara | 2 +- rtdata/languages/Greek | 2 +- rtdata/languages/Hebrew | 2 +- rtdata/languages/Italiano | 2 +- rtdata/languages/Latvian | 2 +- rtdata/languages/Magyar | 2 +- rtdata/languages/Norsk BM | 2 +- rtdata/languages/Polish | 2 +- rtdata/languages/Polish (Latin Characters) | 2 +- rtdata/languages/Russian | 2 +- rtdata/languages/Serbian (Cyrilic Characters) | 2 +- rtdata/languages/Serbian (Latin Characters) | 2 +- rtdata/languages/Slovak | 2 +- rtdata/languages/Suomi | 2 +- rtdata/languages/Turkish | 2 +- rtdata/languages/default | 2 +- 22 files changed, 22 insertions(+), 26 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index a4bd8b069..f4c0ab91a 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1578,7 +1578,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 45d00011d..f6605f63e 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1348,7 +1348,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 2813a4184..f1b952b00 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1345,7 +1345,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index c893c5d55..e1a0acfac 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -91,6 +91,7 @@ CURVEEDITOR_AXIS_IN;x: CURVEEDITOR_AXIS_LEFT_TAN;LT: CURVEEDITOR_AXIS_OUT;y: CURVEEDITOR_AXIS_RIGHT_TAN;RT: +CURVEEDITOR_CATMULLROM;Flexibel CURVEEDITOR_CURVE;Kurve CURVEEDITOR_CURVES;Kurven CURVEEDITOR_CUSTOM;Standard @@ -2407,8 +2408,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -CURVEEDITOR_CATMULLROM;Flexibel diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index fbdb43b15..de8f44a27 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -1279,7 +1279,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !PREFERENCES_SHOWBASICEXIF;Show basic Exif info !PREFERENCES_SHOWDATETIME;Show date and time !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 5a6c60fa6..6b1526dcc 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -1211,7 +1211,7 @@ !PREFERENCES_SHOWBASICEXIF;Show basic Exif info !PREFERENCES_SHOWDATETIME;Show date and time !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index b51e1c7a8..12deea740 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1346,7 +1346,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index eb767c5b1..d5cfc781c 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1345,7 +1345,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 4127c9088..75b3a3dd7 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1346,7 +1346,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index e7570e7c4..7e81ff386 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1777,7 +1777,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 97e37df3d..b97aca446 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1346,7 +1346,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 70191d6ec..02d67437b 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1517,7 +1517,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index f88d154aa..ec695aac6 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1345,7 +1345,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 6ce13d6c8..2a21b3836 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1853,7 +1853,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 4ee26dde4..7889a83cf 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1853,7 +1853,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 90bed5d14..f9a1ae62e 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1844,7 +1844,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview !PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 99acdd920..cd8d6e640 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1766,7 +1766,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index d42f9436d..664894021 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1766,7 +1766,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !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_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules !PREFERENCES_TAB_PERFORMANCE;Performance !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 3721e9d5c..1319912db 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1390,7 +1390,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !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_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done !PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc. diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index a40ff50d1..6ca4406d8 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1347,7 +1347,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index c18b68216..a9d3e9d5e 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1346,7 +1346,7 @@ TP_WBALANCE_TEMPERATURE;Isı !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;Enabling this option when working with folders containing uncompressed TIFF files can increase performance of thumbnail generation. !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +!PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar !PREFERENCES_SINGLETAB;Single Editor Tab Mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done diff --git a/rtdata/languages/default b/rtdata/languages/default index cba59b563..651a3c928 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1210,7 +1210,7 @@ PREFERENCES_SET;Set PREFERENCES_SHOWBASICEXIF;Show basic Exif info PREFERENCES_SHOWDATETIME;Show date and time PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation -PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar +PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows PREFERENCES_SINGLETAB;Single Editor Tab Mode PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs From 51b50f7347076061970a9aeb2c2a10ccee85c408 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 21:10:52 +0100 Subject: [PATCH 54/75] 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 55/75] 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 0051e8f2ac21c31b1bd3a269d1b79982a16733f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Tue, 11 Dec 2018 21:48:14 +0100 Subject: [PATCH 56/75] Fix SEGV in `FileCatalog::(show|hide)ToolBar()` (fixes #4916) --- rtgui/filecatalog.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 305b3985e..9e19f8dfe 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -1211,7 +1211,7 @@ void FileCatalog::developRequested(const std::vector& tbe, bo params.resize.width = options.fastexport_resize_width; params.resize.height = options.fastexport_resize_height; } - + params.resize.enabled = options.fastexport_resize_enabled; params.resize.scale = options.fastexport_resize_scale; params.resize.appliesTo = options.fastexport_resize_appliesTo; @@ -2522,7 +2522,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) void FileCatalog::showToolBar() { - if (!options.FileBrowserToolbarSingleRow) { + if (hbToolBar1STB) { hbToolBar1STB->show(); } @@ -2531,7 +2531,7 @@ void FileCatalog::showToolBar() void FileCatalog::hideToolBar() { - if (!options.FileBrowserToolbarSingleRow) { + if (hbToolBar1STB) { hbToolBar1STB->hide(); } From ef3abe78936b8775e881bebf57ec3c36bc550f61 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 22:04:22 +0100 Subject: [PATCH 57/75] Fixed incorrect degree symbol in Espanol translation --- rtdata/languages/Espanol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 0e4904677..a202e2e47 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1030,7 +1030,7 @@ PARTIALPASTE_BASICGROUP;Ajustes básicos PARTIALPASTE_CACORRECTION;Corrección de aberraciones cromáticas PARTIALPASTE_CHANNELMIXER;Mezclador de canales PARTIALPASTE_CHANNELMIXERBW;Blanco y Negro -PARTIALPASTE_COARSETRANS;Rotar 90º/ voltear +PARTIALPASTE_COARSETRANS;Rotar 90°/ voltear PARTIALPASTE_COLORAPP;Modelo CIE 2002 de apariencia de color PARTIALPASTE_COLORGROUP;Ajustes de color PARTIALPASTE_COLORTONING;Tonificación de Color @@ -1165,11 +1165,11 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Nombre PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;ID Etiqueta PREFERENCES_CUSTPROFBUILDPATH;Ruta al programa ejecutable PREFERENCES_CUTOVERLAYBRUSH;Recortar máscara de color/transparencia -PREFERENCES_D50;5000ºK -PREFERENCES_D50_OLD;5000K -PREFERENCES_D55;5500ºK -PREFERENCES_D60;6000ºK -PREFERENCES_D65;6500ºK +PREFERENCES_D50;5000°K +PREFERENCES_D50_OLD;5000°K +PREFERENCES_D55;5500°K +PREFERENCES_D60;6000°K +PREFERENCES_D65;6500°K PREFERENCES_DARKFRAMEFOUND;Encontrado PREFERENCES_DARKFRAMESHOTS;disparos PREFERENCES_DARKFRAMETEMPLATES;plantillas From 920e9f7a16fe1f9e0d6d70d1a547f52781d97cc0 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Dec 2018 23:13:40 +0100 Subject: [PATCH 58/75] Renamed key to CurveFromHistogramMatching for clarity, #5089 --- rtengine/procparams.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 9addfdce9..01ad4b8bb 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2868,7 +2868,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo saveToKeyfile(!pedited || pedited->toneCurve.hlcomprthresh, "Exposure", "HighlightComprThreshold", toneCurve.hlcomprthresh, keyFile); saveToKeyfile(!pedited || pedited->toneCurve.shcompr, "Exposure", "ShadowCompr", toneCurve.shcompr, keyFile); saveToKeyfile(!pedited || pedited->toneCurve.histmatching, "Exposure", "HistogramMatching", toneCurve.histmatching, keyFile); - saveToKeyfile(!pedited || pedited->toneCurve.fromHistMatching, "Exposure", "FromHistogramMatching", toneCurve.fromHistMatching, keyFile); + saveToKeyfile(!pedited || pedited->toneCurve.fromHistMatching, "Exposure", "CurveFromHistogramMatching", toneCurve.fromHistMatching, keyFile); saveToKeyfile(!pedited || pedited->toneCurve.clampOOG, "Exposure", "ClampOOG", toneCurve.clampOOG, keyFile); // Highlight recovery @@ -3683,7 +3683,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) pedited->toneCurve.fromHistMatching = true; } } else { - assignFromKeyfile(keyFile, "Exposure", "FromHistogramMatching", pedited, toneCurve.fromHistMatching, pedited->toneCurve.fromHistMatching); + assignFromKeyfile(keyFile, "Exposure", "CurveFromHistogramMatching", pedited, toneCurve.fromHistMatching, pedited->toneCurve.fromHistMatching); } assignFromKeyfile(keyFile, "Exposure", "ClampOOG", pedited, toneCurve.clampOOG, pedited->toneCurve.clampOOG); } From d47a54fb3d72d17aca5595f70b7dd586666e6647 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 12 Dec 2018 23:23:02 +0100 Subject: [PATCH 59/75] Fix raw histogram calculation, thanks to @agriggio, #5091 --- rtengine/rawimagesource.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 89a66f6c3..3c7a34e73 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -4833,20 +4833,27 @@ void RawImageSource::getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LU } // end of critical region } // end of parallel region + const auto getidx = + [&](int c, int i) -> int + { + float f = mult[c] * std::max(0.f, i - cblacksom[c]); + return f > 0.f ? (f < 1.f ? 1 : std::min(int(f), 255)) : 0; + }; + for(int i = 0; i < histoSize; i++) { - int idx = std::min(255.f, mult[0] * std::max(0.f, i - cblacksom[0])); + int idx = getidx(0, i); histRedRaw[idx] += hist[0][i]; if (ri->get_colors() > 1) { - idx = std::min(255.f, mult[1] * std::max(0.f, i - cblacksom[1])); + idx = getidx(1, i); histGreenRaw[idx] += hist[1][i]; if (fourColours) { - idx = std::min(255.f, mult[3] * std::max(0.f, i - cblacksom[3])); + idx = getidx(3, i); histGreenRaw[idx] += hist[3][i]; } - idx = std::min(255.f, mult[2] * std::max(0.f, i - cblacksom[2])); + idx = getidx(2, i); histBlueRaw[idx] += hist[2][i]; } } From 71a5521b66d6ecf37a238389d34726ed53161601 Mon Sep 17 00:00:00 2001 From: Hombre Date: Thu, 13 Dec 2018 01:56:36 +0100 Subject: [PATCH 60/75] 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 61/75] 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 62/75] 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 63/75] 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 64/75] 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 65/75] 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 66/75] 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 67/75] 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 68/75] 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 69/75] 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 70/75] 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 71/75] 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 72/75] 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 73/75] 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 74/75] 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 zcmXY1byQUC*98Fy=}~z7@%fEM_l%{tyh~?(``CAWU57una)?yk zF^|xI_He=7G#gdmK#>qODgr*-`&a>1M}HLE>q9)wB(QrhwkRo^ao`kYm9IZ%STM4_ zKj#Y$wm@H7OR5?nq4CU}is8FF?wX$^rQf}iLoy6cSsPkdK9n{$TcqBPTwUFnmjeZN zzd_I$mVnxJGgeh=G-};{HLh&g>Xn~7(KY+ivyMPTWS#UBFE{`n{1bc0NRC%*%$4R- z(rpk~EO`^vi7IX(*mlTgi<^)&^15Br%J%m3r&H;yUw+n@n+l?#M63x!Y4rPUEp}|o z+NFIj1&?~2RVKBBc78`|3v$hNg#%M2@hHTF(%BwlyPvc!dKV#6snKt(Km@_r(KU0* z)fvQ*FpV}zP9da|E)Uj%HU}~*L%zkNPk_Guj z`u}j{TOifAIxuj70ZGi%dfdoDorPxc75z{N<%Ob-) z`S|jT=zi+@i|7q$mlqXTeoN)o*^gYm{^;X9z1ltbc_|1Zx{ya>P62E(%r2s*@ou%n zE-}DqVeYSQkH&{~HiiV4z>!i1!QN%{)79=pjC@K`yBXIyykkDumRe^R-$bP_YhHY+ zFvywi2u>Y1v~=EJyGQxwT4uEPwt22&Mgunzehe3Jp%3}yz(wz4+Vv4{Cp@Ztx@~yh zmg@`OC1j@~^zb7$*bz7-(L|#nkMetcq}^DsWZIc$>&LupRR6+AM0#;ceYC(DogTGb z#4UIt>(Ka$A`s8dGq%0U1e=DJ6_c+{z06&;yH~<)$PMhOBb&?Wp6!HOzm-GrFO%)s zVQ^@tE%_N+`FxThvBSz;Hqa9;_;BXF^j{OXu7%IBxsnRn0Q1ikwE_gdMu=97cca`K zkC_rb%$Wm;Y^nrmUlfkY2KIXiwv;ip_{BFH`wMTkO5~2*;YAie7__V;`0Q1n!O48r zKPd^tFWNd>KQlj!AE4;<$TdG)Fb?n^_lvqe;58mc(0IR$48EAB!Q8{2%|o4s8+OTC zAw!T82Sp|TnXf%A9-v}E6Km(1+Mg0ay3RQig?-fMi1f?Rnrb-Y8xpr!cSXvPzfB}4 zTm{|sm5%+ut4k_~$#~7`rJ4;RK2|hWP)y=JyKYFOFaZ1dgjTri#sBE9w-Z+_{Pmyf zREMj8$(?(FwW;oXfvPk1SLg&|!53NFd*!JdM*T@3>`*=?uAK;la$rAA?o$(AuRwBH zPG#k9LYaMd=9tJ$10dWvUy45O_R-+rr6_vb?kKkjVX8NFbRG=^Vf%&G*^pXNem5eo8My+ z2L0^pX{H&#Vo|>BJtrE>wEQ6WCdOGK5U1xTQ-5-Qo}B)+&xX%PFsc%%fh20)Hz47D zgX+rpIF)X{3H^PWO^Q1G8v(`u>Y_NM;Bp|cKNd`p?`7gtJFl1h#`IN{LHyQUhS_F@ z9BJhn)IW~v{(aWfgUAt6w3;okfz?8}Aq%b=%^Po7mCPg~G-GrBCPme0x^_5ePQUF? z&HuTpWC2_=xjjDHEU>5CG^47xfy)q4*QMpi%Ke)G@Z`(#cN9!CRA zw_|3saKE=dDH28BzLFKo@|a?u7_gc%`zLLy)0}J9|1pSQQ42Yxc+TshID_2VGc+is z`^V>)SdMFkD5B|n-9^y!9!$rPmKRopA5%PC&FT&s>YH~>VML~TwVh!$)CKu}iY?m8 z$?WYJDN|K>A+Bj9D=E`W5-<-e*Js3qz=(6@CpXG5j(xI*cWY8^hR%XpRyG{X{l}X=P}Hi$wv{Qi2^)I$#Jj zCw(t7KPDR!7v|62&0g;1aTey;6{3d>bJOK#5cR!(29YNFsT!Gti1!E5-D>0hij8Vx z`n7zXV2|1lM3th7FVu5mRm?X9ZN9HCTqiTWeWxSuWCxo}OLS^1R8}40*vkX@uudJG z5=hsG(nz=7e)>TQBnur9x7WqFr%?1v5vs@fbKxf zcz0!_W$!H}q2>9m%u1|b;`#fWPc@Uav^RB`*#D%y5^g5(gc0G;Tl1@-T^M75&tvo# z@M+%|#Ev3IPMJWTd8mvb_NS_-LXAfLaP+8GD}R21yEO&-k&a?LWxrw!CZW!txKy@&<}p_&3v>TGsA zCjIC@urycy#=t+RpTIf|yB&Q~ct8M*({Aj09t9R5mPb(+iA(nDxajx$kRfj(U;9 zrs+&vqE7-iSu-gn;n0b-?5SSMhYsS;SZu=PyHSR7k=vzA*Vyg z6i`g-bos}!1xQ1LHA>U>5`xN}548%h39b_Ub3&r4IgBB+UU>+xuXb4jFkBu=3D_Vbz+Ho!#Kq~cc;0-qoMxT_{OdKf0=j_#c*q;H?ckeBStTL(ruh1ZF72ZvH`XgvN$K{q{ z>gvywx{hcsK5$C~ghMgGR4D@{6*x-N8kZwY6NAZX z`PnT5(EE0XCtlnzU6$ExCico#HnWZ~%Wuu|2{KJodbSlPK*!&7H!?$b-uf>41XNt4 z7ajSgFKFO#O?()c?qX)?`*Ob=yV zS8?4Rj{fsv&Ky#n@P)&OXBeFYwh9aR&;M$8{+d&Jf?r@?U2+~z#85}*x<}9-6wP}v zU$&qJ{DSa?Y-`v@yP)y?jT?RO>qhya|(N6izn1+0E`^k5i9*#Y(*A zTh?BbwQNwqZV963mQThD>s09gf+cIjOrM@kQ~#3v+*!d>-(`C%+sjYWFGAz4BoUxV zL!l`bCdJR_e4k%2t9Ep2-K$n1PX~jW?;l9bH%>;P&MORph|w9rg@Lf3b=QbuFHr@_ zzrA1pn-?6ut56na5)wo>Bf^dQY6q4i^{7BjJ6Yq8d#kh6{O2+vE}bx%D)(|@g~0*weW@UW!Tz9vPad?PTqd&t6Ovy znAacbCIfI2L!2ogeb>T_KvGcd8fbcz@bl)|ZP0W@1ny?hBQY!%nX#Xj%Q1cp#&dVI zzTt{Bh!`9Sv-LhHco%Kv&&L|W65xhR+funD-kKLNzh{KM+{b5@Tu#_SoHdT`gIfTJ z_m<=d`Fracm7^{jA(q8!1b+A4%}JG(p8v+xg!iJhvUBTV^Ku6;sQniX1sMEJ$%!US zE$(qkeo;m`TY+gXQG=iq25n7BU)-yA1MR&}y;kR8aUlj!$-C|OhXp3tdSx!}N^056 zx{lwn?I|^X@i+ZYX&31yNCX8jwflf1SEd0_*RBsjx|=0rD_up|R=)(0 zw=?-O1fBiYU9oHeRAUZ!^4~cA@+UU*W)p792qq>vJ$c|i|L28qVc#tViB)O+k69V) z@O?xj%H>*ioHmIq&wUdp@HoZ}9q$OgAI=PM2*P2xZ6hs0a@Hm!e~`A(2m?}=1x9(M zl(>grFn!lfT6|)ufQT~H90~Jm2`9I>@$z32#eXY2UeH-*r>2zG?EMKMrxY5=xpPr! zC2-sdLodQ6Hd!s2S`AM*U5kBdP-a7}?!|zULvE|z6OPTEETy%#y4t(r%Y=~a!lGrG z{OoQnc51Y7NzWG$G-fhUO~6k9l|9odIdij2M}W!uTcVvRfzpvrdR}FFRL2R*w3rV& zimxxWp|ilF>bns4Z-ELIeZY_FNFzCI%+a2|vjP??nLo(1iz8TSM${9v@^4pKm~$RK z6VeO9vq6dpt%MYNLQM8d3@+xN`@ip83|zrG6kXvW7R{7Z59sLpK7eaf5Rh(qAL38) zR1ua_M}k5pXl5$G^Ew=EKn&F|X=1bpsMBO(R4dLS{2GEVySK@tEe!t&F!I6X(d?dM zJCA4m;4Ua_Zkb?Ky9j74L`oFB^*t|82t&ruYU0A+h$6Hw5670)v?o{43M~V(nxir! zWv0Clq0$_Kytf3BCWBOIed_*`8ifBH^ z5BCqAmp8<-IJ|fdW{Hf24k{RH*B}1#V)J6k)X(>{=dv%A~+em(w+hoa%yIKS`bt&{(AhDkfzyi z^r~?cX1B_pBt3^qm1%htGr%wCk|O!EXt|FbxTZ`2dn&dM*4#^EIu0ktXXDH<&Z(2q zXXQsUl%XJ-bi#RQ2GK8G$n2>#8~w{?y6GU#=FjL>=#s0sd?|;VA5J4p6-bs#gQg;K z7K{Pv1~>zec&(|WQK@v2v*!%rCiIxDMQQcK>0dxOqZWkm?gwwLe5ja3@)_X%Ai>PNlT~J{3idg^6&8HIn;jIT z4)@+Ydx2poVW#DK72nDFeYLQ{GG~SFo57;l5RhkqXxsl>2_4xu41 zgYbbJS5@uFGMnGuLaFy1V-kfGxi{!S5`|gIe271hSEw0Nw-5_}3r3mL_-4Hl3!*Um4BPWk~y~pE4bfJp~~8XrTDZA=R848*DnNn(gjKXOj8J03VLY;gkc`& zd^OoloTtg;-_iQ7E-M475K8h=eBDf^4B$4&z)nXZ5~|Hx9&HZp^-aC{_2BLy7_y1f zx5J}a<3l|2n@~MGCzv?jUyn*!5-Vkxl1B;y1;ilRSC&d^k|MA9l;02E(07R%bDLNU z{Nwvw;C5FfmV%^l6{}l0c|zm;)JGnv&F(XkhFpk6)_2$>hi_BUopXs?_s?X@8zAJ@ za4Ki+;%?`oh}LC?SMbRnx+pPp(-=wqgX(jXrE~V9aAe8;=x`inL7u#>{4Uz}Vh3LJDaFOYO#dIwT#65vAX8(c_;BTNty)XG#33JynNAjS|AY#p}f6rPTh2U8C~I4rQI?a@qlUR~lj-TUA!P#8m9P=go{G4hHi%~e@bFZbrfmocAp8F_$ zlTQ(L*gIcCoG|_YH4p^~;~s@`--849)eW9&0wDopT!epqXAP$|4g7+nUY06^!>smh z0+miUk@KC5cmR69u;NMhsakMhG{l0W*y2rF42G7U!ucOs;?*#G7R!DjY7t(7okI4~ z-Y+WD3evY@LNV=UW5(WB!25#sD;$aO?ce=)Kc6}&v3!5QnLS-Is$r*I@8~S)Q5}XN z3r9zI7mqaPZi_=YAA4NLujeoeQa0dlHdB?`s3)f2PRr|ku=W?juEy6T!t-UTHpturM5O`s^RyzrWeb)+xYg6UT+t~RjTEZKdNk=>f=kUPve~gQ^&|@J7mbX zgSkn_&7D6F#sQW-{eHyMHk7`$!`PXBAX!)Vf^mN~f-p=w2E_v;Y=*p`-%UbnC#g-v zJ`BKw4$|QG(E)M%E1;Kgn%rzW!S0=i@#aqBxjd3}=*$e=rVG&67b%Y59&hI2R^pbG z(1e$8xsCGt%$t7@;vx(vloky`Y&rV%SLkZaSG0Tp19Q7n>1e)Z|8Rl{RBgv=a)5uf zEhbaFKC$DbK9;y6TnYU<`8TkMmC=wU*py~UEY-roIdtc1+U^LpV*O^EL)Y{r{>l|x z_s^%NW~`fBDggpP8ZG1(-pD+xsFE_YrB3SDRXXPV+`pJ}oYFBO$WE2*@U6GfVndOPNICX9Xt_1p zv`YMFm)lTL=-AatrHNFKhW;QEBjZ(W7u`X=8GU0~HCM{~qSGO!{2Zt*6BB`|0(Dv7 zN|Rrfv4;=TEXeQVO*MpAHnV1%FvG?%r{!82z=7nqC+Z6`xSz%eug+>q_$4Z zL30{sY4Lepm1@oGjpV^dVXrtkqY>!da2(b9SpE3O%y!t9Hok*ic-SI*kt`4foyMCk zKFBKM(=8PJoX4;?ZT6pys(HI$7$CN}cJSKsd%y#AOdtm;g`_mgF9lcJHzzJ?aG4^; zEo&wMGKKtF1L#}Ls)hB_ERfG{hLl<@ZgPtj2D1>?{qH}Ni4Zb-!Fc5CXwm_Bm5#U}QvQO8!-*TN7Gc%_So%`!1S_lCr?yeU0y(I})G6GBDEad&lo{ z?btJ~RjQ3#<+447R$1E7k;Q8}`+H?&{QR6JFE4NZZxfU{-0!Xe@f_zSyM8KBpA_G_ z%hU%FR_)kdn9lOB6ZQ%TrMWbHWjVBLKwkbldsA2e1x+Cc@sS21G6Y7yV#$P)6QL2F zxMS15)Jv!_CMT|<24T&aZN`LKe9g^~33DNaS>Z!^1a_&2sufKQh-k=q1TawdSm@U^IU=%&Utan%$>w9A~ zB69V&rz;4(>2?<=#c8x!@;Mu|``Z}Du3xXp_S$RbM{?uEtiIQA7y3KVv&`>@#@^m( zEBB)-cHV}za}}Fcz|&O|JU4Q_*^SlI)b#xF@~6!V%NM^JbNkj48KlFOBhe%dqp<)K zbR?a2AAvADs;$s>_Fu0KmwXOvjq*xMBljvh9#ak#t93SjPZ&HkjZx~W< zTks{qT*3oDFNxRpCcGGpxl!{nh~KFPZ^k3ZTT1s=C>dlBJqX2NC6F0Hi+popql1VT z3-iHxsnz&_LWhk(ksR$Q9Kg-5`&D!?xpNOUH#MMAw)D$uEVPmt7Ig)`qbt7{vHKn| zr6~49g^`hwlyCk!J3Axe?5`tVGX1Qzo?MwiZ1x8mDS+>wzB}G z=PGjh$$t(h<9>*;HLZodyABe&MmfD{ZK^Px`1_YU>t@7~Omw^dor9~tv%zGh7gW?R zFbWM|w0H^es0)5ca?whG52=Uaw^2#iX2J94I`LI`#?ELRV`GbO<7v~(x(u=~LYx)D zOVosEe`7$h-hir*P|kIKrA3O3J%xFNy&kB46R1S40Y*LbURu&Q#7%7+UGnXfomL zq>dQ>Ty}mdYNqB@FuzhtP$aa_+?b#Hst`UZ5-usYgGGVUx1}e4S;&{p!!MBGCur?| zdJ+S`V*JkYd~T<*w*LFLYz1#Hj5nzsM6gK1vNx;I)9u{NUB}b+OyJRL%7}@W3<)r| zv0*uL5fT(kyTqiq{wMZm`o(h%&A$D{;=>;+d1fL<==gSOMh5TQj7?(J<9Q)A9$xz6 z$;nCR_|5&c*f;{@p63&?L=$`KmRPm^uV-$TWGbxO6#?3s8`BTYcgvmJplI&P9@??~uV`BxY#!UwFL`H<5Kf z@ZZEqjA~belQJzFA4`f8R}q`7*$AW9AhyT|NSZbRcT8{2S3qwZdjEd@M^y9;4K!Om z3vFKh*wAG^WvXc}ij=!0rvzEh_ETyx}1H_s&(Ty5F zuVr+fM#_#-chcrft@fQA*U$YX9`l7X9KuXP9`_Zo=(AY1t1d`kHKxaY6?;$84aV>i{Qa2LmGz~WXC!`B+p7-IGAqxc+3%lM1f8T2g zUEmYQ6@{t3%JY3FDXveGnhr=)YHdZ5GNiR3R6|iiQRh&56E02-?7mQG3%@VK_DXESaG{M>z4t~0gCxZ!;9Fdz4e?7rBs--Ro*8B z=ru13C(D-5AGj4)fBDKWraW=O?0#Ct^Yos_O!sO3bs*8JX*&zWa|A!DxK5HMAQbX! z)WPq=#O%yWpV1?*X_WR5M(G`nPU-0{k<*FjR3wkTPUv`I_naLU`W<~)_d{7oaXrq* ztDn9aqyH!@EVN#^z1S<(E^U3h-Gf~2RkTExRx}Uq1BWhIruO#H>cvtBUcFp&DAZ(e z`eUAaGOeL<@)@}JEbb!ig@9_)N&mY)wbn%X4fbfOp8>=VUi;MpO7RD)tJGI3fS9kZ z@5Y(ekcCzXo{nLntWtee%CCp(C@S<+iOx=O!2?)7|C4KZLAq zm{Q%nMWpoy!oECXd))7`#$x39njfLaIjT&KU1)EPTRQGq5KnV?dbnz6ECn9`wls19 zW`nZI?h;gtI3TN3%PV}2&L3x1dGew*_>;rBm@iz_%Pq*QD?Kt7hIsCB1CG^wcEGvJ{U zB*V$5ksf}Fy1Yjt*tsX6V2RHG6twH&_2ubX(#VP4DS@2+RN+^*SY*pm))~%Mk?>S2e8A2Z1 zJUqSIVozS^OpKc4)IX|?T9_f07x_!X0g2S_O1>RLz-uf5B6t$TEOMtd`)rgFN@fYJeBHx}UEU&8I=g(hbr^Q?$s&?K-gJT>AY{;#fHHY}tXiAR|{9 z#@(adVes#N`4=nowO_E<2x){#Td1oSX|OxxND81yrnEJkz0OLgZ&Tz0A)H!bW4unz zf?R^u0!%T&rx*w~%1cK_m-;|KLGe=14qbY$)aZd_(>XQW9%yD>%eJbTZ}oEN5#VTC zeSw6q&7&jZK8H=)Z{NN9H|KXS$9<>xBfhD?M^vR+hbK`+cXxMJVWVi?`~GBrl#-=yNlRk2fb@mM1sZB+#kTyd5_{U=ACY&n`zTp z?-dLiOxt8R2&4oUr$0?2*087Dd1OHSvR({Q0xSWA&PqC~^y{DT>vn|WL;YqLY`Mwa zVI*b|ZYSbnL4!=Tli{KXH73qr3FGJ)#l^)R0}z13q`X(Bj0(uJHF&;% z`w5;ez_fBZ+t7&U!ltA4yT-f27O$JlWKs%>A2l^loOgV`Cnk)u^Gi!v*RqkwMZ6Ql zZu7*}D_Rb7^~%Zc=i7aSDqBynKCbwDsMGr|`HMHEzamFlg1&uIh-H>4|iJEJLtQqt2+&CG&b#smiZRez`>TVdh!nM`aHu^F}htxf)A?tb`p zXk!DUB630e>?mAZT%I-2Vnpk+VIRV7&)3<$LDV(IXM^s3xbhy$W7%u_KNM!cxZ<-1EBYNft8AZQRo0W`}$(o=p$&Y6{_an{P`0p?4^`bKAVG)xQ#66k10 zQLSObE-*dDA300Ta%FN+a>C1`wx>#86otiCG<=8LgCxOSt_Cl5vxOkG781B zvXBhiyFYvd&5Q)Q^38OD9Q2fP@RYA1LHTZNaZ^MsG=J7$A%@T>Lv#i(09IhcQQg|w zy1p=aaudB7QgKG~?(q)}U&!+EmuPZ=1ZqHoFreBXugZlk)e@$rR226|jQE^=Kj&07s1!vCCgTm-$ z_;Xax2T{>61QFaUUjgmtQb<27$1@9V5T+qj&Pb(edbw;D(z+kB(pL z4S&0{o^G;;cKhD=Bc_A&cMh#_U0t8@6Iv0Yiq9si(OOOzrOnx)AVn4%W1n7We)Y-= zl4-wnoxu?m8XOkTC;BL_xEv&;mov|22@+U(gOEuK71#h?*L;Ru{?EP5nJ>S_z3$bq zP1X4}^l!#3-6Q@;C+i#VG#!gtlur@dE1SPYzo}<^{dsQ|m zPDQq;ZDD}3>^T|BOF37eS@iI0okiXWUxu<+Bz(>pk$R&1+r06*oL+a0^-Iry=8f_} znDK#eQY2z)tnS;YPU%pZs3DE{U%VEMc7v8tcLlq`9#Pq!QNo+yDQ7x7v)D>y_1bH& z5u^IUk5y2O0&rT;`bO<_qPvp1uegQ$&rCQ`bOhiF3zwAQ2I++>=k`c7lQE_BOO`H? zQ*PFSIz#zSw2UGT(&VhMf+i2;Vb^301FXIMD_sd{AA|T>=o0hotCUc}(NInf5_X@; zoS5h37)JXCY_fk3%!B25mIDcWeQ#TFd@nB;E9=-ft><{1zOHXft0NYxV6PKG!z_I9 zC4s2S{qz8Z)A79x7-jz&riMvbOwHrM$7}*OtIn!zeM8T@C6c(EpTP^T>WcJG59{&f zddd6_VE4NY)o;(rs!xnK%oFm2=DocQGlJ46u~t8S@8u3^W`)K#iuABg2z58Bv3E*k zHISs_<5@4kH#W?EAxA(p^ldf^%r5k^yeG!niMT3L9T%|c_mG6MexGKEKl{^Tx2)#pcla~B4qQz$0Gd>0;^nc^> z_14cF_JclH$ot&6O#5=tuifejkNWpGE2V9w^0d9fRf545l2C{l3r#1T{IP7rfVHCV zje1^FEZh3%JdOpei7JAuIX}wiDh|aKrk6Tw_|-Y$VGdZn*w^wvF8VO1IV@^P7UDNu3_in02gMqh3~3DdQtsJiIn>oB)<^+~p*#hRG7# zUga1ihE9;N7+A=#Qh)Ic5er% z0~7APCRsFSNWDgS?b5F)$B6tMa$wd-uXX`#txY1-{m4kCMA#!qhn7!dd$73)H8p?n z)oi`>PgWKteR)6d(JviM5C(%qOFzRBoDz+uIS5MV4Kzy~3#p@%XGq>Ph|OX=p7YEi!_R%d zeMdrh92#qJl~Ov9#p_ysk}Y{szCY-U9GfZA*d@~ia$)V0oVoS-$a30?LhcF+WUCt+ zuDKgXeM37UGu4eOvob_?5*)@WoKE$x*k0%Jl!?SAPNh|}TYFF1@pgtiQm3owh1lrT zS=MIYGg*I+g+iww3C}fzGNc9uyasCHhe;>?`|r#bs(ba8JgK)>ecPc=6V<8T;F{_rsVRzF`oABdtHT=7!aq=N2JdE&a=$8T zlMqrIA-}ue7Z7M;d=9jBeww?src;j=Ct6m9`9txHdAfWp*OnAq$Hh_)$XE~F=tcaO z{pE9x^+s$Q6<bmpzr)fm0mF*(mw@bLejC@c5-$WEdF0_ zG#CAMJm!>TX zp6@_4)NzRsfPEd%3iU+>|NmwE{PzF5^jvSB&~Tt^>(bn#NQg^b8Z1>I@ip-O0Io#4 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 75/75] 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