Differentiate between different filter modes

We can filter by path, by file status, and by text.

8 files changed, 56 insertions, 55 deletions

diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
index 93e52c192..61d91ad69 100644
--- a/pkg/gui/controllers/files_controller.go
+++ b/pkg/gui/controllers/files_controller.go
@@ -648,7 +648,7 @@ func (self *FilesController) handleStatusFilterPressed() error {
 				},
 			},
 			{
-				Label: self.c.Tr.ResetCommitFilterState,
+				Label: self.c.Tr.ResetFilter,
 				OnPress: func() error {
 					return self.setStatusFiltering(filetree.DisplayAll)
 				},
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 6f17bb7c6..63059ee4d 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -35,7 +35,7 @@ func dutchTranslationSet() TranslationSet {
 		Scroll:                              "Scroll",
 		FilterStagedFiles:                   "Show only staged files",
 		FilterUnstagedFiles:                 "Show only unstaged files",
-		ResetCommitFilterState:              "Reset commit file state filter",
+		ResetFilter:                         "Reset commit file state filter",
 		MergeConflictsTitle:                 "Merge conflicten",
 		Checkout:                            "Uitchecken",
 		PullWait:                            "Pullen...",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 62b9c0015..f916c3c4d 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -54,7 +54,7 @@ type TranslationSet struct {
 	FileFilter                          string
 	FilterStagedFiles                   string
 	FilterUnstagedFiles                 string
-	ResetCommitFilterState              string
+	ResetFilter                         string
 	MergeConflictsTitle                 string
 	Checkout                            string
 	NoChangedFiles                      string
@@ -744,10 +744,10 @@ func EnglishTranslationSet() TranslationSet {
 		Scroll:                              "Scroll",
 		MergeConflictsTitle:                 "Merge conflicts",
 		Checkout:                            "Checkout",
-		FileFilter:                          "Filter files (staged/unstaged)",
+		FileFilter:                          "Filter files by status",
 		FilterStagedFiles:                   "Show only staged files",
 		FilterUnstagedFiles:                 "Show only unstaged files",
-		ResetCommitFilterState:              "Reset filter",
+		ResetFilter:                         "Reset filter",
 		NoChangedFiles:                      "No changed files",
 		PullWait:                            "Pulling...",
 		PushWait:                            "Pushing...",
@@ -1057,51 +1057,52 @@ func EnglishTranslationSet() TranslationSet {
 		GitFlowOptions:                      "Show git-flow options",
 		NotAGitFlowBranch:                   "This does not seem to be a git flow branch",
 		NewGitFlowBranchPrompt:              "New {{.branchType}} name:",
-		IgnoreTracked:                       "Ignore tracked file",
-		IgnoreTrackedPrompt:                 "Are you sure you want to ignore a tracked file?",
-		ExcludeTracked:                      "Exclude tracked file",
-		ExcludeTrackedPrompt:                "Are you sure you want to exclude a tracked file?",
-		ViewResetToUpstreamOptions:          "View upstream reset options",
-		NextScreenMode:                      "Next screen mode (normal/half/fullscreen)",
-		PrevScreenMode:                      "Prev screen mode",
-		StartSearch:                         "Search the current view",
-		StartFilter:                         "Filter the current view",
-		Panel:                               "Panel",
-		KeybindingsLegend:                   "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
-		RenameBranch:                        "Rename branch",
-		SetUnsetUpstream:                    "Set/Unset upstream",
-		NewBranchNamePrompt:                 "Enter new branch name for branch",
-		RenameBranchWarning:                 "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
-		OpenMenu:                            "Open menu",
-		ResetCherryPick:                     "Reset cherry-picked (copied) commits selection",
-		NextTab:                             "Next tab",
-		PrevTab:                             "Previous tab",
-		CantUndoWhileRebasing:               "Can't undo while rebasing",
-		CantRedoWhileRebasing:               "Can't redo while rebasing",
-		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?",
-		MustStashTitle:                      "Must stash",
-		ConfirmationTitle:                   "Confirmation panel",
-		PrevPage:                            "Previous page",
-		NextPage:                            "Next page",
-		GotoTop:                             "Scroll to top",
-		GotoBottom:                          "Scroll to bottom",
-		FilteringBy:                         "Filtering by",
-		ResetInParentheses:                  "(Reset)",
-		OpenFilteringMenu:                   "View filter-by-path options",
-		FilterBy:                            "Filter by",
-		ExitFilterMode:                      "Stop filtering by path",
-		FilterPathOption:                    "Enter path to filter by",
-		EnterFileName:                       "Enter path:",
-		FilteringMenuTitle:                  "Filtering",
-		MustExitFilterModeTitle:             "Command not available",
-		MustExitFilterModePrompt:            "Command not available in filtered mode. Exit filtered mode?",
-		Diff:                                "Diff",
-		EnterRefToDiff:                      "Enter ref to diff",
-		EnterRefName:                        "Enter ref:",
-		ExitDiffMode:                        "Exit diff mode",
-		DiffingMenuTitle:                    "Diffing",
-		SwapDiff:                            "Reverse diff direction",
-		OpenDiffingMenu:                     "Open diff menu",
+
+		IgnoreTracked:              "Ignore tracked file",
+		IgnoreTrackedPrompt:        "Are you sure you want to ignore a tracked file?",
+		ExcludeTracked:             "Exclude tracked file",
+		ExcludeTrackedPrompt:       "Are you sure you want to exclude a tracked file?",
+		ViewResetToUpstreamOptions: "View upstream reset options",
+		NextScreenMode:             "Next screen mode (normal/half/fullscreen)",
+		PrevScreenMode:             "Prev screen mode",
+		StartSearch:                "Search the current view by text",
+		StartFilter:                "Filter the current view by text",
+		Panel:                      "Panel",
+		KeybindingsLegend:          "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
+		RenameBranch:               "Rename branch",
+		SetUnsetUpstream:           "Set/Unset upstream",
+		NewBranchNamePrompt:        "Enter new branch name for branch",
+		RenameBranchWarning:        "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
+		OpenMenu:                   "Open menu",
+		ResetCherryPick:            "Reset cherry-picked (copied) commits selection",
+		NextTab:                    "Next tab",
+		PrevTab:                    "Previous tab",
+		CantUndoWhileRebasing:      "Can't undo while rebasing",
+		CantRedoWhileRebasing:      "Can't redo while rebasing",
+		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?",
+		MustStashTitle:             "Must stash",
+		ConfirmationTitle:          "Confirmation panel",
+		PrevPage:                   "Previous page",
+		NextPage:                   "Next page",
+		GotoTop:                    "Scroll to top",
+		GotoBottom:                 "Scroll to bottom",
+		FilteringBy:                "Filtering by",
+		ResetInParentheses:         "(Reset)",
+		OpenFilteringMenu:          "View filter-by-path options",
+		FilterBy:                   "Filter by",
+		ExitFilterMode:             "Stop filtering by path",
+		FilterPathOption:           "Enter path to filter by",
+		EnterFileName:              "Enter path:",
+		FilteringMenuTitle:         "Filtering",
+		MustExitFilterModeTitle:    "Command not available",
+		MustExitFilterModePrompt:   "Command not available in filter-by-path mode. Exit filter-by-path mode?",
+		Diff:                       "Diff",
+		EnterRefToDiff:             "Enter ref to diff",
+		EnterRefName:               "Enter ref:",
+		ExitDiffMode:               "Exit diff mode",
+		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:",
diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go
index 0c4e8aa13..a85187580 100644
--- a/pkg/i18n/japanese.go
+++ b/pkg/i18n/japanese.go
@@ -61,7 +61,7 @@ func japaneseTranslationSet() TranslationSet {
 		FileFilter:              "ファイルをフィルタ (ステージ/アンステージ)",
 		FilterStagedFiles:       "ステージされたファイルのみを表示",
 		FilterUnstagedFiles:     "ステージされていないファイルのみを表示",
-		ResetCommitFilterState:  "フィルタをリセット",
+		ResetFilter:             "フィルタをリセット",
 		// NoChangedFiles:                      "No changed files",
 		PullWait:                "Pull中...",
 		PushWait:                "Push中...",
diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go
index 4eba85cc8..7b2c9d20d 100644
--- a/pkg/i18n/korean.go
+++ b/pkg/i18n/korean.go
@@ -60,7 +60,7 @@ func koreanTranslationSet() TranslationSet {
 		FileFilter:                          "파일을 필터하기 (Staged/unstaged)",
 		FilterStagedFiles:                   "Staged된 파일만 표시",
 		FilterUnstagedFiles:                 "Stage되지 않은 파일만 표시",
-		ResetCommitFilterState:              "필터 리셋",
+		ResetFilter:                         "필터 리셋",
 		NoChangedFiles:                      "변경된 파일이 없습니다.",
 		PullWait:                            "업데이트 중...",
 		PushWait:                            "푸시 중...",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 5ac6b8a3a..a2ff1bb12 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -31,7 +31,7 @@ func polishTranslationSet() TranslationSet {
 		Scroll:                              "Przewiń",
 		FilterStagedFiles:                   "Pokaż tylko pliki w poczekalni",
 		FilterUnstagedFiles:                 "Pokaż tylko pliki poza poczekalnią",
-		ResetCommitFilterState:              "Resetuj filtr commitów",
+		ResetFilter:                         "Resetuj filtr commitów",
 		Checkout:                            "Przełącz",
 		NoChangedFiles:                      "Brak zmienionych plików",
 		PullWait:                            "Pobieranie zmian...",
diff --git a/pkg/i18n/russian.go b/pkg/i18n/russian.go
index 6d03bce94..d0881fb33 100644
--- a/pkg/i18n/russian.go
+++ b/pkg/i18n/russian.go
@@ -79,7 +79,7 @@ func RussianTranslationSet() TranslationSet {
 		FileFilter:                          "Фильтровать файлы (проиндексированные/непроиндексированные)",
 		FilterStagedFiles:                   "Показывать только проиндексированные файлы",
 		FilterUnstagedFiles:                 "Показывать только непроиндексированные файлы",
-		ResetCommitFilterState:              "Сбросить фильтр",
+		ResetFilter:                         "Сбросить фильтр",
 		NoChangedFiles:                      "Нет изменённых файлов",
 		PullWait:                            "Получение и слияние изменении...",
 		PushWait:                            "Отправка изменении...",
diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go
index b83f344f8..5f10fd10b 100644
--- a/pkg/i18n/traditional_chinese.go
+++ b/pkg/i18n/traditional_chinese.go
@@ -112,7 +112,7 @@ func traditionalChineseTranslationSet() TranslationSet {
 		FileFilter:                          "篩選檔案 (預存/未預存)",
 		FilterStagedFiles:                   "僅顯示預存的檔案",
 		FilterUnstagedFiles:                 "僅顯示未預存的檔案",
-		ResetCommitFilterState:              "重設篩選",
+		ResetFilter:                         "重設篩選",
 		NoChangedFiles:                      "沒有變更的檔案",
 		PullWait:                            "拉取...",
 		PushWait:                            "推送...",