merge with dev...

This commit is contained in:
Desmis
2017-05-04 12:37:49 +02:00
31 changed files with 970 additions and 1986 deletions

View File

@@ -244,7 +244,6 @@ HISTOGRAM_TOOLTIP_R;Show/Hide red histogram.
HISTOGRAM_TOOLTIP_RAW;Show/Hide raw histogram.
HISTORY_CHANGED;Changed
HISTORY_CUSTOMCURVE;Custom curve
HISTORY_DELSNAPSHOT;Del
HISTORY_FROMCLIPBOARD;From clipboard
HISTORY_LABEL;History
HISTORY_MSG_1;Photo loaded
@@ -605,7 +604,7 @@ HISTORY_MSG_356;W - ES - Threshold high
HISTORY_MSG_357;W - Denoise - Link with ES
HISTORY_MSG_358;W - Gamut - CH
HISTORY_MSG_359;Hot/Dead - Threshold
HISTORY_MSG_360;TM Gamma
HISTORY_MSG_360;TM - Gamma
HISTORY_MSG_361;W - Final - Chroma balance
HISTORY_MSG_362;W - Residual - Compression method
HISTORY_MSG_363;W - Residual - Compression strength
@@ -657,12 +656,12 @@ HISTORY_MSG_408;Retinex - Radius
HISTORY_MSG_409;Retinex - Contrast
HISTORY_MSG_410;Retinex - Offset
HISTORY_MSG_411;Retinex - Strength
HISTORY_MSG_412;Retinex - Gaussian Gradient
HISTORY_MSG_412;Retinex - Gaussian gradient
HISTORY_MSG_413;Retinex - Contrast
HISTORY_MSG_414;Retinex - Histogram - Lab
HISTORY_MSG_415;Retinex - Transmission
HISTORY_MSG_416;Retinex
HISTORY_MSG_417;Retinex - Transmission Median
HISTORY_MSG_417;Retinex - Transmission median
HISTORY_MSG_418;Retinex - Threshold
HISTORY_MSG_419;Retinex - Color space
HISTORY_MSG_420;Retinex - Histogram - HSL
@@ -675,8 +674,8 @@ HISTORY_MSG_426;Retinex - Hue equalizer
HISTORY_MSG_427;Output rendering intent
HISTORY_MSG_428;Monitor rendering intent
HISTORY_MSG_429;Retinex - Iterations
HISTORY_MSG_430;Retinex - Transmission Gradient
HISTORY_MSG_431;Retinex - Strength Gradient
HISTORY_MSG_430;Retinex - Transmission gradient
HISTORY_MSG_431;Retinex - Strength gradient
HISTORY_MSG_432;Retinex - M - Highlights
HISTORY_MSG_433;Retinex - M - Highlights TW
HISTORY_MSG_434;Retinex - M - Shadows
@@ -688,7 +687,7 @@ HISTORY_MSG_439;Retinex - Process
HISTORY_MSG_440;CbDL - Method
HISTORY_MSG_441;Retinex - Gain transmission
HISTORY_MSG_442;Retinex - Scale
HISTORY_MSG_443;Output Black Point Compensation
HISTORY_MSG_443;Output black point compensation
HISTORY_MSG_444;WB - Temp bias
HISTORY_MSG_445;Raw Sub-Image
HISTORY_MSG_446;EvPixelShiftMotion
@@ -974,7 +973,6 @@ PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
PARTIALPASTE_PRSHARPENING;Post-resize sharpening
PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
PARTIALPASTE_RAWCACORR_CAAUTOSTRENGTH;CA auto-correction strength
PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
PARTIALPASTE_RAWEXPOS_BLACK;Black levels
PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
@@ -1066,8 +1064,6 @@ PREFERENCES_DIRSOFTWARE;Installation directory
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EDITORLAYOUT;Editor Layout
PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTENDEDZOOMLEVELS;Use finer-grained zoom levels for "fit to screen" zooming
PREFERENCES_EXTENDEDZOOMLEVELS_TOOLTIP;This allows to better fill the editor window when using one of the "fit to screen" zoom modes. However, the preview quality might be slightly degraded, depending on the actual zoom factor computed.
PREFERENCES_EXTERNALEDITOR;External Editor
PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
@@ -1200,7 +1196,6 @@ PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
PREFERENCES_SIMPLAUT;Tool mode
PREFERENCES_SINGLETAB;Single Editor Tab Mode
PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
PREFERENCES_SLIMUI;Slim interface
PREFERENCES_SMA;Small (250x287)
PREFERENCES_SND_BATCHQUEUEDONE;Queue processing done
PREFERENCES_SND_HELP;Enter a full file path to set a sound, or leave blank for no sound.\nFor system sounds on Windows use "SystemDefault", "SystemAsterisk" etc., and on Linux use "complete", "window-attention" etc.
@@ -1223,7 +1218,6 @@ PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
PREFERENCES_USESYSTEMTHEME;Use system theme
PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)
PREFERENCES_WAVLEV;Increase wavelet level in quality 'high'
PREFERENCES_WLONE;One level
@@ -1669,7 +1663,6 @@ TP_ICM_APPLYLOOKTABLE_TOOLTIP;Employ the embedded DCP look table. The setting is
TP_ICM_BLENDCMSMATRIX;Blend ICC highlights with matrix
TP_ICM_BLENDCMSMATRIX_TOOLTIP;Enable to recover clipped highlights when using LUT-based ICC profiles.
TP_ICM_BPC;Black Point Compensation
TP_ICM_BPC_TOOLTIP;Enable this to fit the Luminosity channel to the output color space with a fix White Point
TP_ICM_DCPILLUMINANT;Illuminant
TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolated
TP_ICM_DCPILLUMINANT_TOOLTIP;Select which embedded DCP illuminant to employ. Default is "interpolated" which is a mix between the two based on white balance. The setting is only enabled if a Dual-Illuminant DCP with interpolation support is selected.
@@ -1884,7 +1877,7 @@ TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, bu
TP_RAW_HPHD;HPHD
TP_RAW_IGV;IGV
TP_RAW_IMAGENUM;Sub-image
TP_RAW_IMAGENUM_TOOLTIP;Some raw files might embed several sub-images (HDR, Pixel Shift, Dual Pixel, Dual Sensitivity). Use this button to select the sub-image.
TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
TP_RAW_LABEL;Demosaicing
TP_RAW_LMMSE;LMMSE
TP_RAW_LMMSEITERATIONS;LMMSE enhancement steps
@@ -1894,21 +1887,20 @@ TP_RAW_NONE;None (Shows sensor pattern)
TP_RAW_PIXELSHIFT;Pixel Shift
TP_RAW_PIXELSHIFTADAPTIVE;Adaptive detection
TP_RAW_PIXELSHIFTBLUR;Blur motion mask
TP_RAW_PIXELSHIFTBLUR_TOOLTIP;Blur motion mask
TP_RAW_PIXELSHIFTEPERISO;ISO adaption
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value (0.0) should work fine for base ISO.\nIncrease the value to improve motion detection for higher ISO.\nIncrease in small steps and watch the motion mask while increasing.
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nIncrease the value to improve motion detection for higher ISO.\nIncrease in small steps and watch the motion mask while increasing.
TP_RAW_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Equalize per channel
TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the channels (RGB) individually.\nDisabled: Use same equalization factor for all channels.
TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels.
TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP;Equalize the brightness of the frames to the brightness of the selected frame.\nIf there are overexposed areas in the frames select the brightest frame to avoid magenta colour cast in overexposed areas or enable motion correction.
TP_RAW_PIXELSHIFTEXP0;Experimental
TP_RAW_PIXELSHIFTGREEN;Check green channel for motion
TP_RAW_PIXELSHIFTHOLEFILL;Fill holes in motion mask
TP_RAW_PIXELSHIFTHOLEFILL_TOOLTIP;Fill holes in motion mask
TP_RAW_PIXELSHIFTLMMSE;Use lmmse for motion parts
TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use lmmse instead of amaze for motion areas.\nUseful for High ISO images.
TP_RAW_PIXELSHIFTLMMSE;Use LMMSE for moving parts
TP_RAW_PIXELSHIFTLMMSE_TOOLTIP;Use LMMSE instead of AMaZE for areas of motion.\nUseful for high ISO images.
TP_RAW_PIXELSHIFTMASKTHRESHOLD;3x3 new threshold
TP_RAW_PIXELSHIFTMEDIAN;Median
TP_RAW_PIXELSHIFTMEDIAN;Use median for moving parts
TP_RAW_PIXELSHIFTMEDIAN3;Exclude selected frame from median
TP_RAW_PIXELSHIFTMEDIAN3_TOOLTIP;Excludes selected frame from median.\nUseful if moving objects overlap in frame 2 and 3
TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP;Use median of all frames instead of selected frame for regions with motion.\nRemoves objects which are at different places in all frames.\nGives motion effect on slow moving (overlapping) objects.
@@ -1917,25 +1909,24 @@ TP_RAW_PIXELSHIFTMM_CUSTOM;Custom
TP_RAW_PIXELSHIFTMM_OFF;Off
TP_RAW_PIXELSHIFTMOTION;Motion detection level (deprecated)
TP_RAW_PIXELSHIFTMOTIONCORRECTION;Green motion correction size
TP_RAW_PIXELSHIFTMOTIONCORRECTION_TOOLTIP;1 = 2 pixels\n3 = 3x3 grid\n5 = 5x5 grid
TP_RAW_PIXELSHIFTMOTIONMETHOD;Motion Correction
TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 means no motion detection\n1 - 99 means motion will be detected according to this value. Increase value to increase detection rate\n100 means the Amaze demosaiced frame will be used
TP_RAW_PIXELSHIFTNONGREENAMAZE;Check red/blue amaze
TP_RAW_PIXELSHIFTMOTION_TOOLTIP;0 means no motion detection.\n1 - 99 means motion will be detected according to this value. Increase value to increase detection rate.\n100 means the AMaZE-demosaiced frame will be used.
TP_RAW_PIXELSHIFTNONGREENAMAZE;Check red/blue AMaZE
TP_RAW_PIXELSHIFTNONGREENCROSS;Check red/blue channels for motion
TP_RAW_PIXELSHIFTNONGREENCROSS2;Check green amaze
TP_RAW_PIXELSHIFTNONGREENCROSS2;Check green AMaZE
TP_RAW_PIXELSHIFTNONGREENHORIZONTAL;Check red/blue horizontal
TP_RAW_PIXELSHIFTNONGREENVERTICAL;Check red/blue vertical
TP_RAW_PIXELSHIFTNREADISO;nRead
TP_RAW_PIXELSHIFTPRNU;PRNU (%)
TP_RAW_PIXELSHIFTREDBLUEWEIGHT;Red&Blue weight
TP_RAW_PIXELSHIFTSHOWMOTION;Show motion
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Show mask only
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Shows the motion mask without the image
TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a mask showing the regions with motion
TP_RAW_PIXELSHIFTSHOWMOTION;Show motion mask
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY;Show only motion mask
TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP;Shows the motion mask without the image.
TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a mask showing the regions with motion.
TP_RAW_PIXELSHIFTSIGMA;Blur radius
TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;Default radius of 1.0 usually fits good for base ISO. Increase value for high ISO shots,\n5.0 is a good starting point for high ISO shots.\nWatch motion mask while changing the value.
TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for base ISO.\nIncrease the value for high ISO shots, 5.0 is a good starting point.\nWatch the motion mask while changing the value.
TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with and without motion.\nSet to 0 to disable smooth transitions\nSet to 1 to get Amaze/lmmse or Median
TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red