Commit 50ed1a26 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Consistently use 'gray' and 'color'

Summary: There are few 'grey' and 'colour' in the Krita messages. It would be good to use 'gray' and 'color' consistently.

Test Plan: none

Reviewers: #krita, woltherav

Reviewed By: #krita, woltherav

Subscribers: woltherav

Tags: #krita

Differential Revision: https://phabricator.kde.org/D20609
parent 9cf5c866
......@@ -392,7 +392,7 @@ void KisAdvancedColorSpaceSelector::fillDescription()
"<b><a href=\"https://en.wikipedia.org/wiki/Grayscale\">Grayscale</a></b> only allows for "
"gray values and transparent values. Grayscale images use half "
"the memory and disk space compared to an RGB image of the same bit-depth.<br/>"
"Grayscale is useful for inking and greyscale images. In "
"Grayscale is useful for inking and grayscale images. In "
"Krita, you can mix Grayscale and RGB layers in the same image.")+"</p>");
} else if (currentModelStr == "LABA") {
d->colorSpaceSelector->textProfileDescription->append("<p>"+i18nc("If the selected model is LAB",
......
......@@ -219,7 +219,7 @@ void KisColorSelectorBase::mousePressEvent(QMouseEvent* event)
event->accept();
//this boolean here is to check if the colour selector is updating the resource, so it won't update itself when the resource is updated//
//this boolean here is to check if the color selector is updating the resource, so it won't update itself when the resource is updated//
if (m_colorUpdateSelf==false)
{m_colorUpdateSelf=true;}
......@@ -540,7 +540,7 @@ KisDisplayColorConverter* KisColorSelectorBase::converter() const
void KisColorSelectorBase::tryHideAllPopups()
{
if (m_colorPreviewPopup->isVisible()) {
m_colorUpdateSelf=false; //this is for allowing advanced selector to listen to outside colour-change events.
m_colorUpdateSelf=false; //this is for allowing advanced selector to listen to outside color-change events.
m_colorPreviewPopup->hide();
}
......
......@@ -96,7 +96,7 @@ private:
protected Q_SLOTS:
void hidePopup();
/// if you overwrite this, keep in mind, that you should set the colour only, if m_colorUpdateAllowed is true
/// if you overwrite this, keep in mind, that you should set the color only, if m_colorUpdateAllowed is true
virtual void canvasResourceChanged(int key, const QVariant& v);
void updateLastUsedColorPreview(const KoColor &color);
......
......@@ -78,10 +78,10 @@ Q_SIGNALS:
void paramChanged(qreal hue, qreal hsvSaturation, qreal value, qreal hslSaturation, qreal lightness, qreal hsiSaturation, qreal intensity, qreal hsySaturation, qreal luma);
protected:
const KoColorSpace* colorSpace() const;
/// returns true, if ether the colour space, the size or the parameters have changed since the last paint event
/// returns true, if ether the color space, the size or the parameters have changed since the last paint event
bool isDirty() const;
/// this method must be overloaded to return the colour at position x/y and draw a marker on that position
/// this method must be overloaded to return the color at position x/y and draw a marker on that position
virtual KoColor selectColor(int x, int y) = 0;
/// paint component using given painter
......
......@@ -316,10 +316,10 @@ void KisColorSelectorSettings::changedACSColorSelectorType(int index)
ui->lumaCoefficientGroupbox->setVisible(false);
if (index == 0) { // HSV
ui->ACSTypeDescriptionLabel->setText(i18n("Values goes from black to white, or black to the most saturated colour. Saturation, in turn, goes from the most saturated colour to white, grey or black."));
ui->ACSTypeDescriptionLabel->setText(i18n("Values goes from black to white, or black to the most saturated color. Saturation, in turn, goes from the most saturated color to white, gray or black."));
}
else if (index == 1) { // HSL
ui->ACSTypeDescriptionLabel->setText(i18n("Lightness goes from black to white, with middle grey being equal to the most saturated colour."));
ui->ACSTypeDescriptionLabel->setText(i18n("Lightness goes from black to white, with middle gray being equal to the most saturated color."));
}
else if (index == 2) { // HSI
ui->ACSTypeDescriptionLabel->setText(i18n("Intensity maps to the sum of rgb components"));
......
......@@ -94,7 +94,7 @@ intent.</string>
<item row="3" column="0">
<widget class="QRadioButton" name="radioAbsoluteColorimetric">
<property name="toolTip">
<string>Best for spot colours</string>
<string>Best for spot colors</string>
</property>
<property name="whatsThis">
<string>Within the destination device gamut; hue,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment