diff options
Diffstat (limited to 'locale/gitlab.pot')
| -rw-r--r-- | locale/gitlab.pot | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e9ae9ae9f99..352de8599ba 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4066,6 +4066,9 @@ msgstr "" msgid "Failed to remove user key." msgstr "" +msgid "Failed to save merge conflicts resolutions. Please try again!" +msgstr "" + msgid "Failed to save new settings" msgstr "" @@ -5643,6 +5646,30 @@ msgstr "" msgid "Merge when pipeline succeeds" msgstr "" +msgid "MergeConflict|Commit to source branch" +msgstr "" + +msgid "MergeConflict|Committing..." +msgstr "" + +msgid "MergeConflict|HEAD//our changes" +msgstr "" + +msgid "MergeConflict|Use ours" +msgstr "" + +msgid "MergeConflict|Use theirs" +msgstr "" + +msgid "MergeConflict|conflict" +msgstr "" + +msgid "MergeConflict|conflicts" +msgstr "" + +msgid "MergeConflict|origin//their changes" +msgstr "" + msgid "MergeRequests|Add a reply" msgstr "" |