diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 00:13:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 00:13:44 +0300 |
commit | 7b78125a3829026f54bd87ab560758de3f37ad82 (patch) | |
tree | 23e64653bb916db82b436af4b040582875acb34e /locale | |
parent | 5fc2d78fb96b0fd50dfb737190fd411033b3c3ab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r-- | locale/gitlab.pot | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e82b4e64e59..03bc507ce97 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -30776,7 +30776,7 @@ msgstr "" msgid "SecurityConfiguration|Configure %{feature}" msgstr "" -msgid "SecurityConfiguration|Configure via Merge Request" +msgid "SecurityConfiguration|Configure with a merge request" msgstr "" msgid "SecurityConfiguration|Copy code and open .gitlab-ci.yml file" @@ -39736,9 +39736,6 @@ msgstr "" msgid "You can only edit files when you are on a branch" msgstr "" -msgid "You can only merge once this merge request is approved." -msgstr "" - msgid "You can only transfer the project to namespaces you manage." msgstr "" @@ -41629,6 +41626,9 @@ msgstr "" msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue." msgstr "" +msgid "mrWidget|Merge blocked: this merge request must be approved." +msgstr "" + msgid "mrWidget|Merge failed." msgstr "" @@ -41773,9 +41773,6 @@ msgstr "" msgid "mrWidget|What is a merge train?" msgstr "" -msgid "mrWidget|You can only merge once this merge request is approved." -msgstr "" - msgid "mrWidget|Your password" msgstr "" |