diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
| commit | fdff4cb1ffa76e894dd41ca5f97d31f122fd3f86 (patch) | |
| tree | 20059e8c98923d27f235c9f12de31be97e20240f /Source/Core/DolphinWX/Src/Main.cpp | |
| parent | 2b77acc705eae11fdb4a25be6d6ea5db1fa52e21 (diff) | |
| parent | 5a8ad9230271a5088b0cf582932959214c6b5527 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/DolphinWX/Src/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 709c2b4b53..d38c90e07f 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -115,37 +115,37 @@ bool DolphinApp::OnInit() wxCmdLineEntryDesc cmdLineDesc[] = { { - wxCMD_LINE_SWITCH, wxS("h"), wxS("help"), + wxCMD_LINE_SWITCH, "h", "help", _("Show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { - wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"), + wxCMD_LINE_SWITCH, "d", "debugger", _("Opens the debugger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"), + wxCMD_LINE_SWITCH, "l", "logger", _("Opens the logger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("e"), wxS("exec"), + wxCMD_LINE_OPTION, "e", "exec", _("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"), + wxCMD_LINE_SWITCH, "b", "batch", _("Exit Dolphin with emulator"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"), + wxCMD_LINE_OPTION, "V", "video_backend", _("Specify a video backend"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"), + wxCMD_LINE_OPTION, "A", "audio_emulation", _("Low level (LLE) or high level (HLE) audio"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, |