merge with dev

2018-02-05 07:58:51 +01:00
parent 4b916e444f 06fedfdac7
commit cbc6cf5180
18 changed files with 459 additions and 2769 deletions
--- a/rtdata/images/Dark/actions/gamut-softproof.png
+++ b/rtdata/images/Dark/actions/gamut-softproof.png
--- a/rtdata/images/Dark/actions/gamut-warning.png
+++ b/rtdata/images/Dark/actions/gamut-warning.png
--- a/rtdata/images/Light/actions/gamut-softproof.png
+++ b/rtdata/images/Light/actions/gamut-softproof.png
--- a/rtdata/images/Light/actions/gamut-warning.png
+++ b/rtdata/images/Light/actions/gamut-warning.png
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1368,8 +1368,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h
 SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
 SAVEDLG_WARNFILENAME;File will be named
 SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
-SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the Printer profile.
-SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate the printer's output by using the Printer profile set in Preferences > Color Management.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, pixels with colors that are outside the gamut of the Printer/Output profile are highlighted.
+SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, lets you simulate the appearance of the image when printed (if a Printer profile set in Preferences > Color Management) or when viewed on a display that uses the current output profile (if no printer profile is selected).
 THRESHOLDSELECTOR_B;Bottom
 THRESHOLDSELECTOR_BL;Bottom-left
 THRESHOLDSELECTOR_BR;Bottom-right