diff --git a/docs/Config.md b/docs/Config.md index 883a47ff7..09ff7641c 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -152,6 +152,7 @@ keybinding: toggleTreeView: '`' branches: createPullRequest: 'o' + viewPullRequestOptions: 'O' checkoutBranchByName: 'c' forceCheckoutBranch: 'F' rebaseBranch: 'r' diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 3c426a314..e6ca1188e 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -40,6 +40,7 @@
space: checkout o: create pull request + O: view pull request options ctrl+y: copy pull request URL to clipboard c: checkout by name F: force checkout diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 1777e6e2a..fe6e2700e 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -39,7 +39,8 @@space: uitchecken - o: maak een pull-request + o: maak een pull-aanvraag + O: maak opties voor pull-aanvragen ctrl+y: kopieer de URL van het pull-verzoek naar het klembord c: uitchecken bij naam F: forceer checkout diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 8ab01ff73..361d8b923 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -40,6 +40,7 @@space: przełącz o: utwórz żądanie wyciągnięcia + O: utwórz opcje żądania ściągnięcia ctrl+y: skopiuj adres URL żądania ściągnięcia do schowka c: przełącz używając nazwy F: wymuś przełączenie diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 5519f1954..f41485ebb 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -550,7 +550,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Contexts: []string{string(LOCAL_BRANCHES_CONTEXT_KEY)}, Key: gui.getKey(config.Branches.ViewPullRequestOptions), Handler: gui.handleCreatePullRequestMenu, - Description: gui.Tr.LcCreatePullRequest, + Description: gui.Tr.LcCreatePullRequestOptions, }, { ViewName: "branches", diff --git a/pkg/gui/pull_request_menu_panel.go b/pkg/gui/pull_request_menu_panel.go index 088cae2eb..d76752e36 100644 --- a/pkg/gui/pull_request_menu_panel.go +++ b/pkg/gui/pull_request_menu_panel.go @@ -37,7 +37,7 @@ func (gui *Gui) createPullRequestMenu(selectedBranch *models.Branch, checkedOutB }, }) - return gui.createMenu(fmt.Sprintf(gui.Tr.CreatePullRequest), menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(fmt.Sprintf(gui.Tr.CreatePullRequestOptions), menuItems, createMenuOptions{showCancel: true}) } func createPullRequest(checkedOutBranch *models.Branch, selectedBranch *models.Branch, gui *Gui) error { diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 06fb18d50..e52a2ead5 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -396,5 +396,7 @@ func dutchTranslationSet() TranslationSet { LcInitSubmodule: "initialiseer submodule", LcViewBulkSubmoduleOptions: "bekijk bulk submodule opties", LcViewStashFiles: "bekijk bestanden van stash entry", + CreatePullRequestOptions: "Maak opties voor pull-aanvragen", + LcCreatePullRequestOptions: "maak opties voor pull-aanvragen", } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b0e333bd5..7d1c8b337 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -455,6 +455,8 @@ type TranslationSet struct { IgnoringWhitespaceInDiffView string ShowingWhitespaceInDiffView string CreatePullRequest string + CreatePullRequestOptions string + LcCreatePullRequestOptions string Spans Spans } @@ -1003,6 +1005,8 @@ func englishTranslationSet() TranslationSet { IgnoringWhitespaceInDiffView: "Whitespace will be ignored in the diff view", ShowingWhitespaceInDiffView: "Whitespace will be shown in the diff view", CreatePullRequest: "Create pull request", + CreatePullRequestOptions: "Create pull request options", + LcCreatePullRequestOptions: "create pull request options", Spans: Spans{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "Checkout commit", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 9234c2a70..1420d2ef9 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -255,5 +255,7 @@ func polishTranslationSet() TranslationSet { PullRequestURLCopiedToClipboard: "URL żądania ściągnięcia skopiowany do schowka", CommitMessageCopiedToClipboard: "Commit message skopiowany do schowka", LcCopiedToClipboard: "skopiowany do schowka", + CreatePullRequestOptions: "Utwórz opcje żądania ściągnięcia", + LcCreatePullRequestOptions: "utwórz opcje żądania ściągnięcia", } }