summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-02-27 13:24:32 +1100
committerskidau <skidau@gmail.com>2015-02-27 13:24:32 +1100
commit85359d51690ce71efcd836acab0cec15cc68ac1e (patch)
tree1eb77fb65d0b4a65c9710382fc54ad020d3610fd /Source
parentae9a63479f20c120b42ccd7f64c7d51fda88e67e (diff)
parent2c54ca0f8446707f509f1a411b0145982f8da61c (diff)
Merge pull request #2124 from RachelBryk/framelimit-hotkeys
Fix order of some hotkeys
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/HotkeyManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
index 00aad63d5c..61aa11e837 100644
--- a/Source/Core/Core/HotkeyManager.cpp
+++ b/Source/Core/Core/HotkeyManager.cpp
@@ -68,8 +68,8 @@ const std::string hotkey_labels[] =
_trans("Connect Wiimote 4"),
_trans("Connect Balance Board"),
- _trans("Volume Up"),
_trans("Volume Down"),
+ _trans("Volume Up"),
_trans("Volume Toggle Mute"),
_trans("Toggle IR"),
@@ -77,8 +77,8 @@ const std::string hotkey_labels[] =
_trans("Toggle EFB Copies"),
_trans("Toggle Fog"),
_trans("Toggle Frame limit"),
- _trans("Increase Frame limit"),
_trans("Decrease Frame limit"),
+ _trans("Increase Frame limit"),
_trans("Freelook Decrease Speed"),
_trans("Freelook Increase Speed"),
@@ -91,10 +91,10 @@ const std::string hotkey_labels[] =
_trans("Freelook Zoom Out"),
_trans("Freelook Reset"),
- _trans("Increase Depth"),
_trans("Decrease Depth"),
- _trans("Increase Convergence"),
+ _trans("Increase Depth"),
_trans("Decrease Convergence"),
+ _trans("Increase Convergence"),
_trans("Load State Slot 1"),
_trans("Load State Slot 2"),