diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-05-30 13:40:26 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-05-30 13:40:26 +0000 |
| commit | a546b76ab263cf0d339087583762cd2b6ff50792 (patch) | |
| tree | 1a6a75100b6dea0d5a18807b69295904acf89f37 | |
| parent | 937faf7ab89703461e7b0d4982b9340346fc7cdd (diff) | |
| parent | e88485ebe535b13131d8b3ea386d739042d6f3af (diff) | |
| download | gitlab-ce-a546b76ab263cf0d339087583762cd2b6ff50792.tar.gz | |
Merge branch 'fix-label-color-titles' into 'master'
Fix inconsistent capitalization in label colors
See merge request gitlab-org/gitlab-ce!28922
| -rw-r--r-- | app/helpers/labels_helper.rb | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index a6b3b79737b..db4f29cd996 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -79,10 +79,10 @@ module LabelsHelper { '#0033CC' => s_('SuggestedColors|UA blue'), '#428BCA' => s_('SuggestedColors|Moderate blue'), - '#44AD8E' => s_('SuggestedColors|lime green'), + '#44AD8E' => s_('SuggestedColors|Lime green'), '#A8D695' => s_('SuggestedColors|Feijoa'), '#5CB85C' => s_('SuggestedColors|Slightly desaturated green'), - '#69D100' => s_('SuggestedColors|Bright Green'), + '#69D100' => s_('SuggestedColors|Bright green'), '#004E00' => s_('SuggestedColors|Very dark lime green'), '#34495E' => s_('SuggestedColors|Very dark desaturated blue'), '#7F8C8D' => s_('SuggestedColors|Dark grayish cyan'), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f7352843b5b..d1ec833abff 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9415,7 +9415,7 @@ msgstr "" msgid "Suggested change" msgstr "" -msgid "SuggestedColors|Bright Green" +msgid "SuggestedColors|Bright green" msgstr "" msgid "SuggestedColors|Dark grayish cyan" @@ -9436,6 +9436,9 @@ msgstr "" msgid "SuggestedColors|Feijoa" msgstr "" +msgid "SuggestedColors|Lime green" +msgstr "" + msgid "SuggestedColors|Moderate blue" msgstr "" @@ -9475,9 +9478,6 @@ msgstr "" msgid "SuggestedColors|Very pale orange" msgstr "" -msgid "SuggestedColors|lime green" -msgstr "" - msgid "Sunday" msgstr "" |