diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index d00277ddd..5e682be7e 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -37,7 +37,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ .: Next page <: Scroll to top >: Scroll to bottom - /: Search the current view + /: Search the current view by text H: Scroll left L: Scroll right ]: Next tab @@ -56,7 +56,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ a: Toggle all files included in patch <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed) `: Toggle file tree view - /: Search the current view + /: Search the current view by text ## Commit summary @@ -97,7 +97,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ c: Copy commit (cherry-pick) C: Copy commit range (cherry-pick) <enter>: View selected item's files - /: Search the current view + /: Search the current view by text ## Confirmation panel @@ -113,7 +113,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <c-o>: Copy the file name to the clipboard d: View 'discard changes' options <space>: Toggle staged - <c-b>: Filter files (staged/unstaged) + <c-b>: Filter files by status c: Commit changes w: Commit changes without pre-commit hook A: Amend last commit @@ -131,7 +131,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ `: Toggle file tree view M: Open external merge tool (git mergetool) f: Fetch - /: Search the current view + /: Search the current view by text ## Local branches @@ -155,7 +155,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: Rename branch u: Set/Unset upstream <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Main panel (merging) @@ -194,7 +194,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: Edit file <space>: Add/Remove line(s) to patch <esc>: Exit custom patch builder - /: Search the current view + /: Search the current view by text ## Main panel (staging) @@ -216,7 +216,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ c: Commit changes w: Commit changes without pre-commit hook C: Commit changes using git editor - /: Search the current view + /: Search the current view by text ## Menu @@ -224,7 +224,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: Execute
   <esc>: Close
-  /: Filter the current view
+  /: Filter the current view by text
## Reflog @@ -240,7 +240,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: Copy commit range (cherry-pick) <c-r>: Reset cherry-picked (copied) commits selection <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Remote branches @@ -255,7 +255,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: Set as upstream of checked-out branch g: View reset options <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Remotes @@ -265,7 +265,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Add new remote d: Remove remote e: Edit remote - /: Filter the current view + /: Filter the current view by text ## Stash @@ -277,7 +277,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: New branch r: Rename stash <enter>: View selected item's files - /: Filter the current view + /: Filter the current view by text ## Status @@ -303,7 +303,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: Copy commit range (cherry-pick) <c-r>: Reset cherry-picked (copied) commits selection <enter>: View selected item's files - /: Search the current view + /: Search the current view by text ## Submodules @@ -317,7 +317,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: Update submodule URL i: Initialize submodule b: View bulk submodule options - /: Filter the current view + /: Filter the current view by text ## Tags @@ -329,5 +329,5 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Create tag g: View reset options <enter>: View commits - /: Filter the current view + /: Filter the current view by text diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index dadf78f4a..787796679 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -53,7 +53,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 新しいブランチを作成 r: Stashを変更 <enter>: View selected item's files - /: Filter the current view + /: Filter the current view by text ## Sub-commits @@ -139,7 +139,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: サブモジュールのURLを更新 i: サブモジュールを初期化 b: View bulk submodule options - /: Filter the current view + /: Filter the current view by text ## ステータス @@ -161,7 +161,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: タグを作成 g: View reset options <enter>: コミットを閲覧 - /: Filter the current view + /: Filter the current view by text ## ファイル @@ -212,7 +212,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: ブランチ名を変更 u: Set/Unset upstream <enter>: コミットを閲覧 - /: Filter the current view + /: Filter the current view by text ## メインパネル (Merging) @@ -281,7 +281,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: 実行
   <esc>: 閉じる
-  /: Filter the current view
+  /: Filter the current view by text
## リモート @@ -291,7 +291,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: リモートを新規追加 d: リモートを削除 e: リモートを編集 - /: Filter the current view + /: Filter the current view by text ## リモートブランチ @@ -306,7 +306,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: Set as upstream of checked-out branch g: View reset options <enter>: コミットを閲覧 - /: Filter the current view + /: Filter the current view by text ## 参照ログ @@ -322,7 +322,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: コミットを範囲コピー (cherry-pick) <c-r>: Reset cherry-picked (copied) commits selection <enter>: コミットを閲覧 - /: Filter the current view + /: Filter the current view by text ## 確認パネル diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index e9067ca96..3ebe1f3ad 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -57,7 +57,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: 커밋을 범위로 복사 (cherry-pick) <c-r>: Reset cherry-picked (copied) commits selection <enter>: 커밋 보기 - /: Filter the current view + /: Filter the current view by text ## Stash @@ -69,7 +69,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 새 브랜치 생성 r: Rename stash <enter>: View selected item's files - /: Filter the current view + /: Filter the current view by text ## Sub-commits @@ -93,7 +93,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: 실행
   <esc>: 닫기
