diff --git a/Build/Changes.txt b/Build/Changes.txt index ae7a1c740..ce59e715c 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current BETA Version 5.19.818.#(build) (2019-08-18) +Current BETA Version 5.19.825.#(build) (2019-08-25) ================================================== -------------------------------------------------- @@ -64,6 +64,7 @@ REMOVED: TRANSLATIONS (MUI): -------------------------------------------------- - Portuguese Brazilian (pt-BR) (in progress). +- Slovak (sk-SK) (in progress). - Swedish (sv-SE) (in progress). - Turkish (tr-TR) (in progress). diff --git a/Notepad3.sln b/Notepad3.sln index bc4d298f7..e4f77eec9 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc {15428F5A-16F1-4DA5-9F12-0411183E3DC0} = {15428F5A-16F1-4DA5-9F12-0411183E3DC0} {9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5} {EC255B64-2C2F-4CB6-9D40-4542893FE5E6} = {EC255B64-2C2F-4CB6-9D40-4542893FE5E6} + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} = {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} = {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} {7E16647B-CA40-43E8-8ABB-E4C430C186CA} = {7E16647B-CA40-43E8-8ABB-E4C430C186CA} {2EB07C98-0F3F-4CB6-B448-099770AF1989} = {2EB07C98-0F3F-4CB6-B448-099770AF1989} @@ -37,6 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa {18CD506D-5596-4B58-B868-57FAAC657C6B} = {18CD506D-5596-4B58-B868-57FAAC657C6B} {73B1A06D-F536-4F39-80AA-798A1E8023DE} = {73B1A06D-F536-4F39-80AA-798A1E8023DE} {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} = {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} + {8346318F-632A-4514-AAD7-A93593759823} = {8346318F-632A-4514-AAD7-A93593759823} {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} = {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} {E0DEC59F-D155-46D8-8866-9F305CC75A2B} = {E0DEC59F-D155-46D8-8866-9F305CC75A2B} {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} = {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} @@ -238,8 +240,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_sv_se", "minipath\langua EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_sk_sk", "minipath\language\mp_sk_sk\mp_sk_sk.vcxproj", "{8346318F-632A-4514-AAD7-A93593759823}" + ProjectSection(ProjectDependencies) = postProject + {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_sk_sk", "language\np3_sk_sk\np3_sk_sk.vcxproj", "{8BB7B168-FC6D-463A-BBE4-FA595BDD5753}" + ProjectSection(ProjectDependencies) = postProject + {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Notepad3DLL.sln b/Notepad3DLL.sln index ec81eaafe..bdce4a178 100644 --- a/Notepad3DLL.sln +++ b/Notepad3DLL.sln @@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3DLL {15428F5A-16F1-4DA5-9F12-0411183E3DC0} = {15428F5A-16F1-4DA5-9F12-0411183E3DC0} {9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5} {EC255B64-2C2F-4CB6-9D40-4542893FE5E6} = {EC255B64-2C2F-4CB6-9D40-4542893FE5E6} + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} = {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} = {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} {7E16647B-CA40-43E8-8ABB-E4C430C186CA} = {7E16647B-CA40-43E8-8ABB-E4C430C186CA} {2EB07C98-0F3F-4CB6-B448-099770AF1989} = {2EB07C98-0F3F-4CB6-B448-099770AF1989} @@ -37,6 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa {18CD506D-5596-4B58-B868-57FAAC657C6B} = {18CD506D-5596-4B58-B868-57FAAC657C6B} {73B1A06D-F536-4F39-80AA-798A1E8023DE} = {73B1A06D-F536-4F39-80AA-798A1E8023DE} {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} = {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} + {8346318F-632A-4514-AAD7-A93593759823} = {8346318F-632A-4514-AAD7-A93593759823} {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} = {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} {E0DEC59F-D155-46D8-8866-9F305CC75A2B} = {E0DEC59F-D155-46D8-8866-9F305CC75A2B} {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} = {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} @@ -243,6 +245,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_sv_se", "language\np3_s {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_sk_sk", "minipath\language\mp_sk_sk\mp_sk_sk.vcxproj", "{8346318F-632A-4514-AAD7-A93593759823}" + ProjectSection(ProjectDependencies) = postProject + {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_sk_sk", "language\np3_sk_sk\np3_sk_sk.vcxproj", "{8BB7B168-FC6D-463A-BBE4-FA595BDD5753}" + ProjectSection(ProjectDependencies) = postProject + {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -567,6 +579,22 @@ Global {07C218D7-D510-4D63-95E8-F661F62ED418}.Release|Win32.Build.0 = Release|Win32 {07C218D7-D510-4D63-95E8-F661F62ED418}.Release|x64.ActiveCfg = Release|x64 {07C218D7-D510-4D63-95E8-F661F62ED418}.Release|x64.Build.0 = Release|x64 + {8346318F-632A-4514-AAD7-A93593759823}.Debug|Win32.ActiveCfg = Debug|Win32 + {8346318F-632A-4514-AAD7-A93593759823}.Debug|Win32.Build.0 = Debug|Win32 + {8346318F-632A-4514-AAD7-A93593759823}.Debug|x64.ActiveCfg = Debug|x64 + {8346318F-632A-4514-AAD7-A93593759823}.Debug|x64.Build.0 = Debug|x64 + {8346318F-632A-4514-AAD7-A93593759823}.Release|Win32.ActiveCfg = Release|Win32 + {8346318F-632A-4514-AAD7-A93593759823}.Release|Win32.Build.0 = Release|Win32 + {8346318F-632A-4514-AAD7-A93593759823}.Release|x64.ActiveCfg = Release|x64 + {8346318F-632A-4514-AAD7-A93593759823}.Release|x64.Build.0 = Release|x64 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Debug|Win32.Build.0 = Debug|Win32 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Debug|x64.ActiveCfg = Debug|x64 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Debug|x64.Build.0 = Debug|x64 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Release|Win32.ActiveCfg = Release|Win32 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Release|Win32.Build.0 = Release|Win32 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Release|x64.ActiveCfg = Release|x64 + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -614,6 +642,8 @@ Global {6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {8FD783D5-8709-432D-A88E-6E3073AFF220} {3E19AA6A-0935-4320-962A-C1E9378B387C} = {8FD783D5-8709-432D-A88E-6E3073AFF220} {07C218D7-D510-4D63-95E8-F661F62ED418} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2} + {8346318F-632A-4514-AAD7-A93593759823} = {8FD783D5-8709-432D-A88E-6E3073AFF220} + {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C0B8FE68-ECBC-4173-9027-E1EC2C9B5BDF} diff --git a/Versions/build.txt b/Versions/build.txt index 7fb83ec25..f315c0665 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2596 +2597 diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 649450a55..2390b6de3 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -218,7 +218,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(en-GB) English (brit.) translation by hpwamr" + IDS_MUI_TRANSL_AUTHOR "(en-GB) English translation by hpwamr" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 696ed23d8..f33ca9a2b 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -218,7 +218,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(en-US) English(amer.) text by Flo Balmer et al." + IDS_MUI_TRANSL_AUTHOR "(en-US) English text by Flo Balmer et al." IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index c93fb5486..0c596fa0d 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -218,7 +218,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 (완성형) 번역 testinsovr" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 testinsovr" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s - 스타일 +++" IDS_MUI_TITLE_FIXCUR " %s: %s - 스타일" diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index dfe0bb397..b9c48e447 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -218,7 +218,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(sk-SK) Slovak (Slovakia) translation by Dylino" + IDS_MUI_TRANSL_AUTHOR "(sk-SK) Slovensk� preklad od Dylina" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/minipath/language/mp_en_gb/strings_en_gb.rc b/minipath/language/mp_en_gb/strings_en_gb.rc index 4abf0ca80..a842e25b5 100644 --- a/minipath/language/mp_en_gb/strings_en_gb.rc +++ b/minipath/language/mp_en_gb/strings_en_gb.rc @@ -131,7 +131,7 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "(en-GB) English (brit.) translation by hpwamr" + IDS_MUI_TRANSL_AUTHOR "(en-GB) English translation by hpwamr" END diff --git a/minipath/language/mp_en_us/strings_en_us.rc b/minipath/language/mp_en_us/strings_en_us.rc index 374783a9d..2c17d2ba0 100644 --- a/minipath/language/mp_en_us/strings_en_us.rc +++ b/minipath/language/mp_en_us/strings_en_us.rc @@ -131,7 +131,7 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "(en-US) English(amer.) text by Flo Balmer et al." + IDS_MUI_TRANSL_AUTHOR "(en-US) English text by Flo Balmer et al." END diff --git a/minipath/language/mp_ko_kr/strings_ko_kr.rc b/minipath/language/mp_ko_kr/strings_ko_kr.rc index 5e3e316d7..07f84dde3 100644 --- a/minipath/language/mp_ko_kr/strings_ko_kr.rc +++ b/minipath/language/mp_ko_kr/strings_ko_kr.rc @@ -131,7 +131,7 @@ BEGIN IDS_COPYMOVE "지정 프로그램 디렉토리 선택." IDS_CREATELINK "새로 만들 링크의 디렉토리를 선택하세요." IDS_SAVESETTINGS "설정 저장\n현재의 프로그램 설정이 저장 되었습니다." - IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 (완성형) 번역 testinsovr" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 testinsovr" END diff --git a/minipath/language/mp_sk_sk/dialogs_sk_sk.rc b/minipath/language/mp_sk_sk/dialogs_sk_sk.rc index a0f6e607a..1dbd78a56 100644 --- a/minipath/language/mp_sk_sk/dialogs_sk_sk.rc +++ b/minipath/language/mp_sk_sk/dialogs_sk_sk.rc @@ -415,7 +415,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (United Kingdom) resources +#endif // Slovak (Slovakia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_sk_sk/mp_sk_sk.rc b/minipath/language/mp_sk_sk/mp_sk_sk.rc index dd711970e..17aea72d7 100644 --- a/minipath/language/mp_sk_sk/mp_sk_sk.rc +++ b/minipath/language/mp_sk_sk/mp_sk_sk.rc @@ -52,7 +52,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (United Kingdom) resources +#endif // Slovak (Slovakia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_sk_sk/strings_sk_sk.rc b/minipath/language/mp_sk_sk/strings_sk_sk.rc index 39b603b91..0d4aa34a8 100644 --- a/minipath/language/mp_sk_sk/strings_sk_sk.rc +++ b/minipath/language/mp_sk_sk/strings_sk_sk.rc @@ -131,11 +131,11 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "(sk-SK) Slovak (Slovakia) translation by Dylino" + IDS_MUI_TRANSL_AUTHOR "Slovensk� preklad od Dylina" END -#endif // English (United Kingdom) resources +#endif // Slovak (Slovakia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini index 6ec419d11..31fc1ec5a 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini @@ -24,6 +24,7 @@ POLISH=true PORTUGUESEBR=true RUSSIAN=true SIMPCHINESE=true +SLOVAK=true SPANISH=true SWEDISH=true TURKISH=true diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini index 538cd4e7d..ba395b4b6 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini @@ -123,7 +123,7 @@ RUSSIAN=true ;SERBIAN=true ;SERBIANLATIN=true SIMPCHINESE=true -;SLOVAK=true +SLOVAK=true ;SLOVENIAN=true SPANISH=true ;SPANISHINTERNATIONAL=true diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index cc525e40e..038144e3a 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -28,7 +28,7 @@ setlocal enableextensions :: ==================================================================================================================== -set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU it-IT ja-JP ko-KR nl-NL pl-PL pt-BR ru-RU sv-SE tr-TR zh-CN +set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU it-IT ja-JP ko-KR nl-NL pl-PL pt-BR ru-RU sk-SK sv-SE tr-TR zh-CN :: ==================================================================================================================== diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 13676309a..df4216a25 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c index 9e518ec7f..15d6a8391 100644 --- a/src/MuiLanguage.c +++ b/src/MuiLanguage.c @@ -41,7 +41,7 @@ MUILANGUAGE MUI_LanguageDLLs[] = { IDS_MUI_LANG_PL_PL, L"pl-PL", L"Polski (Polska)\t\t\t[%s]", MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), false, false }, { IDS_MUI_LANG_PT_BR, L"pt-BR", L"Portugu챗s (Brasil)\t\t\t[%s]", MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), false, false }, { IDS_MUI_LANG_RU_RU, L"ru-RU", L"�졥꺫곎곍분먁� (P棘�곎곍먈�)\t\t\t[%s]", MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), false, false }, - { IDS_MUI_LANG_SV_SE, L"sk-SK", L"Slovak (Slovakia)\t\t\t[%s]", MAKELANGID(LANG_SLOVAK, SUBLANG_SLOVAK_SLOVAKIA), false, false }, + { IDS_MUI_LANG_SV_SE, L"sk-SK", L"Sloven훾ina (Slovensko)\t\t\t[%s]", MAKELANGID(LANG_SLOVAK, SUBLANG_SLOVAK_SLOVAKIA), false, false }, { IDS_MUI_LANG_SV_SE, L"sv-SE", L"Svenska (Sverige)\t\t\t[%s]", MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), false, false }, { IDS_MUI_LANG_TR_TR, L"tr-TR", L"T체rk챌e (T체rkiye)\t\t\t[%s]", MAKELANGID(LANG_TURKISH, SUBLANG_TURKISH_TURKEY), false, false }, { IDS_MUI_LANG_ZH_CN, L"zh-CN", L"訝��뻼竊덁릎�쎖竊�\t\t\t[%s]", MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), false, false} diff --git a/src/VersionEx.h b/src/VersionEx.h index a5dc8319c..6dac29056 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 818 -#define VERSION_BUILD 2596 +#define VERSION_REV 825 +#define VERSION_BUILD 2597 #define SCINTILLA_VER 420 #define ONIGURUMA_REGEX_VER 6.9.3 #define UCHARDET_VER 2018.09.27