diff --git a/Notepad3.sln b/Notepad3.sln index 34d8abe18..c470e06b7 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -37,11 +37,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_es_es", "language\np3_e {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_uk", "language\np3_en_uk\np3_en_uk.vcxproj", "{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}" - ProjectSection(ProjectDependencies) = postProject - {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_us", "language\np3_en_us\np3_en_us.vcxproj", "{9DC82B0D-2484-4925-92AD-1237C64CCB78}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_af_za", "language\np3_af_za\np3_af_za.vcxproj", "{C8E80B4C-C0FD-4119-A05A-AB372A61007F}" @@ -54,6 +49,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_nl_nl", "language\np3_n {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_gb", "language\np3_en_gb\np3_en_gb.vcxproj", "{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -130,14 +127,6 @@ Global {3B8C289D-FF47-4237-AD7B-0702230F41A3}.Release|Win32.Build.0 = Release|Win32 {3B8C289D-FF47-4237-AD7B-0702230F41A3}.Release|x64.ActiveCfg = Release|x64 {3B8C289D-FF47-4237-AD7B-0702230F41A3}.Release|x64.Build.0 = Release|x64 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|Win32.ActiveCfg = Debug|Win32 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|Win32.Build.0 = Debug|Win32 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|x64.ActiveCfg = Debug|x64 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|x64.Build.0 = Debug|x64 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|Win32.ActiveCfg = Release|Win32 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|Win32.Build.0 = Release|Win32 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|x64.ActiveCfg = Release|x64 - {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|x64.Build.0 = Release|x64 {9DC82B0D-2484-4925-92AD-1237C64CCB78}.Debug|Win32.ActiveCfg = Debug|Win32 {9DC82B0D-2484-4925-92AD-1237C64CCB78}.Debug|Win32.Build.0 = Debug|Win32 {9DC82B0D-2484-4925-92AD-1237C64CCB78}.Debug|x64.ActiveCfg = Debug|x64 @@ -162,6 +151,14 @@ Global {9B31015C-CB08-4B4B-A957-313A93F862F5}.Release|Win32.Build.0 = Release|Win32 {9B31015C-CB08-4B4B-A957-313A93F862F5}.Release|x64.ActiveCfg = Release|x64 {9B31015C-CB08-4B4B-A957-313A93F862F5}.Release|x64.Build.0 = Release|x64 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|Win32.ActiveCfg = Debug|Win32 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|Win32.Build.0 = Debug|Win32 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|x64.ActiveCfg = Debug|x64 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Debug|x64.Build.0 = Debug|x64 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|Win32.ActiveCfg = Release|Win32 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|Win32.Build.0 = Release|Win32 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|x64.ActiveCfg = Release|x64 + {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/language/np3_en_uk/dialogs_en_uk.rc b/language/np3_en_gb/dialogs_en_gb.rc similarity index 100% rename from language/np3_en_uk/dialogs_en_uk.rc rename to language/np3_en_gb/dialogs_en_gb.rc diff --git a/language/np3_en_uk/dllmain.cpp b/language/np3_en_gb/dllmain.cpp similarity index 100% rename from language/np3_en_uk/dllmain.cpp rename to language/np3_en_gb/dllmain.cpp diff --git a/language/np3_en_uk/encode_en_uk.rc b/language/np3_en_gb/encode_en_gb.rc similarity index 100% rename from language/np3_en_uk/encode_en_uk.rc rename to language/np3_en_gb/encode_en_gb.rc diff --git a/language/np3_en_uk/lexer_en_uk.rc b/language/np3_en_gb/lexer_en_gb.rc similarity index 100% rename from language/np3_en_uk/lexer_en_uk.rc rename to language/np3_en_gb/lexer_en_gb.rc diff --git a/language/np3_en_uk/menu_en_uk.rc b/language/np3_en_gb/menu_en_gb.rc similarity index 99% rename from language/np3_en_uk/menu_en_uk.rc rename to language/np3_en_gb/menu_en_gb.rc index f02b7e208..2d2c0751c 100644 Binary files a/language/np3_en_uk/menu_en_uk.rc and b/language/np3_en_gb/menu_en_gb.rc differ diff --git a/language/np3_en_uk/np3_en_uk.cpp b/language/np3_en_gb/np3_en_gb.cpp similarity index 100% rename from language/np3_en_uk/np3_en_uk.cpp rename to language/np3_en_gb/np3_en_gb.cpp diff --git a/language/np3_en_uk/np3_en_uk.rc b/language/np3_en_gb/np3_en_gb.rc similarity index 83% rename from language/np3_en_uk/np3_en_uk.rc rename to language/np3_en_gb/np3_en_gb.rc index ad656e5a4..b141c2531 100644 Binary files a/language/np3_en_uk/np3_en_uk.rc and b/language/np3_en_gb/np3_en_gb.rc differ diff --git a/language/np3_en_uk/np3_en_uk.vcxproj b/language/np3_en_gb/np3_en_gb.vcxproj similarity index 93% rename from language/np3_en_uk/np3_en_uk.vcxproj rename to language/np3_en_gb/np3_en_gb.vcxproj index f012b4169..42ca0cea4 100644 --- a/language/np3_en_uk/np3_en_uk.vcxproj +++ b/language/np3_en_gb/np3_en_gb.vcxproj @@ -108,9 +108,9 @@ true - mkdir "$(TargetDir)..\en-UK" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-UK\np3lng.dll.mui" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-UK\np3lng.dll.mui" + mkdir "$(TargetDir)..\en-GB" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-GB\np3lng.dll.mui" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-GB\np3lng.dll.mui" @@ -135,9 +135,9 @@ true - mkdir "$(TargetDir)..\en-UK" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-UK\np3lng.dll.mui" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-UK\np3lng.dll.mui" + mkdir "$(TargetDir)..\en-GB" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-GB\np3lng.dll.mui" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-GB\np3lng.dll.mui" @@ -166,9 +166,9 @@ true - mkdir "$(TargetDir)..\en-UK" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-UK\np3lng.dll.mui" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-UK\np3lng.dll.mui" + mkdir "$(TargetDir)..\en-GB" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-GB\np3lng.dll.mui" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-GB\np3lng.dll.mui" @@ -197,9 +197,9 @@ true - mkdir "$(TargetDir)..\en-UK" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-UK\np3lng.dll.mui" -"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-UK\np3lng.dll.mui" + mkdir "$(TargetDir)..\en-GB" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\en-GB\np3lng.dll.mui" +"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\en-GB\np3lng.dll.mui" @@ -217,7 +217,7 @@ - + Create Create @@ -226,32 +226,32 @@ - + true true true true - + true true true true - + true true true true - + true true true true - - + + true true true diff --git a/language/np3_en_uk/np3_en_uk.vcxproj.filters b/language/np3_en_gb/np3_en_gb.vcxproj.filters similarity index 84% rename from language/np3_en_uk/np3_en_uk.vcxproj.filters rename to language/np3_en_gb/np3_en_gb.vcxproj.filters index 93807af71..10b1bfe48 100644 --- a/language/np3_en_uk/np3_en_uk.vcxproj.filters +++ b/language/np3_en_gb/np3_en_gb.vcxproj.filters @@ -32,27 +32,27 @@ Source Files - + Source Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files diff --git a/language/np3_en_uk/resource.h b/language/np3_en_gb/resource.h similarity index 100% rename from language/np3_en_uk/resource.h rename to language/np3_en_gb/resource.h diff --git a/language/np3_en_uk/stdafx.cpp b/language/np3_en_gb/stdafx.cpp similarity index 100% rename from language/np3_en_uk/stdafx.cpp rename to language/np3_en_gb/stdafx.cpp diff --git a/language/np3_en_uk/stdafx.h b/language/np3_en_gb/stdafx.h similarity index 100% rename from language/np3_en_uk/stdafx.h rename to language/np3_en_gb/stdafx.h diff --git a/language/np3_en_uk/strings_en_uk.rc b/language/np3_en_gb/strings_en_gb.rc similarity index 100% rename from language/np3_en_uk/strings_en_uk.rc rename to language/np3_en_gb/strings_en_gb.rc diff --git a/language/np3_en_uk/targetver.h b/language/np3_en_gb/targetver.h similarity index 100% rename from language/np3_en_uk/targetver.h rename to language/np3_en_gb/targetver.h diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index d6218050b..82ed4ddea 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -35,7 +35,7 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe -set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR nl-NL +set NP3_LANGUAGE_SET=af-ZA de-DE en-GB es-ES fr-FR nl-NL set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141 @@ -60,7 +60,7 @@ set DEVNAME= call :GETBUILD :: VERSION fallback from build date -set VERSION=3.%YY%.%MM%%DD%.%BUILD% +set VERSION=4.%YY%.%MM%%DD%.%BUILD% set FILEVER= call :GETFILEVER "%NP3_WIN32_DIR%\Notepad3.exe" diff --git a/src/Notepad3.c b/src/Notepad3.c index d512c203a..ecc85caa1 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -134,7 +134,7 @@ WCHAR g_tchPrefLngLocName[MINI_BUFFER]; LANGID g_iPrefLngLocID = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT); HMODULE g_hLngResContainer = NULL; #define LNG_AVAILABLE_COUNT 6 -static WCHAR* const g_tchAvailableLanguages = L"af-ZA de-DE es-ES en-UK fr-FR nl-NL"; // en-US internal +static WCHAR* const g_tchAvailableLanguages = L"af-ZA de-DE es-ES en-GB fr-FR nl-NL"; // en-US internal static LANGID const g_iAvailableLanguages[LNG_AVAILABLE_COUNT] = { 1078, 1031, 3082, 2057, 1036, 1043 }; // 1033 internal WCHAR g_tchFileDlgFilters[XXXL_BUFFER] = { L'\0' };