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

+ chg: make language menu international (language independant)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-03-08 14:05:19 +01:00
parent 4de024017a
commit d66d7f2c60
23 changed files with 51 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Notepad3.sln
View File

@ -212,6 +212,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "language", "language", "{8FD783D5-8709-432D-A88E-6E3073AFF220}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "language", "language", "{8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}"
ProjectSection(SolutionItems) = preProject
language\language_menus.hpp = language\language_menus.hpp
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
Versions/build.txt
View File

@ -1 +1 @@
1649
1650

23
language/language_menus.hpp Normal file
View File

@ -0,0 +1,23 @@
#ifndef _LANGUAGE_MENUS_H_
#define _LANGUAGE_MENUS_H_
static LNG_MENU_T s_LanguageMenu[] =
{
{ MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L"English (United States)\t\t\t[%s]" },
{ MAKELANGID(LANG_AFRIKAANS, SUBLANG_AFRIKAANS_SOUTH_AFRICA), L"Afrikaans (Suid-Afrika)\t\t\t[%s]" },
{ MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), L"Беларускі (Беларусь)\t\t\t[%s]" },
{ MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), L"Deutsch (Deutschland)\t\t\t[%s]" },
{ MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), L"English (United Kingdom)\t\t\t[%s]" },
{ MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), L"Español (España)\t\t\t[%s]" },
{ MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), L"Français (France)\t\t\t[%s]" },
{ MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), L"Magyar (Magyarország)\t\t\t[%s]" },
{ MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), L"Italiano (Italia)\t\t\t[%s]" },
{ MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), L"日本語（日本）\t\t\t[%s]" },
{ MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), L"한국어 (대한민국)\t\t\t[%s]" },
{ MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), L"Nederlands (Nederland)\t\t\t[%s]" },
{ MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), L"Português (Brasil)\t\t\t[%s]" },
{ MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), L"Русский (Pоссия)\t\t\t[%s]" },
{ MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), L"中文（汉斯）\t\t\t[%s]" }
};
#endif //_LANGUAGE_MENUS_H_

15
language/np3_af_za/strings_af_za.rc
View File

