diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 14:20:09 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 15:34:01 +1100 |
| commit | 1c84f7731920e1970d52f81361d321268054e559 (patch) | |
| tree | 077e68eb695b29fdf911f48a83c654b8bfb72f35 /pkg/i18n | |
| parent | 8d8bdb948b089250c22f3ac4f549152a209dcdb2 (diff) | |
always specify upstream when pushing/pulling
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 4ff6c3555..b815b6b70 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -188,6 +188,7 @@ type TranslationSet struct { ConfirmRebase string ConfirmMerge string FwdNoUpstream string + FwdNoLocalUpstream string FwdCommitsToPush string ErrorOccurred string NoRoom string @@ -281,6 +282,7 @@ type TranslationSet struct { LcEnterFile string ExitLineByLineMode string EnterUpstream string + InvalidUpstream string ReturnToRemotesList string LcAddNewRemote string LcNewRemoteName string @@ -738,6 +740,7 @@ func EnglishTranslationSet() TranslationSet { ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?", ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", FwdNoUpstream: "Cannot fast-forward a branch with no upstream", + FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally", FwdCommitsToPush: "Cannot fast-forward a branch with commits to push", ErrorOccurred: "An error occurred! Please create an issue at", NoRoom: "Not enough room", @@ -831,6 +834,7 @@ func EnglishTranslationSet() TranslationSet { LcEnterFile: "enter file to add selected lines to the patch (or toggle directory collapsed)", ExitLineByLineMode: `exit line-by-line mode`, EnterUpstream: `Enter upstream as '<remote> <branchname>'`, + InvalidUpstream: "Invalid upstream. Must be in the format '<remote> <branchname>'", ReturnToRemotesList: `Return to remotes list`, LcAddNewRemote: `add new remote`, LcNewRemoteName: `New remote name:`, |