diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index ba17919df..af5787dab 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -102,7 +102,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct C: commit changes using git editor e: edit file o: open file - i: Ignore or Exclude file + i: ignore or exclude file r: refresh files s: stash all changes S: view stash options diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index 248146818..690cd5790 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -277,7 +277,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct C: Git 편집기를 사용하여 변경 내용을 커밋합니다. e: 파일 편집 o: 파일 닫기 - i: Ignore file + i: ignore file r: 파일 새로고침 s: 변경사항을 Stash S: Stash 옵션 보기 diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 73c1f4fc8..15484be73 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -55,7 +55,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct C: commit veranderingen met de git editor e: verander bestand o: open bestand - i: Ignore or Exclude file + i: ignore or exclude file r: refresh bestanden s: stash-bestanden S: bekijk stash opties diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index a1796ae75..9cfc64294 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -125,7 +125,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct C: Zatwierdź zmiany używając edytora e: edytuj plik o: otwórz plik - i: Ignore or Exclude file + i: ignore or exclude file r: odśwież pliki s: przechowaj zmiany S: wyświetl opcje schowka diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 20a802169..8f0b8333f 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -85,7 +85,8 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types { Key: opts.GetKey(opts.Config.Files.IgnoreOrExcludeFile), Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu), - Description: self.c.Tr.Actions.IgnoreExcludeFile, + Description: self.c.Tr.Actions.LcIgnoreExcludeFile, + OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Files.RefreshFiles), @@ -501,7 +502,7 @@ func (self *FilesController) ignore(node *filetree.FileNode) error { if node.GetPath() == ".gitignore" { return self.c.ErrorMsg(self.c.Tr.Actions.IgnoreFileErr) } - err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.IgnoreExcludeFile, self.git.WorkingTree.Ignore) + err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.LcIgnoreExcludeFile, self.git.WorkingTree.Ignore) if err != nil { return err } @@ -527,7 +528,7 @@ func (self *FilesController) exclude(node *filetree.FileNode) error { func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error { return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.Actions.IgnoreExcludeFile, + Title: self.c.Tr.Actions.LcIgnoreExcludeFile, Items: []*types.MenuItem{ { LabelColumns: []string{self.c.Tr.LcIgnoreFile}, diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 94add5b8a..fb594a1a9 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -507,7 +507,7 @@ func chineseTranslationSet() TranslationSet { UnstageFile: "取消暂存文件", UnstageAllFiles: "取消暂存所有文件", StageAllFiles: "暂存所有文件", - IgnoreExcludeFile: "忽略文件", + LcIgnoreExcludeFile: "忽略文件", Commit: "提交 (Commit)", EditFile: "编辑文件", Push: "推送 (Push)", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 9fa7f1c42..d316c482e 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -568,8 +568,7 @@ type Actions struct { UnstageFile string UnstageAllFiles string StageAllFiles string - IgnoreExcludeFile string - IgnoreFile string + LcIgnoreExcludeFile string IgnoreFileErr string ExcludeFile string ExcludeFileErr string @@ -1190,8 +1189,7 @@ func EnglishTranslationSet() TranslationSet { UnstageFile: "Unstage file", UnstageAllFiles: "Unstage all files", StageAllFiles: "Stage all files", - IgnoreExcludeFile: "Ignore or Exclude file", - IgnoreFile: "Ignore or Exclude file", + LcIgnoreExcludeFile: "ignore or exclude file", IgnoreFileErr: "Cannot ignore .gitignore", ExcludeFile: "Exclude file", ExcludeFileErr: "Cannot exclude .git/info/exclude", diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 43204833f..03d949549 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -533,7 +533,7 @@ func japaneseTranslationSet() TranslationSet { UnstageFile: "ファイルをアンステージ", UnstageAllFiles: "すべてのファイルをアンステージ", StageAllFiles: "すべてのファイルをステージ", - IgnoreExcludeFile: "ファイルをignore", + LcIgnoreExcludeFile: "ファイルをignore", Commit: "コミット", EditFile: "ファイルを編集", Push: "Push", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index eb7f273ec..afda25c6d 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -536,7 +536,7 @@ func koreanTranslationSet() TranslationSet { UnstageFile: "Unstage file", UnstageAllFiles: "Unstage all files", StageAllFiles: "Stage all files", - IgnoreExcludeFile: "Ignore file", + LcIgnoreExcludeFile: "ignore file", Commit: "커밋", EditFile: "파일 수정", Push: "푸시",