diff options
| author | Bwko <bouwko@gmail.com> | 2016-12-25 17:19:25 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2016-12-26 11:55:28 +0100 |
| commit | 71dee6b7c09242707028cdfe23373a1f88d6a663 (patch) | |
| tree | c5d424d2f68880728baca8a211899ff662f6f2b8 /options | |
| parent | 71634452e17a6c954e5612f861780effe7528992 (diff) | |
| download | gitea-71dee6b7c09242707028cdfe23373a1f88d6a663.tar.gz gitea-71dee6b7c09242707028cdfe23373a1f88d6a663.zip | |
Improve the way how branches are deleted
Delete branch from HeadRepo instead of BaseRepo
Prevent the deletion of a master branch
Show a yes/no overlay when you press the delete branch button
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5368bbf37a..d689a92a3c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -591,7 +591,6 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. pulls.merge_pull_request = Merge Pull Request pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` -pulls.delete_branch = Delete Branch milestones.new = New Milestone milestones.open_tab = %d Open @@ -815,6 +814,14 @@ release.tag_name_already_exist = Release with this tag name already exists. release.tag_name_invalid = Tag name is not valid. release.downloads = Downloads +branch.delete = Delete Branch %s +branch.delete_desc = Once you delete a branch, there is no going back. Please be certain. +branch.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone. +branch.delete_notices_2 = - This operation will permanently delete everything of branch %s. +branch.deletion_success = %s has been deleted successfully! +branch.deletion_failed = Failed to delete branch %s. +branch.delete_branch_has_new_commits = %s cannot be deleted because it has new commits after mergence. + [org] org_name_holder = Organization Name org_full_name_holder = Organization Full Name |