diff options
| author | zeripath <art27@cantab.net> | 2020-10-21 00:50:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 19:50:10 -0400 |
| commit | 965861043ae4daf7ae50460edf5533e52980bdb1 (patch) | |
| tree | 5b4ecf5e4ce21195e5cb5c449c98ee82a170d005 /options | |
| parent | 48a80096bbc7bb4b0fef487df8f176c08f0bf609 (diff) | |
| download | gitea-965861043ae4daf7ae50460edf5533e52980bdb1.tar.gz gitea-965861043ae4daf7ae50460edf5533e52980bdb1.zip | |
Return the full rejection message and errors in flash errors (#13221)
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 16d3874e1b..18c621db67 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -870,9 +870,11 @@ editor.file_already_exists = A file named '%s' already exists in this repository editor.commit_empty_file_header = Commit an empty file editor.commit_empty_file_text = The file you're about to commit is empty. Proceed? editor.no_changes_to_show = There are no changes to show. -editor.fail_to_update_file = Failed to update/create file '%s' with error: %v +editor.fail_to_update_file = Failed to update/create file '%s'. +editor.fail_to_update_file_summary = Error Message: editor.push_rejected_no_message = The change was rejected by the server without a message. Please check githooks. -editor.push_rejected = The change was rejected by the server with the following message:<br>%s<br> Please check githooks. +editor.push_rejected = The change was rejected by the server. Please check githooks. +editor.push_rejected_summary = Full Rejection Message: editor.add_subdir = Add a directory… editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v editor.upload_file_is_locked = File '%s' is locked by %s. @@ -1259,11 +1261,15 @@ pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff) pulls.squash_merge_pull_request = Squash and Merge pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed pulls.invalid_merge_option = You cannot use this merge option for this pull request. -pulls.merge_conflict = Merge Failed: There was a conflict whilst merging: %[1]s<br>%[2]s<br>Hint: Try a different strategy -pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s<br>%[2]s<br>%[3]s<br>Hint:Try a different strategy +pulls.merge_conflict = Merge Failed: There was a conflict whilst merging. Hint: Try a different strategy +pulls.merge_conflict_summary = Error Message +pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s. Hint: Try a different strategy +pulls.rebase_conflict_summary = Error Message +; </summary><code>%[2]s<br>%[3]s</code></details> pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again. -pulls.push_rejected = Merge Failed: The push was rejected with the following message:<br>%s<br>Review the githooks for this repository +pulls.push_rejected = Merge Failed: The push was rejected. Review the githooks for this repository. +pulls.push_rejected_summary = Full Rejection Message pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the githooks for this repository pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.status_checking = Some checks are pending |