merge with dev

This commit is contained in:
Desmis
2018-06-05 10:48:26 +02:00
82 changed files with 2764 additions and 2338 deletions

View File

@@ -7,7 +7,7 @@ ABOUT_TAB_CREDITS;Credits
ABOUT_TAB_LICENSE;License
ABOUT_TAB_RELEASENOTES;Release Notes
ABOUT_TAB_SPLASH;Splash
ADJUSTER_RESET_TO_DEFAULT;Reset to default
ADJUSTER_RESET_TO_DEFAULT;<b>Click</b> - reset to default value.\n<b>Ctrl</b>+<b>click</b> - reset to initial value.
BATCHQUEUE_AUTOSTART;Auto-start
BATCHQUEUE_AUTOSTARTHINT;Start processing automatically when a new job arrives.
BATCHQUEUE_DESTFILENAME;Path and file name
@@ -231,6 +231,7 @@ GENERAL_NONE;None
GENERAL_OK;OK
GENERAL_OPEN;Open
GENERAL_PORTRAIT;Portrait
GENERAL_RESET;Reset
GENERAL_SAVE;Save
GENERAL_SLIDER;Slider
GENERAL_UNCHANGED;(Unchanged)
@@ -481,9 +482,9 @@ HISTORY_MSG_231;B&amp;W - 'Before' curve
HISTORY_MSG_232;B&amp;W - 'Before' curve type
HISTORY_MSG_233;B&amp;W - 'After' curve
HISTORY_MSG_234;B&amp;W - 'After' curve type
HISTORY_MSG_235;B&amp;W - Auto channel mixer
HISTORY_MSG_235;B&amp;W - CM - Auto
HISTORY_MSG_236;--unused--
HISTORY_MSG_237;B&amp;W - Mixer
HISTORY_MSG_237;B&amp;W - CM
HISTORY_MSG_238;GF - Feather
HISTORY_MSG_239;GF - Strength
HISTORY_MSG_240;GF - Center
@@ -519,7 +520,7 @@ HISTORY_MSG_269;CT - High - Red
HISTORY_MSG_270;CT - High - Green
HISTORY_MSG_271;CT - High - Blue
HISTORY_MSG_272;CT - Balance
HISTORY_MSG_273;CT - Reset
HISTORY_MSG_273;CT - Color Balance SMH
HISTORY_MSG_274;CT - Sat. Shadows
HISTORY_MSG_275;CT - Sat. Highlights
HISTORY_MSG_276;CT - Opacity
@@ -638,7 +639,7 @@ HISTORY_MSG_388;W - Residual - CB green mid
HISTORY_MSG_389;W - Residual - CB blue mid
HISTORY_MSG_390;W - Residual - CB green low
HISTORY_MSG_391;W - Residual - CB blue low
HISTORY_MSG_392;W - Residual - CB Reset
HISTORY_MSG_392;W - Residual - Color Balance
HISTORY_MSG_393;DCP - Look table
HISTORY_MSG_394;DCP - Baseline exposure
HISTORY_MSG_395;DCP - Base table
@@ -734,9 +735,9 @@ HISTORY_MSG_484;CAM02 - Auto Yb scene
HISTORY_MSG_485;Lens Correction
HISTORY_MSG_486;Lens Correction - Camera
HISTORY_MSG_487;Lens Correction - Lens
HISTORY_MSG_488;HDR Tone Mapping
HISTORY_MSG_489;HDR TM - Threshold
HISTORY_MSG_490;HDR TM - Amount
HISTORY_MSG_488;Dynamic Range Compression
HISTORY_MSG_489;DRC - Threshold
HISTORY_MSG_490;DRC - Amount
HISTORY_MSG_491;White Balance
HISTORY_MSG_492;RGB Curves
HISTORY_MSG_493;L*a*b* Adjustments
@@ -855,9 +856,12 @@ HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast
HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Local Contrast - Lightness
HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
HISTORY_MSG_METADATA_MODE;Metadata copy mode
HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
HISTORY_MSG_TM_FATTAL_ANCHOR;HDR TM - Anchor
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
HISTORY_SNAPSHOT;Snapshot
@@ -1072,7 +1076,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Shadows/highlights
PARTIALPASTE_SHARPENEDGE;Edges
PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
PARTIALPASTE_SHARPENMICRO;Microcontrast
PARTIALPASTE_TM_FATTAL;HDR Tone mapping
PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
PARTIALPASTE_VIBRANCE;Vibrance
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
@@ -1393,7 +1397,6 @@ TP_BWMIX_ALGO_LI;Linear
TP_BWMIX_ALGO_SP;Special effects
TP_BWMIX_ALGO_TOOLTIP;Linear: will produce a normal <b>linear</b> response.\nSpecial effects: will produce special effects by mixing channels <b>non-linearly</b>.
TP_BWMIX_AUTOCH;Auto
TP_BWMIX_AUTOCH_TIP;Calculate values optimizing Channel Mixer.
TP_BWMIX_CC_ENABLED;Adjust complementary color
TP_BWMIX_CC_TOOLTIP;Enable to allow automatic adjustment of complementary colors in ROYGCBPM mode.
TP_BWMIX_CHANNEL;Luminance equalizer
@@ -1420,9 +1423,8 @@ TP_BWMIX_MET;Method
TP_BWMIX_MET_CHANMIX;Channel Mixer
TP_BWMIX_MET_DESAT;Desaturation
TP_BWMIX_MET_LUMEQUAL;Luminance Equalizer
TP_BWMIX_MIXC;Mixer
TP_BWMIX_NEUTRAL;Reset mixer
TP_BWMIX_NEUTRAL_TIP;Reset all values (Color Filter, Channel Mixer) to default.
TP_BWMIX_MIXC;Channel Mixer
TP_BWMIX_NEUTRAL;Reset
TP_BWMIX_RGBLABEL;R: %1%% G: %2%% B: %3%% Total: %4%%
TP_BWMIX_RGBLABEL_HINT;Final RGB factors that take care of all the mixer options.\n"Total" displays the sum of the RGB values:\n- always 100% in relative mode\n- higher (lighter) or lower (darker) than 100% in absolute mode.
TP_BWMIX_RGB_TOOLTIP;Mix the RGB channels. Use presets for guidance.\nPay attention to negative values that may cause artifacts or erratic behavior.
@@ -1480,7 +1482,7 @@ TP_COLORAPP_BADPIXSL_TOOLTIP;Suppression of hot/bad (brightly colored) pixels.\n
TP_COLORAPP_BRIGHT;Brightness (Q)
TP_COLORAPP_BRIGHT_TOOLTIP;Brightness in CIECAM02 takes into account the white's luminosity and differs from L*a*b* and RGB brightness.
TP_COLORAPP_CHROMA;Chroma (C)
TP_COLORAPP_CHROMA_M;Colorfulnes (M)
TP_COLORAPP_CHROMA_M;Colorfulness (M)
TP_COLORAPP_CHROMA_M_TOOLTIP;Colorfulness in CIECAM02 differs from L*a*b* and RGB colorfulness.
TP_COLORAPP_CHROMA_S;Saturation (S)
TP_COLORAPP_CHROMA_S_TOOLTIP;Saturation in CIECAM02 differs from L*a*b* and RGB saturation.
@@ -1512,7 +1514,7 @@ 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.\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_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 by the user, the 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
@@ -2193,6 +2195,7 @@ TP_SHARPENEDGE_LABEL;Edges
TP_SHARPENEDGE_PASSES;Iterations
TP_SHARPENEDGE_THREE;Luminance only
TP_SHARPENING_AMOUNT;Amount
TP_SHARPENING_CONTRAST;Contrast threshold
TP_SHARPENING_EDRADIUS;Radius
TP_SHARPENING_EDTOLERANCE;Edge tolerance
TP_SHARPENING_HALOCONTROL;Halo control
@@ -2208,12 +2211,13 @@ TP_SHARPENING_RLD_ITERATIONS;Iterations
TP_SHARPENING_THRESHOLD;Threshold
TP_SHARPENING_USM;Unsharp Mask
TP_SHARPENMICRO_AMOUNT;Quantity
TP_SHARPENMICRO_CONTRAST;Contrast threshold
TP_SHARPENMICRO_LABEL;Microcontrast
TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
TP_SHARPENMICRO_UNIFORMITY;Uniformity
TP_TM_FATTAL_AMOUNT;Amount
TP_TM_FATTAL_ANCHOR;Anchor
TP_TM_FATTAL_LABEL;HDR Tone Mapping
TP_TM_FATTAL_LABEL;Dynamic Range Compression
TP_TM_FATTAL_THRESHOLD;Threshold
TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH