From 387609c3be3a7b9072024bf2ffb62078ca2cd176 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Nov 2018 15:02:04 -0500 Subject: [PATCH] shortcuts: Remove #if __INTEL__. This isn't true on x86_64 (so we were displaying the wrong key names there). The actual names of the keys should probably be fetched from the selected keyboard. --- src/preferences/shortcuts/ShortcutsSpec.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/preferences/shortcuts/ShortcutsSpec.cpp b/src/preferences/shortcuts/ShortcutsSpec.cpp index edc058e3c3..f0ada5ab55 100644 --- a/src/preferences/shortcuts/ShortcutsSpec.cpp +++ b/src/preferences/shortcuts/ShortcutsSpec.cpp @@ -618,16 +618,8 @@ ShortcutsSpec::_InitModifierNames() "Name for modifier on keyboard"); sControlName = B_TRANSLATE_COMMENT("Control", "Name for modifier on keyboard"); -// TODO: Wrapping in __INTEL__ define probably won't work to extract catkeys? -#if __INTEL__ sOptionName = B_TRANSLATE_COMMENT("Option", "Name for modifier on keyboard"); sCommandName = B_TRANSLATE_COMMENT("Alt", "Name for modifier on keyboard"); -#else - sOptionName = B_TRANSLATE_COMMENT("Option", - "Name for modifier on keyboard"); - sCommandName = B_TRANSLATE_COMMENT("Command", - "Name for modifier on keyboard"); -#endif }