diff --git a/Build/License.txt b/Build/License.txt
index e7ec7926a..027bdb0b0 100644
--- a/Build/License.txt
+++ b/Build/License.txt
@@ -45,3 +45,9 @@ You should have received a copy of the GNU General Public License along with thi
grepWin is developed by Stefan Küng (https://tools.stefankueng.com/grepWin.html).
Distributed grepWin binaries (currently v1.9.2) and corresponding source code (according to GPL v3.0)
can be retrived at folowing location https://github.com/stefankueng/grepWin/releases/tag/1.9.2.
+
+Modified grepWinNP3 binaries (Notepad3 MOD, currently v1.9.2) and corresponding source code
+(according to GPL v3.0) can be retrived at folowing location:
+https://github.com/RaiKoHoff/grepWin/tree/grepWinNP3.
+
+########################################################################################################
diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 4bca2e72a..069e1cbb4 100644
--- a/Build/Notepad3.ini
+++ b/Build/Notepad3.ini
@@ -15,7 +15,7 @@ SettingsVersion=4
;DefaultWindowPosition=
;DenyVirtualSpaceAccess=0
;filebrowser.exe=minipath.exe
-;grepWin.exe=grepWin\grepWin_portable.exe
+;grepWin.exe=grepWinNP3_portable.exe
;FileCheckInverval=2000
;FileDlgFilters=
;FileLoadWarningMB=64
diff --git a/Build/grepWin/[af-ZA] Afrikaans (Suid-Afrika).lang b/Build/grepWin/Afrikaans (Suid-Afrika) [af-ZA].lang
similarity index 100%
rename from Build/grepWin/[af-ZA] Afrikaans (Suid-Afrika).lang
rename to Build/grepWin/Afrikaans (Suid-Afrika) [af-ZA].lang
diff --git a/Build/grepWin/[de-DE] Deutsch (Deutschland).lang b/Build/grepWin/Deutsch (Deutschland) [de-DE].lang
similarity index 100%
rename from Build/grepWin/[de-DE] Deutsch (Deutschland).lang
rename to Build/grepWin/Deutsch (Deutschland) [de-DE].lang
diff --git a/Build/grepWin/[en-GB] English (United Kingdom).lang b/Build/grepWin/English (United Kingdom) [en-GB].lang
similarity index 100%
rename from Build/grepWin/[en-GB] English (United Kingdom).lang
rename to Build/grepWin/English (United Kingdom) [en-GB].lang
diff --git a/Build/grepWin/[es-ES] Español (España).lang b/Build/grepWin/Español (España) [es-ES].lang
similarity index 100%
rename from Build/grepWin/[es-ES] Español (España).lang
rename to Build/grepWin/Español (España) [es-ES].lang
diff --git a/Build/grepWin/[fr-FR] Français (France).lang b/Build/grepWin/Français (France) [fr-FR].lang
similarity index 100%
rename from Build/grepWin/[fr-FR] Français (France).lang
rename to Build/grepWin/Français (France) [fr-FR].lang
diff --git a/Build/grepWin/GPL_v3.0_LICENSE.txt b/Build/grepWin/GPL_v3.0_LICENSE.txt
index 5b993967c..2af0eb39e 100644
--- a/Build/grepWin/GPL_v3.0_LICENSE.txt
+++ b/Build/grepWin/GPL_v3.0_LICENSE.txt
@@ -623,7 +623,11 @@ copy of the Program in return for a fee.
########################################################################################################
grepWin is developed by Stefan Küng (https://tools.stefankueng.com/grepWin.html).
-Distributed grepWin binaries (currently v1.9.2) and corresponding source code (according to GPL v3.0)
+Original grepWin binaries (currently v1.9.2) and corresponding source code (according to GPL v3.0)
can be retrived at folowing location https://github.com/stefankueng/grepWin/releases/tag/1.9.2.
+Modified grepWinNP3 binaries (Notepad3 MOD, currently v1.9.2) and corresponding source code
+(according to GPL v3.0) can be retrived at folowing location:
+https://github.com/RaiKoHoff/grepWin/tree/grepWinNP3.
+
########################################################################################################
diff --git a/Build/grepWin/[it-IT] Italiano (Italia).lang b/Build/grepWin/Italiano (Italia) [it-IT].lang
similarity index 100%
rename from Build/grepWin/[it-IT] Italiano (Italia).lang
rename to Build/grepWin/Italiano (Italia) [it-IT].lang
diff --git a/Build/grepWin/[hu-HU] Magyar (Magyarország).lang b/Build/grepWin/Magyar (Magyarország) [hu-HU].lang
similarity index 100%
rename from Build/grepWin/[hu-HU] Magyar (Magyarország).lang
rename to Build/grepWin/Magyar (Magyarország) [hu-HU].lang
diff --git a/Build/grepWin/[nl-NL] Nederlands (Nederland).lang b/Build/grepWin/Nederlands (Nederland) [nl-NL].lang
similarity index 100%
rename from Build/grepWin/[nl-NL] Nederlands (Nederland).lang
rename to Build/grepWin/Nederlands (Nederland) [nl-NL].lang
diff --git a/Build/grepWin/[pl-PL] Polski (Polska)Polski.lang b/Build/grepWin/Polski (Polska)Polski [pl-PL].lang
similarity index 100%
rename from Build/grepWin/[pl-PL] Polski (Polska)Polski.lang
rename to Build/grepWin/Polski (Polska)Polski [pl-PL].lang
diff --git a/Build/grepWin/[pt-BR] Português (Brasil).lang b/Build/grepWin/Português (Brasil) [pt-BR].lang
similarity index 100%
rename from Build/grepWin/[pt-BR] Português (Brasil).lang
rename to Build/grepWin/Português (Brasil) [pt-BR].lang
diff --git a/Build/grepWin/[ko-KR] 한국어 (대한민국).lang b/Build/grepWin/Slovenčina (Slovensko) [sk-SK].lang
similarity index 100%
rename from Build/grepWin/[ko-KR] 한국어 (대한민국).lang
rename to Build/grepWin/Slovenčina (Slovensko) [sk-SK].lang
diff --git a/Build/grepWin/[sk-SK] Slovenčina (Slovensko).lang b/Build/grepWin/Svenska (Sverige) [sv-SE].lang
similarity index 100%
rename from Build/grepWin/[sk-SK] Slovenčina (Slovensko).lang
rename to Build/grepWin/Svenska (Sverige) [sv-SE].lang
diff --git a/Build/grepWin/[tr-TR] Türkçe (Türkiye).lang b/Build/grepWin/Türkçe (Türkiye) [tr-TR].lang
similarity index 100%
rename from Build/grepWin/[tr-TR] Türkçe (Türkiye).lang
rename to Build/grepWin/Türkçe (Türkiye) [tr-TR].lang
diff --git a/Build/grepWin/grepWinNP3_portable.exe b/Build/grepWin/grepWinNP3_portable.exe
index e9baad91e..6733eb5c5 100644
Binary files a/Build/grepWin/grepWinNP3_portable.exe and b/Build/grepWin/grepWinNP3_portable.exe differ
diff --git a/Build/grepWin/grepWinNP3_x64_portable.exe b/Build/grepWin/grepWinNP3_x64_portable.exe
index 7e1c41e0b..043db7039 100644
Binary files a/Build/grepWin/grepWinNP3_x64_portable.exe and b/Build/grepWin/grepWinNP3_x64_portable.exe differ
diff --git a/Build/grepWin/[be-BY] Беларуская (Беларусь).lang b/Build/grepWin/Беларуская (Беларусь) [be-BY].lang
similarity index 100%
rename from Build/grepWin/[be-BY] Беларуская (Беларусь).lang
rename to Build/grepWin/Беларуская (Беларусь) [be-BY].lang
diff --git a/Build/grepWin/[ru-RU] Русский (Pоссия).lang b/Build/grepWin/Русский (Pоссия) [ru-RU].lang
similarity index 100%
rename from Build/grepWin/[ru-RU] Русский (Pоссия).lang
rename to Build/grepWin/Русский (Pоссия) [ru-RU].lang
diff --git a/Build/grepWin/[ja-JP] 日本語 （日本）.lang b/Build/grepWin/日本語 （日本） [ja-JP].lang
similarity index 100%
rename from Build/grepWin/[ja-JP] 日本語 （日本）.lang
rename to Build/grepWin/日本語 （日本） [ja-JP].lang
diff --git a/Build/grepWin/[zh-CN] 简体中文 （中国）.lang b/Build/grepWin/简体中文 （中国） [zh-CN].lang
similarity index 100%
rename from Build/grepWin/[zh-CN] 简体中文 （中国）.lang
rename to Build/grepWin/简体中文 （中国） [zh-CN].lang
diff --git a/Build/grepWin/[sv-SE] Svenska (Sverige).lang b/Build/grepWin/한국어 (대한민국) [ko-KR].lang
similarity index 100%
rename from Build/grepWin/[sv-SE] Svenska (Sverige).lang
rename to Build/grepWin/한국어 (대한민국) [ko-KR].lang
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 2d47d2964..a7b861b22 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -161,12 +161,12 @@ copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y
::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
copy "%NP3_GREPWIN_DIR%\GPL_v3.0_LICENSE.txt" "%NP3_PORTAPP_DIR%\Other\Help\grepWin_GPL_v3.0_LICENSE.txt" /Y /V
-mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWin"
-copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWin\grepWinNP3_portable.exe" /Y /V
-copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWin\" /Y /V
-mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWin"
-copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_x64_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWin\grepWinNP3_portable.exe" /Y /V
-copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWin\" /Y /V
+mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng"
+copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWinNP3_portable.exe" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
+mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng"
+copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_x64_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWinNP3_portable.exe" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
:: --------------------------------------------------------------------------------------------------------------------
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index b176d7cab..626bb4329 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 NF
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 5cd8adcd9..7666b0b34 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -3481,17 +3481,12 @@ static grepWin_t grepWinIniSettings[13] =
void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
{
WCHAR tchTemp[MAX_PATH] = { L'\0' };
- WCHAR tchModulePath[MAX_PATH] = { L'\0' };
+ WCHAR tchNotepad3Path[MAX_PATH] = { L'\0' };
WCHAR tchExeFile[MAX_PATH] = { L'\0' };
WCHAR tchOptions[MAX_PATH] = { L'\0' };
- WCHAR tchParams[MAX_PATH * 2] = { L'\0' };
- WCHAR tchGrepWinDir[MAX_PATH] = { L'\0' };
- WCHAR tchIniFilePath[MAX_PATH] = { L'\0' };
- const WCHAR* const tchParamFmt = L"/portable /content %s /searchpath:\"%s\" /searchfor:\"%s\"";
-
- GetModuleFileName(NULL, tchModulePath, COUNTOF(tchModulePath));
- PathCanonicalizeEx(tchModulePath, COUNTOF(tchModulePath));
+ GetModuleFileName(NULL, tchNotepad3Path, COUNTOF(tchNotepad3Path));
+ PathCanonicalizeEx(tchNotepad3Path, COUNTOF(tchNotepad3Path));
// grepWin executable
if (StrIsNotEmpty(Settings2.GrepWinPath)) {
@@ -3502,25 +3497,36 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
StringCchCopy(tchExeFile, COUNTOF(tchExeFile), Constants.FileSearchGrepWin);
}
if (PathIsRelative(tchExeFile)) {
- StringCchCopy(tchTemp, COUNTOF(tchTemp), tchModulePath);
+ StringCchCopy(tchTemp, COUNTOF(tchTemp), tchNotepad3Path);
PathCchRemoveFileSpec(tchTemp, COUNTOF(tchTemp));
PathAppend(tchTemp, tchExeFile);
if (PathFileExists(tchTemp)) {
StringCchCopy(tchExeFile, COUNTOF(tchExeFile), tchTemp);
}
}
+
// working (grepwin.ini) directory
- if (PathFileExists(tchExeFile)) {
+ WCHAR tchGrepWinDir[MAX_PATH] = { L'\0' };
+ WCHAR tchIniFilePath[MAX_PATH] = { L'\0' };
+
+ if (PathFileExists(tchExeFile))
+ {
StringCchCopy(tchGrepWinDir, COUNTOF(tchGrepWinDir), tchExeFile);
PathCchRemoveFileSpec(tchGrepWinDir, COUNTOF(tchGrepWinDir));
// relative Notepad3 path (for grepWin's EditorCmd)
- if (PathRelativePathToW(tchTemp, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchModulePath, FILE_ATTRIBUTE_NORMAL)) {
- StringCchCopy(tchModulePath, COUNTOF(tchModulePath), tchTemp);
+ if (PathRelativePathTo(tchTemp, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchNotepad3Path, FILE_ATTRIBUTE_NORMAL)) {
+ StringCchCopy(tchNotepad3Path, COUNTOF(tchNotepad3Path), tchTemp);
}
+
// grepWin INI-File
- StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchGrepWinDir);
- PathAppend(tchIniFilePath, L"grepwin.ini");
-
+ const WCHAR* const gwIniFileName = L"grepwin.ini";
+ StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), StrIsNotEmpty(Globals.IniFile) ? Globals.IniFile : Globals.IniFileDefault);
+ PathRemoveFileSpec(tchIniFilePath);
+ PathAppend(tchIniFilePath, gwIniFileName);
+ if (PathIsRelative(tchIniFilePath)) {
+ StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchGrepWinDir);
+ PathAppend(tchIniFilePath, gwIniFileName);
+ }
if (!PathFileExists(tchIniFilePath)) {
HANDLE hFile = CreateFile(tchIniFilePath,
GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
@@ -3531,6 +3537,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
}
}
+
// get grepWin language
int lngIdx = -1;
for (int i = 0; i < grepWinLang_CountOf(); ++i) {
@@ -3559,8 +3566,8 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
}
}
- //~StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% /m %s - %%path%%", tchModulePath, searchPattern);
- StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% - %%path%%", tchModulePath);
+ //~StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% /m %s - %%path%%", tchNotepad3Path, searchPattern);
+ StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% - %%path%%", tchNotepad3Path);
IniSectionSetString(L"global", L"editorcmd", tchTemp);
// [settings]
@@ -3575,13 +3582,23 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
}
// search directory
- StringCchCopy(tchTemp, COUNTOF(tchTemp), Globals.CurrentFile);
- if (StrIsNotEmpty(tchTemp)) {
- PathCchRemoveFileSpec(tchTemp, COUNTOF(tchTemp));
+ WCHAR tchSearchDir[MAX_PATH] = { L'\0' };
+ if (StrIsNotEmpty(Globals.CurrentFile)) {
+ StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.CurrentFile);
+ PathCchRemoveFileSpec(tchSearchDir, COUNTOF(tchSearchDir));
+ }
+ else {
+ StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.WorkingDirectory);
}
// grepWin arguments
- StringCchPrintf(tchParams, COUNTOF(tchParams), tchParamFmt, tchOptions, tchTemp, searchPattern);
+ const WCHAR* const tchParamFmt = L"/portable /content %s /inipath:\"%s\" /searchpath:\"%s\" /searchfor:\"%s\"";
+ WCHAR tchParams[MAX_PATH * 2] = { L'\0' };
+ // relative grepwin.ini path (for shorter cmdline)
+ if (PathRelativePathTo(tchTemp, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchIniFilePath, FILE_ATTRIBUTE_NORMAL)) {
+ StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchTemp);
+ }
+ StringCchPrintf(tchParams, COUNTOF(tchParams), tchParamFmt, tchOptions, tchIniFilePath, tchSearchDir, searchPattern);
//if (StrIsNotEmpty(searchPattern)) {
// SetClipboardTextW(hwnd, searchPattern, StringCchLen(searchPattern, 0));
//}
diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c
index 6929af185..a00cd50d0 100644
--- a/src/MuiLanguage.c
+++ b/src/MuiLanguage.c
@@ -63,25 +63,25 @@ int MuiLanguages_CountOf() { return COUNTOF(MUI_LanguageDLLs); };
grepWinLng_t grepWinLangResName[] =
{
- { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L"[en-US] English (United States).lang"},
- { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L"[af-ZA] Afrikaans (Suid-Afrika).lang"},
- { MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), L"[be-BY] Беларуская (Беларусь).lang"},
- { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), L"[de-DE] Deutsch (Deutschland).lang"},
- { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), L"[en-GB] English (United Kingdom).lang"},
- { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), L"[es-ES] Español (España).lang"},
- { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), L"[fr-FR] Français (France).lang"},
- { MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), L"[hu-HU] Magyar (Magyarország).lang"},
- { MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), L"[it-IT] Italiano (Italia).lang"},
- { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), L"[ja-JP] 日本語 （日本）.lang"},
- { MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), L"[ko-KR] 한국어 (대한민국).lang"},
- { MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), L"[nl-NL] Nederlands (Nederland).lang"},
- { MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), L"[pl-PL] Polski (Polska)Polski.lang"},
- { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), L"[pt-BR] Português (Brasil).lang"},
- { MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), L"[ru-RU] Русский (Pоссия).lang"},
- { MAKELANGID(LANG_SLOVAK, SUBLANG_SLOVAK_SLOVAKIA), L"[sk-SK] Slovenčina (Slovensko).lang"},
- { MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), L"[sv-SE] Svenska (Sverige).lang"},
- { MAKELANGID(LANG_TURKISH, SUBLANG_TURKISH_TURKEY), L"[tr-TR] Türkçe (Türkiye).lang"},
- { MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), L"[zh-CN] 简体中文 （中国）.lang"}
+ { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L".\\lng\\gwLng\\English (United States) [en-US].lang"},
+ { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L".\\lng\\gwLng\\Afrikaans (Suid-Afrika) [af-ZA].lang"},
+ { MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), L".\\lng\\gwLng\\Беларуская (Беларусь) [be-BY].lang"},
+ { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), L".\\lng\\gwLng\\Deutsch (Deutschland) [de-DE].lang"},
+ { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), L".\\lng\\gwLng\\English (United Kingdom) [en-GB].lang"},
+ { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), L".\\lng\\gwLng\\Español (España) [es-ES].lang"},
+ { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), L".\\lng\\gwLng\\Français (France) [fr-FR].lang"},
+ { MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang"},
+ { MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), L".\\lng\\gwLng\\Italiano (Italia) [it-IT].lang"},
+ { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), L".\\lng\\gwLng\\日本語 （日本）[ja-JP].lang"},
+ { MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), L".\\lng\\gwLng\\한국어 (대한민국) [ko-KR].lang"},
+ { MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), L".\\lng\\gwLng\\Nederlands (Nederland) [nl-NL].lang"},
+ { MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), L".\\lng\\gwLng\\Polski (Polska)Polski [pl-PL].lang"},
+ { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), L".\\lng\\gwLng\\Português (Brasil) [pt-BR].lang"},
+ { MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), L".\\lng\\gwLng\\Русский (Pоссия) [ru-RU].lang"},
+ { MAKELANGID(LANG_SLOVAK, SUBLANG_SLOVAK_SLOVAKIA), L".\\lng\\gwLng\\Slovenčina (Slovensko) [sk-SK].lang"},
+ { MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), L".\\lng\\gwLng\\Svenska (Sverige) [sv-SE].lang"},
+ { MAKELANGID(LANG_TURKISH, SUBLANG_TURKISH_TURKEY), L".\\lng\\gwLng\\Türkçe (Türkiye) [tr-TR].lang"},
+ { MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), L".\\lng\\gwLng\\简体中文 （中国）[zh-CN].lang"}
};
int grepWinLang_CountOf() { return COUNTOF(grepWinLangResName); };
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 9b43fc880..dcd201d73 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -55,7 +55,7 @@
CONSTANTS_T const Constants = {
2 // StdDefaultLexerID
, L"minipath.exe" // FileBrowserMiniPath
- , L"grepWin\\grepWinNP3_portable.exe" // FileSearchGrepWin
+ , L"grepWinNP3_portable.exe" // FileSearchGrepWin
, L"ThemeFileName" // StylingThemeName
, L"Settings" // Inifile Section "Settings"
, L"Settings2" // Inifile Section "Settings2"
diff --git a/src/Version.h b/src/Version.h
index a0d7422b2..2d8450d82 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -74,7 +74,9 @@
#if defined(_MSC_VER)
#if (_MSC_VER == 1925)
- #if(_MSC_FULL_VER >= 192528610)
+ #if(_MSC_FULL_VER >= 192528611)
+ #define VER_CPL MS Visual C++ 2019 v16.5.1
+ #elif(_MSC_FULL_VER >= 192528610)
#define VER_CPL MS Visual C++ 2019 v16.5.0
#endif
#elif (_MSC_VER == 1924)
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ec40e2a04..b8991df38 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,11 +9,11 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 324
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH NF
-#define VERSION_COMMIT_ID t7820-rk
+#define VERSION_COMMIT_ID nebukadn