diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 3cc41de6c..cc4a3b042 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1310,7 +1310,8 @@ You can re-activate this dialog in Preferences later."/> - + + + @@ -1528,7 +1531,7 @@ Do you want to save your changes before switching themes?"/> + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index f25889c1e..ee3a02c79 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1151,7 +1151,8 @@ You can define several column markers by using white space to separate the diffe - + + + @@ -1352,7 +1355,7 @@ Do you want to save your changes before switching themes?"/> + diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index 4441aa631..cec9c5d8e 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -353,12 +353,22 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive, } else { - generic_string str2display = TEXT("\""); - str2display += longFileName; - str2display += TEXT("\" cannot be opened:\nFolder \""); - str2display += longFileDir; - str2display += TEXT("\" doesn't exist."); - ::MessageBox(_pPublicInterface->getHSelf(), str2display.c_str(), TEXT("Cannot open file"), MB_OK); + generic_string msg, title; + if (!_nativeLangSpeaker.getMsgBoxLang("OpenFileNoFolderError", title, msg)) + { + title = TEXT("Cannot open file"); + msg = TEXT("\""); + msg += longFileName; + msg += TEXT("\" cannot be opened:\nFolder \""); + msg += longFileDir; + msg += TEXT("\" doesn't exist."); + } + else + { + msg = stringReplace(msg, TEXT("$STR_REPLACE1$"), longFileName); + msg = stringReplace(msg, TEXT("$STR_REPLACE2$"), longFileDir); + } + ::MessageBox(_pPublicInterface->getHSelf(), msg.c_str(), title.c_str(), MB_OK); } if (!isCreateFileSuccessful)