-  /: Filter the current view
+  /: Filter the current view by text
## 메인 패널 (Merging) @@ -178,7 +178,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: 브랜치 이름 변경 u: Set/Unset upstream <enter>: 커밋 보기 - /: Filter the current view + /: Filter the current view by text ## 상태 @@ -202,7 +202,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: 서브모듈의 URL을 수정 i: 서브모듈 초기화 b: View bulk submodule options - /: Filter the current view + /: Filter the current view by text ## 원격 @@ -212,7 +212,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 새로운 Remote 추가 d: Remote를 삭제 e: Remote를 수정 - /: Filter the current view + /: Filter the current view by text ## 원격 브랜치 @@ -227,7 +227,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: Set as upstream of checked-out branch g: View reset options <enter>: 커밋 보기 - /: Filter the current view + /: Filter the current view by text ## 커밋 @@ -295,7 +295,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 태그를 생성 g: View reset options <enter>: 커밋 보기 - /: Filter the current view + /: Filter the current view by text ## 파일 diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index b8277bfab..feae84761 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -50,7 +50,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <c-o>: Kopieer de bestandsnaam naar het klembord d: Bekijk 'veranderingen ongedaan maken' opties <space>: Toggle staged - <c-b>: Filter files (staged/unstaged) + <c-b>: Filter files by status c: Commit veranderingen w: Commit veranderingen zonder pre-commit hook A: Wijzig laatste commit @@ -99,7 +99,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: Hernoem branch u: Set/Unset upstream <enter>: Bekijk commits - /: Filter the current view + /: Filter the current view by text ## Commit bericht @@ -163,7 +163,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: Uitvoeren
   <esc>: Sluiten
-  /: Filter the current view
+  /: Filter the current view by text
## Mergen @@ -218,7 +218,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: Kopieer commit reeks (cherry-pick) <c-r>: Reset cherry-picked (gekopieerde) commits selectie <enter>: Bekijk commits - /: Filter the current view + /: Filter the current view by text ## Remote branches @@ -233,7 +233,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: Stel in als upstream van uitgecheckte branch g: Bekijk reset opties <enter>: Bekijk commits - /: Filter the current view + /: Filter the current view by text ## Remotes @@ -243,7 +243,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Voeg een nieuwe remote toe d: Verwijder remote e: Wijzig remote - /: Filter the current view + /: Filter the current view by text ## Staging @@ -277,7 +277,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Nieuwe branch r: Rename stash <enter>: Bekijk gecommite bestanden - /: Filter the current view + /: Filter the current view by text ## Status @@ -317,7 +317,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: Update submodule URL i: Initialiseer submodule b: Bekijk bulk submodule opties - /: Filter the current view + /: Filter the current view by text ## Tags @@ -329,5 +329,5 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Creëer tag g: Bekijk reset opties <enter>: Bekijk commits - /: Filter the current view + /: Filter the current view by text diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 59eebbe4a..c619bfff8 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -37,7 +37,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ .: Next page <: Scroll to top >: Scroll to bottom - /: Search the current view + /: Search the current view by text H: Scroll left L: Scroll right ]: Next tab @@ -82,7 +82,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ c: Kopiuj commit (przebieranie) C: Kopiuj zakres commitów (przebieranie) <enter>: Przeglądaj pliki commita - /: Search the current view + /: Search the current view by text ## Confirmation panel @@ -113,7 +113,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: Rename branch u: Set/Unset upstream <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Main panel (patch building) @@ -129,7 +129,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: Edytuj plik <space>: Add/Remove line(s) to patch <esc>: Wyście z trybu "linia po linii" - /: Search the current view + /: Search the current view by text ## Menu @@ -137,7 +137,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: Wykonaj
   <esc>: Zamknij
