From c87b05dfb15d0886c88057397c4b5a0ca50e3db1 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 16 Feb 2018 13:59:29 +0100 Subject: [PATCH 01/22] RT Crashes on CL LAB curve, fixes #4402 --- rtengine/improcfun.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 74d73f382..ecbd4fa37 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -5883,7 +5883,7 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW editWhatever->v (i, j) = LIM01 (LL / 100.f); // Lab C=f(L) pipette } - if (clut) { // begin C=f(L) + if (clut && LL > 0.f) { // begin C=f(L) float factorskin, factorsat, factor, factorskinext; float chromaCfactor = (clcurve[LL * 655.35f]) / (LL * 655.35f); //apply C=f(L) float curf = 0.7f; //empirical coeff because curve is more progressive From b1d673a2ba77c31e57961cca5daf53873aa55289 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 17 Feb 2018 20:52:00 +0100 Subject: [PATCH 02/22] Fix bug in vectorized lut access, fixes #4392 --- rtengine/LUT.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/rtengine/LUT.h b/rtengine/LUT.h index b2d11c234..d4d2a91f8 100644 --- a/rtengine/LUT.h +++ b/rtengine/LUT.h @@ -97,7 +97,6 @@ protected: float maxsf; // For the SSE routine operator[](vfloat), we just clip float lookup values // to just below the max value. - float maxIndexFloat; T * data; unsigned int clip; unsigned int size; @@ -135,7 +134,6 @@ public: upperBound = size - 1; maxs = size - 2; maxsf = (float)maxs; - maxIndexFloat = ((float)upperBound) - 1e-5; #ifdef __SSE2__ maxsv = F2V( maxs ); sizeiv = _mm_set1_epi32( (int)(size - 1) ); @@ -166,7 +164,6 @@ public: upperBound = size - 1; maxs = size - 2; maxsf = (float)maxs; - maxIndexFloat = ((float)upperBound) - 1e-5; #ifdef __SSE2__ maxsv = F2V( maxs ); sizeiv = _mm_set1_epi32( (int)(size - 1) ); @@ -242,7 +239,6 @@ public: this->upperBound = rhs.upperBound; this->maxs = this->size - 2; this->maxsf = (float)this->maxs; - this->maxIndexFloat = ((float)this->upperBound) - 1e-5; #ifdef __SSE2__ this->maxsv = F2V( this->size - 2); this->sizeiv = _mm_set1_epi32( (int)(this->size - 1) ); @@ -317,7 +313,7 @@ public: // Clamp and convert to integer values. Extract out of SSE register because all // lookup operations use regular addresses. - vfloat clampedIndexes = vmaxf(ZEROV, vminf(F2V(maxIndexFloat), indexv)); + vfloat clampedIndexes = vmaxf(ZEROV, vminf(maxsv, indexv)); vint indexes = _mm_cvttps_epi32(clampedIndexes); int indexArray[4]; _mm_storeu_si128(reinterpret_cast<__m128i*>(&indexArray[0]), indexes); @@ -349,7 +345,7 @@ public: // Clamp and convert to integer values. Extract out of SSE register because all // lookup operations use regular addresses. - vfloat clampedIndexes = vmaxf(ZEROV, vminf(F2V(maxIndexFloat), indexv)); + vfloat clampedIndexes = vmaxf(ZEROV, vminf(maxsv, indexv)); vint indexes = _mm_cvttps_epi32(clampedIndexes); int indexArray[4]; _mm_storeu_si128(reinterpret_cast<__m128i*>(&indexArray[0]), indexes); @@ -369,7 +365,7 @@ public: vfloat lower = _mm_castsi128_ps(_mm_unpacklo_epi64(temp0, temp1)); vfloat upper = _mm_castsi128_ps(_mm_unpackhi_epi64(temp0, temp1)); - vfloat diff = clampedIndexes - _mm_cvtepi32_ps(indexes); + vfloat diff = vmaxf(ZEROV, vminf(sizev, indexv)) - _mm_cvtepi32_ps(indexes); return vintpf(diff, upper, lower); } @@ -380,7 +376,7 @@ public: // Clamp and convert to integer values. Extract out of SSE register because all // lookup operations use regular addresses. - vfloat clampedIndexes = vmaxf(ZEROV, vminf(F2V(maxsf), indexv)); + vfloat clampedIndexes = vmaxf(ZEROV, vminf(maxsv, indexv)); vint indexes = _mm_cvttps_epi32(clampedIndexes); int indexArray[4]; _mm_storeu_si128(reinterpret_cast<__m128i*>(&indexArray[0]), indexes); @@ -587,7 +583,6 @@ public: maxs = 0; maxsf = 0.f; clip = 0; - maxIndexFloat = ((float)upperBound) - 1e-5; } // create an identity LUT (LUT(x) = x) or a scaled identity LUT (LUT(x) = x / divisor) @@ -697,7 +692,6 @@ public: upperBound = size - 1; maxs = size - 2; maxsf = (float)maxs; - maxIndexFloat = ((float)upperBound) - 1e-5; #ifdef __SSE2__ maxsv = F2V( size - 2); sizeiv = _mm_set1_epi32( (int)(size - 1) ); From 828964ce8d234c6bd0f84d0e5c8f7d2d098fe9d5 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 17 Feb 2018 21:03:30 +0100 Subject: [PATCH 03/22] Removed obsolete comment, #4392 --- rtengine/LUT.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/rtengine/LUT.h b/rtengine/LUT.h index d4d2a91f8..abc2b0bde 100644 --- a/rtengine/LUT.h +++ b/rtengine/LUT.h @@ -95,8 +95,6 @@ protected: // list of variables ordered to improve cache speed int maxs; float maxsf; - // For the SSE routine operator[](vfloat), we just clip float lookup values - // to just below the max value. T * data; unsigned int clip; unsigned int size; From fc751a0ccead9a21d62364b394e700dedcf5f34e Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 17 Feb 2018 22:25:57 +0100 Subject: [PATCH 04/22] Wavelet Level Functions not working at all in dev, fixes #4405 --- rtengine/ipwavelet.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index edbc94822..4767a7fba 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -1739,11 +1739,6 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float * } - if(max0 <= 0.0) { - // completely black image => nothing to do - return; - } - // printf("MAXmax0=%f MINmin0=%f\n",max0,min0); //tone mapping @@ -1791,7 +1786,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float * #pragma omp parallel num_threads(wavNestedLevels) if(wavNestedLevels>1) #endif { - if(contrast != 0.f && cp.resena) { // contrast = 0.f means that all will be multiplied by 1.f, so we can skip this step + if(contrast != 0.f && cp.resena && max0 > 0.0) { // contrast = 0.f means that all will be multiplied by 1.f, so we can skip this step { #ifdef _OPENMP #pragma omp for From cb0798502bd5da40baf64cccfec7bc83c7c6ddb3 Mon Sep 17 00:00:00 2001 From: Hombre Date: Sun, 18 Feb 2018 01:13:49 +0100 Subject: [PATCH 05/22] Fix #4396: "5.4-RC1 stuck on release notes panel" Now the alert windows pops after closing the splash window --- rtgui/main.cc | 11 ----------- rtgui/rtwindow.cc | 20 ++++++++++++++++++++ rtgui/rtwindow.h | 1 + rtgui/splash.cc | 1 + 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index 5c2296b58..2ae442e5a 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -347,17 +347,6 @@ RTWindow *create_rt_window() //gdk_threads_enter (); RTWindow *rtWindow = new RTWindow(); - // alerting users if the default raw and image profiles are missing - if (options.is_defProfRawMissing()) { - Gtk::MessageDialog msgd (Glib::ustring::compose (M ("OPTIONS_DEFRAW_MISSING"), options.defProfRaw), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); - msgd.run (); - } - - if (options.is_defProfImgMissing()) { - Gtk::MessageDialog msgd (Glib::ustring::compose (M ("OPTIONS_DEFIMG_MISSING"), options.defProfImg), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); - msgd.run (); - } - return rtWindow; } diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 80e481315..afc95efd0 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -321,6 +321,7 @@ void RTWindow::on_realize () vMajor.emplace_back(v, 0, v.find_first_not_of("0123456789.")); } + bool waitForSplash = false; if (vMajor.size() == 2 && vMajor[0] != vMajor[1]) { // Update the version parameter with the right value options.version = versionString; @@ -330,6 +331,7 @@ void RTWindow::on_realize () splash->signal_delete_event().connect ( sigc::mem_fun (*this, &RTWindow::splashClosed) ); if (splash->hasReleaseNotes()) { + waitForSplash = true; splash->showReleaseNotes(); splash->show (); } else { @@ -337,8 +339,25 @@ void RTWindow::on_realize () splash = nullptr; } } + + if (!waitForSplash) { + showErrors(); + } } +void RTWindow::showErrors() +{ + // alerting users if the default raw and image profiles are missing + if (options.is_defProfRawMissing()) { + Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_DEFRAW_MISSING"), options.defProfRaw), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + msgd.run (); + } + + if (options.is_defProfImgMissing()) { + Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_DEFIMG_MISSING"), options.defProfImg), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + msgd.run (); + } +} bool RTWindow::on_configure_event (GdkEventConfigure* event) { if (!is_maximized() && is_visible()) { @@ -875,6 +894,7 @@ bool RTWindow::splashClosed (GdkEventAny* event) { delete splash; splash = nullptr; + showErrors(); return true; } diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h index 9c1699bcf..e9fe51b1d 100644 --- a/rtgui/rtwindow.h +++ b/rtgui/rtwindow.h @@ -59,6 +59,7 @@ private: bool splashClosed (GdkEventAny* event); bool isEditorPanel (Widget* panel); bool isEditorPanel (guint pageNum); + void showErrors (); Glib::ustring versionStr; #if defined(__APPLE__) diff --git a/rtgui/splash.cc b/rtgui/splash.cc index 9e0cc2015..b95071d0b 100644 --- a/rtgui/splash.cc +++ b/rtgui/splash.cc @@ -281,4 +281,5 @@ void Splash::showReleaseNotes() void Splash::closePressed() { hide(); + close(); } From ff021826c627e41003cea1e5862c058754204dcc Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 19 Feb 2018 23:20:41 +0100 Subject: [PATCH 06/22] Falling back to RT's default profile if actually set default profile doesn't exist (see #4396). If the actually set default profile was RT's default profile, whichcan't be accessed for any reason, it'll then fall back by the Internal profile. --- rtdata/languages/Francais | 4 ++-- rtdata/languages/default | 4 ++-- rtgui/options.cc | 32 ++++++++++++++++++++++---------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 0fbce91f5..349251d45 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -868,8 +868,8 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Largeur = %1, Hauteur = %2 NAVIGATOR_XY_NA;x = n/d, y = n/d -OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les images standards n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\nLes valeurs internes pas défaut seront utilisées. -OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les images Raw n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\nLes valeurs internes pas défaut seront utilisées. +OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les images standards n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. +OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les images Raw n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. PARTIALPASTE_ADVANCEDGROUP;Réglages Avancés PARTIALPASTE_BASICGROUP;Réglages de base PARTIALPASTE_CACORRECTION;Aberration chromatique diff --git a/rtdata/languages/default b/rtdata/languages/default index 0db6a20f0..dc8b5fbbe 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -869,8 +869,8 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Width: %1, Height: %2 NAVIGATOR_XY_NA;x: --, y: -- -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\nDefault internal values will be used. -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\nDefault internal values will be used. +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_BASICGROUP;Basic Settings PARTIALPASTE_CACORRECTION;Chromatic aberration correction diff --git a/rtgui/options.cc b/rtgui/options.cc index 60ac9a74e..55e99ce2d 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -2192,7 +2192,7 @@ void Options::load (bool lightweight) // Check default Raw and Img procparams existence if (options.defProfRaw.empty()) { - options.defProfRaw = DEFPROFILE_INTERNAL; + options.defProfRaw = DEFPROFILE_RAW; } else { Glib::ustring tmpFName = options.findProfilePath (options.defProfRaw); @@ -2201,17 +2201,23 @@ void Options::load (bool lightweight) printf ("Default profile for raw images \"%s\" found\n", options.defProfRaw.c_str()); } } else { - if (options.rtSettings.verbose) { - printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); + if (options.defProfRaw != DEFPROFILE_RAW) { + if (options.rtSettings.verbose) { + printf ("Default profile for raw images \"%s\" not found or not set -> using RawTherapee's default raw profile\n", options.defProfRaw.c_str()); + } + options.defProfRaw = DEFPROFILE_RAW; + } else { + if (options.rtSettings.verbose) { + printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); + } + options.defProfRaw = DEFPROFILE_INTERNAL; } - - options.defProfRaw = DEFPROFILE_INTERNAL; options.defProfRawMissing = true; } } if (options.defProfImg.empty()) { - options.defProfImg = DEFPROFILE_INTERNAL; + options.defProfImg = DEFPROFILE_IMG; } else { Glib::ustring tmpFName = options.findProfilePath (options.defProfImg); @@ -2220,11 +2226,17 @@ void Options::load (bool lightweight) printf ("Default profile for non-raw images \"%s\" found\n", options.defProfImg.c_str()); } } else { - if (options.rtSettings.verbose) { - printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); + if (options.defProfImg != DEFPROFILE_IMG) { + if (options.rtSettings.verbose) { + printf ("Default profile for non-raw images \"%s\" not found or not set -> using RawTherapee's default non-raw profile\n", options.defProfImg.c_str()); + } + options.defProfImg = DEFPROFILE_IMG; + } else { + if (options.rtSettings.verbose) { + printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); + } + options.defProfImg = DEFPROFILE_INTERNAL; } - - options.defProfImg = DEFPROFILE_INTERNAL; options.defProfImgMissing = true; } } From e69952d654b72987c84ccc27e7fefdd6957db05b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 21 Feb 2018 14:28:54 +0100 Subject: [PATCH 07/22] use double precision for large summations, #4408 --- rtengine/EdgePreservingDecomposition.cc | 7 ++++--- rtengine/PF_correct_RT.cc | 8 ++++---- rtengine/improcfun.cc | 4 +--- rtengine/ipwavelet.cc | 6 +++--- rtengine/tmo_fattal02.cc | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/rtengine/EdgePreservingDecomposition.cc b/rtengine/EdgePreservingDecomposition.cc index eac42ffaa..1ddd17107 100644 --- a/rtengine/EdgePreservingDecomposition.cc +++ b/rtengine/EdgePreservingDecomposition.cc @@ -42,7 +42,8 @@ float *SparseConjugateGradient(void Ax(float *Product, float *x, void *Pass), fl } //s is preconditionment of r. Without, direct to r. - float *s = r, rs = 0.0f; + float *s = r; + double rs = 0.0; // use double precision for large summations if(Preconditioner != nullptr) { s = new float[n]; @@ -77,7 +78,7 @@ float *SparseConjugateGradient(void Ax(float *Product, float *x, void *Pass), fl for(iterate = 0; iterate < MaximumIterates; iterate++) { //Get step size alpha, store ax while at it. - float ab = 0.0f; + double ab = 0.0; // use double precision for large summations Ax(ax, d, Pass); #ifdef _OPENMP #pragma omp parallel for reduction(+:ab) @@ -94,7 +95,7 @@ float *SparseConjugateGradient(void Ax(float *Product, float *x, void *Pass), fl ab = rs / ab; //Update x and r with this step size. - float rms = 0.0; + double rms = 0.0; // use double precision for large summations #ifdef _OPENMP #pragma omp parallel for reduction(+:rms) #endif diff --git a/rtengine/PF_correct_RT.cc b/rtengine/PF_correct_RT.cc index 1a937b409..70c334928 100644 --- a/rtengine/PF_correct_RT.cc +++ b/rtengine/PF_correct_RT.cc @@ -70,7 +70,7 @@ void ImProcFunctions::PF_correct_RT(LabImage * src, LabImage * dst, double radiu gaussianBlur (src->b, tmp1->b, src->W, src->H, radius); } - float chromave = 0.0f; + double chromave = 0.0; // use double precision for large summations #ifdef _OPENMP #pragma omp parallel @@ -382,7 +382,7 @@ void ImProcFunctions::PF_correct_RTcam(CieImage * src, CieImage * dst, double ra gaussianBlur (srbb, tmbb, src->W, src->H, radius); } - float chromave = 0.0f; + double chromave = 0.0; // use double precision for large summations #ifdef __SSE2__ @@ -1042,7 +1042,7 @@ void ImProcFunctions::Badpixelscam(CieImage * src, CieImage * dst, double radius // begin chroma badpixels - float chrommed = 0.f; + double chrommed = 0.0; // use double precision for large summations #ifdef _OPENMP #pragma omp parallel for reduction(+:chrommed) #endif @@ -1646,7 +1646,7 @@ void ImProcFunctions::BadpixelsLab(LabImage * src, LabImage * dst, double radius if(mode == 3) { // begin chroma badpixels - float chrommed = 0.f; + double chrommed = 0.0; // use double precision for large summations #ifdef _OPENMP #pragma omp parallel for reduction(+:chrommed) #endif diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index ecbd4fa37..d274a056a 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -2002,8 +2002,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw hist16Q.clear(); } - float sum = 0.f; -// float sumQ = 0.f; + double sum = 0.0; // use double precision for large summations #ifdef _OPENMP const int numThreads = min (max (width * height / 65536, 1), omp_get_max_threads()); @@ -2023,7 +2022,6 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw hist16Qthr.clear(); } - // #pragma omp for reduction(+:sum,sumQ) #pragma omp for reduction(+:sum) diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 4767a7fba..cd1bbc5f5 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -1271,7 +1271,7 @@ void ImProcFunctions::Aver( float * RESTRICT DataList, int datalen, float &aver //find absolute mean int countP = 0, countN = 0; - float averaP = 0.f, averaN = 0.f; + double averaP = 0.0, averaN = 0.0; // use double precision for large summations float thres = 5.f;//different fom zero to take into account only data large enough max = 0.f; @@ -1332,7 +1332,7 @@ void ImProcFunctions::Aver( float * RESTRICT DataList, int datalen, float &aver void ImProcFunctions::Sigma( float * RESTRICT DataList, int datalen, float averagePlus, float averageNeg, float &sigmaPlus, float &sigmaNeg) { int countP = 0, countN = 0; - float variP = 0.f, variN = 0.f; + double variP = 0.0, variN = 0.0; // use double precision for large summations float thres = 5.f;//different fom zero to take into account only data large enough #ifdef _OPENMP @@ -1687,7 +1687,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float * float contrast = cp.contrast; float multL = (float)contrast * (maxl - 1.f) / 100.f + 1.f; float multH = (float) contrast * (maxh - 1.f) / 100.f + 1.f; - double avedbl = 0.f; // use double precision for big summations + double avedbl = 0.0; // use double precision for large summations float max0 = 0.f; float min0 = FLT_MAX; diff --git a/rtengine/tmo_fattal02.cc b/rtengine/tmo_fattal02.cc index dfdeb56b5..0a88958d1 100644 --- a/rtengine/tmo_fattal02.cc +++ b/rtengine/tmo_fattal02.cc @@ -276,7 +276,7 @@ float calculateGradients (Array2Df* H, Array2Df* G, int k, bool multithread) const int width = H->getCols(); const int height = H->getRows(); const float divider = pow ( 2.0f, k + 1 ); - float avgGrad = 0.0f; + double avgGrad = 0.0; // use double precision for large summations #pragma omp parallel for reduction(+:avgGrad) if(multithread) From b430ca19a603eaa43acb359cbe93b24ddf566a78 Mon Sep 17 00:00:00 2001 From: Hombre Date: Sat, 24 Feb 2018 14:02:50 +0100 Subject: [PATCH 08/22] Double fallback implemented (see #4396) If the user's default profile is not found, it'll fallback to the bundled one. If this one is not found, it'll fall back to internal values. No restart required. Only the GUI alert are localized. --- rtdata/languages/Francais | 5 +- rtdata/languages/default | 1 + rtgui/main-cli.cc | 30 +++++++++++ rtgui/options.cc | 107 ++++++++++++++++++++++++++++---------- rtgui/options.h | 55 ++++++++------------ rtgui/rtwindow.cc | 13 +++++ 6 files changed, 149 insertions(+), 62 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 349251d45..939e6b112 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -868,8 +868,9 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Largeur = %1, Hauteur = %2 NAVIGATOR_XY_NA;x = n/d, y = n/d -OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les images standards n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. -OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les images Raw n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. +OPTIONS_BUNDLED_MISSING;Le profile fourni "%1" n'a pas été trouvé!\n\nVotre installation peut être endomagé.\n\nLes valeurs internes par défaut seront utilisées à la place. +OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les images standards n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. +OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les images Raw n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez le dossier de vos profils, il peut être manquant ou endommagé\n\n"%1" sera utilisé à la place. PARTIALPASTE_ADVANCEDGROUP;Réglages Avancés PARTIALPASTE_BASICGROUP;Réglages de base PARTIALPASTE_CACORRECTION;Aberration chromatique diff --git a/rtdata/languages/default b/rtdata/languages/default index dc8b5fbbe..c6c7d08ba 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -869,6 +869,7 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Width: %1, Height: %2 NAVIGATOR_XY_NA;x: --, y: -- +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 diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc index fdfee64ab..2365123e1 100644 --- a/rtgui/main-cli.cc +++ b/rtgui/main-cli.cc @@ -163,6 +163,36 @@ int main (int argc, char **argv) return -2; } + if (options.is_defProfRawMissing()) { + options.defProfRaw = DEFPROFILE_RAW; + std::cerr << std::endl + << "The default profile for raw photos could not be found or is not set." << std::endl + << "Please check your profiles' directory, it may be missing or damaged." << std::endl + << "\"" << DEFPROFILE_RAW << "\" will be used instead." << std::endl << std::endl; + } + if (options.is_bundledDefProfRawMissing()) { + std::cerr << std::endl + << "The bundled profile \"" << options.defProfRaw << "\" could not be found!" << std::endl + << "Your installation could be damaged." << std::endl + << "Default internal values will be used instead." << std::endl << std::endl; + options.defProfRaw = DEFPROFILE_INTERNAL; + } + + if (options.is_defProfImgMissing()) { + options.defProfImg = DEFPROFILE_IMG; + std::cerr << std::endl + << "The default profile for non-raw photos could not be found or is not set." << std::endl + << "Please check your profiles' directory, it may be missing or damaged." << std::endl + << "\"" << DEFPROFILE_IMG << "\" will be used instead." << std::endl << std::endl; + } + if (options.is_bundledDefProfImgMissing()) { + std::cerr << std::endl + << "The bundled profile " << options.defProfImg << " could not be found!" << std::endl + << "Your installation could be damaged." << std::endl + << "Default internal values will be used instead." << std::endl << std::endl; + options.defProfImg = DEFPROFILE_INTERNAL; + } + rtengine::setPaths(); TIFFSetWarningHandler (nullptr); // avoid annoying message boxes diff --git a/rtgui/options.cc b/rtgui/options.cc index 55e99ce2d..68cd39e6d 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -52,8 +52,7 @@ Glib::ustring paramFileExtension = ".pp3"; Options::Options () { - defProfRawMissing = false; - defProfImgMissing = false; + defProfError = 0; setDefaults (); } @@ -2194,58 +2193,50 @@ void Options::load (bool lightweight) if (options.defProfRaw.empty()) { options.defProfRaw = DEFPROFILE_RAW; } else { - Glib::ustring tmpFName = options.findProfilePath (options.defProfRaw); - - if (!tmpFName.empty()) { + if (!options.findProfilePath (options.defProfRaw).empty()) { if (options.rtSettings.verbose) { - printf ("Default profile for raw images \"%s\" found\n", options.defProfRaw.c_str()); + std::cout << "Default profile for raw images \"" << options.defProfRaw << "\" found" << std::endl; } } else { if (options.defProfRaw != DEFPROFILE_RAW) { - if (options.rtSettings.verbose) { - printf ("Default profile for raw images \"%s\" not found or not set -> using RawTherapee's default raw profile\n", options.defProfRaw.c_str()); + options.setDefProfRawMissing(true); + + Glib::ustring dpr(DEFPROFILE_RAW); + if (options.findProfilePath (dpr).empty()) { + options.setBundledDefProfRawMissing(true); } - options.defProfRaw = DEFPROFILE_RAW; } else { - if (options.rtSettings.verbose) { - printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); - } - options.defProfRaw = DEFPROFILE_INTERNAL; + options.setBundledDefProfRawMissing(true); } - options.defProfRawMissing = true; } } if (options.defProfImg.empty()) { options.defProfImg = DEFPROFILE_IMG; } else { - Glib::ustring tmpFName = options.findProfilePath (options.defProfImg); - - if (!tmpFName.empty()) { + if (!options.findProfilePath (options.defProfImg).empty()) { if (options.rtSettings.verbose) { - printf ("Default profile for non-raw images \"%s\" found\n", options.defProfImg.c_str()); + std::cout << "Default profile for non-raw images \"" << options.defProfImg << "\" found" << std::endl; } } else { if (options.defProfImg != DEFPROFILE_IMG) { - if (options.rtSettings.verbose) { - printf ("Default profile for non-raw images \"%s\" not found or not set -> using RawTherapee's default non-raw profile\n", options.defProfImg.c_str()); + options.setDefProfImgMissing(true); + + Glib::ustring dpi(DEFPROFILE_IMG); + if (options.findProfilePath (dpi).empty()) { + options.setBundledDefProfImgMissing(true); } - options.defProfImg = DEFPROFILE_IMG; } else { - if (options.rtSettings.verbose) { - printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); - } - options.defProfImg = DEFPROFILE_INTERNAL; + options.setBundledDefProfImgMissing(true); } - options.defProfImgMissing = true; } } - //We handle languages using a hierarchy of translations. The top of the hierarchy is default. This includes a default translation for all items + // We handle languages using a hierarchy of translations. The top of the hierarchy is default. This includes a default translation for all items // (most likely using simple English). The next level is the language: for instance, English, French, Chinese, etc. This file should contain a // generic translation for all items which differ from default. Finally there is the locale. This is region-specific items which differ from the // language file. These files must be name in the format (), where Language is the name of the language which it inherits from, - // and LC is the local code. Some examples of this would be English (US) (American English), French (FR) (Franch French), French (CA) (Canadian + // and LC is the local code. Some examples of this would be English (US) (American English), French (FR) (France French), French (CA) (Canadian // French), etc. // // Each level will only contain the differences between itself and its parent translation. For instance, English (UK) or English (CA) may @@ -2346,3 +2337,63 @@ bool Options::is_extention_enabled (Glib::ustring ext) return false; } + +Glib::ustring Options::getUserProfilePath() +{ + return userProfilePath; +} + +Glib::ustring Options::getGlobalProfilePath() +{ + return globalProfilePath; +} + +bool Options::is_defProfRawMissing() +{ + return defProfError & rtengine::toUnderlying(DefProfError::defProfRawMissing); +} +bool Options::is_defProfImgMissing() +{ + return defProfError & rtengine::toUnderlying(DefProfError::defProfImgMissing); +} +void Options::setDefProfRawMissing (bool value) +{ + if (value) { + defProfError |= rtengine::toUnderlying(DefProfError::defProfRawMissing); + } else { + defProfError &= ~rtengine::toUnderlying(DefProfError::defProfRawMissing); + } +} +void Options::setDefProfImgMissing (bool value) +{ + if (value) { + defProfError |= rtengine::toUnderlying(DefProfError::defProfImgMissing); + } else { + defProfError &= ~rtengine::toUnderlying(DefProfError::defProfImgMissing); + } +} +bool Options::is_bundledDefProfRawMissing() +{ + return defProfError & rtengine::toUnderlying(DefProfError::bundledDefProfRawMissing); +} +bool Options::is_bundledDefProfImgMissing() +{ + return defProfError & rtengine::toUnderlying(DefProfError::bundledDefProfImgMissing); +} +void Options::setBundledDefProfRawMissing (bool value) +{ + if (value) { + defProfError |= rtengine::toUnderlying(DefProfError::bundledDefProfRawMissing); + } else { + defProfError &= ~rtengine::toUnderlying(DefProfError::bundledDefProfRawMissing); + } +} +void Options::setBundledDefProfImgMissing (bool value) +{ + if (value) { + defProfError |= rtengine::toUnderlying(DefProfError::bundledDefProfImgMissing); + } else { + defProfError &= ~rtengine::toUnderlying(DefProfError::bundledDefProfImgMissing); + } +} + diff --git a/rtgui/options.h b/rtgui/options.h index 7a4a23b4d..a5eef1543 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -90,8 +90,13 @@ public: }; private: - bool defProfRawMissing; - bool defProfImgMissing; + enum class DefProfError : short { + defProfRawMissing = 1 << 0, + bundledDefProfRawMissing = 1 << 1, + defProfImgMissing = 1 << 2, + bundledDefProfImgMissing = 1 << 3 + }; + short defProfError; Glib::ustring userProfilePath; Glib::ustring globalProfilePath; bool checkProfilePath (Glib::ustring &path); @@ -344,9 +349,9 @@ public: Options (); - Options* copyFrom (Options* other); - void filterOutParsedExtensions (); - void setDefaults (); + Options* copyFrom (Options* other); + void filterOutParsedExtensions (); + void setDefaults (); void readFromFile (Glib::ustring fname); void saveToFile (Glib::ustring fname); static void load (bool lightweight = false); @@ -354,34 +359,20 @@ public: // if multiUser=false, send back the global profile path Glib::ustring getPreferredProfilePath(); - Glib::ustring getUserProfilePath() - { - return userProfilePath; - } - Glib::ustring getGlobalProfilePath() - { - return globalProfilePath; - } + Glib::ustring getUserProfilePath(); + Glib::ustring getGlobalProfilePath(); Glib::ustring findProfilePath (Glib::ustring &profName); - bool is_parse_extention (Glib::ustring fname); - bool has_retained_extention (Glib::ustring fname); - bool is_extention_enabled (Glib::ustring ext); - bool is_defProfRawMissing() - { - return defProfRawMissing; - } - bool is_defProfImgMissing() - { - return defProfImgMissing; - } - void setDefProfRawMissing (bool value) - { - defProfRawMissing = value; - } - void setDefProfImgMissing (bool value) - { - defProfImgMissing = value; - } + bool is_parse_extention (Glib::ustring fname); + bool has_retained_extention (Glib::ustring fname); + bool is_extention_enabled (Glib::ustring ext); + bool is_defProfRawMissing(); + bool is_bundledDefProfRawMissing(); + bool is_defProfImgMissing(); + bool is_bundledDefProfImgMissing(); + void setDefProfRawMissing (bool value); + void setBundledDefProfRawMissing (bool value); + void setDefProfImgMissing (bool value); + void setBundledDefProfImgMissing (bool value); }; extern Options options; diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index afc95efd0..860221e02 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -349,15 +349,28 @@ void RTWindow::showErrors() { // alerting users if the default raw and image profiles are missing if (options.is_defProfRawMissing()) { + options.defProfRaw = DEFPROFILE_RAW; Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_DEFRAW_MISSING"), options.defProfRaw), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); } + if (options.is_bundledDefProfRawMissing()) { + Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_BUNDLED_MISSING"), options.defProfRaw), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + msgd.run (); + options.defProfRaw = DEFPROFILE_INTERNAL; + } if (options.is_defProfImgMissing()) { + options.defProfImg = DEFPROFILE_IMG; Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_DEFIMG_MISSING"), options.defProfImg), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); } + if (options.is_bundledDefProfImgMissing()) { + Gtk::MessageDialog msgd (*this, Glib::ustring::compose (M ("OPTIONS_BUNDLED_MISSING"), options.defProfImg), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + msgd.run (); + options.defProfImg = DEFPROFILE_INTERNAL; + } } + bool RTWindow::on_configure_event (GdkEventConfigure* event) { if (!is_maximized() && is_visible()) { From 619ae528ca5baa347eb73b994f92d5c4576447eb Mon Sep 17 00:00:00 2001 From: Hombre Date: Sun, 25 Feb 2018 22:32:32 +0100 Subject: [PATCH 09/22] Updated French language file --- rtdata/languages/Francais | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 0fbce91f5..946d9908c 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -729,6 +729,7 @@ HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste Local HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Contraste Local - H.L. HISTORY_MSG_LOCALCONTRAST_RADIUS;Contraste Local - Rayon HISTORY_MSG_METADATA_MODE;Mode de copie des métadonnées +HISTORY_MSG_TM_FATTAL_ANCHOR;CT HDR - Ancre HISTORY_NEWSNAPSHOT;Ajouter HISTORY_NEWSNAPSHOT_TOOLTIP;Raccourci: Alt-s HISTORY_SNAPSHOT;Capture @@ -1230,6 +1231,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Meilleurs compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma div SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé SAVEDLG_WARNFILENAME;Le fichier sera nommé SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs +SOFTPROOF_GAMUTCHECK_TOOLTIP;Met en lumière les pixels en dehors du gamut en fonction:\n- du profile de l'imprimante, si l'un est sélectionné et que l'épreuvage écran est activé,\n- du profile de sortie, si aucun profile d'imprimante n'est sélectionné et que l'épreuvage écran est activé,\n- du profile du moniteur, si l'épreuvage écran est désactivé. +SOFTPROOF_TOOLTIP;L'épreuvage écran simule l'apparence de l'image:\n- lorsque imprimé, si un profile d'imprimante a été sélectionné dans Préférences > Gestion des couleurs,\n- lorsque visionné sur un écran qui utilise le profile de sortie actuel, si un profile d'imprimante n'est pas sélectionné. THRESHOLDSELECTOR_B;Bas THRESHOLDSELECTOR_BL;Bas-gauche THRESHOLDSELECTOR_BR;Bas-droite @@ -1959,6 +1962,7 @@ TP_SHARPENMICRO_LABEL;Microcontraste TP_SHARPENMICRO_MATRIX;Matrice 3×3 au lieu de 5×5 TP_SHARPENMICRO_UNIFORMITY;Uniformité TP_TM_FATTAL_AMOUNT;Quantité +TP_TM_FATTAL_ANCHOR;Ancre TP_TM_FATTAL_LABEL;Compression Tonale HDR TP_TM_FATTAL_THRESHOLD;Seuil TP_VIBRANCE_AVOIDCOLORSHIFT;Éviter les dérives de teinte @@ -2204,11 +2208,3 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: f ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: + ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!HISTORY_MSG_TM_FATTAL_ANCHOR;HDR TM - Anchor -!SOFTPROOF_GAMUTCHECK_TOOLTIP;Highlight pixels with out-of-gamut colors with respect to:\n- the printer profile, if one is set and soft-proofing is enabled,\n- the output profile, if a printer profile is not set and soft-proofing is enabled,\n- the monitor profile, if soft-proofing is disabled. -!SOFTPROOF_TOOLTIP;Soft-proofing simulates the appearance of the image:\n- when printed, if a printer profile is set in Preferences > Color Management,\n- when viewed on a display that uses the current output profile, if a printer profile is not set. -!TP_TM_FATTAL_ANCHOR;Anchor From cfd666f23e06dfaa2071b2d9801fcae47d9bc77b Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 26 Feb 2018 00:14:33 +0100 Subject: [PATCH 10/22] Clear Film Simulation combo when changing images When switching to the "next" image whose HaldCLUT does not exist, RT would show the previous image HaldCLUT's name in the "Film Simulation" combo, even though it is not being used. This patch by Hombre fixes it, and fixes #4388 --- rtgui/filmsimulation.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtgui/filmsimulation.cc b/rtgui/filmsimulation.cc index 89ab31748..ba8f6740b 100644 --- a/rtgui/filmsimulation.cc +++ b/rtgui/filmsimulation.cc @@ -425,6 +425,8 @@ void ClutComboBox::setSelectedClut( Glib::ustring filename ) if ( found ) { set_active( found ); + } else { + set_active(-1); } } } From af59dc5cc6a19e59afbcbb02026b84b2951fa669 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 26 Feb 2018 14:44:35 +0100 Subject: [PATCH 11/22] Added translation field to appdata so it passes validation --- rawtherapee.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/rawtherapee.appdata.xml b/rawtherapee.appdata.xml index 2ad159ede..6a15e723a 100644 --- a/rawtherapee.appdata.xml +++ b/rawtherapee.appdata.xml @@ -6,6 +6,7 @@ Program pro konverzi a zpracování digitálních raw fotografií Logiciel de conversion et de traitement de photos numériques de format raw (but de capteur) Zaawansowany program do wywoływania zdjęć typu raw + rawtherapee

