merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-11-03 17:24:34 +01:00
52 changed files with 324 additions and 339 deletions

View File

@@ -741,7 +741,7 @@ HISTORY_MSG_485;Lens Correction
HISTORY_MSG_486;Lens Correction - Camera
HISTORY_MSG_487;Lens Correction - Lens
HISTORY_MSG_488;Dynamic Range Compression
HISTORY_MSG_489;DRC - Threshold
HISTORY_MSG_489;DRC - Detail
HISTORY_MSG_490;DRC - Amount
HISTORY_MSG_491;White Balance
HISTORY_MSG_492;RGB Curves
@@ -1164,10 +1164,11 @@ PREFERENCES_BEHAVIOR;Behavior
PREFERENCES_BEHSETALL;All to 'Set'
PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
PREFERENCES_BLACKBODY;Tungsten
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear pp3
PREFERENCES_CACHECLEARMIP;Clear mip
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHECLEAR;Clear
PREFERENCES_CACHECLEAR_ALL;Clear all cached files:
PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles:
PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles:
PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched.
PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
@@ -2276,7 +2277,7 @@ TP_SOFTLIGHT_STRENGTH;Strength
TP_TM_FATTAL_AMOUNT;Amount
TP_TM_FATTAL_ANCHOR;Anchor
TP_TM_FATTAL_LABEL;Dynamic Range Compression
TP_TM_FATTAL_THRESHOLD;Threshold
TP_TM_FATTAL_THRESHOLD;Detail
TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones