From d66d7f2c60fbd5f7efbeb861e8dc90caeb3283ea Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 8 Mar 2019 14:05:19 +0100 Subject: [PATCH] + chg: make language menu international (language independant) --- Notepad3.sln | 3 +++ Versions/build.txt | 2 +- language/language_menus.hpp | 23 +++++++++++++++++++++++ language/np3_af_za/strings_af_za.rc | 15 --------------- language/np3_be_by/strings_be_by.rc | 15 --------------- language/np3_de_de/np3_de_de.vcxproj | 10 +++++----- language/np3_de_de/strings_de_de.rc | 15 --------------- language/np3_en_gb/strings_en_gb.rc | 15 --------------- language/np3_en_us/strings_en_us.rc | 15 --------------- language/np3_es_es/strings_es_es.rc | 15 --------------- language/np3_fr_fr/strings_fr_fr.rc | 15 --------------- language/np3_hu_hu/strings_hu_hu.rc | 15 --------------- language/np3_it_it/strings_it_it.rc | 15 --------------- language/np3_ja_jp/strings_ja_jp.rc | 15 --------------- language/np3_ko_kr/strings_ko_kr.rc | 15 --------------- language/np3_nl_nl/strings_nl_nl.rc | 15 --------------- language/np3_pt_br/strings_pt_br.rc | 15 --------------- language/np3_ru_ru/strings_ru_ru.rc | 15 --------------- language/np3_zh_cn/strings_zh_cn.rc | 15 --------------- res/Notepad3.exe.manifest.conf | 2 +- src/MuiLanguage.h | 2 +- src/Notepad3.c | 19 ++++++++++++++++--- src/VersionEx.h | 2 +- 23 files changed, 51 insertions(+), 237 deletions(-) create mode 100644 language/language_menus.hpp diff --git a/Notepad3.sln b/Notepad3.sln index 6db969464..1c5fd43f1 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -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 diff --git a/Versions/build.txt b/Versions/build.txt index a99e01b04..712cd79a3 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1649 +1650 diff --git a/language/language_menus.hpp b/language/language_menus.hpp new file mode 100644 index 000000000..690e5371a --- /dev/null +++ b/language/language_menus.hpp @@ -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_ diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index c6ed784e3..76c063e9e 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -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 diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 581848a7b..ef9b31cc7 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -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 diff --git a/language/np3_de_de/np3_de_de.vcxproj b/language/np3_de_de/np3_de_de.vcxproj index 5e8663650..e19502b6f 100644 --- a/language/np3_de_de/np3_de_de.vcxproj +++ b/language/np3_de_de/np3_de_de.vcxproj @@ -1,4 +1,4 @@ - + @@ -120,7 +120,7 @@ MUI Split - 0x0423 + 0x0407 $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -146,7 +146,7 @@ MUI Split - 0x0423 + 0x0407 $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -178,7 +178,7 @@ MUI Split - 0x0423 + 0x0407 $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) @@ -210,7 +210,7 @@ MUI Split - 0x0423 + 0x0407 $(ProjectDir)..\..\res;%(AdditionalIncludeDirectories) diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 0f09fac3d..c25cf336a 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -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 (Sdafrika)\t\t\t[%s]" - IDS_MUI_LANG_BE_BY "Weirussisch (Weirussland)\t\t\t[%s]" - IDS_MUI_LANG_DE_DE "Deutsch (Deutschland)\t\t\t[%s]" - IDS_MUI_LANG_EN_GB "Englisch (Vereinigtes Knigreich)\t\t\t[%s]" - IDS_MUI_LANG_ES_ES "Spanisch (Spanien)\t\t\t[%s]" - IDS_MUI_LANG_FR_FR "Franzsisch (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 "Niederlndisch (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 diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 7d89ee205..a7d5ede0b 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -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 diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index aefb1c84f..010388d6a 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -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 diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index f984ca13a..70f237309 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -201,21 +201,6 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "Idioma" - IDS_MUI_LANG_EN_US "Ingls (Estados Unidos)\t\t\t[%s]" - IDS_MUI_LANG_AF_ZA "Afrikans (Sudfrica)\t\t\t[%s]" - IDS_MUI_LANG_BE_BY "Bielorruso (Belars)\t\t\t[%s]" - IDS_MUI_LANG_DE_DE "Alemn (Alemania)\t\t\t[%s]" - IDS_MUI_LANG_EN_GB "Ingls (Reino Unido)\t\t\t[%s]" - IDS_MUI_LANG_ES_ES "Espaol (Espaa)\t\t\t[%s]" - IDS_MUI_LANG_FR_FR "Francs (Francia)\t\t\t[%s]" - IDS_MUI_LANG_HU_HU "Hngaro (Hungra)\t\t\t[%s]" - IDS_MUI_LANG_IT_IT "Italiano (Italia)\t\t\t[%s]" - IDS_MUI_LANG_JP_JP "Japons (Japn)\t\t\t[%s]" - IDS_MUI_LANG_KO_KR "Coreano (Corea)\t\t\t[%s]" - IDS_MUI_LANG_NL_NL "Holands (Pases Bajos)\t\t\t[%s]" - IDS_MUI_LANG_PT_BR "Portugus (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 diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index c7c73980a..7de48c0a7 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -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 "Bilorusse (Bilorussie)\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 "Franais (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 "Coren (Core)\t\t\t[%s]" - IDS_MUI_LANG_NL_NL "Nerlandais (Pays-Bas)\t\t\t[%s]" - IDS_MUI_LANG_PT_BR "Portugais (Brsil)\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 diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index bf53030e3..112c51713 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -229,21 +229,6 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "Nyelv" - IDS_MUI_LANG_EN_US "Angol (Egyeslt llamok)\t\t\t[%s]" - IDS_MUI_LANG_AF_ZA "Afrikaans (Dl-Afrika)\t\t\t[%s]" - IDS_MUI_LANG_BE_BY "Fehroroszorszg (Fehroroszorszg)\t\t\t[%s]" - IDS_MUI_LANG_DE_DE "Nmet (Nmetorszg)\t\t\t[%s]" - IDS_MUI_LANG_EN_GB "Angol Egyeslt Kirlysg)\t\t\t[%s]" - IDS_MUI_LANG_ES_ES "Spanyol (Spanyolorszg)\t\t\t[%s]" - IDS_MUI_LANG_FR_FR "Francia (Franciaorszg)\t\t\t[%s]" - IDS_MUI_LANG_HU_HU "Magyar (Magyarorszg)\t\t\t[%s]" - IDS_MUI_LANG_IT_IT "Olasz (Olaszorszg)\t\t\t[%s]" - IDS_MUI_LANG_JP_JP "Japn (Japn)\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 "Portugl (Brazlia)\t\t\t[%s]" - IDS_MUI_LANG_RU_RU "Orosz (Oroszorszg)\t\t\t[%s]" - IDS_MUI_LANG_ZH_CN "Knai (Hans)\t\t\t[%s]" END STRINGTABLE diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index f80b99c4b..df4500d80 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -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 diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index faa921b24..d4b6d55ce 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -201,21 +201,6 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "" - IDS_MUI_LANG_EN_US "piAJj\t\t\t[%s]" - IDS_MUI_LANG_AF_ZA "AtJ[XiAtJj\t\t\t[%s]" - IDS_MUI_LANG_BE_BY "x[Vix[Vj\t\t\t[%s]" - IDS_MUI_LANG_DE_DE "hCcihCcj\t\t\t[%s]" - IDS_MUI_LANG_EN_GB "piCMXj\t\t\t[%s]" - IDS_MUI_LANG_ES_ES "XyCiXyCj\t\t\t[%s]" - IDS_MUI_LANG_FR_FR "tXitXj\t\t\t[%s]" - IDS_MUI_LANG_HU_HU "nK[inK[j\t\t\t[%s]" - IDS_MUI_LANG_IT_IT "C^AiC^Aj\t\t\t[%s]" - IDS_MUI_LANG_JP_JP "{i{j\t\t\t[%s]" - IDS_MUI_LANG_KO_KR "؍i؍j\t\t\t[%s]" - IDS_MUI_LANG_NL_NL "I_iI_j\t\t\t[%s]" - IDS_MUI_LANG_PT_BR "|gKiuWj\t\t\t[%s]" - IDS_MUI_LANG_RU_RU "VAiVAj\t\t\t[%s]" - IDS_MUI_LANG_ZH_CN "inXj\t\t\t[%s]" END STRINGTABLE diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 2eb6d343a..156fee9bc 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -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 diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 906c15cc9..859b7c574 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -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 diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 9048c84e7..2a0bce792 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -229,21 +229,6 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "Lngua" - IDS_MUI_LANG_EN_US "Ingls (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 (Bielorrssia)\t\t\t[%s]" - IDS_MUI_LANG_DE_DE "Alemanha (Alem)\t\t\t[%s]" - IDS_MUI_LANG_EN_GB "Ingls (Reino Unido)\t\t\t[%s]" - IDS_MUI_LANG_ES_ES "Espanhol (Espanha)\t\t\t[%s]" - IDS_MUI_LANG_FR_FR "Francs Frana)\t\t\t[%s]" - IDS_MUI_LANG_HU_HU "Hngaro (Hungria)\t\t\t[%s]" - IDS_MUI_LANG_IT_IT "Italiano (Itlia)\t\t\t[%s]" - IDS_MUI_LANG_JP_JP "Japons (Japo)\t\t\t[%s]" - IDS_MUI_LANG_KO_KR "Coreano (Coria)\t\t\t[%s]" - IDS_MUI_LANG_NL_NL "Holands (Holanda)\t\t\t[%s]" - IDS_MUI_LANG_PT_BR "Portugus (Brasil)\t\t\t[%s]" - IDS_MUI_LANG_RU_RU "Russo (Rssia)\t\t\t[%s]" - IDS_MUI_LANG_ZH_CN "Chins (Hans)\t\t\t[%s]" END STRINGTABLE diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 111393cb8..cc94f4846 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -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 diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index b05c13b05..a91969dd6 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -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 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 87937f5d4..d08f5d81f 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 XpErImEnTaL diff --git a/src/MuiLanguage.h b/src/MuiLanguage.h index ba9e48dde..b4d638ee7 100644 --- a/src/MuiLanguage.h +++ b/src/MuiLanguage.h @@ -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; diff --git a/src/Notepad3.c b/src/Notepad3.c index eab5b398d..953b1dc70 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -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 diff --git a/src/VersionEx.h b/src/VersionEx.h index a1b14bca8..0ebb3f428 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -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