diff --git a/Build/Changes.txt b/Build/Changes.txt index 45e064bb2..315e5eae6 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -48,6 +48,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[.xxx.1]- Renaming Spanish Latin America (es-419) to Spanish Mexican (es-MX) (MUI). [1228.1]- AboutBox's RichEdit Ctrl: enable more options for EM_AUTOURLDETECT. [1228.1]- Hyperlink RegEx Scanner: don't allow XML tagging brackets as part of Hyperlink text. [1226.1]- In Windows 11, running "Notepad" from "Run" (Win+R) launches "Notepad3". @@ -117,7 +118,7 @@ with a priority to take over "(incomplete...)" translation projects: - Irish (ga-IE) - Norwegian (nb-NO) - Romanian (ro-RO) -- Spanish Latin America (es-419) (incomplete...) +- Spanish Mexican (es-MX) (incomplete...) - Turkish (tr-TR) (incomplete...) - Ukrainian (uk-UA) - Vietnamese (vi-VN) (incomplete...) diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 91b7e8d9a..222c0f76b 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -141,10 +141,10 @@ Source: "{#bindir}\Release_x64_v143\lng\el-GR\mplng.dll.mui"; DestDir: "{app}\ln Source: "{#bindir}\Release_x64_v143\lng\el-GR\np3lng.dll.mui"; DestDir: "{app}\lng\el-GR"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\en-GB\mplng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\en-GB\np3lng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: "{#bindir}\Release_x64_v143\lng\es-419\mplng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: "{#bindir}\Release_x64_v143\lng\es-419\np3lng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\es-ES\mplng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\es-ES\np3lng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: "{#bindir}\Release_x64_v143\lng\es-MX\mplng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: "{#bindir}\Release_x64_v143\lng\es-MX\np3lng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\fr-FR\mplng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\fr-FR\np3lng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion; Check: Is64BitInstallMode() Source: "{#bindir}\Release_x64_v143\lng\hi-IN\mplng.dll.mui"; DestDir: "{app}\lng\hi-IN"; Flags: ignoreversion; Check: Is64BitInstallMode() @@ -194,10 +194,10 @@ Source: "{#bindir}\Release_x86_v143\lng\el-GR\mplng.dll.mui"; DestDir: "{app}\ln Source: "{#bindir}\Release_x86_v143\lng\el-GR\np3lng.dll.mui"; DestDir: "{app}\lng\el-GR"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\en-GB\mplng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\en-GB\np3lng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: "{#bindir}\Release_x86_v143\lng\es-419\mplng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: "{#bindir}\Release_x86_v143\lng\es-419\np3lng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\es-ES\mplng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\es-ES\np3lng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: "{#bindir}\Release_x86_v143\lng\es-MX\mplng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: "{#bindir}\Release_x86_v143\lng\es-MX\np3lng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\fr-FR\mplng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\fr-FR\np3lng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: "{#bindir}\Release_x86_v143\lng\hi-IN\mplng.dll.mui"; DestDir: "{app}\lng\hi-IN"; Flags: ignoreversion; Check: not Is64BitInstallMode() diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index f3ba2459a..2d3d53cf3 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -130,10 +130,10 @@ Source: "{#bindir}\Release_x86_v143\lng\el-GR\mplng.dll.mui"; DestDir: "{app}\ln Source: "{#bindir}\Release_x86_v143\lng\el-GR\np3lng.dll.mui"; DestDir: "{app}\lng\el-GR"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\en-GB\mplng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\en-GB\np3lng.dll.mui"; DestDir: "{app}\lng\en-GB"; Flags: ignoreversion -Source: "{#bindir}\Release_x86_v143\lng\es-419\mplng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion -Source: "{#bindir}\Release_x86_v143\lng\es-419\np3lng.dll.mui"; DestDir: "{app}\lng\es-419"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\es-ES\mplng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\es-ES\np3lng.dll.mui"; DestDir: "{app}\lng\es-ES"; Flags: ignoreversion +Source: "{#bindir}\Release_x86_v143\lng\es-MX\mplng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion +Source: "{#bindir}\Release_x86_v143\lng\es-MX\np3lng.dll.mui"; DestDir: "{app}\lng\es-MX"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\fr-FR\mplng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\fr-FR\np3lng.dll.mui"; DestDir: "{app}\lng\fr-FR"; Flags: ignoreversion Source: "{#bindir}\Release_x86_v143\lng\hi-IN\mplng.dll.mui"; DestDir: "{app}\lng\hi-IN"; Flags: ignoreversion diff --git a/Notepad3.sln b/Notepad3.sln index ab9f96d5b..9bbe5004f 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -347,12 +347,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uxtheme-stub", "src\DarkMod 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_419", "minipath\language\mp_es_419\mp_es_419.vcxproj", "{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}" +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}") = "np3_es_419", "language\np3_es_419\np3_es_419.vcxproj", "{B6757299-D2DD-4103-834D-45227AC13CB7}" +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 diff --git a/Readme.md b/Readme.md index 707e23faa..1c35f5914 100644 --- a/Readme.md +++ b/Readme.md @@ -115,8 +115,8 @@ Belarusian/Belarus (be-BY) German/Germany (de-DE) Greek/Greece (el-GR) English/United Kingdom (en-GB) -Spanish/Latin America (es-419) Spanish/Spain (es-ES) +Spanish/Mexico (es-MX) French/France (fr-FR) Hindi/India (hi-IN) Hungarian/Hungary (hu-HU) diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj index b118da6f6..39f7b3dc4 100644 --- a/grepWinNP3/grepWinNP3.vcxproj +++ b/grepWinNP3/grepWinNP3.vcxproj @@ -483,8 +483,8 @@ - + diff --git a/grepWinNP3/grepWinNP3.vcxproj.filters b/grepWinNP3/grepWinNP3.vcxproj.filters index 2ba8da55b..70e9d4bdf 100644 --- a/grepWinNP3/grepWinNP3.vcxproj.filters +++ b/grepWinNP3/grepWinNP3.vcxproj.filters @@ -344,10 +344,10 @@ translationsNP3 - + translationsNP3 - + translationsNP3 diff --git a/grepWinNP3/translationsNP3/Español (América Latina) [es-419].lang b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang similarity index 99% rename from grepWinNP3/translationsNP3/Español (América Latina) [es-419].lang rename to grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang index 4d155b3cf..51c6dda08 100644 --- a/grepWinNP3/translationsNP3/Español (América Latina) [es-419].lang +++ b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang @@ -8,8 +8,8 @@ "Content-Transfer-Encoding: 8bit\n" # # encoding: UTF-8 -# Language: Spanish (Latin America) resources -# Translator: (es-419) Traducción española latinoaméricana por Ghost +# Language: Spanish Mexican (Mexico) resources +# Translator: (es-MX) Traducción española mexicana por Ghost # #, fuzzy diff --git a/language/common_res.h b/language/common_res.h index 3ecd1f856..2f7691843 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -7,9 +7,6 @@ #include "ColorDlg.h" -// undefined Sub-Language -#define SUBLANG_SPANISH_LATIN_AMERICA 0x16 - #if defined(MUI_BASE_LNG_EN_US) #define MUI_BASE_LNG_ID L"en-US" #elif defined(MUI_BASE_LNG_AF_ZA) @@ -22,10 +19,10 @@ #define MUI_BASE_LNG_ID L"el-GR" #elif defined(MUI_BASE_LNG_EN_GB) #define MUI_BASE_LNG_ID L"en-GB" -#elif defined(MUI_BASE_LNG_ES_419) -#define MUI_BASE_LNG_ID L"es-419" #elif defined(MUI_BASE_LNG_ES_ES) #define MUI_BASE_LNG_ID L"es-ES" +#elif defined(MUI_BASE_LNG_ES_MX) +#define MUI_BASE_LNG_ID L"es-MX" #elif defined(MUI_BASE_LNG_FR_FR) #define MUI_BASE_LNG_ID L"fr-FR" #elif defined(MUI_BASE_LNG_HI_IN) @@ -537,8 +534,8 @@ #define IDS_MUI_LANG_DE_DE 34504 #define IDS_MUI_LANG_EL_GR 34505 #define IDS_MUI_LANG_EN_GB 34506 -#define IDS_MUI_LANG_ES_419 34507 -#define IDS_MUI_LANG_ES_ES 34508 +#define IDS_MUI_LANG_ES_ES 34507 +#define IDS_MUI_LANG_ES_MX 34508 #define IDS_MUI_LANG_FR_FR 34509 #define IDS_MUI_LANG_HI_IN 34510 #define IDS_MUI_LANG_HU_HU 34511 diff --git a/language/np3_es_419/dialogs_es_419.rc b/language/np3_es_mx/dialogs_es_mx.rc similarity index 99% rename from language/np3_es_419/dialogs_es_419.rc rename to language/np3_es_mx/dialogs_es_mx.rc index 648450e03..43d41a149 100644 --- a/language/np3_es_419/dialogs_es_419.rc +++ b/language/np3_es_mx/dialogs_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -1113,7 +1113,7 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/dllmain.cpp b/language/np3_es_mx/dllmain.cpp similarity index 100% rename from language/np3_es_419/dllmain.cpp rename to language/np3_es_mx/dllmain.cpp diff --git a/language/np3_es_419/encode_es_419.rc b/language/np3_es_mx/encode_es_mx.rc similarity index 97% rename from language/np3_es_419/encode_es_419.rc rename to language/np3_es_mx/encode_es_mx.rc index 7a46b43d7..233bc04c9 100644 --- a/language/np3_es_419/encode_es_419.rc +++ b/language/np3_es_mx/encode_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -162,7 +162,7 @@ BEGIN END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/lexer_es_419.rc b/language/np3_es_mx/lexer_es_mx.rc similarity index 98% rename from language/np3_es_419/lexer_es_419.rc rename to language/np3_es_mx/lexer_es_mx.rc index 5d355b58a..b1ab33154 100644 --- a/language/np3_es_419/lexer_es_419.rc +++ b/language/np3_es_mx/lexer_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -497,7 +497,7 @@ BEGIN IDS_LEX_CSV_COL_9 "Columna 9" END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_mx/menu_es_mx.rc similarity index 99% rename from language/np3_es_419/menu_es_419.rc rename to language/np3_es_mx/menu_es_mx.rc index b3e58e413..13f3893aa 100644 --- a/language/np3_es_419/menu_es_419.rc +++ b/language/np3_es_mx/menu_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -588,7 +588,7 @@ BEGIN END END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/np3_es_419.cpp b/language/np3_es_mx/np3_es_mx.cpp similarity index 100% rename from language/np3_es_419/np3_es_419.cpp rename to language/np3_es_mx/np3_es_mx.cpp diff --git a/language/np3_es_419/np3_es_419.rc b/language/np3_es_mx/np3_es_mx.rc similarity index 71% rename from language/np3_es_419/np3_es_419.rc rename to language/np3_es_mx/np3_es_mx.rc index b1da379bb..dfc27765f 100644 --- a/language/np3_es_419/np3_es_419.rc +++ b/language/np3_es_mx/np3_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #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_419.rc""\r\n" - "#include ""strings_es_419.rc""\r\n" - "#include ""encode_es_419.rc""\r\n" - "#include ""lexer_es_419.rc""\r\n" - "#include ""dialogs_es_419.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" "\r\n" "\0" END @@ -55,7 +55,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// @@ -65,11 +65,11 @@ END // Generated from the TEXTINCLUDE 3 resource. // #include "../common_res.rc" -#include "menu_es_419.rc" -#include "strings_es_419.rc" -#include "encode_es_419.rc" -#include "lexer_es_419.rc" -#include "dialogs_es_419.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" ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/np3_es_419.vcxproj b/language/np3_es_mx/np3_es_mx.vcxproj similarity index 90% rename from language/np3_es_419/np3_es_419.vcxproj rename to language/np3_es_mx/np3_es_mx.vcxproj index 4f97a08ce..c9b6a902c 100644 --- a/language/np3_es_419/np3_es_419.vcxproj +++ b/language/np3_es_mx/np3_es_mx.vcxproj @@ -30,7 +30,7 @@ 15.0 {B6757299-D2DD-4103-834D-45227AC13CB7} Win32Proj - np3es419 + np3esmx 10.0 @@ -163,16 +163,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -193,16 +193,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -230,16 +230,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -266,16 +266,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -303,16 +303,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -339,16 +339,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-419\np3lng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\np3lng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\np3lng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\es-419\np3lng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -359,7 +359,7 @@ - + Create Create @@ -370,7 +370,7 @@ - + true true true @@ -378,7 +378,7 @@ true true - + true true true @@ -386,7 +386,7 @@ true true - + true true true @@ -394,7 +394,7 @@ true true - + true true true @@ -402,8 +402,8 @@ true true - - + + true true true diff --git a/language/np3_es_419/np3_es_419.vcxproj.filters b/language/np3_es_mx/np3_es_mx.vcxproj.filters similarity index 85% rename from language/np3_es_419/np3_es_419.vcxproj.filters rename to language/np3_es_mx/np3_es_mx.vcxproj.filters index 07e5ffbde..ba7d26262 100644 --- a/language/np3_es_419/np3_es_419.vcxproj.filters +++ b/language/np3_es_mx/np3_es_mx.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_419/resource.h b/language/np3_es_mx/resource.h similarity index 100% rename from language/np3_es_419/resource.h rename to language/np3_es_mx/resource.h diff --git a/language/np3_es_419/stdafx.cpp b/language/np3_es_mx/stdafx.cpp similarity index 100% rename from language/np3_es_419/stdafx.cpp rename to language/np3_es_mx/stdafx.cpp diff --git a/language/np3_es_419/stdafx.h b/language/np3_es_mx/stdafx.h similarity index 100% rename from language/np3_es_419/stdafx.h rename to language/np3_es_mx/stdafx.h diff --git a/language/np3_es_419/strings_es_419.rc b/language/np3_es_mx/strings_es_mx.rc similarity index 98% rename from language/np3_es_419/strings_es_419.rc rename to language/np3_es_mx/strings_es_mx.rc index 5ef87a594..510c26b17 100644 --- a/language/np3_es_419/strings_es_419.rc +++ b/language/np3_es_mx/strings_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -242,7 +242,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(es-419) Traducción española latinoaméricana por Ghost" + IDS_MUI_TRANSL_AUTHOR "(es-MX) Traducción española mexicana por Ghost" IDS_MUI_TITLE_FIXBASE "BASE (%s)" IDS_MUI_TITLE_RELCUR "+++ %s: %s Estilo +++" IDS_MUI_TITLE_FIXCUR "%s: %s Estilo" @@ -367,7 +367,7 @@ IDS_MUI_ABOUT_RTF_5 "\ END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/language/np3_es_419/targetver.h b/language/np3_es_mx/targetver.h similarity index 100% rename from language/np3_es_419/targetver.h rename to language/np3_es_mx/targetver.h diff --git a/minipath/language/common_res.h b/minipath/language/common_res.h index 6e60ea768..08bf6e8ec 100644 --- a/minipath/language/common_res.h +++ b/minipath/language/common_res.h @@ -5,9 +5,6 @@ #ifndef _COMMON_RES_H_ #define _COMMON_RES_H_ -// undefined Sub-Language -#define SUBLANG_SPANISH_LATIN_AMERICA 0x16 - #if defined(MUI_BASE_LNG_EN_US) #define MUI_BASE_LNG_ID L"en-US" #elif defined(MUI_BASE_LNG_AF_ZA) @@ -20,10 +17,10 @@ #define MUI_BASE_LNG_ID L"el-GR" #elif defined(MUI_BASE_LNG_EN_GB) #define MUI_BASE_LNG_ID L"en-GB" -#elif defined(MUI_BASE_LNG_ES_419) -#define MUI_BASE_LNG_ID L"es-419" #elif defined(MUI_BASE_LNG_ES_ES) #define MUI_BASE_LNG_ID L"es-ES" +#elif defined(MUI_BASE_LNG_ES_MX) +#define MUI_BASE_LNG_ID L"es-MX" #elif defined(MUI_BASE_LNG_FR_FR) #define MUI_BASE_LNG_ID L"fr-FR" #elif defined(MUI_BASE_LNG_HI_IN) diff --git a/minipath/language/mp_es_419/dialogs_es_419.rc b/minipath/language/mp_es_mx/dialogs_es_mx.rc similarity index 98% rename from minipath/language/mp_es_419/dialogs_es_419.rc rename to minipath/language/mp_es_mx/dialogs_es_mx.rc index 92c138dd3..88da39d84 100644 --- a/minipath/language/mp_es_419/dialogs_es_419.rc +++ b/minipath/language/mp_es_mx/dialogs_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -416,7 +416,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_419/dllmain.cpp b/minipath/language/mp_es_mx/dllmain.cpp similarity index 100% rename from minipath/language/mp_es_419/dllmain.cpp rename to minipath/language/mp_es_mx/dllmain.cpp diff --git a/minipath/language/mp_es_419/menu_es_419.rc b/minipath/language/mp_es_mx/menu_es_mx.rc similarity index 96% rename from minipath/language/mp_es_419/menu_es_419.rc rename to minipath/language/mp_es_mx/menu_es_mx.rc index b3df4cded..aef9a1642 100644 --- a/minipath/language/mp_es_419/menu_es_419.rc +++ b/minipath/language/mp_es_mx/menu_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #pragma code_page(65001) // UTF-8 #ifdef APSTUDIO_INVOKED @@ -127,7 +127,7 @@ BEGIN END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_419/mp_es_419.cpp b/minipath/language/mp_es_mx/mp_es_mx.cpp similarity index 100% rename from minipath/language/mp_es_419/mp_es_419.cpp rename to minipath/language/mp_es_mx/mp_es_mx.cpp diff --git a/minipath/language/mp_es_419/mp_es_419.rc b/minipath/language/mp_es_mx/mp_es_mx.rc similarity index 77% rename from minipath/language/mp_es_419/mp_es_419.rc rename to minipath/language/mp_es_mx/mp_es_mx.rc index 2f05f5e74..b137ac208 100644 --- a/minipath/language/mp_es_419/mp_es_419.rc +++ b/minipath/language/mp_es_mx/mp_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #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_419.rc""\r\n" - "#include ""strings_es_419.rc""\r\n" - "#include ""dialogs_es_419.rc""\r\n" + "#include ""menu_es_mx.rc""\r\n" + "#include ""strings_es_mx.rc""\r\n" + "#include ""dialogs_es_mx.rc""\r\n" "\r\n" "\0" END @@ -53,7 +53,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// @@ -63,9 +63,9 @@ END // Generated from the TEXTINCLUDE 3 resource. // #include "../common_res.rc" -#include "menu_es_419.rc" -#include "strings_es_419.rc" -#include "dialogs_es_419.rc" +#include "menu_es_mx.rc" +#include "strings_es_mx.rc" +#include "dialogs_es_mx.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/minipath/language/mp_es_419/mp_es_419.vcxproj b/minipath/language/mp_es_mx/mp_es_mx.vcxproj similarity index 91% rename from minipath/language/mp_es_419/mp_es_419.vcxproj rename to minipath/language/mp_es_mx/mp_es_mx.vcxproj index 10f637557..b3e5524b9 100644 --- a/minipath/language/mp_es_419/mp_es_419.vcxproj +++ b/minipath/language/mp_es_mx/mp_es_mx.vcxproj @@ -30,7 +30,7 @@ 15.0 {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} Win32Proj - mpes419 + mpesmx 10.0 @@ -163,16 +163,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -193,16 +193,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -229,16 +229,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -265,16 +265,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -301,16 +301,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -337,16 +337,16 @@ true - mkdir "$(TargetDir)..\es-419" - if exist "$(TargetDir)..\es-419\mplng.dll.mui" del /f /q "$(TargetDir)..\es-419\mplng.dll.mui" + mkdir "$(TargetDir)..\es-MX" + if exist "$(TargetDir)..\es-MX\mplng.dll.mui" del /f /q "$(TargetDir)..\es-MX\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 0x580a -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\es-419\mplng.dll.mui" - "$(UCRTContentRoot)bin\$(TargetPlatformVersion)\$(PlatformShortName)\muirct.exe" -c "$(TargetDir)..\mplng.dll" -e "$(TargetDir)..\es-419\mplng.dll.mui" + "$(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" MUI Split - 0x580a + 0x080a $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -357,7 +357,7 @@ - + Create Create @@ -368,7 +368,7 @@ - + true true true @@ -376,7 +376,7 @@ true true - + true true true @@ -384,8 +384,8 @@ true true - - + + true true true diff --git a/minipath/language/mp_es_419/mp_es_419.vcxproj.filters b/minipath/language/mp_es_mx/mp_es_mx.vcxproj.filters similarity index 87% rename from minipath/language/mp_es_419/mp_es_419.vcxproj.filters rename to minipath/language/mp_es_mx/mp_es_mx.vcxproj.filters index 5b3f2cc4f..fe489be1c 100644 --- a/minipath/language/mp_es_419/mp_es_419.vcxproj.filters +++ b/minipath/language/mp_es_mx/mp_es_mx.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_419/resource.h b/minipath/language/mp_es_mx/resource.h similarity index 100% rename from minipath/language/mp_es_419/resource.h rename to minipath/language/mp_es_mx/resource.h diff --git a/minipath/language/mp_es_419/stdafx.cpp b/minipath/language/mp_es_mx/stdafx.cpp similarity index 100% rename from minipath/language/mp_es_419/stdafx.cpp rename to minipath/language/mp_es_mx/stdafx.cpp diff --git a/minipath/language/mp_es_419/stdafx.h b/minipath/language/mp_es_mx/stdafx.h similarity index 100% rename from minipath/language/mp_es_419/stdafx.h rename to minipath/language/mp_es_mx/stdafx.h diff --git a/minipath/language/mp_es_419/strings_es_419.rc b/minipath/language/mp_es_mx/strings_es_mx.rc similarity index 95% rename from minipath/language/mp_es_419/strings_es_419.rc rename to minipath/language/mp_es_mx/strings_es_mx.rc index 83fe30ef0..f2e9ec752 100644 --- a/minipath/language/mp_es_419/strings_es_419.rc +++ b/minipath/language/mp_es_mx/strings_es_mx.rc @@ -15,10 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Latin America) resources +// Spanish (Mexico) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESM) +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN #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-419) Traducción española latinoaméricana por Ghost" + IDS_MUI_TRANSL_AUTHOR "(es-MX) Traducción española mexicana por Ghost" END -#endif // Spanish (Latin America) resources +#endif // Spanish (Mexico) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/minipath/language/mp_es_419/targetver.h b/minipath/language/mp_es_mx/targetver.h similarity index 100% rename from minipath/language/mp_es_419/targetver.h rename to minipath/language/mp_es_mx/targetver.h diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index 473b666b3..c7f5e41f4 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -120,7 +120,7 @@ HMODULE g_hLngResContainer = NULL; WCHAR g_UsedLngLocaleName[LOCALE_NAME_MAX_LENGTH] = { L'\0' }; #if defined(HAVE_DYN_LOAD_LIBS_MUI_LNGS) -static WCHAR* const g_tchAvailableLanguages = L"af-ZA be-BY de-DE el-GR en-GB en-US es-419 es-ES 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 el-GR en-GB en-US 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"; #endif diff --git a/minipath/src/minipath.rc b/minipath/src/minipath.rc index 7d35fb907..f7cc52464 100644 --- a/minipath/src/minipath.rc +++ b/minipath/src/minipath.rc @@ -45,10 +45,10 @@ BEGIN "#include ""../language/mp_el_gr/mp_el_gr.rc""\r\n" #elif defined(MUI_BASE_LNG_EN_GB) "#include ""../language/mp_en_gb/mp_en_gb.rc""\r\n" -#elif defined(MUI_BASE_LNG_ES_419) - "#include ""../language/mp_es_419/mp_es_419.rc""\r\n" #elif defined(MUI_BASE_LNG_ES_ES) "#include ""../language/mp_es_es/mp_es_es.rc""\r\n" +#elif defined(MUI_BASE_LNG_ES_MX) + "#include ""../language/mp_es_mx/mp_es_mx.rc""\r\n" #elif defined(MUI_BASE_LNG_FR_FR) "#include ""../language/mp_fr_fr/mp_fr_fr.rc""\r\n" #elif defined(MUI_BASE_LNG_HI_IN) @@ -234,10 +234,10 @@ END #include "../language/mp_el_gr/mp_el_gr.rc" #elif defined(MUI_BASE_LNG_EN_GB) #include "../language/mp_en_gb/mp_en_gb.rc" -#elif defined(MUI_BASE_LNG_ES_419) - #include "../language/mp_es_419/mp_es_419.rc" #elif defined(MUI_BASE_LNG_ES_ES) #include "../language/mp_es_es/mp_es_es.rc" +#elif defined(MUI_BASE_LNG_ES_MX) + #include "../language/mp_es_mx/mp_es_mx.rc" #elif defined(MUI_BASE_LNG_FR_FR) #include "../language/mp_fr_fr/mp_fr_fr.rc" #elif defined(MUI_BASE_LNG_HI_IN) diff --git a/minipath/src/resource.h b/minipath/src/resource.h index abc22b656..f4f21f063 100644 --- a/minipath/src/resource.h +++ b/minipath/src/resource.h @@ -27,8 +27,8 @@ ///#define MUI_BASE_LNG_DE_DE 1 ///#define MUI_BASE_LNG_EL_GR 1 ///#define MUI_BASE_LNG_EN_GB 1 -///#define MUI_BASE_LNG_ES_419 1 ///#define MUI_BASE_LNG_ES_ES 1 +///#define MUI_BASE_LNG_ES_MX 1 ///#define MUI_BASE_LNG_FR_FR 1 ///#define MUI_BASE_LNG_HI_IN 1 ///#define MUI_BASE_LNG_HU_HU 1 diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 30275c8d9..2849248a4 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 el-GR en-GB es-419 es-ES 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 el-GR 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 :: =================================================================================================== diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c index 6104aa904..3ca8bce5c 100644 --- a/src/MuiLanguage.c +++ b/src/MuiLanguage.c @@ -62,8 +62,8 @@ grepWinLng_t grepWinLangResName[] = { { L"de-DE", L".\\lng\\gwLng\\Deutsch (Deutschland) [de-DE].lang" }, { L"el-GR", L".\\lng\\gwLng\\Ελληνικά (Ελλάδα) [el-GR].lang" }, { L"en-GB", L".\\lng\\gwLng\\English (United Kingdom) [en-GB].lang" }, - { L"es-419", L".\\lng\\gwLng\\Español (América Latina) [es-419].lang" }, { L"es-ES", L".\\lng\\gwLng\\Español (España) [es-ES].lang" }, + { L"es-MX", L".\\lng\\gwLng\\Español Mexicano (Mexico) [es-MX].lang" }, { L"fr-FR", L".\\lng\\gwLng\\Français (France) [fr-FR].lang" }, { L"hi-IN", L".\\lng\\gwLng\\हिन्दी (भारत) [hi-IN].lang" }, { L"hu-HU", L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang" }, @@ -215,8 +215,8 @@ MUILANGUAGE MUI_LanguageDLLs[] = { { IDS_MUI_LANG_DE_DE, L"de-DE", L"Deutsch (Deutschland)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_EL_GR, L"el-GR", L"Ελληνικά (Ελλάδα)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_EN_GB, L"en-GB", L"English (United Kingdom)\t\t\t[%s]", false, false }, - { IDS_MUI_LANG_ES_419, L"es-419", L"Español (América Latina)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_ES_ES, L"es-ES", L"Español (España)\t\t\t[%s]", false, false }, + { IDS_MUI_LANG_ES_MX, L"es-MX", L"Español Mexicano (Mexico)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_FR_FR, L"fr-FR", L"Français (France)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_HI_IN, L"hi-IN", L"हिन्दी (भारत)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_HU_HU, L"hu-HU", L"Magyar (Magyarország)\t\t\t[%s]", false, false }, diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 12c38ac8f..f7a201f84 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -47,10 +47,10 @@ BEGIN "#include ""../language/np3_el_gr/np3_el_gr.rc""\r\n" #elif defined(MUI_BASE_LNG_EN_GB) "#include ""../language/np3_en_gb/np3_en_gb.rc""\r\n" -#elif defined(MUI_BASE_LNG_ES_419) - "#include ""../language/np3_es_419/np3_es_419.rc""\r\n" #elif defined(MUI_BASE_LNG_ES_ES) "#include ""../language/np3_es_es/np3_es_es.rc""\r\n" +#elif defined(MUI_BASE_LNG_ES_MX) + "#include ""../language/np3_es_mx/np3_es_mx.rc""\r\n" #elif defined(MUI_BASE_LNG_FR_FR) "#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n" #elif defined(MUI_BASE_LNG_HI_IN) @@ -496,10 +496,10 @@ END #include "../language/np3_el_gr/np3_el_gr.rc" #elif defined(MUI_BASE_LNG_EN_GB) #include "../language/np3_en_gb/np3_en_gb.rc" -#elif defined(MUI_BASE_LNG_ES_419) - #include "../language/np3_es_419/np3_es_419.rc" #elif defined(MUI_BASE_LNG_ES_ES) #include "../language/np3_es_es/np3_es_es.rc" +#elif defined(MUI_BASE_LNG_ES_MX) + #include "../language/np3_es_mx/np3_es_mx.rc" #elif defined(MUI_BASE_LNG_FR_FR) #include "../language/np3_fr_fr/np3_fr_fr.rc" #elif defined(MUI_BASE_LNG_HI_IN) diff --git a/src/resource.h b/src/resource.h index 4a73b0efb..f2a293251 100644 --- a/src/resource.h +++ b/src/resource.h @@ -25,8 +25,8 @@ ///#define MUI_BASE_LNG_DE_DE 1 ///#define MUI_BASE_LNG_EL_GR 1 ///#define MUI_BASE_LNG_EN_GB 1 -///#define MUI_BASE_LNG_ES_419 1 ///#define MUI_BASE_LNG_ES_ES 1 +///#define MUI_BASE_LNG_ES_MX 1 ///#define MUI_BASE_LNG_FR_FR 1 ///#define MUI_BASE_LNG_HI_IN 1 ///#define MUI_BASE_LNG_HU_HU 1