diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-03-14 23:52:01 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-07 22:41:58 +0300 |
| commit | 55a9bff7e274646b35e7e0cee0a772b4afb490b2 (patch) | |
| tree | 21a8dc1557aa8e3663bbb322409a0f904d69b553 /locale | |
| parent | b4165554113a7f9ce9fecd7d169f9a64686b5c44 (diff) | |
Improve project merge request settings
Prioritize and simplify project settings content.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3bc48e8c5d2..f22b351ad78 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -351,6 +351,12 @@ msgstr "" msgid "A member of GitLab's abuse team will review your report as soon as possible." msgstr "" +msgid "A merge commit is created for every merge, and merging is allowed as long as there are no conflicts." +msgstr "" + +msgid "A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build." +msgstr "" + msgid "A new branch will be created in your fork and a new merge request will be started." msgstr "" @@ -1068,6 +1074,9 @@ msgstr "" msgid "Automatically marked as default internal user" msgstr "" +msgid "Automatically resolve merge request diff discussions when they become outdated" +msgstr "" + msgid "Automatically resolved" msgstr "" @@ -3643,6 +3652,9 @@ msgstr "" msgid "Failure" msgstr "" +msgid "Fast-forward merge" +msgstr "" + msgid "Fast-forward merge without a merge commit" msgstr "" @@ -5016,9 +5028,15 @@ msgstr "" msgid "Merge Requests" msgstr "" +msgid "Merge commit" +msgstr "" + msgid "Merge commit message" msgstr "" +msgid "Merge commit with semi-linear history" +msgstr "" + msgid "Merge events" msgstr "" @@ -5028,6 +5046,9 @@ msgstr "" msgid "Merge in progress" msgstr "" +msgid "Merge method" +msgstr "" + msgid "Merge request" msgstr "" @@ -5459,6 +5480,9 @@ msgstr "" msgid "No license. All rights reserved" msgstr "" +msgid "No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. When fast-forward merge is not possible, the user is given the option to rebase." +msgstr "" + msgid "No merge requests found" msgstr "" @@ -5650,6 +5674,12 @@ msgstr "" msgid "Only admins" msgstr "" +msgid "Only allow merge requests to be merged if all discussions are resolved" +msgstr "" + +msgid "Only allow merge requests to be merged if the pipeline succeeds" +msgstr "" + msgid "Only mirror protected branches" msgstr "" @@ -5905,6 +5935,9 @@ msgstr "" msgid "Pipelines for last year" msgstr "" +msgid "Pipelines need to be configured to enable this feature." +msgstr "" + msgid "Pipelines settings for '%{project_name}' were successfully updated." msgstr "" @@ -7409,6 +7442,9 @@ msgstr "" msgid "Show latest version" msgstr "" +msgid "Show link to create/view merge request when pushing from the command line" +msgstr "" + msgid "Show parent pages" msgstr "" @@ -9247,6 +9283,9 @@ msgstr "" msgid "When enabled, users cannot use GitLab until the terms have been accepted." msgstr "" +msgid "When fast-forward merge is not possible, the user is given the option to rebase." +msgstr "" + msgid "When this merge request is accepted" msgid_plural "When these merge requests are accepted" msgstr[0] "" |