diff options
| author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-04-26 10:08:09 +0200 |
|---|---|---|
| committer | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-05-01 08:59:45 +0200 |
| commit | 18b77a6488edbbba19076869d891a3687147ef9c (patch) | |
| tree | 6ff0dcea9aa6bcd042e32757202b06c1f93d6174 /locale/gitlab.pot | |
| parent | 77efa66cdf17740e28e996cdfee3a3a8d7b19ef4 (diff) | |
| download | gitlab-ce-js-i18n-merge-conflict.tar.gz | |
Internationalisation of merge_conflicts directoryjs-i18n-merge-conflict
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.
i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
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 06f2f848925..ec3a5578b1c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3973,6 +3973,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 "" @@ -5538,6 +5541,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 "" |