@ -200,21 +200,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Taal"
IDS_MUI_LANG_EN_US "Engels (Verenigde State)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Suid-Afrika)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Wit-Russies (Wit-Rusland)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Duits (Duitsland)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Engels (Verenigde Koninkryk)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spaans (Spanje)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Frans (Frankryk)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hongaars (Hongarye)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiaans (Italië)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japannese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Koreaanse (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Afrikaans (Nederland)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugees (Brasilië)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russies (Rusland)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Sjinees (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_be_by/strings_be_by.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Ìîâû"
IDS_MUI_LANG_EN_US "Àíãë³éñêàÿ (ÇØÀ)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Àôðûêààíñ (Ïà¢äí¸âàÿ Àôðûêà)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Áåëàðóñê³ (Áåëàðóñü)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Íÿìåöêàÿ (Ãåðìàí³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Àíãë³éñêàÿ (Âÿë³êàáðûòàí³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "²ñïàíñê³ (²ñïàí³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Ôðàíöóçñêàÿ (Ôðàíöûÿ)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Âåíãåðñêàÿ (Âåíãðûÿ)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "²òàëüÿíñê³ (³òàë³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "ßïîíñê³ (ßïîí³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Êàðýéñêàÿ (Êàðýÿ)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Ãàëàíäñê³ (ͳäýðëàíäû)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Ïàðòóãàëüñêàÿ (Áðàç³ë³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Ðàñ³³ (Ðàñ³ÿ)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "ʳòàéñê³ (Hans)\t\t\t[%s]"
END
STRINGTABLE

10
language/np3_de_de/np3_de_de.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -120,7 +120,7 @@
<Message>MUI Split</Message>
</PostBuildEvent>
<ResourceCompile>
<Culture>0x0423</Culture>
<Culture>0x0407</Culture>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
@ -146,7 +146,7 @@
<Message>MUI Split</Message>
</PostBuildEvent>
<ResourceCompile>
<Culture>0x0423</Culture>
<Culture>0x0407</Culture>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
@ -178,7 +178,7 @@
<Message>MUI Split</Message>
</PostBuildEvent>
<ResourceCompile>
<Culture>0x0423</Culture>
<Culture>0x0407</Culture>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
@ -210,7 +210,7 @@
<Message>MUI Split</Message>
</PostBuildEvent>
<ResourceCompile>
<Culture>0x0423</Culture>
<Culture>0x0407</Culture>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>

15
language/np3_de_de/strings_de_de.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Sprache"
IDS_MUI_LANG_EN_US "Englisch (Vereinigte Staaten)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Südafrika)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Weißrussisch (Weißrussland)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Deutsch (Deutschland)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Englisch (Vereinigtes Königreich)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanisch (Spanien)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Französisch (Frankreich)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Ungarisch (Ungarn)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italienisch (Italien)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanisch (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Koreanisch (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Niederländisch (Niederlande)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugiesisch (Brasilien)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russisch (Russland)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinesisch (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_en_gb/strings_en_gb.rc
View File

@ -229,21 +229,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Language"
IDS_MUI_LANG_EN_US "English (United States)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (South Africa)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Korean (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_en_us/strings_en_us.rc
View File

@ -229,21 +229,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Language"
IDS_MUI_LANG_EN_US "English (United States)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (South Africa)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Korean (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_es_es/strings_es_es.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Idioma"
IDS_MUI_LANG_EN_US "Inglés (Estados Unidos)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikáans (Sudáfrica)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Bielorruso (Belarús)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Alemán (Alemania)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Inglés (Reino Unido)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Español (España)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Francés (Francia)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Húngaro (Hungría)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiano (Italia)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japonés (Japón)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coreano (Corea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Holandés (Países Bajos)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugués (Brasil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Ruso (Rusia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chino (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -199,21 +199,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Langue"
IDS_MUI_LANG_EN_US "Anglais (États-Unis)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Afrique du Sud)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Biélorusse (Biélorussie)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Allemand (Allemagne)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Anglais (Royaume Uni)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Espagnol (Espagne)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Français (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hongrois (Hongrie)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italien (Italie)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japonais (Japon)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coréen (Corée)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Néerlandais (Pays-Bas)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugais (Brésil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russe (Russie)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinois (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -229,21 +229,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Nyelv"
IDS_MUI_LANG_EN_US "Angol (Egyesült Államok)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Dél-Afrika)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Fehéroroszország (Fehéroroszország)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Német (Németország)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Angol Egyesült Királyság)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanyol (Spanyolország)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Francia (Franciaország)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Magyar (Magyarország)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Olasz (Olaszország)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japán (Japán)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Koreai (koreai)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Holland (Hollandia)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugál (Brazília)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Orosz (Oroszország)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Kínai (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_it_it/strings_it_it.rc
View File

@ -229,21 +229,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Lingua"
IDS_MUI_LANG_EN_US "Inglese (Stati Uniti)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Sudafrica)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Bielorusso (Bielorussia)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Tedesco (Germania)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Inglese (Regno Unito)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spagnolo (Spagna)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Francese (Francia)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Ungherese (Ungheria)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiano (Italia)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Giapponese (Giappone)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coreano (coreana\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Olandese (Paesi Bassi)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portoghese (Brasile)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russo (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Cinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Œ¾Œê"
IDS_MUI_LANG_EN_US "英語（アメリカ）\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "アフリカーンス語（南アフリカ）\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "ベラルーシ語（ベラルーシ）\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "ドイツ語（ドイツ）\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "英語（イギリス）\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "スペイン語（スペイン）\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "フランス語（フランス）\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "ハンガリー語（ハンガリー）\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "イタリア語（イタリア）\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "日本語（日本）\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "韓国語（韓国）\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "オランダ語（オランダ）\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "ポルトガル語（ブラジル）\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "ロシア語（ロシア）\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "中国語（ハンス）\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -221,21 +221,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "나라말"
IDS_MUI_LANG_EN_US "영어 (미국)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "아프리칸스 (남아프리카 공화국)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "벨로루시어 (벨로루시)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "독일어 (독일)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "영어 (영국)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "스페인어 (스페인)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "프랑스어 (프랑스)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "헝가리어 (헝가리)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "이탈리아어 (이탈리아)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "일본어 (일본)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "한국어 (대한민국)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "네덜란드어 (네덜란드)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "포르투갈어 (브라질)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "러시아어 (러시아)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "중국어 (한어)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Taal"
IDS_MUI_LANG_EN_US "Engels (Verenigde Staten)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Zuid-Afrika)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Wit-Russisch (Wit-Rusland)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Duits (Duitsland)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Engels (Verenigd Koninkrijk)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spaans (Spanje)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Frans (Frankrijk)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hongaars (Hongarije)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiaans (Italië)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japans (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Koreaans (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Nederlands (Nederland)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugees (Brazilië)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russisch (Rusland)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinees (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_pt_br/strings_pt_br.rc
View File

@ -229,21 +229,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Língua"
IDS_MUI_LANG_EN_US "Inglês (Estados Unidos)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (África do Sul)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Bielorrusso (Bielorrússia)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Alemanha (Alemã)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Inglês (Reino Unido)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Espanhol (Espanha)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Francês França)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Húngaro (Hungria)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiano (Itália)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japonês (Japão)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coreano (Coréia)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Holandês (Holanda)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Português (Brasil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russo (Rússia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinês (Hans)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "ßçûê"
IDS_MUI_LANG_EN_US "Àíãëèéñêèé Ñîåäèíåííûå Øòàòû)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Àôðèêààíñ (Þæíàÿ Àôðèêà)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Áåëîðóññêèé (Áåëàðóñü)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Íåìåöêèé (ãåðìàíèÿ)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Àíãëèéñêèé (Âåëèêîáðèòàíèÿ)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Èñïàíñêèé (Èñïàíèÿ)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Ôðàíöóçñêèé (ôðàíöèÿ)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Âåíãåðñêèé (Âåíãðèÿ)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Èòàëüÿíñêèé (èòàëèÿ)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "ßïîíñêèé (ÿïîíèÿ)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Êîðåéñêèé (Kîðåÿ)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Ãîëëàíäñêèé (Íèäåðëàíäû)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Ïîðòóãàëüñêèé (Áðàçèëèÿ)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Ðóññêèé (Pîññèÿ)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Êèòàéñêèé (Ãàíñ)\t\t\t[%s]"
END
STRINGTABLE

15
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -201,21 +201,6 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "ÓïÑÔ"
IDS_MUI_LANG_EN_US "英语（美国）\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "南非荷兰语（南非）\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "B白俄罗斯（白俄罗斯）\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "德语（德国）\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "英语（英国）\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "西班牙语（西班牙\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "法国（法国）\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "匈牙利语（匈牙利）\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "意大利（意大利）\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "日本（日本）\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "韩国（韩国）\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "荷兰（荷兰）\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "葡萄牙语（巴西）\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "俄罗斯（俄罗斯）\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "中文（汉斯）\t\t\t[%s]"
END
STRINGTABLE

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.308.1649"
version="5.19.308.1650"
type="win32"
/>
<description>Notepad3 XpErImEnTaL</description>

2
src/MuiLanguage.h
View File

@ -22,7 +22,7 @@ typedef struct _muilanguage
UINT rid;
WCHAR szLocaleName[LOCALE_NAME_MAX_LENGTH];
// !!! WARNING: LCID is DEPRECATED
LANGID LangId; // just for historic reasons
LANGID LangId;
bool bHasDLL;
bool bIsActive;

19
src/Notepad3.c
View File

@ -42,7 +42,6 @@
#include "SciXLexer.h"
#include "MuiLanguage.h"
#include "Notepad3.h"
@ -478,6 +477,13 @@ static void _InitGlobals()
}
typedef struct _lng_menu_t {
LANGID LangID;
const WCHAR* MenuItem;
} LNG_MENU_T;
#include "../language/language_menus.hpp"
static bool _InsertLanguageMenu(HMENU hMenuBar)
{
// check, if we need a language switching menu
@ -493,7 +499,15 @@ static bool _InsertLanguageMenu(HMENU hMenuBar)
{
if (MUI_LanguageDLLs[lng].bHasDLL)
{
GetLngString(MUI_LanguageDLLs[lng].rid, wchMenuItemFmt, COUNTOF(wchMenuItemFmt));
// GetLngString(MUI_LanguageDLLs[lng].rid, wchMenuItemFmt, COUNTOF(wchMenuItemFmt));
for (int i = 0; i < COUNTOF(s_LanguageMenu); ++i) {
if (MUI_LanguageDLLs[lng].LangId == s_LanguageMenu[i].LangID)
{
StringCchCopy(wchMenuItemFmt, COUNTOF(wchMenuItemFmt), s_LanguageMenu[i].MenuItem);
break;
}
}
StringCchPrintfW(wchMenuItemStrg, COUNTOF(wchMenuItemStrg), wchMenuItemFmt, MUI_LanguageDLLs[lng].szLocaleName);
AppendMenu(hmenuLanguage, MF_ENABLED | MF_STRING, MUI_LanguageDLLs[lng].rid, wchMenuItemStrg);
}
@ -1747,7 +1761,6 @@ static HBITMAP _LoadBitmapFile(LPCWSTR path)
return hbmp;
}
//=============================================================================
//
// SelectExternalToolBar() - Select and Load an external Bitmal as ToolBarImage

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 308
#define VERSION_BUILD 1649
#define VERSION_BUILD 1650
#define SCINTILLA_VER 414
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH XpErImEnTaL