-  /: Filter the current view
+  /: Filter the current view by text
## Pliki @@ -146,7 +146,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <c-o>: Copy the file name to the clipboard d: Pokaż opcje porzucania zmian <space>: Przełącz stan poczekalni - <c-b>: Filter files (staged/unstaged) + <c-b>: Filter files by status c: Zatwierdź zmiany w: Zatwierdź zmiany bez skryptu pre-commit A: Zmień ostatni commit @@ -164,7 +164,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ `: Toggle file tree view M: Open external merge tool (git mergetool) f: Pobierz - /: Search the current view + /: Search the current view by text ## Pliki commita @@ -179,7 +179,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ a: Toggle all files included in patch <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed) `: Toggle file tree view - /: Search the current view + /: Search the current view by text ## Poczekalnia @@ -201,7 +201,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ c: Zatwierdź zmiany w: Zatwierdź zmiany bez skryptu pre-commit C: Zatwierdź zmiany używając edytora - /: Search the current view + /: Search the current view by text ## Reflog @@ -217,7 +217,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: Kopiuj zakres commitów (przebieranie) <c-r>: Reset cherry-picked (copied) commits selection <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Remote branches @@ -232,7 +232,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: Set as upstream of checked-out branch g: Wyświetl opcje resetu <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Remotes @@ -242,7 +242,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Add new remote d: Remove remote e: Edit remote - /: Filter the current view + /: Filter the current view by text ## Scalanie @@ -270,7 +270,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Nowa gałąź r: Rename stash <enter>: Przeglądaj pliki commita - /: Filter the current view + /: Filter the current view by text ## Status @@ -296,7 +296,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: Kopiuj zakres commitów (przebieranie) <c-r>: Reset cherry-picked (copied) commits selection <enter>: Przeglądaj pliki commita - /: Search the current view + /: Search the current view by text ## Submodules @@ -310,7 +310,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: Update submodule URL i: Initialize submodule b: View bulk submodule options - /: Filter the current view + /: Filter the current view by text ## Tags @@ -322,7 +322,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: Create tag g: Wyświetl opcje resetu <enter>: View commits - /: Filter the current view + /: Filter the current view by text ## Zwykłe diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index 85a823ea8..cfd05fec8 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -36,8 +36,8 @@ _Связки клавиш_ ,: Предыдущая страница .: Следующая страница <: Пролистать наверх - /: Найти >: Прокрутить вниз + /: Найти H: Прокрутить влево L: Прокрутить вправо ]: Следующая вкладка @@ -63,6 +63,7 @@ _Связки клавиш_ c: Сохранить изменения w: Закоммитить изменения без предварительного хука коммита C: Сохранить изменения с помощью редактора git + /: Найти ## Главная панель (Обычный) @@ -101,6 +102,7 @@ _Связки клавиш_ e: Редактировать файл <space>: Добавить/удалить строку(и) для патча <esc>: Выйти из сборщика пользовательских патчей + /: Найти ## Журнал ссылок (Reflog) @@ -116,6 +118,7 @@ _Связки клавиш_ C: Скопировать несколько отобранных коммитов (cherry-pick) <c-r>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов <enter>: Просмотреть коммиты + /: Filter the current view by text ## Коммиты @@ -149,6 +152,7 @@ _Связки клавиш_ c: Скопировать отобранные коммит (cherry-pick) C: Скопировать несколько отобранных коммитов (cherry-pick) <enter>: Просмотреть файлы выбранного элемента + /: Найти ## Локальные Ветки @@ -172,6 +176,7 @@ _Связки клавиш_ R: Переименовать ветку u: Установить/убрать upstream-ветку <enter>: Просмотреть коммиты + /: Filter the current view by text ## Меню @@ -179,6 +184,7 @@ _Связки клавиш_ 
   <enter>: Выполнить
   <esc>: Закрыть
