separate fixes

src/_locales/dict.browser.json

@@ -388,16 +388,16 @@
  "zh_TW": "後一分頁（當前面板）"
  },
  "KbSwitchToNextTab": {
- "en": "Switch to the next tab (using mouse-wheel settings for tabs switching)",
- "ru": "Переключиться на следующую вкладку (используя настройки колесика мыши для переключения вкладок)",
- "zh_CN": "切换到下一个标签页(使用鼠标滚轮设置切换标签页)",
- "zh_TW": "切換到下一個分頁(依據滑鼠滾輪切換設定決定切換行為)"
+ "en": "Switch to the next tab",
+ "ru": "Переключиться на следующую вкладку",
+ "zh_CN": "切换到下一个标签页",
+ "zh_TW": "切換到下一個分頁"
  },
  "KbSwitchToPrevTab": {
- "en": "Switch to the prev tab (using mouse-wheel settings for tabs switching)",
- "ru": "Переключиться на предыдущую вкладку (используя настройки колесика мыши для переключения вкладок)",
- "zh_CN": "切换到上一个标签页(使用鼠标滚轮设置切换标签页)",
- "zh_TW": "切換到上一個分頁(依據滑鼠滾輪切換設定決定切換行為)"
+ "en": "Switch to the prev tab",
+ "ru": "Переключиться на предыдущую вкладку",
+ "zh_CN": "切换到上一个标签页",
+ "zh_TW": "切換到上一個分頁"
  },
  "KbSwitchToParentTab": {
  "en": "Switch to parent tab",

src/_locales/dict.setup-page.ts

@@ -3852,6 +3852,12 @@ Beispiele: "*", "ctrl+$", "ctrl+alt+g"`,
  zh_CN: '切换标签',
  zh_TW: '切換分頁',
  },
+ 'settings.kb_switch_act_note': {
+ en: '- using mouse-wheel settings for tabs switching',
+ ru: '- используя настройки колесика мыши для переключения вкладок',
+ zh_CN: '- 使用鼠标滚轮切换设置决定：\n - 切换范围（面板/全局）\n - 切换时是否跳过/循环',
+ zh_TW: '- 依據滑鼠滾輪切換設定決定：\n - 切換範圍（面板/全域）\n - 切換時是否跳過/循環',
+ },
  'settings.kb_move_tabs': {
  en: 'Moving tabs',
  ru: 'Перемещение вкладок',

src/defaults/menu.ts

@@ -9,7 +9,7 @@ export const TABS_MENU: MenuConf = [
  },
  {
  name: '%menu.tab.reopen_in_sub_menu_name',
- opts: ['reopenInNewWin', 'reopenInWin', 'reopenInCtr', 'reopenInNewCtr'],
+ opts: ['reopenInNewWin', 'reopenInWin', 'separator-6', 'reopenInCtr', 'reopenInNewCtr'],
  },
  {
  name: '%menu.tab.colorize_',

src/page.setup/components/keybindings.vue

@@ -106,7 +106,9 @@
  h2 {{translate('settings.kb_switching_tab')}}
  span.header-shadow
  KeybindingField.-no-separator(:keybinding="Keybindings.reactive.byName.switch_to_next_tab")
+ .info {{translate('settings.kb_switch_act_note')}}
  KeybindingField(:keybinding="Keybindings.reactive.byName.switch_to_prev_tab")
+ .info {{translate('settings.kb_switch_act_note')}}
  KeybindingField(:keybinding="Keybindings.reactive.byName.switch_to_parent_tab")
  KeybindingField(:keybinding="Keybindings.reactive.byName.switch_to_unpinned_tab_0")
  KeybindingField(:keybinding="Keybindings.reactive.byName.switch_to_unpinned_tab_1")

src/page.setup/components/settings.mouse.vue

@@ -9,19 +9,20 @@ section(ref="el")
  :opts="Settings.getOpts('hScrollAction')"
  :folded="true"
  @update:value="Settings.saveDebounced(150)")
- ToggleField(
- label="settings.one_panel_switch_per_scroll"
- v-model:value="Settings.state.onePanelSwitchPerScroll"
- :inactive="Settings.state.hScrollAction !== 'switch_panels'"
- @update:value="Settings.saveDebounced(150)"
- )
+ .sub-fields
+ ToggleField(
+ label="settings.one_panel_switch_per_scroll"
+ v-model:value="Settings.state.onePanelSwitchPerScroll"
+ :inactive="Settings.state.hScrollAction !== 'switch_panels'"
+ @update:value="Settings.saveDebounced(150)"
+ )
  SelectField(
  label="settings.scroll_through_tabs"
  optLabel="settings.scroll_through_tabs_"
  v-model:value="Settings.state.scrollThroughTabs"
  :folded="true"
  :opts="Settings.getOpts('scrollThroughTabs')"
- :note="Settings.state.scrollThroughTabs === 'psp' ? translate('settings.scroll_through_tabs_preselect_note') : undefined"
+ :note="(Settings.state.scrollThroughTabs === 'psp' || Settings.state.scrollThroughTabs === 'psg') ? translate('settings.scroll_through_tabs_preselect_note') : undefined"
  @update:value="Settings.saveDebounced(150)")
  .sub-fields
  ToggleField(

src/services/menu.actions.ts

@@ -15,7 +15,7 @@ import { BOOKMARKS_MENU, BOOKMARKS_PANEL_MENU } from 'src/defaults/menu'
 import { HISTORY_MENU, NEW_TAB_MENU } from 'src/defaults/menu'
 import { OTHER_PANELS_MENU } from 'src/defaults/menu'
 import { Snapshots } from './snapshots'
-import { translate } from 'src/dict'
+import { translate, LANG } from 'src/dict'
 import { Search } from 'src/services/search'
 
 export type OpenCallback = (blocks: MenuBlock[], x?: number, y?: number) => void
@@ -292,7 +292,7 @@ function createMenuBlocks(config: MenuConf, customForced?: boolean): MenuBlock[]
 }
 
 export function shrinkLabel(parentLabel: string, label?: string): string | undefined {
- if (!label || label.length - parentLabel.length < 2) return
+ if (!label || label.length - parentLabel.length < 2 || LANG === 'zh') return
 
  const preLen = parentLabel.length
  let cutIndex = preLen