From 8e3df6b981c8d501fcaecf6689aa7f78c25920fa Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Wed, 15 Aug 2018 15:02:01 +0200 Subject: add option to force delete given branch --- pkg/i18n/english.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkg/i18n/english.go') diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index bebe9b282..db51fcdc4 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -159,6 +159,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "deleteBranch", Other: "delete branch", + }, &i18n.Message{ + ID: "forceDeleteBranch", + Other: "delete branch (force)", }, &i18n.Message{ ID: "NoBranchesThisRepo", Other: "No branches for this repo", -- cgit v1.2.3 From 5f6b61d28c86676fec311ec94edad977343e48bd Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 21 Aug 2018 12:06:42 +0200 Subject: adjust translation(s) for forced branch deletion --- pkg/i18n/english.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkg/i18n/english.go') diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index db51fcdc4..55f6c5bc3 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -140,7 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "Delete Branch", }, &i18n.Message{ ID: "DeleteBranchMessage", - Other: "Are you sure you want delete the branch {{.selectedBranchName}} ?", + Other: "Are you sure you want to delete the branch {{.selectedBranchName}} ?", + }, &i18n.Message{ + ID: "ForceDeleteBranchMessage", + Other: "Are you sure you want to force delete the branch {{.selectedBranchName}} ?", }, &i18n.Message{ ID: "CantMergeBranchIntoItself", Other: "You cannot merge a branch into itself", -- cgit v1.2.3 From 3e8ef0d12d394bdd2437ecb0084cea2985de01be Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Wed, 22 Aug 2018 11:27:45 -0400 Subject: Remove space before punctuation --- pkg/i18n/english.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/i18n/english.go') diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 2269ffb9f..38fbac4cb 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -140,10 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "Delete Branch", }, &i18n.Message{ ID: "DeleteBranchMessage", - Other: "Are you sure you want to delete the branch {{.selectedBranchName}} ?", + Other: "Are you sure you want to delete the branch {{.selectedBranchName}}?", }, &i18n.Message{ ID: "ForceDeleteBranchMessage", - Other: "Are you sure you want to force delete the branch {{.selectedBranchName}} ?", + Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?", }, &i18n.Message{ ID: "CantMergeBranchIntoItself", Other: "You cannot merge a branch into itself", -- cgit v1.2.3