diff --git a/Notepad3.sln b/Notepad3.sln index 28bf1c3b5..7a485be70 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -335,22 +335,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_hi_in", "minipath\langua {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_es_mx", "language\np3_es_mx\np3_es_mx.vcxproj", "{B6757299-D2DD-4103-834D-45227AC13CB7}" - ProjectSection(ProjectDependencies) = postProject - {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_es_mx", "minipath\language\mp_es_mx\mp_es_mx.vcxproj", "{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}" - ProjectSection(ProjectDependencies) = postProject - {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lexilla", "lexilla\Lexilla.vcxproj", "{6D470002-E04D-4BBB-8B57-D20C2721FECE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uxtheme-stub", "src\DarkMode\uxtheme-stub\uxtheme-stub.vcxproj", "{0873B090-7FFD-4ABD-9B42-619A06C5041F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user32-stub", "src\DarkMode\user32-stub\user32-stub.vcxproj", "{1F757558-0E57-4DE5-82D6-A14E9D81F05F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_es_la", "minipath\language\mp_es_la\mp_es_la.vcxproj", "{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}" + ProjectSection(ProjectDependencies) = postProject + {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_es_la", "language\np3_es_la\np3_es_la.vcxproj", "{B6757299-D2DD-4103-834D-45227AC13CB7}" + ProjectSection(ProjectDependencies) = postProject + {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -1307,42 +1307,6 @@ Global {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|Win32.Build.0 = Release|Win32 {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|x64.ActiveCfg = Release|x64 {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|x64.Build.0 = Release|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM.ActiveCfg = Debug|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM64.ActiveCfg = Debug|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.ActiveCfg = Debug|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.Build.0 = Debug|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.ActiveCfg = Debug|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.Build.0 = Debug|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|ARM.ActiveCfg = Release_Dbg|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|ARM64.ActiveCfg = Release_Dbg|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|Win32.ActiveCfg = Release_Dbg|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|Win32.Build.0 = Release_Dbg|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|x64.ActiveCfg = Release_Dbg|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|x64.Build.0 = Release_Dbg|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM.ActiveCfg = Release|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM64.ActiveCfg = Release|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.ActiveCfg = Release|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.Build.0 = Release|Win32 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.ActiveCfg = Release|x64 - {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.Build.0 = Release|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM.ActiveCfg = Debug|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM64.ActiveCfg = Debug|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.ActiveCfg = Debug|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.Build.0 = Debug|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.ActiveCfg = Debug|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.Build.0 = Debug|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|ARM.ActiveCfg = Release_Dbg|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|ARM64.ActiveCfg = Release_Dbg|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|Win32.ActiveCfg = Release_Dbg|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|Win32.Build.0 = Release_Dbg|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|x64.ActiveCfg = Release_Dbg|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|x64.Build.0 = Release_Dbg|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM.ActiveCfg = Release|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM64.ActiveCfg = Release|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.ActiveCfg = Release|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.Build.0 = Release|Win32 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.ActiveCfg = Release|x64 - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.Build.0 = Release|x64 {6D470002-E04D-4BBB-8B57-D20C2721FECE}.Debug|ARM.ActiveCfg = Debug|Win32 {6D470002-E04D-4BBB-8B57-D20C2721FECE}.Debug|ARM64.ActiveCfg = Debug|Win32 {6D470002-E04D-4BBB-8B57-D20C2721FECE}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1409,6 +1373,42 @@ Global {1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|Win32.Build.0 = Release|Win32 {1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|x64.ActiveCfg = Release|x64 {1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|x64.Build.0 = Release|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM.ActiveCfg = Debug|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM64.ActiveCfg = Debug|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.ActiveCfg = Debug|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.Build.0 = Debug|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.ActiveCfg = Debug|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.Build.0 = Debug|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|ARM.ActiveCfg = Release_Dbg|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|ARM64.ActiveCfg = Release_Dbg|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|Win32.ActiveCfg = Release_Dbg|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|Win32.Build.0 = Release_Dbg|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|x64.ActiveCfg = Release_Dbg|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release_Dbg|x64.Build.0 = Release_Dbg|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM.ActiveCfg = Release|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM64.ActiveCfg = Release|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.ActiveCfg = Release|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.Build.0 = Release|Win32 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.ActiveCfg = Release|x64 + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.Build.0 = Release|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM.ActiveCfg = Debug|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM64.ActiveCfg = Debug|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.Build.0 = Debug|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.ActiveCfg = Debug|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.Build.0 = Debug|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|ARM.ActiveCfg = Release_Dbg|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|ARM64.ActiveCfg = Release_Dbg|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|Win32.ActiveCfg = Release_Dbg|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|Win32.Build.0 = Release_Dbg|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|x64.ActiveCfg = Release_Dbg|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release_Dbg|x64.Build.0 = Release_Dbg|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM.ActiveCfg = Release|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM64.ActiveCfg = Release|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.ActiveCfg = Release|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.Build.0 = Release|Win32 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.ActiveCfg = Release|x64 + {B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1469,11 +1469,11 @@ Global {85333322-C153-4101-89BB-36B8EF86DFEF} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2} {55D166D9-9B48-4048-9EDC-856066F60C87} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2} {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1} = {8FD783D5-8709-432D-A88E-6E3073AFF220} - {B6757299-D2DD-4103-834D-45227AC13CB7} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2} - {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {8FD783D5-8709-432D-A88E-6E3073AFF220} {6D470002-E04D-4BBB-8B57-D20C2721FECE} = {C3735E17-6EAE-4CC5-980E-30BCEF094862} {0873B090-7FFD-4ABD-9B42-619A06C5041F} = {C3735E17-6EAE-4CC5-980E-30BCEF094862} {1F757558-0E57-4DE5-82D6-A14E9D81F05F} = {C3735E17-6EAE-4CC5-980E-30BCEF094862} + {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {8FD783D5-8709-432D-A88E-6E3073AFF220} + {B6757299-D2DD-4103-834D-45227AC13CB7} = {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 d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/grepWinNP3/src/Resources/grepWin.rc2 b/grepWinNP3/src/Resources/grepWin.rc2 index 7155ca363..05eed692c 100644 Binary files a/grepWinNP3/src/Resources/grepWin.rc2 and b/grepWinNP3/src/Resources/grepWin.rc2 differ diff --git a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang b/grepWinNP3/translationsNP3/Español (América Latina) [es-LA].lang similarity index 99% rename from grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang rename to grepWinNP3/translationsNP3/Español (América Latina) [es-LA].lang index d1143f429..cbb239bcb 100644 --- a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang +++ b/grepWinNP3/translationsNP3/Español (América Latina) [es-LA].lang @@ -8,8 +8,8 @@ "Content-Transfer-Encoding: 8bit\n" # # encoding: UTF-8 -# Language: Spanish Mexican (Mexico) resources -# Translator: (es-MX) Traducción española mexicana por Ghost +# Language: Spanish (Latin America) resources +# Translator: (es-LA) Traducción española latinoaméricana por Ghost # #, fuzzy diff --git a/language/common_res.h b/language/common_res.h index 509486c04..2268e8b2d 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -441,7 +441,7 @@ #define IDS_MUI_LANG_DE_DE 34504 #define IDS_MUI_LANG_EN_GB 34505 #define IDS_MUI_LANG_ES_ES 34506 -#define IDS_MUI_LANG_ES_MX 34507 +#define IDS_MUI_LANG_ES_LA 34507 #define IDS_MUI_LANG_FR_FR 34508 #define IDS_MUI_LANG_HI_IN 34509 #define IDS_MUI_LANG_HU_HU 34510 diff --git a/language/np3_es_mx/dialogs_es_mx.rc b/language/np3_es_la/dialogs_es_la.rc similarity index 99% rename from language/np3_es_mx/dialogs_es_mx.rc rename to language/np3_es_la/dialogs_es_la.rc index 06fa0a163..16a56ac0f 100644 --- a/language/np3_es_mx/dialogs_es_mx.rc +++ b/language/np3_es_la/dialogs_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -987,7 +987,7 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/dllmain.cpp b/language/np3_es_la/dllmain.cpp similarity index 100% rename from language/np3_es_mx/dllmain.cpp rename to language/np3_es_la/dllmain.cpp diff --git a/language/np3_es_mx/encode_es_mx.rc b/language/np3_es_la/encode_es_la.rc similarity index 97% rename from language/np3_es_mx/encode_es_mx.rc rename to language/np3_es_la/encode_es_la.rc index a18684fc5..ac4ed583b 100644 --- a/language/np3_es_mx/encode_es_mx.rc +++ b/language/np3_es_la/encode_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -162,7 +162,7 @@ BEGIN END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/lexer_es_mx.rc b/language/np3_es_la/lexer_es_la.rc similarity index 98% rename from language/np3_es_mx/lexer_es_mx.rc rename to language/np3_es_la/lexer_es_la.rc index c44cb6c86..2fbde81e1 100644 --- a/language/np3_es_mx/lexer_es_mx.rc +++ b/language/np3_es_la/lexer_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -487,7 +487,7 @@ BEGIN IDS_LEX_CSV_COL_9 "Columna 9" END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_la/menu_es_la.rc similarity index 99% rename from language/np3_es_mx/menu_es_mx.rc rename to language/np3_es_la/menu_es_la.rc index 420a1989f..09e7e5650 100644 --- a/language/np3_es_mx/menu_es_mx.rc +++ b/language/np3_es_la/menu_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -576,7 +576,7 @@ BEGIN END END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/np3_es_mx.cpp b/language/np3_es_la/np3_es_la.cpp similarity index 100% rename from language/np3_es_mx/np3_es_mx.cpp rename to language/np3_es_la/np3_es_la.cpp diff --git a/language/np3_es_mx/np3_es_mx.rc b/language/np3_es_la/np3_es_la.rc similarity index 72% rename from language/np3_es_mx/np3_es_mx.rc rename to language/np3_es_la/np3_es_la.rc index 3df4796fe..602f83cce 100644 --- a/language/np3_es_mx/np3_es_mx.rc +++ b/language/np3_es_la/np3_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -43,11 +43,11 @@ END 3 TEXTINCLUDE BEGIN "#include ""../common_res.rc""\r\n" - "#include ""menu_es_mx.rc""\r\n" - "#include ""strings_es_mx.rc""\r\n" - "#include ""encode_es_mx.rc""\r\n" - "#include ""lexer_es_mx.rc""\r\n" - "#include ""dialogs_es_mx.rc""\r\n" + "#include ""menu_es_la.rc""\r\n" + "#include ""strings_es_la.rc""\r\n" + "#include ""encode_es_la.rc""\r\n" + "#include ""lexer_es_la.rc""\r\n" + "#include ""dialogs_es_la.rc""\r\n" "\r\n" "\0" END @@ -55,7 +55,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// @@ -65,11 +65,11 @@ END // Generated from the TEXTINCLUDE 3 resource. // #include "../common_res.rc" -#include "menu_es_mx.rc" -#include "strings_es_mx.rc" -#include "encode_es_mx.rc" -#include "lexer_es_mx.rc" -#include "dialogs_es_mx.rc" +#include "menu_es_la.rc" +#include "strings_es_la.rc" +#include "encode_es_la.rc" +#include "lexer_es_la.rc" +#include "dialogs_es_la.rc" ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/np3_es_mx.vcxproj b/language/np3_es_la/np3_es_la.vcxproj similarity index 90% rename from language/np3_es_mx/np3_es_mx.vcxproj rename to language/np3_es_la/np3_es_la.vcxproj index 92561f606..fd5db8a94 100644 --- a/language/np3_es_mx/np3_es_mx.vcxproj +++ b/language/np3_es_la/np3_es_la.vcxproj @@ -30,7 +30,7 @@ 15.0 {B6757299-D2DD-4103-834D-45227AC13CB7} Win32Proj - np3esmx + np3esla 10.0 @@ -155,16 +155,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -183,16 +183,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -217,16 +217,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -251,16 +251,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -285,16 +285,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -319,16 +319,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-LA\np3lng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-MX\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\np3lng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-LA\np3lng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -339,7 +339,7 @@ - + Create Create @@ -350,7 +350,7 @@ - + true true true @@ -358,7 +358,7 @@ true true - + true true true @@ -366,7 +366,7 @@ true true - + true true true @@ -374,7 +374,7 @@ true true - + true true true @@ -382,8 +382,8 @@ true true - - + + true true true diff --git a/language/np3_es_mx/np3_es_mx.vcxproj.filters b/language/np3_es_la/np3_es_la.vcxproj.filters similarity index 85% rename from language/np3_es_mx/np3_es_mx.vcxproj.filters rename to language/np3_es_la/np3_es_la.vcxproj.filters index ba7d26262..f26371d49 100644 --- a/language/np3_es_mx/np3_es_mx.vcxproj.filters +++ b/language/np3_es_la/np3_es_la.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_es_mx/resource.h b/language/np3_es_la/resource.h similarity index 100% rename from language/np3_es_mx/resource.h rename to language/np3_es_la/resource.h diff --git a/language/np3_es_mx/stdafx.cpp b/language/np3_es_la/stdafx.cpp similarity index 100% rename from language/np3_es_mx/stdafx.cpp rename to language/np3_es_la/stdafx.cpp diff --git a/language/np3_es_mx/stdafx.h b/language/np3_es_la/stdafx.h similarity index 100% rename from language/np3_es_mx/stdafx.h rename to language/np3_es_la/stdafx.h diff --git a/language/np3_es_mx/strings_es_mx.rc b/language/np3_es_la/strings_es_la.rc similarity index 98% rename from language/np3_es_mx/strings_es_mx.rc rename to language/np3_es_la/strings_es_la.rc index e284fb074..afd025ee1 100644 --- a/language/np3_es_mx/strings_es_mx.rc +++ b/language/np3_es_la/strings_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -235,7 +235,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(es-MX) Traducción española mexicana por Ghost" + IDS_MUI_TRANSL_AUTHOR "(es-LA) Traducción española latinoaméricana por Ghost" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Estilo +++" IDS_MUI_TITLE_FIXCUR " %s: %s Estilo" @@ -350,7 +350,7 @@ IDS_MUI_ABOUT_RTF_5 "\ END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_mx/targetver.h b/language/np3_es_la/targetver.h similarity index 100% rename from language/np3_es_mx/targetver.h rename to language/np3_es_la/targetver.h diff --git a/minipath/language/mp_es_mx/dialogs_es_mx.rc b/minipath/language/mp_es_la/dialogs_es_la.rc similarity index 98% rename from minipath/language/mp_es_mx/dialogs_es_mx.rc rename to minipath/language/mp_es_la/dialogs_es_la.rc index ca948a280..444699f55 100644 --- a/minipath/language/mp_es_mx/dialogs_es_mx.rc +++ b/minipath/language/mp_es_la/dialogs_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -416,7 +416,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_mx/dllmain.cpp b/minipath/language/mp_es_la/dllmain.cpp similarity index 100% rename from minipath/language/mp_es_mx/dllmain.cpp rename to minipath/language/mp_es_la/dllmain.cpp diff --git a/minipath/language/mp_es_mx/menu_es_mx.rc b/minipath/language/mp_es_la/menu_es_la.rc similarity index 96% rename from minipath/language/mp_es_mx/menu_es_mx.rc rename to minipath/language/mp_es_la/menu_es_la.rc index 7bb9d833e..e64ea3cb5 100644 --- a/minipath/language/mp_es_mx/menu_es_mx.rc +++ b/minipath/language/mp_es_la/menu_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -127,7 +127,7 @@ BEGIN END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_mx/mp_es_mx.cpp b/minipath/language/mp_es_la/mp_es_la.cpp similarity index 100% rename from minipath/language/mp_es_mx/mp_es_mx.cpp rename to minipath/language/mp_es_la/mp_es_la.cpp diff --git a/minipath/language/mp_es_mx/mp_es_mx.rc b/minipath/language/mp_es_la/mp_es_la.rc similarity index 77% rename from minipath/language/mp_es_mx/mp_es_mx.rc rename to minipath/language/mp_es_la/mp_es_la.rc index 250c3c30f..d1783f622 100644 --- a/minipath/language/mp_es_mx/mp_es_mx.rc +++ b/minipath/language/mp_es_la/mp_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -43,9 +43,9 @@ END 3 TEXTINCLUDE BEGIN "#include ""../common_res.rc""\r\n" - "#include ""menu_es_mx.rc""\r\n" - "#include ""strings_es_mx.rc""\r\n" - "#include ""dialogs_es_mx.rc""\r\n" + "#include ""menu_es_la.rc""\r\n" + "#include ""strings_es_la.rc""\r\n" + "#include ""dialogs_es_la.rc""\r\n" "\r\n" "\0" END @@ -53,7 +53,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// @@ -63,9 +63,9 @@ END // Generated from the TEXTINCLUDE 3 resource. // #include "../common_res.rc" -#include "menu_es_mx.rc" -#include "strings_es_mx.rc" -#include "dialogs_es_mx.rc" +#include "menu_es_la.rc" +#include "strings_es_la.rc" +#include "dialogs_es_la.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/minipath/language/mp_es_mx/mp_es_mx.vcxproj b/minipath/language/mp_es_la/mp_es_la.vcxproj similarity index 91% rename from minipath/language/mp_es_mx/mp_es_mx.vcxproj rename to minipath/language/mp_es_la/mp_es_la.vcxproj index e1fa185a2..6149e2f55 100644 --- a/minipath/language/mp_es_mx/mp_es_mx.vcxproj +++ b/minipath/language/mp_es_la/mp_es_la.vcxproj @@ -30,7 +30,7 @@ 15.0 {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} Win32Proj - mpesmx + mpesla 10.0 @@ -155,16 +155,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -183,16 +183,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -217,16 +217,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -251,16 +251,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -285,16 +285,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -319,16 +319,16 @@ true - mkdir "$(TargetDir)..\es-MX" - if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\mplng.dll.mui" + mkdir "$(TargetDir)..\es-LA" + if exist "$(TargetDir)..\es-LA\mplng.dll.mui" del /f /q "$(TargetDir)..\es-LA\mplng.dll.mui" if exist "$(TargetDir)$(TargetFileName).discard" del /f /q "$(TargetDir)$(TargetFileName).discard" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x080a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-MX\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-MX\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -q "$(ProjectDir)..\..\..\language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-LA\mplng.dll.mui" + "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-LA\mplng.dll.mui" MUI Split - 0x080a + 0x580a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -339,7 +339,7 @@ - + Create Create @@ -350,7 +350,7 @@ - + true true true @@ -358,7 +358,7 @@ true true - + true true true @@ -366,8 +366,8 @@ true true - - + + true true true diff --git a/minipath/language/mp_es_mx/mp_es_mx.vcxproj.filters b/minipath/language/mp_es_la/mp_es_la.vcxproj.filters similarity index 87% rename from minipath/language/mp_es_mx/mp_es_mx.vcxproj.filters rename to minipath/language/mp_es_la/mp_es_la.vcxproj.filters index fe489be1c..4610e7bf2 100644 --- a/minipath/language/mp_es_mx/mp_es_mx.vcxproj.filters +++ b/minipath/language/mp_es_la/mp_es_la.vcxproj.filters @@ -29,7 +29,7 @@ Source Files - + Source Files @@ -37,16 +37,16 @@ - + Resource Files - + Resource Files - + Resource Files - + Resource Files diff --git a/minipath/language/mp_es_mx/resource.h b/minipath/language/mp_es_la/resource.h similarity index 100% rename from minipath/language/mp_es_mx/resource.h rename to minipath/language/mp_es_la/resource.h diff --git a/minipath/language/mp_es_mx/stdafx.cpp b/minipath/language/mp_es_la/stdafx.cpp similarity index 100% rename from minipath/language/mp_es_mx/stdafx.cpp rename to minipath/language/mp_es_la/stdafx.cpp diff --git a/minipath/language/mp_es_mx/stdafx.h b/minipath/language/mp_es_la/stdafx.h similarity index 100% rename from minipath/language/mp_es_mx/stdafx.h rename to minipath/language/mp_es_la/stdafx.h diff --git a/minipath/language/mp_es_mx/strings_es_mx.rc b/minipath/language/mp_es_la/strings_es_la.rc similarity index 95% rename from minipath/language/mp_es_mx/strings_es_mx.rc rename to minipath/language/mp_es_la/strings_es_la.rc index fe6b578a7..f31822c1d 100644 --- a/minipath/language/mp_es_mx/strings_es_mx.rc +++ b/minipath/language/mp_es_la/strings_es_la.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish Mexican (Mexico) resources +// Spanish (Latin America) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -132,11 +132,11 @@ BEGIN IDS_COPYMOVE "Seleccionar una carpeta de destino." IDS_CREATELINK "Seleccionar una carpeta de destino para el nuevo enlace." IDS_SAVESETTINGS "Guardar configuración\nLa configuración actual del programa se ha guardado." - IDS_MUI_TRANSL_AUTHOR "(es-MX) Traducción española mexicana por Ghost" + IDS_MUI_TRANSL_AUTHOR "(es-LA) Traducción española latinoaméricana por Ghost" END -#endif // Spanish Mexican (Mexico) resources +#endif // Spanish (Latin America) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_mx/targetver.h b/minipath/language/mp_es_la/targetver.h similarity index 100% rename from minipath/language/mp_es_mx/targetver.h rename to minipath/language/mp_es_la/targetver.h diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index f2aa91f5d..46b4f44ff 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -128,7 +128,7 @@ HMODULE g_hLngResContainer = NULL; WCHAR g_tchPrefLngLocName[LOCALE_NAME_MAX_LENGTH + 1]; LANGID g_iPrefLANGID = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); // 'en-US' internal default -static WCHAR* const g_tchAvailableLanguages = L"af-ZA be-BY de-DE en-GB es-ES es-MX fr-FR hi-IN hu-HU id-ID it-IT ja-JP ko-KR nl-NL pl-PL pt-BR pt-PT ru-RU sk-SK sv-SE tr-TR vi-VN zh-CN zh-TW"; +static WCHAR* const g_tchAvailableLanguages = L"af-ZA be-BY de-DE en-GB es-ES es-LA fr-FR hi-IN hu-HU id-ID it-IT ja-JP ko-KR nl-NL pl-PL pt-BR pt-PT ru-RU sk-SK sv-SE tr-TR vi-VN zh-CN zh-TW"; //============================================================================= diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 8041c3d3d..ea295a9b0 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -26,7 +26,7 @@ chcp 65001 >nul 2>&1 :: :: =================================================================================================== -set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES es-MX fr-FR hi-IN hu-HU id-ID it-IT ja-JP ko-KR nl-NL pl-PL pt-BR pt-PT ru-RU sk-SK sv-SE tr-TR vi-VN zh-CN zh-TW +set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES es-LA fr-FR hi-IN hu-HU id-ID it-IT ja-JP ko-KR nl-NL pl-PL pt-BR pt-PT ru-RU sk-SK sv-SE tr-TR vi-VN zh-CN zh-TW :: =================================================================================================== diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 37e7e1add..d6148afc2 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 e2a22cac7..2cd66d285 100644 --- a/src/MuiLanguage.c +++ b/src/MuiLanguage.c @@ -40,7 +40,7 @@ MUILANGUAGE MUI_LanguageDLLs[] = { { IDS_MUI_LANG_DE_DE, L"de-DE", L"Deutsch (Deutschland)\t\t\t[%s]", MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), false, false }, { IDS_MUI_LANG_EN_GB, L"en-GB", L"English (United Kingdom)\t\t\t[%s]", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), false, false }, { IDS_MUI_LANG_ES_ES, L"es-ES", L"Español (España)\t\t\t[%s]", MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), false, false }, - { IDS_MUI_LANG_ES_MX, L"es-MX", L"Español Mexicano (Mexico)\t\t\t[%s]", MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MEXICAN), false, false }, + { IDS_MUI_LANG_ES_LA, L"es-LA", L"Español (América Latina)\t\t\t[%s]", MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), false, false }, { IDS_MUI_LANG_FR_FR, L"fr-FR", L"Français (France)\t\t\t[%s]", MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), false, false }, { IDS_MUI_LANG_HI_IN, L"hi-IN", L"हिन्दी (भारत)\t\t\t[%s]", MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA), false, false }, { IDS_MUI_LANG_HU_HU, L"hu-HU", L"Magyar (Magyarország)\t\t\t[%s]", MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), false, false }, @@ -76,7 +76,7 @@ grepWinLng_t grepWinLangResName[] = { { 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_SPANISH, SUBLANG_SPANISH_MEXICAN), L".\\lng\\gwLng\\Español Mexicano (Mexico) [es-MX].lang"}, + { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_US), L".\\lng\\gwLng\\Español (América Latina) [es-LA].lang"}, { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), L".\\lng\\gwLng\\Français (France) [fr-FR].lang"}, { MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA), L".\\lng\\gwLng\\हिन्दी (भारत) [hi-IN].lang"}, { MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang"}, diff --git a/src/VersionEx.h b/src/VersionEx.h index ac9f9e20f..4aac7f4f7 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 21 #define VERSION_REV 302 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 446 #define ONIGURUMA_REGEX_VER 6.9.7 #define UCHARDET_VER 2018.09.27