Try to solve conflit

This commit is contained in:
Desmis
2016-01-03 16:56:21 +01:00
13 changed files with 67 additions and 46 deletions

View File

@@ -657,17 +657,18 @@ HISTORY_MSG_423;Retinex - Gamma slope
HISTORY_MSG_424;Retinex - HL threshold
HISTORY_MSG_425;Retinex - Log base
HISTORY_MSG_426;Retinex - Hue equalizer
HISTORY_MSG_427;Retinex - Iterations
HISTORY_MSG_428;Retinex - T. Gradient
HISTORY_MSG_429;Retinex - S. Gradient
HISTORY_MSG_430;Retinex - Mask highlights
HISTORY_MSG_431;Retinex - Mask TW highlights
HISTORY_MSG_432;Retinex - Mask shadows
HISTORY_MSG_433;Retinex - Mask TW shadows
HISTORY_MSG_434;Retinex - Mask radius
HISTORY_MSG_435;Retinex - Mask method
HISTORY_MSG_436;Retinex - Mask curve
HISTORY_MSG_437;Retinex - Preview
HISTORY_MSG_427;Output rendering intent
HISTORY_MSG_428;Retinex - Iterations
HISTORY_MSG_429;Retinex - T. Gradient
HISTORY_MSG_430;Retinex - S. Gradient
HISTORY_MSG_431;Retinex - Mask highlights
HISTORY_MSG_432;Retinex - Mask TW highlights
HISTORY_MSG_433;Retinex - Mask shadows
HISTORY_MSG_434;Retinex - Mask TW shadows
HISTORY_MSG_435;Retinex - Mask radius
HISTORY_MSG_436;Retinex - Mask method
HISTORY_MSG_437;Retinex - Mask curve
HISTORY_MSG_438;Retinex - Preview
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
HISTORY_SNAPSHOT;Snapshot
@@ -785,6 +786,8 @@ MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
MAIN_TOOLTIP_THRESHOLD;Threshold
MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
MONITOR_SOFTPROOF;Soft-proof
MONITOR_PROFILE_SYSTEM;System default
NAVIGATOR_B;B:
NAVIGATOR_G;G:
NAVIGATOR_H;H:
@@ -898,7 +901,7 @@ PREFERENCES_CLIPPINGIND;Clipping Indication
PREFERENCES_CLUTSCACHE;HaldCLUT Cache
PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
PREFERENCES_CLUTSDIR;HaldCLUT directory
PREFERENCES_CMETRICINTENT;Colorimetric intent
PREFERENCES_MONINTENT;Default monitor intent
PREFERENCES_CURVEBBOXPOS;Position of curve copypasta buttons
PREFERENCES_CURVEBBOXPOS_ABOVE;Above
PREFERENCES_CURVEBBOXPOS_BELOW;Below
@@ -993,7 +996,7 @@ PREFERENCES_MENUGROUPRANK;Group "Rank"
PREFERENCES_MENUOPTIONS;Context Menu Options
PREFERENCES_METADATA;Metadata
PREFERENCES_MIN;Mini (100x115)
PREFERENCES_MONITORICC;Monitor color profile
PREFERENCES_MONPROFILE;Default monitor profile
PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs In Own Window Mode
PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
@@ -1024,6 +1027,7 @@ PREFERENCES_PROFILEPRCACHE;Profile in cache
PREFERENCES_PROFILEPRFILE;Profile next to the input file
PREFERENCES_PROFILESAVECACHE;Save processing profile to the cache
PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file
PREFERENCES_PROFILE_NONE;None
PREFERENCES_PROPERTY;Property
PREFERENCES_PSPATH;Adobe Photoshop installation directory
PREFERENCES_REMEMBERZOOMPAN;Remember zoom % and pan offset
@@ -1525,6 +1529,7 @@ TP_ICM_INPUTPROFILE;Input Profile
TP_ICM_LABEL;Color Management
TP_ICM_NOICM;No ICM: sRGB Output
TP_ICM_OUTPUTPROFILE;Output Profile
TP_ICM_PROFILEINTENT;Rendering Intent
TP_ICM_SAVEREFERENCE;Save Reference Image for Profiling
TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance
TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles.