summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorBwko <bouwko@gmail.com>2017-10-26 02:49:16 +0200
committerLunny Xiao <xiaolunwen@gmail.com>2017-10-26 08:49:16 +0800
commit3ab580c8d6b8a2c063d848f8e3002347c9e5cebb (patch)
tree3f66f793be25db1ca8baac8d5333e39bfdd4f7e1 /options
parente86a0bf3feab82c1b3439806245083dffb2f37c9 (diff)
downloadgitea-3ab580c8d6b8a2c063d848f8e3002347c9e5cebb.tar.gz
gitea-3ab580c8d6b8a2c063d848f8e3002347c9e5cebb.zip
Add branch overiew page (#2108)
* Add branch overiew page * fix changed method name on sub menu * remove unused code
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini10
1 files changed, 10 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 088aa05a9f..686e353ea1 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1055,10 +1055,16 @@ 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.name = Branch name
+branch.search = Search branches
+branch.already_exists = A branch named %s already exists.
+branch.delete_head = Delete
branch.delete = Delete Branch %s
+branch.delete_html = Delete Branch
branch.delete_desc = Deleting a branch is permanent. There is no way to undo it.
branch.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone.
branch.delete_notices_2 = - This operation will permanently delete everything in branch %s.
+branch.delete_notices_html = - This operation will permanently delete everything in branch
branch.deletion_success = %s has been deleted.
branch.deletion_failed = Failed to delete branch %s.
branch.delete_branch_has_new_commits = %s cannot be deleted because new commits have been added after merging.
@@ -1068,6 +1074,10 @@ branch.create_success = Branch '%s' has been created successfully!
branch.branch_already_exists = Branch '%s' already exists in this repository.
branch.branch_name_conflict = Branch name '%s' conflicts with already existing branch '%s'.
branch.tag_collision = Branch '%s' can not be created as tag with same name already exists in this repository.
+branch.deleted_by = Deleted by %s
+branch.restore_success = %s successfully restored
+branch.restore_failed = Failed to restore branch %s.
+branch.protected_deletion_failed = It's not possible to delete protected branch %s.
[org]
org_name_holder = Organization Name