aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2017-01-11 08:42:41 -0500
committerGitHub <[email protected]>2017-01-11 08:42:41 -0500
commit5b71be06a2efc42acf1af22a63730a947d7a1978 (patch)
treea5adbe0242ae43f06034113d383ad002bc73d36e /ShiftOS.WinForms
parent5958b0acff0227648e89abe89b91e8b4c48d253e (diff)
parent32fc0f960d99af9345cc920ccefb5f4b55e5c92b (diff)
downloadshiftos_thereturn-5b71be06a2efc42acf1af22a63730a947d7a1978.tar.gz
shiftos_thereturn-5b71be06a2efc42acf1af22a63730a947d7a1978.tar.bz2
shiftos_thereturn-5b71be06a2efc42acf1af22a63730a947d7a1978.zip
Merge pull request #31 from vicr123/master
Catch exception when a command throws an unhandled exception
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Resources/strings_en.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt
index 032a554..54c9b54 100644
--- a/ShiftOS.WinForms/Resources/strings_en.txt
+++ b/ShiftOS.WinForms/Resources/strings_en.txt
@@ -176,6 +176,7 @@ If a system file is deleted by the virus scanner, it will be replaced.",
"{COMMAND_DEV_MULTARG_DESCRIPTION}":"A command which requiers multiple arguments",
"{ERR_COMMAND_NOT_FOUND}":"Command not found.",
+ "{ERROR_EXCEPTION_THROWN_IN_METHOD}":"An error occurred within the command. Error details:",
"{MUD_ERROR}":"MUD error",
"{PROLOGUE_NO_USER_DETECTED}":"No user detected. Please enter a username.",
@@ -236,4 +237,4 @@ If a system file is deleted by the virus scanner, it will be replaced.",
"{DIALOG_NAME}":"Dialog",
"{COLOR_PICKER_NAME}":"Color Picker",
"{CHAT_NAME}":"Chat",
-} \ No newline at end of file
+}