Skip to content

Commit

Permalink
Improve localizations and fix recorder not allowing multiple modifier…
Browse files Browse the repository at this point in the history
…s when option is present (#187)
  • Loading branch information
francisfeng authored Oct 21, 2024
1 parent 528cd5c commit 9203a8d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"record_shortcut" = "设置快捷键";
"press_shortcut" = "按下快捷键";
"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用,因为它已被用作菜单项 “%@” 的快捷键。";
"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用,因为它已被用作菜单项“%@”的快捷键。";
"keyboard_shortcut_used_by_system" = "当前快捷键无法使用,因为它已被用作系统快捷键。";
"keyboard_shortcuts_can_be_changed" = "可以在 “系统设置 › 键盘 › 键盘快捷键” 中更改大多数系统快捷键。";
"keyboard_shortcut_disallowed" = "Option 修飾鍵必須與 Command 或 Control 組合使用。";
"keyboard_shortcuts_can_be_changed" = "可以在“系统设置 › 键盘 › 键盘快捷键”中更改大多数系统快捷键。";
"keyboard_shortcut_disallowed" = "Option键必须与Command键或Control键组合使用。";
"force_use_shortcut" = "强制使用";
"ok" = "好";
"space_key" = "空格";
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"keyboard_shortcut_used_by_menu_item" = "此快速鍵無法使用,因為它已被選單項目「%@」使用。";
"keyboard_shortcut_used_by_system" = "此快速鍵無法使用,因為它已被系統使用。";
"keyboard_shortcuts_can_be_changed" = "可以在「系統設定 › 鍵盤 › 鍵盤快速鍵」中更改大多數的系統快速鍵。";
"keyboard_shortcut_disallowed" = "Option 鍵必須與 Command 或 Control 鍵組合使用。";
"keyboard_shortcut_disallowed" = "Option鍵必須與Command鍵或Control鍵組合使用。";
"force_use_shortcut" = "強制使用";
"ok" = "好";
"space_key" = "空格";
2 changes: 1 addition & 1 deletion Sources/KeyboardShortcuts/Shortcut.swift
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extension KeyboardShortcuts.Shortcut {

// If Option is present, ensure there's at least one modifier other than Option and Shift
let otherModifiers: NSEvent.ModifierFlags = [.command, .control, .function, .capsLock]
return !modifiers.isDisjoint(with: otherModifiers)
return modifiers.isDisjoint(with: otherModifiers)
}

/**
Expand Down

0 comments on commit 9203a8d

Please sign in to comment.