From 90005b06639bf7697bc141feae873435ff81c841 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Sat, 27 Jun 2020 15:21:50 +0200 Subject: [PATCH] Fix more relicts from merge conflict --- rtdata/languages/default | 3 --- 1 file changed, 3 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 7179e75f4..f68a97b39 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2858,7 +2858,6 @@ TP_LOCALLAB_USEMASK;Use mask TP_LOCALLAB_VART;Variance (contrast) TP_LOCALLAB_VIBRANCE;Vibrance - Warm & Cool TP_LOCALLAB_VIB_TOOLNAME;Vibrance - Warm & Cool - 3 -<<<<<<< HEAD TP_LOCALLAB_SOFT_TOOLNAME;Soft Light & Original Retinex - 6 TP_LOCALLAB_BLUR_TOOLNAME;Smooth Blur Gain & Denoise - 1 TP_LOCALLAB_TONE_TOOLNAME;Tone Mapping - 4 @@ -2868,9 +2867,7 @@ TP_LOCALLAB_LC_TOOLNAME;Local Constrast & Wavelet (Defects) - 7 TP_LOCALLAB_CBDL_TOOLNAME;CBDL (Defects) - 2 TP_LOCALLAB_LOG_TOOLNAME;Encoding log - 0 TP_LOCALLAB_MASKCOM_TOOLNAME;Common Color Mask - 13 -======= TP_LOCALLAB_VIS_TOOLTIP;Click to show/hide selected Control Spot.\nCtrl+click to show/hide all Control Spot. ->>>>>>> dev TP_LOCALLAB_WAMASKCOL;Ψ Mask Wavelet level TP_LOCALLAB_WARM;Warm - Cool & Color artifacts TP_LOCALLAB_WARM_TOOLTIP;This slider use Ciecam algorithm and acts as White Balance, it can warm or cool the area selected.\nIt can also in some cases reduce color artifacts.