+  /: Filter the current view by text
## Панель Подтверждения @@ -201,6 +207,7 @@ _Связки клавиш_ C: Скопировать несколько отобранных коммитов (cherry-pick) <c-r>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов <enter>: Просмотреть файлы выбранного элемента + /: Найти ## Подмодули @@ -214,6 +221,7 @@ _Связки клавиш_ e: Обновить URL подмодуля i: Инициализировать подмодуль b: Просмотреть параметры массового подмодуля + /: Filter the current view by text ## Сводка коммита @@ -235,6 +243,7 @@ _Связки клавиш_ a: Переключить все файлы, включённые в патч <enter>: Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) `: Переключить вид дерева файлов + /: Найти ## Статус @@ -256,6 +265,7 @@ _Связки клавиш_ n: Создать тег g: Просмотреть параметры сброса <enter>: Просмотреть коммиты + /: Filter the current view by text ## Удалённые ветки @@ -268,9 +278,9 @@ _Связки клавиш_ r: Перебазировать переключённую ветку на эту ветку d: Удалить ветку u: Установить как upstream-ветку переключённую ветку - <esc>: Вернуться к списку удалённых репозитории g: Просмотреть параметры сброса <enter>: Просмотреть коммиты + /: Filter the current view by text ## Удалённые репозитории @@ -280,6 +290,7 @@ _Связки клавиш_ n: Добавить новую удалённую ветку d: Удалить удалённую ветку e: Редактировать удалённый репозитории + /: Filter the current view by text ## Файлы @@ -306,6 +317,7 @@ _Связки клавиш_ `: Переключить вид дерева файлов M: Открыть внешний инструмент слияния (git mergetool) f: Получить изменения + /: Найти ## Хранилище @@ -317,4 +329,5 @@ _Связки клавиш_ n: Новая ветка r: Переименовать хранилище <enter>: Просмотреть файлы выбранного элемента + /: Filter the current view by text diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md index b5097a60d..3274b1a0c 100644 --- a/docs/keybindings/Keybindings_zh-CN.md +++ b/docs/keybindings/Keybindings_zh-CN.md @@ -57,7 +57,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ C: 复制提交范围（拣选） <c-r>: 重置已拣选（复制）的提交 <enter>: 查看提交 - /: Filter the current view + /: Filter the current view by text ## 分支页面 @@ -81,7 +81,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ R: 重命名分支 u: Set/Unset upstream <enter>: 查看提交 - /: Filter the current view + /: Filter the current view by text ## 子提交 @@ -111,7 +111,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ e: 更新子模块 URL i: 初始化子模块 b: 查看批量子模块选项 - /: Filter the current view + /: Filter the current view by text ## 提交 @@ -176,7 +176,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <c-o>: 将文件名复制到剪贴板 d: 查看'放弃更改'选项 <space>: 切换暂存状态 - <c-b>: Filter files (staged/unstaged) + <c-b>: Filter files by status c: 提交更改 w: 提交更改而无需预先提交钩子 A: 修补最后一次提交 @@ -222,7 +222,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 创建标签 g: 查看重置选项 <enter>: 查看提交 - /: Filter the current view + /: Filter the current view by text ## 正在合并 @@ -292,7 +292,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <enter>: 执行
   <esc>: 关闭
-  /: Filter the current view
+  /: Filter the current view by text
## 贮藏 @@ -304,7 +304,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 新分支 r: Rename stash <enter>: 查看提交的文件 - /: Filter the current view + /: Filter the current view by text ## 远程分支 @@ -319,7 +319,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ u: 设置为检出分支的上游 g: 查看重置选项 <enter>: 查看提交 - /: Filter the current view + /: Filter the current view by text ## 远程页面 @@ -329,5 +329,5 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 添加新的远程仓库 d: 删除远程 e: 编辑远程仓库 - /: Filter the current view + /: Filter the current view by text diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index a131a9766..68859a23d 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -57,7 +57,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ C: 複製提交範圍 (揀選) <c-r>: 重設選定的揀選 (複製) 提交 <enter>: 檢視提交 - /: Filter the current view + /: Filter the current view by text ## 主視窗 (一般) @@ -126,7 +126,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ 
   <enter>: 執行
   <esc>: 關閉
-  /: Filter the current view
+  /: Filter the current view by text
## 子提交 @@ -156,7 +156,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ e: 更新子模組 URL i: 初始化子模組 b: 查看批量子模組選項 - /: Filter the current view + /: Filter the current view by text ## 提交 @@ -224,7 +224,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ n: 新分支 r: 重新命名收藏 <enter>: 檢視所選項目的檔案 - /: Filter the current view + /: Filter the current view by text ## 本地分支 @@ -248,7 +248,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ R: 重新命名分支 u: 設定/取消設定上游 <enter>: 檢視提交 - /: Filter the current view + /: Filter the current view by text ## 標籤 @@ -260,7 +260,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ n: 建立標籤 g: 檢視重設選項 <enter>: 檢視提交 - /: Filter the current view + /: Filter the current view by text ## 檔案 @@ -314,7 +314,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ n: 新增遠端 d: 移除遠端 e: 編輯遠端 - /: Filter the current view + /: Filter the current view by text ## 遠端分支 @@ -329,5 +329,5 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ u: 將此分支設為當前分支之上游 g: 檢視重設選項 <enter>: 檢視提交 - /: Filter the current view + /: Filter the current view by text 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: `` means ctrl+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: `` means ctrl+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: "推送...",