RawTherapee is a powerful, cross-platform raw photo processing program. It is written mostly in C++ using a GTK+ front-end. It uses a patched version of dcraw for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process. From aa2d7e1cb132c22d2ae80b354a1815c9ce386b04 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 26 Feb 2018 20:23:37 +0100 Subject: [PATCH 12/22] generateTranslationDiffs --- rtdata/languages/Catala | 5 +++-- rtdata/languages/Chinese (Simplified) | 5 +++-- rtdata/languages/Chinese (Traditional) | 5 +++-- rtdata/languages/Czech | 5 +++-- rtdata/languages/Dansk | 5 +++-- rtdata/languages/Deutsch | 9 +++++++-- rtdata/languages/English (UK) | 5 +++-- rtdata/languages/English (US) | 5 +++-- rtdata/languages/Espanol | 5 +++-- rtdata/languages/Euskara | 5 +++-- rtdata/languages/Greek | 5 +++-- rtdata/languages/Hebrew | 5 +++-- rtdata/languages/Italiano | 5 +++-- rtdata/languages/Japanese | 5 +++-- rtdata/languages/Latvian | 5 +++-- rtdata/languages/Magyar | 5 +++-- rtdata/languages/Nederlands | 5 +++-- rtdata/languages/Norsk BM | 5 +++-- rtdata/languages/Polish | 5 +++-- rtdata/languages/Polish (Latin Characters) | 5 +++-- rtdata/languages/Portugues (Brasil) | 5 +++-- rtdata/languages/Russian | 5 +++-- rtdata/languages/Serbian (Cyrilic Characters) | 5 +++-- rtdata/languages/Serbian (Latin Characters) | 5 +++-- rtdata/languages/Slovak | 5 +++-- rtdata/languages/Suomi | 5 +++-- rtdata/languages/Swedish | 5 +++-- rtdata/languages/Turkish | 5 +++-- 28 files changed, 88 insertions(+), 56 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 85572464a..5ebd67faf 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -435,8 +435,6 @@ MAIN_TOOLTIP_THRESHOLD;Llindar MAIN_TOOLTIP_TOGGLE;Alterna vista abans/després.\nDrecera: Majús-B NAVIGATOR_XY_FULL;Amplada = %1, Altura = %2 NAVIGATOR_XY_NA;x = n/a, y = n/a -OPTIONS_DEFIMG_MISSING;No es troba el perfil per omissió per a fotografies no-raw o no s'ha especificat.\n\nReviseu el directori de perfils, potser falta o està fet malbé.\n\nEs faran servir els valors interns per omissió. -OPTIONS_DEFRAW_MISSING;No es troba el perfil per omissió per a fotografies raw.\n\nReviseu el directori de perfils, potser falta o està fet malbé.\n\nEs faran servir els valors interns per omissió. PARTIALPASTE_BASICGROUP;Ajustos bàsics PARTIALPASTE_CACORRECTION;Correcció A. C.(Aberració Cromàtica) PARTIALPASTE_CHANNELMIXER;Barrejador de canals @@ -1382,6 +1380,9 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !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_CHANNELMIXERBW;Black-and-white !PARTIALPASTE_COLORAPP;CIECAM02 diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index b22c0b35f..39c5b2e2f 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1485,8 +1485,9 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g !MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B !MONITOR_PROFILE_SYSTEM;System default -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. !PARTIALPASTE_ADVANCEDGROUP;Advanced Settings !PARTIALPASTE_LOCALCONTRAST;Local contrast !PARTIALPASTE_METADATA;Metadata mode diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index f6cea32dd..26629437d 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1076,8 +1076,9 @@ TP_WBALANCE_TEMPERATURE;色溫 !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index d87ed8757..096d5793d 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -891,8 +891,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Šířka: %1, Výška: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Výchozí profil pro ne raw fotky nelze nalézt nebo nastavit.\n\nZkontrolujte prosím vaši složku s profily, buď chybí nebo je poškozena.\n\nBudou použity výchozí přednastavené hodnoty. -OPTIONS_DEFRAW_MISSING;Výchozí profil pro raw fotky nelze nalézt nebo nastavit.\n\nZkontrolujte prosím vaši složku s profily, buď chybí nebo je poškozena.\n\nBudou použity výchozí přednastavené hodnoty. PARTIALPASTE_BASICGROUP;Základní nastavení PARTIALPASTE_CACORRECTION;Korekce chromatické aberace PARTIALPASTE_CHANNELMIXER;Míchání kanálů @@ -2220,6 +2218,9 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !HISTORY_MSG_TM_FATTAL_ANCHOR;HDR TM - Anchor !MAIN_TAB_ADVANCED;Advanced !MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. !PARTIALPASTE_ADVANCEDGROUP;Advanced Settings !PARTIALPASTE_LOCALCONTRAST;Local contrast !PARTIALPASTE_METADATA;Metadata mode diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 7e628d1bf..88c124dc5 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;Temperatur !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 239b8a030..f66c43ec9 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -921,8 +921,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Breite = %1, Höhe = %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Die Standard-Profile für Nicht-RAW-Bilder wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet. -OPTIONS_DEFRAW_MISSING;Die Standard-Profile für RAW-Bilder wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet. PARTIALPASTE_ADVANCEDGROUP;Erweiterte Einstellungen PARTIALPASTE_BASICGROUP;Basisparameter PARTIALPASTE_CACORRECTION;Farbsaum entfernen @@ -2259,3 +2257,10 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!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. diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 0aca437e3..e634937fa 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -949,8 +949,9 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_BASICGROUP;Basic Settings !PARTIALPASTE_CACORRECTION;Chromatic aberration correction diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index e84af5383..2d2693de6 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -870,8 +870,9 @@ !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_BASICGROUP;Basic Settings !PARTIALPASTE_CACORRECTION;Chromatic aberration correction diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 681f9a4ed..1b23bdcff 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -654,8 +654,6 @@ MAIN_TOOLTIP_TOGGLE;Cambiar vista antes/después.\nAtajo: Shift-B NAVIGATOR_NA; -- NAVIGATOR_XY_FULL;Ancho = %1, Alto = %2 NAVIGATOR_XY_NA;x = n/a, y = n/a -OPTIONS_DEFIMG_MISSING;El perfil predeterminado para fotos no raw no se pudo encontrar o no está establecido.\n\nPor favor verifique su folder de perfiles, puede estar dañado o no existir.\n\nSe usarán valores predeterminados internos. -OPTIONS_DEFRAW_MISSING;El perfil predeterminado para fotos raw no se pudo encontrar o no está establecido.\n\nPor favor verifique su folder de perfiles, puede estar dañado o no existir.\n\nSe usarán valores predeterminados internos. PARTIALPASTE_BASICGROUP;Ajustes básicos PARTIALPASTE_CACORRECTION;Corrección de aberraciones cromáticas PARTIALPASTE_CHANNELMIXER;Mezclador de canales @@ -1763,6 +1761,9 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !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_EQUALIZER;Wavelet levels !PARTIALPASTE_GRADIENT;Graduated filter diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index df495358a..a17262d45 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index 9f899c42d..cdb1b71a2 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1073,8 +1073,9 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index a7abf904c..5dc24ae51 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;מידת חום !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 8405768e3..820e43816 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -563,8 +563,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Larghezza: %1, Altezza: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Il profilo predefinito per le foto non-raw non può essere trovato o non è stato impostato.\n\nControlla la tua cartella dei profili, potrebbe essere assente o danneggiata.\n\nSaranno utilizzati i valori di default. -OPTIONS_DEFRAW_MISSING;Il profilo predefinito per le foto raw non può essere trovato o non è stato impostato.\n\nControlla la tua cartella dei profili, potrebbe essere assente o danneggiata.\n\nSaranno utilizzati i valori di default. PARTIALPASTE_BASICGROUP;Parametri principali PARTIALPASTE_CACORRECTION;Correzione AC PARTIALPASTE_CHANNELMIXER;Miscelatore Canali @@ -1630,6 +1628,9 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !MAIN_TAB_INSPECT; Inspect !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!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_COLORTONING;Color toning !PARTIALPASTE_EQUALIZER;Wavelet levels diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 63b325d93..5915f6071 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -759,8 +759,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;幅 = %1, 高さ = %2 NAVIGATOR_XY_NA;x = n/a, y = n/a -OPTIONS_DEFIMG_MISSING;rawではない画像のデフォルプロファイルが見つからないか、設定されていません\n\nプロファイル・ディレクトリを確認してください、存在しないか破損しているかもしれません\n\nデフォルト設定値が使用されます -OPTIONS_DEFRAW_MISSING;raw画像のデフォル・プロファイルが見つからないか、設定されていません\n\nプロファイル・ディレクトリを確認してください、存在しないか破損しているかもしれません\n\nデフォルト設定値が使用されます PARTIALPASTE_BASICGROUP;基本設定 PARTIALPASTE_CACORRECTION;色収差補正 PARTIALPASTE_CHANNELMIXER;チャンネル・ミキサー @@ -2000,6 +1998,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. !PARTIALPASTE_ADVANCEDGROUP;Advanced Settings !PARTIALPASTE_LOCALCONTRAST;Local contrast !PARTIALPASTE_METADATA;Metadata mode diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 92d6e95d4..057a6d699 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 1dad371c8..caea757b5 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1315,8 +1315,9 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !NAVIGATOR_S;S: !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXERBW;Black-and-white !PARTIALPASTE_COLORAPP;CIECAM02 diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 65502e038..3804c52a7 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -838,8 +838,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Breedte: %1, Hoogte: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Het standaard profiel voor non-raw foto's kan niet worden gevonden of is niet ingesteld.\n\nControleer de map met de profielen, deze kan missen of beschadigd zijn.\n\nDe standaard waarden zullen worden gebruikt. -OPTIONS_DEFRAW_MISSING;Het standaard profiel voor raw foto's kan niet worden gevonden of is niet ingesteld.\n\nControleer de map met de profielen, deze kan missen of beschadigd zijn.\n\nDe standaard waarden zullen worden gebruikt. PARTIALPASTE_BASICGROUP;Basisinstellingen PARTIALPASTE_CACORRECTION;C/A-correctie PARTIALPASTE_CHANNELMIXER;Kleurkanaal mixer @@ -2165,6 +2163,9 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !MAIN_TAB_ADVANCED;Advanced !MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. !PARTIALPASTE_ADVANCEDGROUP;Advanced Settings !PARTIALPASTE_LOCALCONTRAST;Local contrast !PARTIALPASTE_METADATA;Metadata mode diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 6d28790db..7d8823afc 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1073,8 +1073,9 @@ TP_WBALANCE_TEMPERATURE;Temperatur !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index a71d094a0..946c8ea63 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -608,8 +608,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Szerokość: %1, Wysokość: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Nie znaleziono domyślnego profilu dla plików innych niż raw, lub profil nie jest ustawiony.\n\nProszę sprawdz folder z profilami - możliwe że został skasowany bądź uszkodzony.\n\nDomyślne wewnętrzne ustawienia zostaną użyte. -OPTIONS_DEFRAW_MISSING;Nie znaleziono domyślnego profilu dla plików raw, lub profil nie jest ustawiony.\n\nProszę sprawdz folder z profilami - możliwe że został skasowany bądź uszkodzony.\n\nDomyślne wewnętrzne ustawienia zostaną użyte. PARTIALPASTE_BASICGROUP;Podstawowe ustawienia PARTIALPASTE_CACORRECTION;Korekcja aberacji chr. PARTIALPASTE_CHANNELMIXER;Mieszacz kanałów @@ -1712,6 +1710,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !MAIN_TAB_INSPECT; Inspect !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!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_EQUALIZER;Wavelet levels !PARTIALPASTE_LOCALCONTRAST;Local contrast diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 5e8150e46..2e6d74122 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -608,8 +608,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Szerokosc: %1, Wysokosc: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Nie znaleziono domyslnego profilu dla plikow innych niz raw, lub profil nie jest ustawiony.\n\nProsze sprawdz folder z profilami - mozliwe ze zostal skasowany badz uszkodzony.\n\nDomyslne wewnetrzne ustawienia zostana uzyte. -OPTIONS_DEFRAW_MISSING;Nie znaleziono domyslnego profilu dla plikow raw, lub profil nie jest ustawiony.\n\nProsze sprawdz folder z profilami - mozliwe ze zostal skasowany badz uszkodzony.\n\nDomyslne wewnetrzne ustawienia zostana uzyte. PARTIALPASTE_BASICGROUP;Podstawowe ustawienia PARTIALPASTE_CACORRECTION;Korekcja aberacji chr. PARTIALPASTE_CHANNELMIXER;Mieszacz kanalow @@ -1712,6 +1710,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !MAIN_TAB_INSPECT; Inspect !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!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_EQUALIZER;Wavelet levels !PARTIALPASTE_LOCALCONTRAST;Local contrast diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 2363297a9..ddbfc8c88 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;Temperatura !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 18d86afc7..01efea73d 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -609,8 +609,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Ширина: %1, Высота: %2 NAVIGATOR_XY_NA;x: --, y: -- -OPTIONS_DEFIMG_MISSING;Профиль по умолчанию для не-raw снимков не найден или не установлен.\n\nПожалуйста, проверьте папку с профилями, она может отсутствовать или быть повреждена.\n\nБудут использованы значения по умолчанию. -OPTIONS_DEFRAW_MISSING;Профиль по умолчанию для raw снимков не найден или не установлен.\n\nПожалуйста, проверьте папку с профилями, она может отсутствовать или быть повреждена.\n\nБудут использованы значения по умолчанию. PARTIALPASTE_ADVANCEDGROUP;Дополнительные параметры PARTIALPASTE_BASICGROUP;Базовые настройки PARTIALPASTE_CACORRECTION;Коррекция C/A @@ -1681,6 +1679,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue. !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default +!OPTIONS_BUNDLED_MISSING;The bundled profile "%1" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"%1" will be used instead. +!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_COLORTONING;Color toning !PARTIALPASTE_EQUALIZER;Wavelet levels !PARTIALPASTE_FILMSIMULATION;Film simulation diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 2fd749c60..56cc853de 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -534,8 +534,6 @@ MAIN_TOOLTIP_THRESHOLD;Праг MAIN_TOOLTIP_TOGGLE;Приказује слику пре и после обраде Б NAVIGATOR_XY_FULL;Ширина = %1, Висина = %2 NAVIGATOR_XY_NA;x = ○, y = ○ -OPTIONS_DEFIMG_MISSING;Није пронађен или доступан подразумевани профил за слике које нису у сировом формату.\n\nПроверите фасциклу са профилима, можда не постоји или је оштећена.\n\nБиће коришћене подразумеване вредности. -OPTIONS_DEFRAW_MISSING;Није пронађен или доступан подразумевани профил за слике у сировом формату.\n\nПроверите фасциклу са профилима, можда не постоји или је оштећена.\n\nБиће коришћене подразумеване вредности. PARTIALPASTE_BASICGROUP;Основна подешавања PARTIALPASTE_CACORRECTION;Исправљање аберација PARTIALPASTE_CHANNELMIXER;Мешање канала @@ -1615,6 +1613,9 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !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_COLORTONING;Color toning !PARTIALPASTE_EQUALIZER;Wavelet levels diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index e09453cde..3157f1089 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -534,8 +534,6 @@ MAIN_TOOLTIP_THRESHOLD;Prag MAIN_TOOLTIP_TOGGLE;Prikazuje sliku pre i posle obrade B NAVIGATOR_XY_FULL;Širina = %1, Visina = %2 NAVIGATOR_XY_NA;x = ○, y = ○ -OPTIONS_DEFIMG_MISSING;Nije pronađen ili dostupan podrazumevani profil za slike koje nisu u sirovom formatu.\n\nProverite fasciklu sa profilima, možda ne postoji ili je oštećena.\n\nBiće korišćene podrazumevane vrednosti. -OPTIONS_DEFRAW_MISSING;Nije pronađen ili dostupan podrazumevani profil za slike u sirovom formatu.\n\nProverite fasciklu sa profilima, možda ne postoji ili je oštećena.\n\nBiće korišćene podrazumevane vrednosti. PARTIALPASTE_BASICGROUP;Osnovna podešavanja PARTIALPASTE_CACORRECTION;Ispravljanje aberacija PARTIALPASTE_CHANNELMIXER;Mešanje kanala @@ -1615,6 +1613,9 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !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_COLORTONING;Color toning !PARTIALPASTE_EQUALIZER;Wavelet levels diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index ae8475b0f..1664b6150 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1128,8 +1128,9 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !NAVIGATOR_S;S: !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index dd6f23d70..00abac8a7 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1075,8 +1075,9 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 8a4ceffeb..c7b03a1b1 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -748,8 +748,6 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Bredd = %1, Höjd = %2 NAVIGATOR_XY_NA;x = -, y = - -OPTIONS_DEFIMG_MISSING;Standardprofilen för icke-råbilder kunde inte hittas eller är inte angiven.\n\nVar vänlig kontrollera din profilmapp: den kanske ej finns eller är skadad.\n\nInterna värden kommer att användas som standard. -OPTIONS_DEFRAW_MISSING;Standardprofilen för råbilder kunde inte hittas eller är den ej angiven.\n\nVar vänlig kontrollera din profilmapp: kanske finns den ej eller är filen skadad.\n\nInterna värden kommer att användas som standard. PARTIALPASTE_BASICGROUP;Grundläggande inställningar PARTIALPASTE_CACORRECTION;Reducera kromatiska abberationer PARTIALPASTE_CHANNELMIXER;Kanalmixer @@ -1989,6 +1987,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !MAIN_TAB_ADVANCED;Advanced !MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w !MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: Middle grey\nShortcut: 9 +!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_COLORTONING;Color toning !PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 0cf6558dc..3f84afd6c 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1074,8 +1074,9 @@ TP_WBALANCE_TEMPERATURE;Isı !NAVIGATOR_V;V: !NAVIGATOR_XY_FULL;Width: %1, Height: %2 !NAVIGATOR_XY_NA;x: --, y: -- -!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\nDefault internal values will be used. -!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\nDefault internal values will be used. +!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_CHANNELMIXER;Channel mixer !PARTIALPASTE_CHANNELMIXERBW;Black-and-white From f5face52e7854ddefc8e2a0e2ea53a8218ecf136 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Tue, 27 Feb 2018 00:07:27 +0100 Subject: [PATCH 13/22] Update Deutsch locale --- rtdata/languages/Deutsch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index f66c43ec9..96f6c7c05 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -51,6 +51,7 @@ #50 07.01.2018 Crop Settings (TooWaBoo) RT 5.3 #51 10.02.2018 Erweiterung (TooWaBoo) RT 5.3 #52 10.02.2018 Korrektur (TooWaBoo) RT 5.3 +#53 26.02.2018 Erweiterung (TooWaBoo) RT 5.3 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -2261,6 +2262,6 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!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. +OPTIONS_BUNDLED_MISSING;Das mitgelieferte Profil %1 konnte nicht gefunden werden!\n\nIhre Installation könnte beschädigt sein.\n\nEs werden die internen Standardwerte verwendet. +OPTIONS_DEFIMG_MISSING;Das Standardprofil für Bilddateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. +OPTIONS_DEFRAW_MISSING;Das Standardprofil für RAW-Dateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. From 27e1b9cd54fab2d045ab306673304af9ab523267 Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Tue, 27 Feb 2018 14:24:23 +0100 Subject: [PATCH 14/22] Added note on getting the source code --- RELEASE_NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index ee44c6de1..83ad8acc4 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -31,6 +31,7 @@ New features since 5.3: News Relevant to Package Maintainers ------------------------------------ In general: +- To get the source code, either clone from git or use the tarball from http://rawtherapee.com/shared/source/ . Do not use the auto-generated GitHub release tarballs. - Requires GTK+ version >=3.16, though 3.22 is recommended. - RawTherapee 5 requires GCC-4.9 or higher, or Clang. - Do not use -ffast-math, it will not make RawTherapee faster but will introduce artifacts. From b8440087273da6edbee52bdbd63f7c30081be71b Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Wed, 28 Feb 2018 09:41:56 +0100 Subject: [PATCH 15/22] Added D65 matrix for FUJIFILM X-E3, closes #4415 --- rtengine/camconst.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 95d9606fa..8709c16c7 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1265,6 +1265,12 @@ Camera constants: "ranges": { "white": 16100 } }, + { // Quality B + "make_model": "FUJIFILM X-E3", + "dcraw_matrix": [ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 ], // DNG v10 D65 + "ranges": { "white": 16100 } + }, + { // Quality B "make_model": "FUJIFILM X-PRO1", "dcraw_matrix": [ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 ], // DNG_v9.4 D65 From 34807dc7a9bd06148eff296d00da329a12ac5a10 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Wed, 28 Feb 2018 16:06:11 +0100 Subject: [PATCH 16/22] Updated zoom-to-crop/fit keyboard shortcuts where possible, #4417 --- rtdata/languages/Catala | 2 +- rtdata/languages/Chinese (Simplified) | 4 ++-- rtdata/languages/Czech | 4 ++-- rtdata/languages/Deutsch | 14 +++++--------- rtdata/languages/Espanol | 2 +- rtdata/languages/Francais | 4 ++-- rtdata/languages/Italiano | 2 +- rtdata/languages/Japanese | 4 ++-- rtdata/languages/Magyar | 2 +- rtdata/languages/Nederlands | 4 ++-- rtdata/languages/Polish | 4 ++-- rtdata/languages/Polish (Latin Characters) | 4 ++-- rtdata/languages/Russian | 2 +- rtdata/languages/Serbian (Cyrilic Characters) | 2 +- rtdata/languages/Serbian (Latin Characters) | 2 +- rtdata/languages/Slovak | 2 +- rtdata/languages/Swedish | 4 ++-- 17 files changed, 29 insertions(+), 33 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 5ebd67faf..4bc691a65 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -940,7 +940,7 @@ TP_WBALANCE_TUNGSTEN;Tungstèn ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Obre una altra finestra de detall ZOOMPANEL_ZOOM100;Zoom 100%\nDrecera: z -ZOOMPANEL_ZOOMFITSCREEN;Ajusta a la finestra\nDrecera: f +ZOOMPANEL_ZOOMFITSCREEN;Ajusta a la finestra\nDrecera: Alt-f ZOOMPANEL_ZOOMIN;Apropa\nDrecera: + ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 39c5b2e2f..b73ec1980 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1017,8 +1017,8 @@ TP_WBALANCE_WATER_HEADER;水下 ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;开启(新)细节窗口 ZOOMPANEL_ZOOM100;缩放到100%\n快捷键: z -ZOOMPANEL_ZOOMFITCROPSCREEN;适应边缘到屏幕\n快捷键：Alt-f -ZOOMPANEL_ZOOMFITSCREEN;适应屏幕\n快捷键: f +ZOOMPANEL_ZOOMFITCROPSCREEN;适应边缘到屏幕\n快捷键：f +ZOOMPANEL_ZOOMFITSCREEN;适应屏幕\n快捷键: Alt-f ZOOMPANEL_ZOOMIN;缩放拉近\n快捷键: + ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 096d5793d..02188902a 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2191,8 +2191,8 @@ TP_WBALANCE_WATER_HEADER;Pod vodou ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Otevřít (nové) okno detailu ZOOMPANEL_ZOOM100;Zvětšit na 100%\nZkratka: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit obrázek obrazovce\nZkratka: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: f +ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit obrázek obrazovce\nZkratka: Alt-f ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 96f6c7c05..ddc6d0175 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -922,6 +922,9 @@ NAVIGATOR_S;S: NAVIGATOR_V;V: NAVIGATOR_XY_FULL;Breite = %1, Höhe = %2 NAVIGATOR_XY_NA;x: --, y: -- +OPTIONS_BUNDLED_MISSING;Das mitgelieferte Profil %1 konnte nicht gefunden werden!\n\nIhre Installation könnte beschädigt sein.\n\nEs werden die internen Standardwerte verwendet. +OPTIONS_DEFIMG_MISSING;Das Standardprofil für Bilddateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. +OPTIONS_DEFRAW_MISSING;Das Standardprofil für RAW-Dateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. PARTIALPASTE_ADVANCEDGROUP;Erweiterte Einstellungen PARTIALPASTE_BASICGROUP;Basisparameter PARTIALPASTE_CACORRECTION;Farbsaum entfernen @@ -2253,15 +2256,8 @@ TP_WBALANCE_WATER_HEADER;Unterwasser ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Neues Detailfenster öffnen ZOOMPANEL_ZOOM100;Zoom 100%\nTaste: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Ausschnitt an Bildschirm anpassen\nTaste: Alt + f -ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Ausschnitt an Bildschirm anpassen\nTaste: f +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. -!!!!!!!!!!!!!!!!!!!!!!!!! - -OPTIONS_BUNDLED_MISSING;Das mitgelieferte Profil %1 konnte nicht gefunden werden!\n\nIhre Installation könnte beschädigt sein.\n\nEs werden die internen Standardwerte verwendet. -OPTIONS_DEFIMG_MISSING;Das Standardprofil für Bilddateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. -OPTIONS_DEFRAW_MISSING;Das Standardprofil für RAW-Dateien wurde nicht gefunden oder ist beschädigt.\n\nBitte überprüfen Sie das Verzeichnis Ihrer Profile.\n\nProfil %1 wird stattdessen verwendet. diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 1b23bdcff..dc78f321e 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1477,7 +1477,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_ZOOMFITSCREEN;Ajustar a pantalla\nAtajo: f +ZOOMPANEL_ZOOMFITSCREEN;Ajustar a pantalla\nAtajo: Alt-f ZOOMPANEL_ZOOMIN;Aumentar Zoom\nAtajo: + ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 17ee23ae2..3ea77ab78 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2204,8 +2204,8 @@ TP_WBALANCE_WATER_HEADER;Sous-marin ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Ouvrir une (nouvelle) vue détaillée ZOOMPANEL_ZOOM100;Zoom à 100%\nRaccourci: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Zoom/affiche la zone recadrée\nRaccourci: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Zoom/affiche la zone recadrée\nRaccourci: f +ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: Alt-f ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: + ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 820e43816..4615a1c62 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1312,7 +1312,7 @@ TP_WBALANCE_WATER_HEADER;Subacqueo ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Apri (nuova) finestra di dettaglio ZOOMPANEL_ZOOM100;Ingrandimento al 100%.\nScorciatoia: z -ZOOMPANEL_ZOOMFITSCREEN;Adatta allo schermo.\nScorciatoia: f +ZOOMPANEL_ZOOMFITSCREEN;Adatta allo schermo.\nScorciatoia: Alt-f ZOOMPANEL_ZOOMIN;Ingrandisci.\nScorciatoia: + ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 5915f6071..bc6daac04 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -1846,8 +1846,8 @@ TP_WBALANCE_WATER_HEADER;水中 ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;新規ディテール ウィンドウを開く ZOOMPANEL_ZOOM100;100%にズーム\nショートカット: z -ZOOMPANEL_ZOOMFITCROPSCREEN;切り抜き画像を画面に合わせる\nショートカット：　Alt-f -ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカット: f +ZOOMPANEL_ZOOMFITCROPSCREEN;切り抜き画像を画面に合わせる\nショートカット： f +ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカット: Alt-f ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: + ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index caea757b5..c8cbc100f 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -858,7 +858,7 @@ TP_WBALANCE_TUNGSTEN;Tungsten ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;(Új) lupe megnyitása ZOOMPANEL_ZOOM100;Nagyítás 100%-ra z -ZOOMPANEL_ZOOMFITSCREEN;Képernyő méretéhez igazítás f +ZOOMPANEL_ZOOMFITSCREEN;Képernyő méretéhez igazítás Alt-f ZOOMPANEL_ZOOMIN;Nagyítás + ZOOMPANEL_ZOOMOUT;Kicsinyítés - diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 3804c52a7..1f317a7fa 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2108,8 +2108,8 @@ TP_WBALANCE_WATER_HEADER;Onderwater ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Open (nieuw) detailvenster ZOOMPANEL_ZOOM100;Zoom naar 100%\nSneltoets: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Maak uitsnede passend in het scherm\nSneltoets: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Passend in venster\nSneltoets: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Maak uitsnede passend in het scherm\nSneltoets: f +ZOOMPANEL_ZOOMFITSCREEN;Passend in venster\nSneltoets: Alt-f ZOOMPANEL_ZOOMIN;Zoom in\nSneltoets: + ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 946c8ea63..a4def66c5 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1434,8 +1434,8 @@ TP_WBALANCE_WATER_HEADER;Pod wodą ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Otwórz (nową) lupę ZOOMPANEL_ZOOM100;Powiększ do 100%\nSkrót: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Dopasuj kadr do ekranu\nSkrót: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Dopasuj cały obraz do ekranu\nSkrót: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Dopasuj kadr do ekranu\nSkrót: f +ZOOMPANEL_ZOOMFITSCREEN;Dopasuj cały obraz do ekranu\nSkrót: Alt-f ZOOMPANEL_ZOOMIN;Przybliż\nSkrót: + ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 2e6d74122..5c5d31f72 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1434,8 +1434,8 @@ TP_WBALANCE_WATER_HEADER;Pod woda ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Otworz (nowa) lupe ZOOMPANEL_ZOOM100;Powieksz do 100%\nSkrot: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Dopasuj kadr do ekranu\nSkrot: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Dopasuj caly obraz do ekranu\nSkrot: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Dopasuj kadr do ekranu\nSkrot: f +ZOOMPANEL_ZOOMFITSCREEN;Dopasuj caly obraz do ekranu\nSkrot: Alt-f ZOOMPANEL_ZOOMIN;Przybliz\nSkrot: + ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 01efea73d..c27a78270 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1406,7 +1406,7 @@ ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Новое окно детального просмотра ZOOMPANEL_ZOOM100;Масштаб 100%\nГорячая клавиша: z ZOOMPANEL_ZOOMFITCROPSCREEN;Уместить кадрированное изображение по размеру экрану\nГорячая клавиша: f -ZOOMPANEL_ZOOMFITSCREEN;Уместить изображение по размерам окна\nГорячая клавиша: Alt-f +ZOOMPANEL_ZOOMFITSCREEN;Уместить изображение по размерам окна\nГорячая клавиша: Alt-f ZOOMPANEL_ZOOMIN;Приблизить\nГорячая клавиша: + ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 56cc853de..4c45633eb 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1269,7 +1269,7 @@ TP_WBALANCE_WATER_HEADER;Подводна фотографија ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Отвара нови прозор са детаљима ZOOMPANEL_ZOOM100;Повећава преглед на 100% z -ZOOMPANEL_ZOOMFITSCREEN;Уклапа слику у величину прозора Ф +ZOOMPANEL_ZOOMFITSCREEN;Уклапа слику у величину прозора Alt-Ф ZOOMPANEL_ZOOMIN;Увећава приказ слике + ZOOMPANEL_ZOOMOUT;Умањује приказ слике - diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 3157f1089..0552ba29a 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1269,7 +1269,7 @@ TP_WBALANCE_WATER_HEADER;Podvodna fotografija ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Otvara novi prozor sa detaljima ZOOMPANEL_ZOOM100;Povećava pregled na 100% z -ZOOMPANEL_ZOOMFITSCREEN;Uklapa sliku u veličinu prozora F +ZOOMPANEL_ZOOMFITSCREEN;Uklapa sliku u veličinu prozora Alt-f ZOOMPANEL_ZOOMIN;Uvećava prikaz slike + ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 1664b6150..a8728cbc5 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -499,7 +499,7 @@ TP_WBALANCE_TEMPERATURE;Teplota ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Otvoriť (nové) okno s detailom ZOOMPANEL_ZOOM100;Priblíženie na 100% z -ZOOMPANEL_ZOOMFITSCREEN;Prispôsobiť obrazovke f +ZOOMPANEL_ZOOMFITSCREEN;Prispôsobiť obrazovke Alt-f ZOOMPANEL_ZOOMIN;Priblížiť + ZOOMPANEL_ZOOMOUT;Oddialiť - diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index c7b03a1b1..67572efba 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1852,8 +1852,8 @@ TP_WBALANCE_WATER_HEADER;Under vattnet ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Öppna (nytt) detaljfönster. ZOOMPANEL_ZOOM100;Förstora till 100%.\nKortkommando: z -ZOOMPANEL_ZOOMFITCROPSCREEN;Anpassa beskärningen till skärmen\nKortkommando: Alt-f -ZOOMPANEL_ZOOMFITSCREEN;Passa till skärmen.\nKortkommando: f +ZOOMPANEL_ZOOMFITCROPSCREEN;Anpassa beskärningen till skärmen\nKortkommando: f +ZOOMPANEL_ZOOMFITSCREEN;Passa till skärmen.\nKortkommando: Alt-f ZOOMPANEL_ZOOMIN;Förstora.\nKortkommando: + ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - From 0b8eb418967d3685d6984bf7a7639ad031df8295 Mon Sep 17 00:00:00 2001 From: Hombre Date: Fri, 2 Mar 2018 00:12:02 +0100 Subject: [PATCH 17/22] The EXIFIfd data type produced by libtiff is updated to 0x0004 which make the Exifs understandable by Windows. (see #4393) --- rtengine/imageio.cc | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index bebebbd2d..391ca6cfe 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -1337,6 +1337,8 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) pl->setProgress (0.0); } + bool applyExifPatch = false; + if (exifRoot) { rtexif::TagDirectory* cl = (const_cast (exifRoot))->clone (nullptr); @@ -1379,6 +1381,7 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) // at a different offset: TIFFSetWriteOffset (out, exif_size + 8); TIFFSetField (out, TIFFTAG_EXIFIFD, 8); + applyExifPatch = true; } } @@ -1490,6 +1493,40 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) writeOk = false; } + /************************************************************************************************************ + * + * Hombre: This is a dirty hack to update the Exif tag data type to 0x0004 so that Windows can understand it. + * libtiff will set this data type to 0x000d and doesn't provide any mechanism to update it before + * dumping to the file. + * + */ + if (applyExifPatch) { + unsigned char b[10]; + uint16 tagCount = 0; + lseek(fileno, 4, SEEK_SET); + read(fileno, b, 4); + uint32 ifd0Offset = rtexif::sget4(b, exifRoot->getOrder()); + printf("IFD0Offset: %d\n", ifd0Offset); + lseek(fileno, ifd0Offset, SEEK_SET); + read(fileno, b, 2); + tagCount = rtexif::sget2(b, exifRoot->getOrder()); + for (size_t i = 0; i < tagCount ; ++i) { + uint16 tagID = 0; + read(fileno, b, 2); + tagID = rtexif::sget2(b, exifRoot->getOrder()); + printf("TagID: %d\n", tagID); + if (tagID == 0x8769) { + rtexif::sset2(4, b, exifRoot->getOrder()); + write(fileno, b, 4); + break; + } else { + read(fileno, b, 10); + } + } + } + /************************************************************************************************************/ + + TIFFClose (out); #ifdef WIN32 fclose (file); From abec60d099934d2bec1652f44bafa4fd9fc65934 Mon Sep 17 00:00:00 2001 From: Hombre Date: Fri, 2 Mar 2018 01:03:00 +0100 Subject: [PATCH 18/22] Bugfix: wrong length written to file --- rtengine/imageio.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index 391ca6cfe..147edba53 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -1506,7 +1506,6 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) lseek(fileno, 4, SEEK_SET); read(fileno, b, 4); uint32 ifd0Offset = rtexif::sget4(b, exifRoot->getOrder()); - printf("IFD0Offset: %d\n", ifd0Offset); lseek(fileno, ifd0Offset, SEEK_SET); read(fileno, b, 2); tagCount = rtexif::sget2(b, exifRoot->getOrder()); @@ -1514,10 +1513,9 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) uint16 tagID = 0; read(fileno, b, 2); tagID = rtexif::sget2(b, exifRoot->getOrder()); - printf("TagID: %d\n", tagID); if (tagID == 0x8769) { rtexif::sset2(4, b, exifRoot->getOrder()); - write(fileno, b, 4); + write(fileno, b, 2); break; } else { read(fileno, b, 10); From 6c5696a97697de04ca3d6e21b1eef48ba4a83c51 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 2 Mar 2018 19:37:08 +0100 Subject: [PATCH 19/22] Fixed failed system language detection for de, fr, nl, es, it, pt in case locale is != xx_XX, for example it failed for de_AT --- rtgui/multilangmgr.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index c85d0d7b8..8d2985436 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -20,7 +20,6 @@ #include #include - #ifdef WIN32 #include #include @@ -93,7 +92,7 @@ struct LocaleToLang : private std::map, } // Look for matching language only. - iterator = find (key (major)); + iterator = find (key (major, major.uppercase())); if (iterator != end ()) { return iterator->second; From 466aa17295e9594cb3bc2c623e69a96e6fde78ad Mon Sep 17 00:00:00 2001 From: Hombre Date: Fri, 2 Mar 2018 22:08:08 +0100 Subject: [PATCH 20/22] Fixing linking error : removed 'inline' statement (see #4393) --- rtexif/rtexif.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rtexif/rtexif.h b/rtexif/rtexif.h index b7ba5ff1d..52411b33c 100644 --- a/rtexif/rtexif.h +++ b/rtexif/rtexif.h @@ -61,11 +61,11 @@ bool extractLensInfo (std::string &fullname, double &minFocal, double &maxFocal, unsigned short sget2 (unsigned char *s, ByteOrder order); int sget4 (unsigned char *s, ByteOrder order); -inline unsigned short get2 (FILE* f, ByteOrder order); -inline int get4 (FILE* f, ByteOrder order); -inline void sset2 (unsigned short v, unsigned char *s, ByteOrder order); -inline void sset4 (int v, unsigned char *s, ByteOrder order); -inline float int_to_float (int i); +unsigned short get2 (FILE* f, ByteOrder order); +int get4 (FILE* f, ByteOrder order); +void sset2 (unsigned short v, unsigned char *s, ByteOrder order); +void sset4 (int v, unsigned char *s, ByteOrder order); +float int_to_float (int i); short int int2_to_signed (short unsigned int i); struct TIFFHeader { From 5e10f1133bb872e112f4e97264f024978e72e9d8 Mon Sep 17 00:00:00 2001 From: Hombre Date: Sat, 3 Mar 2018 16:03:15 +0100 Subject: [PATCH 21/22] Fix UTF16 support for EXIF.UserComment on behalf of floessie Issue reported here https://discuss.pixls.us/t/call-for-testing-rawtherapee-5-4-rc2/6828/9 --- rtexif/rtexif.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc index b6a60bbd8..ff5607b02 100644 --- a/rtexif/rtexif.cc +++ b/rtexif/rtexif.cc @@ -1948,8 +1948,8 @@ void Tag::initUserComment (const Glib::ustring &text) memcpy(value, "ASCII\0\0\0", 8); memcpy(value + 8, text.c_str(), valuesize - 8); } else { - wchar_t *commentStr = (wchar_t*)g_utf8_to_utf16 (text.c_str(), -1, nullptr, nullptr, nullptr); - size_t wcStrSize = wcslen(commentStr); + glong wcStrSize = 0; + gunichar2 *commentStr = g_utf8_to_utf16 (text.c_str(), -1, nullptr, &wcStrSize, nullptr); valuesize = count = wcStrSize * 2 + 8 + (useBOM ? 2 : 0); value = new unsigned char[valuesize]; memcpy(value, "UNICODE\0", 8); From 5441e89699539e897e254d4163265e72f6495fc4 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sat, 3 Mar 2018 17:31:43 +0100 Subject: [PATCH 22/22] Fix missing labels in Preferences > Batch > NR Noise Reduction label keys were revised in commit 431d13 but the keys used in Preferences were not updated. This commit updates them to use the new keys. Closes #4423 --- rtgui/preferences.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 97fd10b25..25855d588 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -253,13 +253,13 @@ Gtk::Widget* Preferences::getBatchProcPanel () mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_DIRPYRDENOISE_LABEL")); //appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMA"), ADDSET_DIRPYRDN_LUMA, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_LDETAIL"), ADDSET_DIRPYRDN_LUMDET, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHROMA, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_RED"), ADDSET_DIRPYRDN_CHROMARED, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_BLUE"), ADDSET_DIRPYRDN_CHROMABLUE, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_GAMMA"), ADDSET_DIRPYRDN_GAMMA, true); - appendBehavList (mi, M ("TP_DIRPYRDENOISE_PASSES"), ADDSET_DIRPYRDN_PASSES, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING"), ADDSET_DIRPYRDN_LUMA, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMINANCE_DETAIL"), ADDSET_DIRPYRDN_LUMDET, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMINANCE_MASTER"), ADDSET_DIRPYRDN_CHROMA, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMINANCE_REDGREEN"), ADDSET_DIRPYRDN_CHROMARED, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMINANCE_BLUEYELLOW"), ADDSET_DIRPYRDN_CHROMABLUE, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_MAIN_GAMMA"), ADDSET_DIRPYRDN_GAMMA, true); + appendBehavList (mi, M ("TP_DIRPYRDENOISE_MEDIAN_PASSES"), ADDSET_DIRPYRDN_PASSES, true); mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_WBALANCE_LABEL"));