diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 18:46:34 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 18:46:34 +0300 |
| commit | 5f90d92c10e89d60a5a6d9c59da8e480fd12d8de (patch) | |
| tree | 5e8734ef66f824e9148a9ca52e700fa58baae0be /locale | |
| parent | c3da8849c364885841fddf592346974ff4148c8d (diff) | |
| parent | f4f3f286f1c6bc37133fe775862e7340d7b56f1e (diff) | |
Merge branch 'master' into fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 75d7074d100..efaaddfbaa1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -32,6 +32,9 @@ msgid_plural "%d commits behind" msgstr[0] "" msgstr[1] "" +msgid "%d commits" +msgstr "" + msgid "%d exporter" msgid_plural "%d exporters" msgstr[0] "" @@ -2540,6 +2543,9 @@ msgstr "" msgid "Delete list" msgstr "" +msgid "Delete source branch" +msgstr "" + msgid "Delete this attachment" msgstr "" @@ -3265,6 +3271,9 @@ msgstr "" msgid "Failure" msgstr "" +msgid "Fast-forward merge without a merge commit" +msgstr "" + msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)" msgstr "" @@ -3917,6 +3926,9 @@ msgstr "" msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept." msgstr "" +msgid "Include merge request description" +msgstr "" + msgid "Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>." msgstr "" @@ -4452,9 +4464,18 @@ msgstr "" msgid "Merge Requests" msgstr "" +msgid "Merge commit message" +msgstr "" + msgid "Merge events" msgstr "" +msgid "Merge immediately" +msgstr "" + +msgid "Merge in progress" +msgstr "" + msgid "Merge request" msgstr "" @@ -4464,6 +4485,9 @@ msgstr "" msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others" msgstr "" +msgid "Merge when pipeline succeeds" +msgstr "" + msgid "MergeRequests|Add a reply" msgstr "" @@ -4620,6 +4644,12 @@ msgstr "" msgid "Modal|Close" msgstr "" +msgid "Modify commit messages" +msgstr "" + +msgid "Modify merge commit" +msgstr "" + msgid "Monday" msgstr "" @@ -6640,6 +6670,9 @@ msgstr "" msgid "Something went wrong while closing the %{issuable}. Please try again later" msgstr "" +msgid "Something went wrong while deleting the source branch. Please try again." +msgstr "" + msgid "Something went wrong while fetching comments. Please try again." msgstr "" @@ -6652,6 +6685,9 @@ msgstr "" msgid "Something went wrong while fetching the registry list." msgstr "" +msgid "Something went wrong while merging this merge request. Please try again." +msgstr "" + msgid "Something went wrong while reopening the %{issuable}. Please try again later" msgstr "" @@ -6796,6 +6832,9 @@ msgstr "" msgid "Specify the following URL during the Runner setup:" msgstr "" +msgid "Squash commit message" +msgstr "" + msgid "Squash commits" msgstr "" @@ -8321,6 +8360,9 @@ msgstr "" msgid "You can only edit files when you are on a branch" msgstr "" +msgid "You can only merge once the items above are resolved" +msgstr "" + msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}" msgstr "" @@ -8615,6 +8657,12 @@ msgstr[1] "" msgid "missing" msgstr "" +msgid "mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}." +msgstr "" + +msgid "mrWidgetCommitsAdded|1 merge commit" +msgstr "" + msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch" msgstr "" |