diff options
| author | Mark Kopenga <mkopenga@gmail.com> | 2018-10-27 15:06:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-27 15:06:51 +0200 |
| commit | 45c249acca0bb4e390f660a896122040510bebd2 (patch) | |
| tree | 41816887288a6700a5c80514feebe7168b11ab00 /pkg/i18n | |
| parent | 1df1053947a2206d85a739208faa383f0735bd7b (diff) | |
| parent | c6da4c8a47a45a96beb2de4fbe5b98cfb87446b4 (diff) | |
Merge branch 'master' into https-ask-for-username-password
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 52c2f993a..dc4e1537c 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -185,7 +185,7 @@ func addEnglish(i18nObject *i18n.Bundle) error { 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: "{{.selectedBranchName}} is not fully merged. Are you sure you want to delete it?", }, &i18n.Message{ ID: "CantMergeBranchIntoItself", Other: "You cannot merge a branch into itself", |