# HG changeset patch # User Wuzzy # Date 1556565882 -7200 # Node ID 24df603fbcd2f9114d7aa0e4d431d31c342420df # Parent bb412d8e435fd7f78fde01bee4c63a5e2b581e59 Match key names in sdlkeys with SDL-pretty printed names (for localization) diff -r bb412d8e435f -r 24df603fbcd2 QTfrontend/sdlkeys.cpp --- a/QTfrontend/sdlkeys.cpp Mon Apr 29 21:23:50 2019 +0200 +++ b/QTfrontend/sdlkeys.cpp Mon Apr 29 21:24:42 2019 +0200 @@ -100,22 +100,22 @@ {"y", "Y"}, {"z", "Z"}, {"delete", QT_TRANSLATE_NOOP("binds (keys)", "Delete")}, - {"keypad_0", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 0")}, - {"keypad_1", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 1")}, - {"keypad_2", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 2")}, - {"keypad_3", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 3")}, - {"keypad_4", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 4")}, - {"keypad_5", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 5")}, - {"keypad_6", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 6")}, - {"keypad_7", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 7")}, - {"keypad_8", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 8")}, - {"keypad_9", QT_TRANSLATE_NOOP("binds (keys)", "Numpad 9")}, - {"keypad_.", QT_TRANSLATE_NOOP("binds (keys)", "Numpad .")}, - {"keypad_/", QT_TRANSLATE_NOOP("binds (keys)", "Numpad /")}, - {"keypad_*", QT_TRANSLATE_NOOP("binds (keys)", "Numpad *")}, - {"keypad_-", QT_TRANSLATE_NOOP("binds (keys)", "Numpad -")}, - {"keypad_+", QT_TRANSLATE_NOOP("binds (keys)", "Numpad +")}, - {"enter", QT_TRANSLATE_NOOP("binds (keys)", "Enter")}, + {"keypad_0", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 0")}, + {"keypad_1", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 1")}, + {"keypad_2", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 2")}, + {"keypad_3", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 3")}, + {"keypad_4", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 4")}, + {"keypad_5", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 5")}, + {"keypad_6", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 6")}, + {"keypad_7", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 7")}, + {"keypad_8", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 8")}, + {"keypad_9", QT_TRANSLATE_NOOP("binds (keys)", "Keypad 9")}, + {"keypad_.", QT_TRANSLATE_NOOP("binds (keys)", "Keypad .")}, + {"keypad_/", QT_TRANSLATE_NOOP("binds (keys)", "Keypad /")}, + {"keypad_*", QT_TRANSLATE_NOOP("binds (keys)", "Keypad *")}, + {"keypad_-", QT_TRANSLATE_NOOP("binds (keys)", "Keypad -")}, + {"keypad_+", QT_TRANSLATE_NOOP("binds (keys)", "Keypad +")}, + {"keypad_enter", QT_TRANSLATE_NOOP("binds (keys)", "Keypad Enter")}, {"up", QT_TRANSLATE_NOOP("binds (keys)", "Up")}, {"down", QT_TRANSLATE_NOOP("binds (keys)", "Down")}, {"right", QT_TRANSLATE_NOOP("binds (keys)", "Right")}, @@ -123,8 +123,8 @@ {"insert", QT_TRANSLATE_NOOP("binds (keys)", "Insert")}, {"home", QT_TRANSLATE_NOOP("binds (keys)", "Home")}, {"end", QT_TRANSLATE_NOOP("binds (keys)", "End")}, - {"pageup", QT_TRANSLATE_NOOP("binds (keys)", "Page up")}, - {"pagedown", QT_TRANSLATE_NOOP("binds (keys)", "Page down")}, + {"pageup", QT_TRANSLATE_NOOP("binds (keys)", "PageUp")}, + {"pagedown", QT_TRANSLATE_NOOP("binds (keys)", "PageDown")}, {"f1", "F1"}, {"f2", "F2"}, {"f3", "F3"}, @@ -140,25 +140,19 @@ {"f13", "F13"}, {"f14", "F14"}, {"f15", "F15"}, - {"numlock", QT_TRANSLATE_NOOP("binds (keys)", "Num lock")}, - {"capslock", QT_TRANSLATE_NOOP("binds (keys)", "Caps lock")}, - {"scrolllock", QT_TRANSLATE_NOOP("binds (keys)", "Scroll lock")}, - {"right_shift", QT_TRANSLATE_NOOP("binds (keys)", "Right shift")}, - {"left_shift", QT_TRANSLATE_NOOP("binds (keys)", "Left shift")}, - {"right_ctrl", QT_TRANSLATE_NOOP("binds (keys)", "Right ctrl")}, - {"left_ctrl", QT_TRANSLATE_NOOP("binds (keys)", "Left ctrl")}, - {"right_alt", QT_TRANSLATE_NOOP("binds (keys)", "Right alt")}, - {"left_alt", QT_TRANSLATE_NOOP("binds (keys)", "Left alt")}, -#if defined Q_OS_WIN - {"right_gui", QT_TRANSLATE_NOOP("binds (keys)", "Right Windows")}, - {"left_gui", QT_TRANSLATE_NOOP("binds (keys)", "Left Windows")} -#elif defined Q_OS_MACOS - {"right_gui", QT_TRANSLATE_NOOP("binds (keys)", "Right command")}, - {"left_gui", QT_TRANSLATE_NOOP("binds (keys)", "Left command")} -#else - {"right_gui", QT_TRANSLATE_NOOP("binds (keys)", "Right meta")}, - {"left_gui", QT_TRANSLATE_NOOP("binds (keys)", "Left meta")} -#endif + {"numlock", QT_TRANSLATE_NOOP("binds (keys)", "Numlock")}, + {"capslock", QT_TRANSLATE_NOOP("binds (keys)", "CapsLock")}, + {"scrolllock", QT_TRANSLATE_NOOP("binds (keys)", "ScrollLock")}, + {"right_shift", QT_TRANSLATE_NOOP("binds (keys)", "Right Shift")}, + {"left_shift", QT_TRANSLATE_NOOP("binds (keys)", "Left Shift")}, + {"right_ctrl", QT_TRANSLATE_NOOP("binds (keys)", "Right Ctrl")}, + {"left_ctrl", QT_TRANSLATE_NOOP("binds (keys)", "Left Ctrl")}, + {"right_alt", QT_TRANSLATE_NOOP("binds (keys)", "Right Alt")}, + {"left_alt", QT_TRANSLATE_NOOP("binds (keys)", "Left Alt")}, + //: Windows key / Command key / Meta key /Super key (right) + {"right_gui", QT_TRANSLATE_NOOP("binds (keys)", "Right GUI")}, + //: Windows key / Command key / Meta key /Super key (left) + {"left_gui", QT_TRANSLATE_NOOP("binds (keys)", "Left GUI")} }; // button name definitions for Microsoft's XBox360 controller