merge with Dev

This commit is contained in:
Desmis
2017-08-19 08:17:43 +02:00
55 changed files with 2270 additions and 1197 deletions

View File

@@ -36,6 +36,7 @@ CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard.
CURVEEDITOR_TOOLTIPSAVE;Save current curve.
CURVEEDITOR_TYPE;Type:
DIRBROWSER_FOLDERS;Folders
DONT_SHOW_AGAIN;Don't show this message again.
DYNPROFILEEDITOR_DELETE;Delete
DYNPROFILEEDITOR_EDIT;Edit
DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
@@ -234,6 +235,7 @@ GENERAL_PORTRAIT;Portrait
GENERAL_SAVE;Save
GENERAL_UNCHANGED;(Unchanged)
GENERAL_WARNING;Warning
GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
HISTOGRAM_TOOLTIP_B;Show/Hide blue histogram.
HISTOGRAM_TOOLTIP_BAR;Show/Hide RGB indicator bar.\nRight-click on image preview to freeze/unfreeze.
HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
@@ -720,97 +722,103 @@ HISTORY_MSG_472;PS Smooth transitions
HISTORY_MSG_473;PS Use lmmse
HISTORY_MSG_474;PS Equalize
HISTORY_MSG_475;PS Equalize channel
HISTORY_MSG_476;Local L*a*b*
HISTORY_MSG_477;Local - Bottom
HISTORY_MSG_478;Local - Right
HISTORY_MSG_479;Local - Center
HISTORY_MSG_480;Local - Lightness/
HISTORY_MSG_481;Local - Lightness
HISTORY_MSG_482;Local - Contrast
HISTORY_MSG_483;Local - Chrominance
HISTORY_MSG_484;Local - Transition
HISTORY_MSG_485;Local - Avoid color shift
HISTORY_MSG_486;Local - Top
HISTORY_MSG_487;Local - Left
HISTORY_MSG_488;Local - Method
HISTORY_MSG_489;Local - Color Inverse
HISTORY_MSG_490;Local - Radius
HISTORY_MSG_491;Local - Blur Inverse
HISTORY_MSG_492;Local - Noise
HISTORY_MSG_493;Local - Scope
HISTORY_MSG_494;Local - Retinex method
HISTORY_MSG_495;Local - Retinex strength
HISTORY_MSG_496;Local - Retinex radius
HISTORY_MSG_497;Local - Retinex contrast
HISTORY_MSG_498;Local - Retinex Gain curve
HISTORY_MSG_499;Local - Retinex chroma
HISTORY_MSG_500;Local - Retinex Inverse
HISTORY_MSG_501;Local - Hue scope
HISTORY_MSG_502;Local - Spot
HISTORY_MSG_503;Local - Blur Luminance only
HISTORY_MSG_504;Local - Update GUI and Mip -1
HISTORY_MSG_505;Local - Sh Radius
HISTORY_MSG_506;Local - Sh Amount
HISTORY_MSG_507;Local - Sh Damping
HISTORY_MSG_508;Local - Sh Iterations
HISTORY_MSG_509;Local - Sh Scope
HISTORY_MSG_510;Local - Sh Inverse
HISTORY_MSG_511;Local - Spot size
HISTORY_MSG_512;Local - artifacts theshold
HISTORY_MSG_513;Local - artifacts iterations
HISTORY_MSG_514;Local - Quality
HISTORY_MSG_515;Local - Noise lum f
HISTORY_MSG_516;Local - Noise lum c
HISTORY_MSG_517;Local - Noise chro f
HISTORY_MSG_518;Local - Noise chro c
HISTORY_MSG_519;Local - cbdl threshold
HISTORY_MSG_520;Local - cbdl mult
HISTORY_MSG_521;Local - cbdl scope
HISTORY_MSG_522;Local - Blur scope
HISTORY_MSG_523;Local - TM strength
HISTORY_MSG_524;Local - TM gamma
HISTORY_MSG_525;Local - TM edge stopping
HISTORY_MSG_526;Local - TM scale
HISTORY_MSG_527;Local - TM Reweighting
HISTORY_MSG_528;Local - TM scope
HISTORY_MSG_529;Local - Update GUI and Mip -2
HISTORY_MSG_530;Local - Update GUI and Mip -3
HISTORY_MSG_531;Local - LL Curve
HISTORY_MSG_532;Local - Color and light
HISTORY_MSG_533;Local - Blur and noise
HISTORY_MSG_534;Local - Tone mapping
HISTORY_MSG_535;Local - Retinex
HISTORY_MSG_536;Local - Sharpening
HISTORY_MSG_537;Local - CBDL
HISTORY_MSG_538;Local - Denoise
HISTORY_MSG_539;Local - LH Curve
HISTORY_MSG_540;Local - Enable super
HISTORY_MSG_541;Local - CC curve
HISTORY_MSG_542;Local - curve method
HISTORY_MSG_543;Local - hueref
HISTORY_MSG_544;Local - chromaref
HISTORY_MSG_545;Local - lumaref
HISTORY_MSG_546;Local - H curve
HISTORY_MSG_547;Local - Vibrance
HISTORY_MSG_548;Local - Vib H curve
HISTORY_MSG_549;Local - Vib Protect skin tones
HISTORY_MSG_550;Local - Vib avoid colorshift
HISTORY_MSG_551;Local - Vib link
HISTORY_MSG_552;Local - Vib Pastel
HISTORY_MSG_553;Local - Vib Saturated
HISTORY_MSG_554;Local - Vib Threshold
HISTORY_MSG_555;Local - Vib Scope
HISTORY_MSG_556;Local - Exposure
HISTORY_MSG_557;Local - Exp Compensation
HISTORY_MSG_558;Local - Exp Hlcompr
HISTORY_MSG_559;Local - Exp hlcomprthresh
HISTORY_MSG_560;Local - Exp black
HISTORY_MSG_561;Local - Exp Shcompr
HISTORY_MSG_562;Local - Exp Scope
HISTORY_MSG_563;Local - Exp Contrast curve
HISTORY_MSG_564;CAM02 - Temp out
HISTORY_MSG_565;CAM02 - Green out
HISTORY_MSG_566;CAM02 - Yb out
HISTORY_MSG_476;CAM02 - Temp out
HISTORY_MSG_477;CAM02 - Green out
HISTORY_MSG_478;CAM02 - Yb out
HISTORY_MSG_479;CAM02 - CAT02 adaptation out
HISTORY_MSG_480;CAM02 - Automatic CAT02 out
HISTORY_MSG_481;CAM02 - Temp scene
HISTORY_MSG_482;CAM02 - Green scene
HISTORY_MSG_483;CAM02 - Yb scene
HISTORY_MSG_484;CAM02 - Auto Yb scene
HISTORY_MSG_485;Local L*a*b*
HISTORY_MSG_486;Local - Bottom
HISTORY_MSG_487;Local - Right
HISTORY_MSG_488;Local - Center
HISTORY_MSG_489;Local - Lightness/
HISTORY_MSG_490;Local - Lightness
HISTORY_MSG_491;Local - Contrast
HISTORY_MSG_492;Local - Chrominance
HISTORY_MSG_493;Local - Transition
HISTORY_MSG_494;Local - Avoid color shift
HISTORY_MSG_495;Local - Top
HISTORY_MSG_496;Local - Left
HISTORY_MSG_497;Local - Method
HISTORY_MSG_498;Local - Color Inverse
HISTORY_MSG_499;Local - Radius
HISTORY_MSG_500;Local - Blur Inverse
HISTORY_MSG_501;Local - Noise
HISTORY_MSG_502;Local - Scope
HISTORY_MSG_503;Local - Retinex method
HISTORY_MSG_504;Local - Retinex strength
HISTORY_MSG_505;Local - Retinex radius
HISTORY_MSG_506;Local - Retinex contrast
HISTORY_MSG_507;Local - Retinex Gain curve
HISTORY_MSG_508;Local - Retinex chroma
HISTORY_MSG_509;Local - Retinex Inverse
HISTORY_MSG_510;Local - Hue scope
HISTORY_MSG_511;Local - Spot
HISTORY_MSG_512;Local - Blur Luminance only
HISTORY_MSG_513;Local - Update GUI and Mip -1
HISTORY_MSG_514;Local - Sh Radius
HISTORY_MSG_515;Local - Sh Amount
HISTORY_MSG_516;Local - Sh Damping
HISTORY_MSG_517;Local - Sh Iterations
HISTORY_MSG_518;Local - Sh Scope
HISTORY_MSG_519;Local - Sh Inverse
HISTORY_MSG_520;Local - Spot size
HISTORY_MSG_521;Local - artifacts theshold
HISTORY_MSG_522;Local - artifacts iterations
HISTORY_MSG_523;Local - Quality
HISTORY_MSG_524;Local - Noise lum f
HISTORY_MSG_525;Local - Noise lum c
HISTORY_MSG_526;Local - Noise chro f
HISTORY_MSG_527;Local - Noise chro c
HISTORY_MSG_528;Local - cbdl threshold
HISTORY_MSG_529;Local - cbdl mult
HISTORY_MSG_530;Local - cbdl scope
HISTORY_MSG_531;Local - Blur scope
HISTORY_MSG_532;Local - TM strength
HISTORY_MSG_533;Local - TM gamma
HISTORY_MSG_534;Local - TM edge stopping
HISTORY_MSG_535;Local - TM scale
HISTORY_MSG_536;Local - TM Reweighting
HISTORY_MSG_537;Local - TM scope
HISTORY_MSG_538;Local - Update GUI and Mip -2
HISTORY_MSG_539;Local - Update GUI and Mip -3
HISTORY_MSG_540;Local - LL Curve
HISTORY_MSG_541;Local - Color and light
HISTORY_MSG_542;Local - Blur and noise
HISTORY_MSG_543;Local - Tone mapping
HISTORY_MSG_544;Local - Retinex
HISTORY_MSG_545;Local - Sharpening
HISTORY_MSG_546;Local - CBDL
HISTORY_MSG_547;Local - Denoise
HISTORY_MSG_548;Local - LH Curve
HISTORY_MSG_549;Local - Enable super
HISTORY_MSG_550;Local - CC curve
HISTORY_MSG_551;Local - curve method
HISTORY_MSG_552;Local - hueref
HISTORY_MSG_553;Local - chromaref
HISTORY_MSG_554;Local - lumaref
HISTORY_MSG_555;Local - H curve
HISTORY_MSG_556;Local - Vibrance
HISTORY_MSG_557;Local - Vib H curve
HISTORY_MSG_558;Local - Vib Protect skin tones
HISTORY_MSG_559;Local - Vib avoid colorshift
HISTORY_MSG_560;Local - Vib link
HISTORY_MSG_561;Local - Vib Pastel
HISTORY_MSG_562;Local - Vib Saturated
HISTORY_MSG_563;Local - Vib Threshold
HISTORY_MSG_564;Local - Vib Scope
HISTORY_MSG_565;Local - Exposure
HISTORY_MSG_566;Local - Exp Compensation
HISTORY_MSG_567;Local - Exp Hlcompr
HISTORY_MSG_568;Local - Exp hlcomprthresh
HISTORY_MSG_569;Local - Exp black
HISTORY_MSG_570;Local - Exp Shcompr
HISTORY_MSG_571;Local - Exp Scope
HISTORY_MSG_572;Local - Exp Contrast curve
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
HISTORY_SNAPSHOT;Snapshot
@@ -1064,8 +1072,8 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Name
PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
PREFERENCES_CUSTPROFBUILDPATH;Executable path
PREFERENCES_CUTOVERLAYBRUSH;Crop mask color/transparency
PREFERENCES_D50_OLD;5000K
PREFERENCES_D50;Settings in main menu
PREFERENCES_D50_OLD;5000K
PREFERENCES_D55;5500K
PREFERENCES_D60;6000K
PREFERENCES_D65;6500K
@@ -1077,8 +1085,6 @@ PREFERENCES_DATEFORMAT;Date format
PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n<b>%y</b> - year\n<b>%m</b> - month\n<b>%d</b> - day\n\nFor example, the ISO 8601 standard dictates the date format as follows:\n<b>%y-%m-%d</b>
PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4
PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
PREFERENCES_DEFAULTLANG;Default Language
PREFERENCES_DEFAULTTHEME;Default Theme
PREFERENCES_DIRDARKFRAMES;Dark-frames directory
PREFERENCES_DIRHOME;Home directory
PREFERENCES_DIRLAST;Last visited directory
@@ -1110,8 +1116,8 @@ PREFERENCES_GREY;Output device's Yb luminance (%)
PREFERENCES_GREY05;Yb=05 CIE L#30
PREFERENCES_GREY10;Yb=10 CIE L#40
PREFERENCES_GREY15;Yb=15 CIE L#45
PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
PREFERENCES_GREY18;Settings in main menu
PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
PREFERENCES_GREY23;Yb=23 CIE L#55
PREFERENCES_GREY30;Yb=30 CIE L#60
PREFERENCES_GREY40;Yb=40 CIE L#70
@@ -1133,6 +1139,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Perceptual
PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
PREFERENCES_INTENT_SATURATION;Saturation
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
PREFERENCES_LANG;Language
PREFERENCES_LANGAUTODETECT;Use system language
PREFERENCES_LEVAUTDN;Denoising level
PREFERENCES_LEVDN;Cell size
@@ -1235,6 +1242,7 @@ PREFERENCES_TAB_GENERAL;General
PREFERENCES_TAB_IMPROC;Image Processing
PREFERENCES_TAB_PERFORMANCE;Performance & Quality
PREFERENCES_TAB_SOUND;Sounds
PREFERENCES_THEME;Theme
PREFERENCES_TIMAX;High
PREFERENCES_TINB;Number of tiles
PREFERENCES_TISTD;Standard
@@ -1392,11 +1400,11 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally.
TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\n\nShortcuts:\n<b>[</b> - Multiple Editor Tabs Mode,\n<b>Alt-[</b> - Single Editor Tab Mode.
TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotate right.\n\nShortcuts:\n<b>]</b> - Multiple Editor Tabs Mode,\n<b>Alt-]</b> - Single Editor Tab Mode.
TP_COARSETRAF_TOOLTIP_VFLIP;Flip vertically.
TP_COLORAPP_ADAPTSCENE;Scene luminosity
TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider.
TP_COLORAPP_ADAPTVIEWING;Viewing luminosity (cd/m²)
TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolute luminance of the viewing environnement\n(usually 16cd/m²).
TP_COLORAPP_ADAP_AUTO_TOOLTIP;If the checkbox is checked (recommended) RawTherapee calculates an optimum value from Exif data.\nTo set the value manually, uncheck the checkbox first.
TP_COLORAPP_ADAPTSCENE;Scene absolute luminance
TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environment (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider.
TP_COLORAPP_ADAPTVIEWING;Viewing absolute luminance (cd/m²)
TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolute luminance of the viewing environment\n(usually 16cd/m²).
TP_COLORAPP_ADAP_AUTO_TOOLTIP;If the checkbox is checked (recommended) RawTherapee calculates an optimum value from the Exif data.\nTo set the value manually, uncheck the checkbox first.
TP_COLORAPP_ALGO;Algorithm
TP_COLORAPP_ALGO_ALL;All
TP_COLORAPP_ALGO_JC;Lightness + Chroma (JC)
@@ -1416,8 +1424,8 @@ TP_COLORAPP_CHROMA_TOOLTIP;Chroma in CIECAM02 differs from L*a*b* and RGB chroma
TP_COLORAPP_CIECAT_DEGREE;CAT02 adaptation
TP_COLORAPP_CONTRAST;Contrast (J)
TP_COLORAPP_CONTRAST_Q;Contrast (Q)
TP_COLORAPP_CONTRAST_Q_TOOLTIP;Contrast in CIECAM02 for the Q slider; it differs from L*a*b* and RGB contrast.
TP_COLORAPP_CONTRAST_TOOLTIP;Contrast in CIECAM02 for the J slider; it differs from L*a*b* and RGB contrast.
TP_COLORAPP_CONTRAST_Q_TOOLTIP;Differs from L*a*b* and RGB contrast.
TP_COLORAPP_CONTRAST_TOOLTIP;Differs from L*a*b* and RGB contrast.
TP_COLORAPP_CURVEEDITOR1;Tone curve 1
TP_COLORAPP_CURVEEDITOR1_TOOLTIP;Shows the histogram of L* (L*a*b*) before CIECAM02.\nIf the "Show CIECAM02 output histograms in curves" checkbox is enabled, shows the histogram of J or Q after CIECAM02.\n\nJ and Q are not shown in the main histogram panel.\n\nFor final output refer to the main histogram panel.
TP_COLORAPP_CURVEEDITOR2;Tone curve 2
@@ -1428,6 +1436,7 @@ TP_COLORAPP_DATACIE;CIECAM02 output histograms in curves
TP_COLORAPP_DATACIE_TOOLTIP;When enabled, histograms in CIECAM02 curves show approximate values/ranges for J or Q, and C, s or M after the CIECAM02 adjustments.\nThis selection does not impact the main histogram panel.\n\nWhen disabled, histograms in CIECAM02 curves show L*a*b* values before CIECAM02 adjustments.
TP_COLORAPP_DEGREE_AUTO_TOOLTIP;If the check-box is checked (recommended), RawTherapee calculates an optimum value, which is then used by CAT02, and also for the entire CIECAM02.\nTo set the value manually, uncheck the check-box first (values above 65 are recommended).
TP_COLORAPP_DEGREE_TOOLTIP;Amount of CIE Chromatic Adaptation Transform 2002.
TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
TP_COLORAPP_GAMUT;Gamut control (L*a*b*)
TP_COLORAPP_GAMUT_TOOLTIP;Allow gamut control in L*a*b* mode.
TP_COLORAPP_HUE;Hue (h)
@@ -1439,9 +1448,11 @@ TP_COLORAPP_LABEL_VIEWING;Viewing Conditions
TP_COLORAPP_LIGHT;Lightness (J)
TP_COLORAPP_LIGHT_TOOLTIP;Lightness in CIECAM02 differs from L*a*b* and RGB lightness.
TP_COLORAPP_MODEL;WP Model
TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\n<b>WB [RT] + [output]</b>: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Viewing Conditions.\n\n<b>WB [RT+CAT02] + [output]</b>: RT's white balance settings are used by CAT02 and the output device's white balance is set in Viewing Conditions.
TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\n<b>WB [RT] + [output]</b>: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Viewing Conditions.\n\n<b>WB [RT+CAT02] + [output]</b>: RT's white balance settings are used by CAT02 and the output device's white balance is set in Viewing Conditions.\n\n<b>Free temp+green + CAT02 + [output]:</b> temp and green are selected bu user, output device's white balance is set in Viewing Conditions.
TP_COLORAPP_NEUTRAL;Reset
TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
TP_COLORAPP_RSTPRO;Red & skin-tones protection
TP_COLORAPP_RSTPRO_TOOLTIP;Red and skin-tones protection affects both sliders and curves.
TP_COLORAPP_RSTPRO_TOOLTIP;Red &amp; skin-tones protection affects both sliders and curves.
TP_COLORAPP_SHARPCIE;--unused--
TP_COLORAPP_SHARPCIE_TOOLTIP;--unused--
TP_COLORAPP_SURROUND;Surround
@@ -1460,11 +1471,14 @@ TP_COLORAPP_TCMODE_LABEL2;Curve mode 2
TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
TP_COLORAPP_TCMODE_SATUR;Saturation
TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
TP_COLORAPP_WBRT;WB [RT] + [output]
TP_COLORAPP_YB;Yb (mean luminance)
TP_COLORAPP_YB;Yb% (mean luminance)
TP_COLORAPP_YBSCENE;Yb% (mean luminance)
TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
TP_COLORTONING_AB;o C/L
TP_COLORTONING_AUTOSAT;Automatic
TP_COLORTONING_BALANCE;Balance
@@ -2342,5 +2356,3 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: <b>Alt</b>-<b>f</b>
ZOOMPANEL_ZOOMFITSCREEN;Fit whole image to screen\nShortcut: <b>f</b>
ZOOMPANEL_ZOOMIN;Zoom In\nShortcut: <b>+</b>
ZOOMPANEL_ZOOMOUT;Zoom Out\nShortcut: <b>-</b>
GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
DONT_SHOW_AGAIN;Don't show this message again.