diff options
| author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-02-07 15:14:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-07 15:14:56 +0000 |
| commit | 407fd2edc791c5d159eedad3dfe5521543b50d91 (patch) | |
| tree | 75c526d7e55051720507d955a09a6f1d81a0ccbc /locale | |
| parent | 232ae06a829ba1a7e795564f711e730bd839be41 (diff) | |
| download | gitlab-ce-407fd2edc791c5d159eedad3dfe5521543b50d91.tar.gz | |
Resolve "Override squash commit message"
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 df4975877df..06af4e21d1e 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] "" @@ -2531,6 +2534,9 @@ msgstr "" msgid "Delete list" msgstr "" +msgid "Delete source branch" +msgstr "" + msgid "Delete this attachment" msgstr "" @@ -3256,6 +3262,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 "" @@ -3905,6 +3914,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 "" @@ -4437,9 +4449,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 "" @@ -4449,6 +4470,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 "" @@ -4605,6 +4629,12 @@ msgstr "" msgid "Modal|Close" msgstr "" +msgid "Modify commit messages" +msgstr "" + +msgid "Modify merge commit" +msgstr "" + msgid "Monitor your errors by integrating with Sentry" msgstr "" @@ -6622,6 +6652,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 "" @@ -6634,6 +6667,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 "" @@ -6778,6 +6814,9 @@ msgstr "" msgid "Specify the following URL during the Runner setup:" msgstr "" +msgid "Squash commit message" +msgstr "" + msgid "Squash commits" msgstr "" @@ -8294,6 +8333,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 "" @@ -8588,6 +8630,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 "" |