diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-28 12:14:02 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-28 12:14:02 +0300 |
| commit | fad63d9eebb651c2bccfb17596461fef88437419 (patch) | |
| tree | 4edfb5196957f3f2c59a09f648d38bbd8a7d526e /locale | |
| parent | e10726f6045c5b26f0b95e21fab1f64869109c08 (diff) | |
| parent | bf213dce74c10208312d7ef429905a4517b2b4a3 (diff) | |
Merge branch 'ce-11098-update-merge-request-settings-description-text' into 'master'
CE backport for gitlab-org/gitlab-ee!11859: Update description text of "Merge requests" section of general project settings page
See merge request gitlab-org/gitlab-ce!27838
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 81c21a35605..b8ce2c20563 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1991,9 +1991,6 @@ msgstr "" msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions." msgstr "" -msgid "Choose your merge method, options, checks, and set up a default merge request description template." -msgstr "" - msgid "CiStatusLabel|canceled" msgstr "" @@ -8073,6 +8070,9 @@ msgstr "" msgid "ProjectSettings|Badges" msgstr "" +msgid "ProjectSettings|Choose your merge method, merge options, and merge checks." +msgstr "" + msgid "ProjectSettings|Customize your project badges." msgstr "" |