summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/ctrlmenu.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
commitbf4640c309c655c6cb7bc5b9bbab5c03029ccd86 (patch)
treec50f6f204d34c7a1888ab41cdf6c5250ffe7b8af /src/emu/ui/ctrlmenu.cpp
parentcc24a339d8c0517259084b5c178d784626ba965c (diff)
parenta0ba40749d98488dafb84d365e4a6e44a4c01f84 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Resolved Conflicts: - src/osd/modules/render/d3d/d3dhlsl.cpp - src/osd/modules/render/d3d/d3dhlsl.h - src/osd/modules/render/drawd3d.cpp - src/osd/modules/render/drawd3d.h - src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/ui/ctrlmenu.cpp')
-rw-r--r--src/emu/ui/ctrlmenu.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/ui/ctrlmenu.cpp b/src/emu/ui/ctrlmenu.cpp
index 74b35abd8e3..f954a596f7a 100644
--- a/src/emu/ui/ctrlmenu.cpp
+++ b/src/emu/ui/ctrlmenu.cpp
@@ -17,14 +17,14 @@ const char *ui_menu_controller_mapping::m_device_status[] = { "none", "keyboard"
ui_menu_controller_mapping::ctrl_option ui_menu_controller_mapping::m_options[] = {
{ 0, nullptr, nullptr },
- { 0, "Lightgun Device Assignment", OPTION_LIGHTGUN_DEVICE },
- { 0, "Trackball Device Assignment", OPTION_TRACKBALL_DEVICE },
- { 0, "Pedal Device Assignment", OPTION_PEDAL_DEVICE },
- { 0, "Adstick Device Assignment", OPTION_ADSTICK_DEVICE },
- { 0, "Paddle Device Assignment", OPTION_PADDLE_DEVICE },
- { 0, "Dial Device Assignment", OPTION_DIAL_DEVICE },
- { 0, "Positional Device Assignment", OPTION_POSITIONAL_DEVICE },
- { 0, "Mouse Device Assignment", OPTION_MOUSE_DEVICE }
+ { 0, __("Lightgun Device Assignment"), OPTION_LIGHTGUN_DEVICE },
+ { 0, __("Trackball Device Assignment"), OPTION_TRACKBALL_DEVICE },
+ { 0, __("Pedal Device Assignment"), OPTION_PEDAL_DEVICE },
+ { 0, __("Adstick Device Assignment"), OPTION_ADSTICK_DEVICE },
+ { 0, __("Paddle Device Assignment"), OPTION_PADDLE_DEVICE },
+ { 0, __("Dial Device Assignment"), OPTION_DIAL_DEVICE },
+ { 0, __("Positional Device Assignment"), OPTION_POSITIONAL_DEVICE },
+ { 0, __("Mouse Device Assignment"), OPTION_MOUSE_DEVICE }
};
//-------------------------------------------------
@@ -88,7 +88,7 @@ void ui_menu_controller_mapping::populate()
for (int d = 1; d < ARRAY_LENGTH(m_options); ++d)
{
UINT32 arrow_flags = get_arrow_flags(0, ARRAY_LENGTH(m_device_status) - 1, m_options[d].status);
- item_append(m_options[d].description, m_device_status[m_options[d].status], arrow_flags, (void *)(FPTR)d);
+ item_append(_(m_options[d].description), m_device_status[m_options[d].status], arrow_flags, (void *)(FPTR)d);
}
item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);