chore: rename "Set/Unset upstream" menu to "Upstream Options"

This should already have been done when adding the "View divergence from
upstream" command, but now we're going to add yet another item to the menu that
is unrelated to setting or unsetting the upstream.

docs/keybindings/Keybindings_en.md

@@ -155,7 +155,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: Create tag
   <kbd>g</kbd>: View reset options
   <kbd>R</kbd>: Rename branch
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: View commits
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_ja.md

@@ -227,7 +227,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: タグを作成
   <kbd>g</kbd>: View reset options
   <kbd>R</kbd>: ブランチ名を変更
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_ko.md

@@ -190,7 +190,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: 태그를 생성
   <kbd>g</kbd>: View reset options
   <kbd>R</kbd>: 브랜치 이름 변경
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_nl.md

@@ -97,7 +97,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: Creëer tag
   <kbd>g</kbd>: Bekijk reset opties
   <kbd>R</kbd>: Hernoem branch
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: Bekijk commits
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_pl.md

@@ -113,7 +113,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: Create tag
   <kbd>g</kbd>: Wyświetl opcje resetu
   <kbd>R</kbd>: Rename branch
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: View commits
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_ru.md

@@ -188,7 +188,7 @@ _Связки клавиш_
   <kbd>T</kbd>: Создать тег
   <kbd>g</kbd>: Просмотреть параметры сброса
   <kbd>R</kbd>: Переименовать ветку
-  <kbd>u</kbd>: Установить/убрать upstream-ветку
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_zh-CN.md

@@ -91,7 +91,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>T</kbd>: 创建标签
   <kbd>g</kbd>: 查看重置选项
   <kbd>R</kbd>: 重命名分支
-  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: 查看提交
   <kbd>/</kbd>: Filter the current view by text

docs/keybindings/Keybindings_zh-TW.md

@@ -263,7 +263,7 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
   <kbd>T</kbd>: 建立標籤
   <kbd>g</kbd>: 檢視重設選項
   <kbd>R</kbd>: 重新命名分支
-  <kbd>u</kbd>: 設定/取消設定上游
+  <kbd>u</kbd>: View upstream options
   <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: 檢視提交
   <kbd>/</kbd>: Filter the current view by text

pkg/gui/controllers/branches_controller.go

@@ -108,7 +108,8 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 		{
 			Key:         opts.GetKey(opts.Config.Branches.SetUpstream),
 			Handler:     self.checkSelected(self.setUpstream),
-			Description: self.c.Tr.SetUnsetUpstream,
+			Description: self.c.Tr.ViewBranchUpstreamOptions,
+			Tooltip:     self.c.Tr.ViewBranchUpstreamOptionsTooltip,
 			OpensMenu:   true,
 		},
 	}
