CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ chg: language en-UK renamed to en-GB (correct language code)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-06-20 00:54:41 +02:00
parent c567ab7e10
commit ba9b433cfc
17 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Notepad3.sln
View File

@ -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

0
language/np3_en_uk/dialogs_en_uk.rc → language/np3_en_gb/dialogs_en_gb.rc
View File

0
language/np3_en_uk/dllmain.cpp → language/np3_en_gb/dllmain.cpp
View File

0
language/np3_en_uk/encode_en_uk.rc → language/np3_en_gb/encode_en_gb.rc
View File

0
language/np3_en_uk/lexer_en_uk.rc → language/np3_en_gb/lexer_en_gb.rc
View File

BIN
language/np3_en_uk/menu_en_uk.rc → language/np3_en_gb/menu_en_gb.rc
View File

Binary file not shown.

0
language/np3_en_uk/np3_en_uk.cpp → language/np3_en_gb/np3_en_gb.cpp
View File

BIN
language/np3_en_uk/np3_en_uk.rc → language/np3_en_gb/np3_en_gb.rc
View File

Binary file not shown.

38
language/np3_en_uk/np3_en_uk.vcxproj → language/np3_en_gb/np3_en_gb.vcxproj
View File

@ -108,9 +108,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>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"
<Command>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"
</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -135,9 +135,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>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"
<Command>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"
</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -166,9 +166,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>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"
<Command>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"
</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -197,9 +197,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>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"
<Command>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"
</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -217,7 +217,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="np3_en_uk.cpp" />
<ClCompile Include="np3_en_gb.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@ -226,32 +226,32 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="dialogs_en_uk.rc">
<ResourceCompile Include="dialogs_en_gb.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="encode_en_uk.rc">
<ResourceCompile Include="encode_en_gb.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="lexer_en_uk.rc">
<ResourceCompile Include="lexer_en_gb.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="menu_en_uk.rc">
<ResourceCompile Include="menu_en_gb.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="np3_en_uk.rc" />
<ResourceCompile Include="strings_en_uk.rc">
<ResourceCompile Include="np3_en_gb.rc" />
<ResourceCompile Include="strings_en_gb.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

14
language/np3_en_uk/np3_en_uk.vcxproj.filters → language/np3_en_gb/np3_en_gb.vcxproj.filters
View File

@ -32,27 +32,27 @@
<ClCompile Include="dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="np3_en_uk.cpp">
<ClCompile Include="np3_en_gb.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="np3_en_uk.rc">
<ResourceCompile Include="np3_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="encode_en_uk.rc">
<ResourceCompile Include="encode_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="dialogs_en_uk.rc">
<ResourceCompile Include="dialogs_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="menu_en_uk.rc">
<ResourceCompile Include="menu_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="strings_en_uk.rc">
<ResourceCompile Include="strings_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="lexer_en_uk.rc">
<ResourceCompile Include="lexer_en_gb.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>

0
language/np3_en_uk/resource.h → language/np3_en_gb/resource.h
View File

0
language/np3_en_uk/stdafx.cpp → language/np3_en_gb/stdafx.cpp
View File

0
language/np3_en_uk/stdafx.h → language/np3_en_gb/stdafx.h
View File

0
language/np3_en_uk/strings_en_uk.rc → language/np3_en_gb/strings_en_gb.rc
View File

0
language/np3_en_uk/targetver.h → language/np3_en_gb/targetver.h
View File

4
np3portableapp/build_np3portableapp.cmd
View File

@ -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"

2
src/Notepad3.c
View File

@ -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' };