diff options
| author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-05-02 13:07:34 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-05-02 13:07:34 +0000 |
| commit | 7f75ac0ce8a71dcb583e70c739d01975959038f8 (patch) | |
| tree | ddf724d369d52d7c32999fbf96d2bd9eda256d74 /locale | |
| parent | 448a0862fb8336b019881395268a57f4bd9b836c (diff) | |
| download | gitlab-ce-7f75ac0ce8a71dcb583e70c739d01975959038f8.tar.gz | |
Internationalisation of merge_conflicts directory
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')
| -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 "" |