@@ -140,7 +141,7 @@ func (self *BranchesController) GetOnRenderToMain() func() error {
 
 func (self *BranchesController) setUpstream(selectedBranch *models.Branch) error {
 	return self.c.Menu(types.CreateMenuOptions{
-		Title: self.c.Tr.Actions.SetUnsetUpstream,
+		Title: self.c.Tr.BranchUpstreamOptionsTitle,
 		Items: []*types.MenuItem{
 			{
 				LabelColumns: []string{self.c.Tr.ViewDivergenceFromUpstream},

pkg/i18n/english.go

@@ -396,7 +396,9 @@ type TranslationSet struct {
 	KeybindingsMenuSectionGlobal        string
 	KeybindingsMenuSectionNavigation    string
 	RenameBranch                        string
-	SetUnsetUpstream                    string
+	ViewBranchUpstreamOptions           string
+	BranchUpstreamOptionsTitle          string
+	ViewBranchUpstreamOptionsTooltip    string
 	NewGitFlowBranchPrompt              string
 	RenameBranchWarning                 string
 	OpenMenu                            string
@@ -654,7 +656,6 @@ type Actions struct {
 	Merge                             string
 	RebaseBranch                      string
 	RenameBranch                      string
-	SetUnsetUpstream                  string
 	CreateBranch                      string
 	FastForwardBranch                 string
 	CherryPick                        string
@@ -1166,51 +1167,53 @@ func EnglishTranslationSet() TranslationSet {
 		NotAGitFlowBranch:                   "This does not seem to be a git flow branch",
 		NewGitFlowBranchPrompt:              "New {{.branchType}} name:",
 
-		IgnoreTracked:              "Ignore tracked file",
+		IgnoreTracked:                    "Ignore tracked file",
-		IgnoreTrackedPrompt:        "Are you sure you want to ignore a tracked file?",
+		IgnoreTrackedPrompt:              "Are you sure you want to ignore a tracked file?",
-		ExcludeTracked:             "Exclude tracked file",
+		ExcludeTracked:                   "Exclude tracked file",
-		ExcludeTrackedPrompt:       "Are you sure you want to exclude a tracked file?",
+		ExcludeTrackedPrompt:             "Are you sure you want to exclude a tracked file?",
-		ViewResetToUpstreamOptions: "View upstream reset options",
+		ViewResetToUpstreamOptions:       "View upstream reset options",
-		NextScreenMode:             "Next screen mode (normal/half/fullscreen)",
+		NextScreenMode:                   "Next screen mode (normal/half/fullscreen)",
-		PrevScreenMode:             "Prev screen mode",
+		PrevScreenMode:                   "Prev screen mode",
-		StartSearch:                "Search the current view by text",
+		StartSearch:                      "Search the current view by text",
-		StartFilter:                "Filter the current view by text",
+		StartFilter:                      "Filter the current view by text",
-		Panel:                      "Panel",
+		Panel:                            "Panel",
-		KeybindingsLegend:          "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
+		KeybindingsLegend:                "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
-		RenameBranch:               "Rename branch",
+		RenameBranch:                     "Rename branch",
-		SetUnsetUpstream:           "Set/Unset upstream",
+		BranchUpstreamOptionsTitle:       "Upstream options",
-		NewBranchNamePrompt:        "Enter new branch name for branch",
+		ViewBranchUpstreamOptionsTooltip: "View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream",
-		RenameBranchWarning:        "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
+		ViewBranchUpstreamOptions:        "View upstream options",
-		OpenMenu:                   "Open menu",
+		NewBranchNamePrompt:              "Enter new branch name for branch",
-		ResetCherryPick:            "Reset cherry-picked (copied) commits selection",
+		RenameBranchWarning:              "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
-		NextTab:                    "Next tab",
+		OpenMenu:                         "Open menu",
-		PrevTab:                    "Previous tab",
+		ResetCherryPick:                  "Reset cherry-picked (copied) commits selection",
-		CantUndoWhileRebasing:      "Can't undo while rebasing",
+		NextTab:                          "Next tab",
-		CantRedoWhileRebasing:      "Can't redo while rebasing",
+		PrevTab:                          "Previous tab",
-		MustStashWarning:           "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
+		CantUndoWhileRebasing:            "Can't undo while rebasing",
-		MustStashTitle:             "Must stash",
+		CantRedoWhileRebasing:            "Can't redo while rebasing",
-		ConfirmationTitle:          "Confirmation panel",
+		MustStashWarning:                 "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
-		PrevPage:                   "Previous page",
+		MustStashTitle:                   "Must stash",
-		NextPage:                   "Next page",
+		ConfirmationTitle:                "Confirmation panel",
-		GotoTop:                    "Scroll to top",
+		PrevPage:                         "Previous page",
-		GotoBottom:                 "Scroll to bottom",
+		NextPage:                         "Next page",
-		FilteringBy:                "Filtering by",
+		GotoTop:                          "Scroll to top",
-		ResetInParentheses:         "(Reset)",
+		GotoBottom:                       "Scroll to bottom",
-		OpenFilteringMenu:          "View filter-by-path options",
+		FilteringBy:                      "Filtering by",
-		FilterBy:                   "Filter by",
+		ResetInParentheses:               "(Reset)",
-		ExitFilterMode:             "Stop filtering by path",
+		OpenFilteringMenu:                "View filter-by-path options",
-		FilterPathOption:           "Enter path to filter by",
+		FilterBy:                         "Filter by",
-		EnterFileName:              "Enter path:",
+		ExitFilterMode:                   "Stop filtering by path",
-		FilteringMenuTitle:         "Filtering",
+		FilterPathOption:                 "Enter path to filter by",
-		MustExitFilterModeTitle:    "Command not available",
+		EnterFileName:                    "Enter path:",
-		MustExitFilterModePrompt:   "Command not available in filter-by-path mode. Exit filter-by-path mode?",
+		FilteringMenuTitle:               "Filtering",
-		Diff:                       "Diff",
+		MustExitFilterModeTitle:          "Command not available",
-		EnterRefToDiff:             "Enter ref to diff",
+		MustExitFilterModePrompt:         "Command not available in filter-by-path mode. Exit filter-by-path mode?",
-		EnterRefName:               "Enter ref:",
+		Diff:                             "Diff",
-		ExitDiffMode:               "Exit diff mode",
+		EnterRefToDiff:                   "Enter ref to diff",
-		DiffingMenuTitle:           "Diffing",
+		EnterRefName:                     "Enter ref:",
-		SwapDiff:                   "Reverse diff direction",
+		ExitDiffMode:                     "Exit diff mode",
-		OpenDiffingMenu:            "Open diff menu",
+		DiffingMenuTitle:                 "Diffing",
+		SwapDiff:                         "Reverse diff direction",
+		OpenDiffingMenu:                  "Open diff menu",
 		// the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part
 		OpenExtrasMenu:                      "Open command log menu",
 		ShowingGitDiff:                      "Showing output for:",
@@ -1394,7 +1397,6 @@ func EnglishTranslationSet() TranslationSet {
 			Merge:                             "Merge",
 			RebaseBranch:                      "Rebase branch",
 			RenameBranch:                      "Rename branch",
-			SetUnsetUpstream:                  "Set/Unset upstream",
 			CreateBranch:                      "Create branch",
 			CherryPick:                        "(Cherry-pick) paste commits",
 			CheckoutFile:                      "Checkout file",

pkg/i18n/korean.go

@@ -476,7 +476,6 @@ func koreanTranslationSet() TranslationSet {
 			Merge:                             "병합",
 			RebaseBranch:                      "브랜치 리베이스",
 			RenameBranch:                      "브랜치 이름 변경",
-			SetUnsetUpstream:                  "Set/Unset upstream",
 			CreateBranch:                      "브랜치 생성",
 			CherryPick:                        "(Cherry-pick) 커밋 붙여넣기",
 			CheckoutFile:                      "체크아웃 파일",

pkg/i18n/russian.go

@@ -395,7 +395,6 @@ func RussianTranslationSet() TranslationSet {
 		Panel:                               "Панель",
 		KeybindingsLegend:                   "Связки клавиш",
 		RenameBranch:                        "Переименовать ветку",
-		SetUnsetUpstream:                    "Установить/убрать upstream-ветку",
 		NewBranchNamePrompt:                 "Введите новое название ветки",
 		RenameBranchWarning:                 "Эта ветвь отслеживает удалённый репозитории. Это действие переименует только имя локальной ветки, а не имя удалённой ветки. Продолжать?",
 		OpenMenu:                            "Открыть меню",
@@ -566,7 +565,6 @@ func RussianTranslationSet() TranslationSet {
 			Merge:                             "Слить",
 			RebaseBranch:                      "Перебазировать ветку",
 			RenameBranch:                      "Переименовать ветку",
-			SetUnsetUpstream:                  "Установить/убрать upstream-ветку",
 			CreateBranch:                      "Создать ветку",
 			CherryPick:                        "(Cherry-pick) Вставить коммиты",
 			CheckoutFile:                      "Переключить файл",

pkg/i18n/traditional_chinese.go

@@ -421,7 +421,6 @@ func traditionalChineseTranslationSet() TranslationSet {
 		Panel:                               "面板",
 		KeybindingsLegend:                   "說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B",
 		RenameBranch:                        "重新命名分支",
-		SetUnsetUpstream:                    "設定/取消設定上游",
 		NewBranchNamePrompt:                 "為分支輸入新名稱",
 		RenameBranchWarning:                 "此分支正在追蹤遠端分支。此操作僅會重新命名本地分支名稱，而不是遠端分支的名稱。是否繼續？",
 		OpenMenu:                            "開啟選單",
@@ -592,7 +591,6 @@ func traditionalChineseTranslationSet() TranslationSet {
 			Merge:                             "合併",
 			RebaseBranch:                      "變基分支",
 			RenameBranch:                      "重新命名分支",
-			SetUnsetUpstream:                  "設置/取消上游",
 			CreateBranch:                      "建立分支",
 			CherryPick:                        "（Cherry-pick）粘貼提交",
 			CheckoutFile:                      "檢出檔案",

pkg/integration/tests/branch/reset_upstream.go

@@ -25,7 +25,7 @@ var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
 			Press(keys.Branches.SetUpstream).
 			Tap(func() {
 				t.ExpectPopup().Menu().
-					Title(Equals("Set/Unset upstream")).
+					Title(Equals("Upstream options")).
 					Select(Contains("Unset upstream of selected branch")).
 					Confirm()
 			}).

pkg/integration/tests/branch/set_upstream.go

@@ -24,7 +24,7 @@ var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
 			Press(keys.Branches.SetUpstream).
 			Tap(func() {
 				t.ExpectPopup().Menu().
-					Title(Equals("Set/Unset upstream")).
+					Title(Equals("Upstream options")).
 					Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
 					Confirm()
 

pkg/integration/tests/branch/show_divergence_from_upstream.go

@@ -38,7 +38,7 @@ var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(Contains("master")).
 			Press(keys.Branches.SetUpstream)
 
-		t.ExpectPopup().Menu().Title(Contains("upstream")).Select(Contains("View divergence from upstream")).Confirm()
+		t.ExpectPopup().Menu().Title(Contains("Upstream")).Select(Contains("View divergence from upstream")).Confirm()
 
 		t.Views().SubCommits().
 			IsFocused().