1 files changed, 7 insertions, 28 deletions
diff --git a/CPP/7zip/UI/Explorer/MyMessages.cpp b/CPP/7zip/UI/Explorer/MyMessages.cpp
index 62ac42ec..70c2a460 100755..100644
--- a/CPP/7zip/UI/Explorer/MyMessages.cpp
+++ b/CPP/7zip/UI/Explorer/MyMessages.cpp
@@ -4,12 +4,10 @@
 
 #include "MyMessages.h"
 
-#include "Windows/Error.h"
-#include "Windows/ResourceString.h"
+#include "../../../Windows/ErrorMsg.h"
+#include "../../../Windows/ResourceString.h"
 
-#ifdef LANG
 #include "../FileManager/LangUtils.h"
-#endif
 
 using namespace NWindows;
 
@@ -18,41 +16,22 @@ void ShowErrorMessage(HWND window, LPCWSTR message)
   ::MessageBoxW(window, message, L"7-Zip", MB_OK | MB_ICONSTOP);
 }
 
-void ShowErrorMessageHwndRes(HWND window, UINT resID
-    #ifdef LANG
-    , UInt32 langID
-    #endif
-    )
+void ShowErrorMessageHwndRes(HWND window, UINT resID)
 {
-  ShowErrorMessage(window,
-  #ifdef LANG
-  LangString(resID, langID)
-  #else
-  MyLoadStringW(resID)
-  #endif
-  );
+  ShowErrorMessage(window, LangString(resID));
 }
 
-void ShowErrorMessageRes(UINT resID
-    #ifdef LANG
-    , UInt32 langID
-    #endif
-    )
+void ShowErrorMessageRes(UINT resID)
 {
-  ShowErrorMessageHwndRes(0, resID
-  #ifdef LANG
-  , langID
-  #endif
-  );
+  ShowErrorMessageHwndRes(0, resID);
 }
 
 void ShowErrorMessageDWORD(HWND window, DWORD errorCode)
 {
-  ShowErrorMessage(window, NError::MyFormatMessageW(errorCode));
+  ShowErrorMessage(window, NError::MyFormatMessage(errorCode));
 }
 
 void ShowLastErrorMessage(HWND window)
 {
   ShowErrorMessageDWORD(window, ::GetLastError());
 }
-