From bb393596689ee7c33ecb041806ae2c9e8dc5dfab Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Sat, 9 Oct 2021 01:03:04 +0800 Subject: Add a simple way to rename branch like gh (#15870) - Update default branch if needed - Update protected branch if needed - Update all not merged pull request base branch name - Rename git branch - Record this rename work and auto redirect for old branch on ui Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: delvh --- options/locale/locale_en-US.ini | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'options/locale') diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bc03f86619..d5af933f40 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1985,6 +1985,12 @@ settings.lfs_pointers.inRepo=In Repo settings.lfs_pointers.exists=Exists in store settings.lfs_pointers.accessible=Accessible to User settings.lfs_pointers.associateAccessible=Associate accessible %d OIDs +settings.rename_branch_failed_exist=Cannot rename branch because target branch %s exists. +settings.rename_branch_failed_not_exist=Cannot rename branch %s because it does not exist. +settings.rename_branch_success =Branch %s was successfully renamed to %s. +settings.rename_branch_from=old branch name +settings.rename_branch_to=new branch name +settings.rename_branch=Rename branch diff.browse_source = Browse Source diff.parent = parent @@ -2106,6 +2112,7 @@ branch.create_new_branch = Create branch from branch: branch.confirm_create_branch = Create branch branch.new_branch = Create new branch branch.new_branch_from = Create new branch from '%s' +branch.renamed = Branch %s was renamed to %s. tag.create_tag = Create tag %s tag.create_success = Tag '%s' has been created. -- cgit v1.2.3