Skip to content

Commit d4e5361

Browse files
committed
fix
1 parent 6708343 commit d4e5361

26 files changed

+745
-1128
lines changed

options/locale/locale_en-US.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,17 +1374,14 @@ editor.branch_already_exists = Branch "%s" already exists in this repository.
13741374
editor.directory_is_a_file = Directory name "%s" is already used as a filename in this repository.
13751375
editor.file_is_a_symlink = `"%s" is a symbolic link. Symbolic links cannot be edited in the web editor`
13761376
editor.filename_is_a_directory = Filename "%s" is already used as a directory name in this repository.
1377-
editor.file_editing_no_longer_exists = The file being edited, "%s", no longer exists in this repository.
1378-
editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer exists in this repository.
1377+
editor.file_modifying_no_longer_exists = The file being modified, "%s", no longer exists in this repository.
13791378
editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener noreferrer" href="%s">Click here</a> to see them or <strong>Commit Changes again</strong> to overwrite them.
13801379
editor.file_already_exists = A file named "%s" already exists in this repository.
13811380
editor.commit_id_not_matching = The Commit ID does not match the ID when you began editing. Commit into a patch branch and then merge.
13821381
editor.push_out_of_date = The push appears to be out of date.
13831382
editor.commit_empty_file_header = Commit an empty file
13841383
editor.commit_empty_file_text = The file you're about to commit is empty. Proceed?
13851384
editor.no_changes_to_show = There are no changes to show.
1386-
editor.fail_to_update_file = Failed to update/create file "%s".
1387-
editor.fail_to_update_file_summary = Error Message:
13881385
editor.push_rejected_no_message = The change was rejected by the server without a message. Please check Git Hooks.
13891386
editor.push_rejected = The change was rejected by the server. Please check Git Hooks.
13901387
editor.push_rejected_summary = Full Rejection Message:
@@ -1398,6 +1395,8 @@ editor.user_no_push_to_branch = User cannot push to branch
13981395
editor.require_signed_commit = Branch requires a signed commit
13991396
editor.cherry_pick = Cherry-pick %s onto:
14001397
editor.revert = Revert %s onto:
1398+
editor.failed_to_commit = Failed to commit changes.
1399+
editor.failed_to_commit_summary = Error Message:
14011400
14021401
commits.desc = Browse source code change history.
14031402
commits.commits = Commits

routers/web/repo/cherry_pick.go

Lines changed: 0 additions & 193 deletions
This file was deleted.

0 commit comments

Comments
 (0)