diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-26 20:54:03 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-30 12:51:33 +0000 |
| commit | da6fa19fd2ee9b1c7e9b6421152ec3997660c3ea (patch) | |
| tree | 08ef63a0030445803897ecfa41a4cf922f6f83ad | |
| parent | d074658a3fbd86ef30b0409ff10165c124cf5787 (diff) | |
| download | gitlab-ce-da6fa19fd2ee9b1c7e9b6421152ec3997660c3ea.tar.gz | |
Merge branch 'patch-74' into 'master'
fix: remove double %
See merge request gitlab-org/gitlab-ce!32178
(cherry picked from commit bf2b4c526955829e8eb99fe8557563b2cb8f775f)
22e2a601 fix: remove double % from layout width description
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index d99063e344f..0887e8e64da 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -47,7 +47,7 @@ = s_('Preferences|Layout width') = f.select :layout, layout_choices, {}, class: 'select2' .form-text.text-muted - = s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.') + = s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' } .form-group = f.label :dashboard, class: 'label-bold' do = s_('Preferences|Default dashboard') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 1fd10232ff8..d6a1940e9a7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8233,7 +8233,7 @@ msgstr "" msgid "Preferences|Behavior" msgstr "" -msgid "Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout." +msgid "Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout." msgstr "" msgid "Preferences|Choose what content you want to see on a project’s overview page." |