From 76234eff64f9367a51e8babc33608362a51adb91 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 26 Mar 2021 17:41:38 +0100 Subject: [PATCH 1/8] MUI - Add Kotlin & Dart Lexer from Zufuliu's source --- language/np3_af_za/lexer_af_za.rc | 3 ++- language/np3_be_by/lexer_be_by.rc | 3 ++- language/np3_de_de/lexer_de_de.rc | 2 +- language/np3_el_gr/lexer_el_gr.rc | 3 ++- language/np3_en_gb/lexer_en_gb.rc | 3 ++- language/np3_en_us/lexer_en_us.rc | 2 +- language/np3_es_419/lexer_es_419.rc | 3 ++- language/np3_es_es/lexer_es_es.rc | 3 ++- language/np3_fr_fr/lexer_fr_fr.rc | 3 ++- language/np3_hi_in/lexer_hi_in.rc | 3 ++- language/np3_hu_hu/lexer_hu_hu.rc | 3 ++- language/np3_id_id/lexer_id_id.rc | 3 ++- language/np3_it_it/lexer_it_it.rc | 3 ++- language/np3_ja_jp/lexer_ja_jp.rc | 3 ++- language/np3_ko_kr/lexer_ko_kr.rc | 3 ++- language/np3_nl_nl/lexer_nl_nl.rc | 3 ++- language/np3_pl_pl/lexer_pl_pl.rc | 3 ++- language/np3_pt_br/lexer_pt_br.rc | 3 ++- language/np3_pt_pt/lexer_pt_pt.rc | 3 ++- language/np3_ru_ru/lexer_ru_ru.rc | 3 ++- language/np3_sk_sk/lexer_sk_sk.rc | 3 ++- language/np3_sv_se/lexer_sv_se.rc | 3 ++- language/np3_tr_tr/lexer_tr_tr.rc | 3 ++- language/np3_vi_vn/lexer_vi_vn.rc | 3 ++- language/np3_zh_cn/lexer_zh_cn.rc | 3 ++- language/np3_zh_tw/lexer_zh_tw.rc | 3 ++- 26 files changed, 50 insertions(+), 26 deletions(-) diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc index db4903926..a305c54b1 100644 --- a/language/np3_af_za/lexer_af_za.rc +++ b/language/np3_af_za/lexer_af_za.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolom 0" + IDS_LEX_CSV_COL_0 "Kolom 0" IDS_LEX_CSV_COL_1 "Kolom 1" IDS_LEX_CSV_COL_2 "Kolom 2" IDS_LEX_CSV_COL_3 "Kolom 3" diff --git a/language/np3_be_by/lexer_be_by.rc b/language/np3_be_by/lexer_be_by.rc index 8ef266544..751175ebb 100644 --- a/language/np3_be_by/lexer_be_by.rc +++ b/language/np3_be_by/lexer_be_by.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Слупок 0" + IDS_LEX_CSV_COL_0 "Слупок 0" IDS_LEX_CSV_COL_1 "Слупок 1" IDS_LEX_CSV_COL_2 "Слупок 2" IDS_LEX_CSV_COL_3 "Слупок 3" diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index c9c2677d0..ed12a5b5b 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_el_gr/lexer_el_gr.rc b/language/np3_el_gr/lexer_el_gr.rc index 84a4783b1..a5fe701ae 100644 --- a/language/np3_el_gr/lexer_el_gr.rc +++ b/language/np3_el_gr/lexer_el_gr.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc index 271ac7786..015faca84 100644 --- a/language/np3_en_gb/lexer_en_gb.rc +++ b/language/np3_en_gb/lexer_en_gb.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 0f7d91016..21644299d 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_es_419/lexer_es_419.rc b/language/np3_es_419/lexer_es_419.rc index d80e55e7d..d2137f602 100644 --- a/language/np3_es_419/lexer_es_419.rc +++ b/language/np3_es_419/lexer_es_419.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Columna 0" + IDS_LEX_CSV_COL_0 "Columna 0" IDS_LEX_CSV_COL_1 "Columna 1" IDS_LEX_CSV_COL_2 "Columna 2" IDS_LEX_CSV_COL_3 "Columna 3" diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc index 07508374a..366102f7e 100644 --- a/language/np3_es_es/lexer_es_es.rc +++ b/language/np3_es_es/lexer_es_es.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Columna 0" + IDS_LEX_CSV_COL_0 "Columna 0" IDS_LEX_CSV_COL_1 "Columna 1" IDS_LEX_CSV_COL_2 "Columna 2" IDS_LEX_CSV_COL_3 "Columna 3" diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc index 4a5e5b34c..bcdd4a12e 100644 --- a/language/np3_fr_fr/lexer_fr_fr.rc +++ b/language/np3_fr_fr/lexer_fr_fr.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Colonne 0" + IDS_LEX_CSV_COL_0 "Colonne 0" IDS_LEX_CSV_COL_1 "Colonne 1" IDS_LEX_CSV_COL_2 "Colonne 2" IDS_LEX_CSV_COL_3 "Colonne 3" diff --git a/language/np3_hi_in/lexer_hi_in.rc b/language/np3_hi_in/lexer_hi_in.rc index 22337e83e..44c3c0abf 100644 --- a/language/np3_hi_in/lexer_hi_in.rc +++ b/language/np3_hi_in/lexer_hi_in.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "खंड 0" + IDS_LEX_CSV_COL_0 "खंड 0" IDS_LEX_CSV_COL_1 "खंड 1" IDS_LEX_CSV_COL_2 "खंड 2" IDS_LEX_CSV_COL_3 "खंड 3" diff --git a/language/np3_hu_hu/lexer_hu_hu.rc b/language/np3_hu_hu/lexer_hu_hu.rc index ba19656c8..d19d436db 100644 --- a/language/np3_hu_hu/lexer_hu_hu.rc +++ b/language/np3_hu_hu/lexer_hu_hu.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Oszlop 0" + IDS_LEX_CSV_COL_0 "Oszlop 0" IDS_LEX_CSV_COL_1 "Oszlop 1" IDS_LEX_CSV_COL_2 "Oszlop 2" IDS_LEX_CSV_COL_3 "Oszlop 3" diff --git a/language/np3_id_id/lexer_id_id.rc b/language/np3_id_id/lexer_id_id.rc index 04a3c4f36..bfd3a9528 100644 --- a/language/np3_id_id/lexer_id_id.rc +++ b/language/np3_id_id/lexer_id_id.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_it_it/lexer_it_it.rc b/language/np3_it_it/lexer_it_it.rc index d771fd924..0d5bd9ee2 100644 --- a/language/np3_it_it/lexer_it_it.rc +++ b/language/np3_it_it/lexer_it_it.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Colonna 0" + IDS_LEX_CSV_COL_0 "Colonna 0" IDS_LEX_CSV_COL_1 "Colonna 1" IDS_LEX_CSV_COL_2 "Colonna 2" IDS_LEX_CSV_COL_3 "Colonna 3" diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index 0759ee8cf..040bc8211 100644 --- a/language/np3_ja_jp/lexer_ja_jp.rc +++ b/language/np3_ja_jp/lexer_ja_jp.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "列 0" + IDS_LEX_CSV_COL_0 "列 0" IDS_LEX_CSV_COL_1 "列 1" IDS_LEX_CSV_COL_2 "列 2" IDS_LEX_CSV_COL_3 "列 3" diff --git a/language/np3_ko_kr/lexer_ko_kr.rc b/language/np3_ko_kr/lexer_ko_kr.rc index e0b86ff2c..b92e15df9 100644 --- a/language/np3_ko_kr/lexer_ko_kr.rc +++ b/language/np3_ko_kr/lexer_ko_kr.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "데코레이터" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "열 0" + IDS_LEX_CSV_COL_0 "열 0" IDS_LEX_CSV_COL_1 "열 1" IDS_LEX_CSV_COL_2 "열 2" IDS_LEX_CSV_COL_3 "열 3" diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc index 31c597bc2..a8d7165de 100644 --- a/language/np3_nl_nl/lexer_nl_nl.rc +++ b/language/np3_nl_nl/lexer_nl_nl.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolom 0" + IDS_LEX_CSV_COL_0 "Kolom 0" IDS_LEX_CSV_COL_1 "Kolom 1" IDS_LEX_CSV_COL_2 "Kolom 2" IDS_LEX_CSV_COL_3 "Kolom 3" diff --git a/language/np3_pl_pl/lexer_pl_pl.rc b/language/np3_pl_pl/lexer_pl_pl.rc index 82e89c308..37e302804 100644 --- a/language/np3_pl_pl/lexer_pl_pl.rc +++ b/language/np3_pl_pl/lexer_pl_pl.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolumna 0" + IDS_LEX_CSV_COL_0 "Kolumna 0" IDS_LEX_CSV_COL_1 "Kolumna 1" IDS_LEX_CSV_COL_2 "Kolumna 2" IDS_LEX_CSV_COL_3 "Kolumna 3" diff --git a/language/np3_pt_br/lexer_pt_br.rc b/language/np3_pt_br/lexer_pt_br.rc index 6bc1b57d0..b9047d2b4 100644 --- a/language/np3_pt_br/lexer_pt_br.rc +++ b/language/np3_pt_br/lexer_pt_br.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Coluna 0" + IDS_LEX_CSV_COL_0 "Coluna 0" IDS_LEX_CSV_COL_1 "Coluna 1" IDS_LEX_CSV_COL_2 "Coluna 2" IDS_LEX_CSV_COL_3 "Coluna 3" diff --git a/language/np3_pt_pt/lexer_pt_pt.rc b/language/np3_pt_pt/lexer_pt_pt.rc index 4e11a3111..f7a5cf989 100644 --- a/language/np3_pt_pt/lexer_pt_pt.rc +++ b/language/np3_pt_pt/lexer_pt_pt.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Coluna 0" + IDS_LEX_CSV_COL_0 "Coluna 0" IDS_LEX_CSV_COL_1 "Coluna 1" IDS_LEX_CSV_COL_2 "Coluna 2" IDS_LEX_CSV_COL_3 "Coluna 3" diff --git a/language/np3_ru_ru/lexer_ru_ru.rc b/language/np3_ru_ru/lexer_ru_ru.rc index c12f6cb6e..5306416bb 100644 --- a/language/np3_ru_ru/lexer_ru_ru.rc +++ b/language/np3_ru_ru/lexer_ru_ru.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Колонка 0" + IDS_LEX_CSV_COL_0 "Колонка 0" IDS_LEX_CSV_COL_1 "Колонка 1" IDS_LEX_CSV_COL_2 "Колонка 2" IDS_LEX_CSV_COL_3 "Колонка 3" diff --git a/language/np3_sk_sk/lexer_sk_sk.rc b/language/np3_sk_sk/lexer_sk_sk.rc index f245ee6b0..9faa1b1ad 100644 --- a/language/np3_sk_sk/lexer_sk_sk.rc +++ b/language/np3_sk_sk/lexer_sk_sk.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Stĺpec 0" + IDS_LEX_CSV_COL_0 "Stĺpec 0" IDS_LEX_CSV_COL_1 "Stĺpec 1" IDS_LEX_CSV_COL_2 "Stĺpec 2" IDS_LEX_CSV_COL_3 "Stĺpec 3" diff --git a/language/np3_sv_se/lexer_sv_se.rc b/language/np3_sv_se/lexer_sv_se.rc index f44cd5cd0..d0315d5a8 100644 --- a/language/np3_sv_se/lexer_sv_se.rc +++ b/language/np3_sv_se/lexer_sv_se.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolumn 0" + IDS_LEX_CSV_COL_0 "Kolumn 0" IDS_LEX_CSV_COL_1 "Kolumn 1" IDS_LEX_CSV_COL_2 "Kolumn 2" IDS_LEX_CSV_COL_3 "Kolumn 3" diff --git a/language/np3_tr_tr/lexer_tr_tr.rc b/language/np3_tr_tr/lexer_tr_tr.rc index 10e9e2d60..3ed5aefe4 100644 --- a/language/np3_tr_tr/lexer_tr_tr.rc +++ b/language/np3_tr_tr/lexer_tr_tr.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_vi_vn/lexer_vi_vn.rc b/language/np3_vi_vn/lexer_vi_vn.rc index a5d56ae00..efc3c0bf3 100644 --- a/language/np3_vi_vn/lexer_vi_vn.rc +++ b/language/np3_vi_vn/lexer_vi_vn.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_zh_cn/lexer_zh_cn.rc b/language/np3_zh_cn/lexer_zh_cn.rc index 44ff9d25a..9eea819e8 100644 --- a/language/np3_zh_cn/lexer_zh_cn.rc +++ b/language/np3_zh_cn/lexer_zh_cn.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_zh_tw/lexer_zh_tw.rc b/language/np3_zh_tw/lexer_zh_tw.rc index c22c536b3..199d88a16 100644 --- a/language/np3_zh_tw/lexer_zh_tw.rc +++ b/language/np3_zh_tw/lexer_zh_tw.rc @@ -476,11 +476,12 @@ END STRINGTABLE BEGIN IDS_LEX_STR_63372 "Decorator" + IDS_LEX_STR_63373 "Task Marker" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" From 8063a677b20f8dc13e13b2a11917eb464de4bb48 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 26 Mar 2021 17:44:50 +0100 Subject: [PATCH 2/8] MUI - Extend Compiler switch to allow mono language binary for all languages --- src/Notepad3.rc | 97 +++++++++++++++++++++++++++++++++++++++++++++++-- src/resource.h | 28 +++++++++++++- 2 files changed, 119 insertions(+), 6 deletions(-) diff --git a/src/Notepad3.rc b/src/Notepad3.rc index fc43dd39a..607b391e6 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -39,10 +39,54 @@ BEGIN "#include ""../language/np3_en_us/np3_en_us.rc""\r\n" #elif defined(MUI_BASE_LNG_AF_ZA) "#include ""../language/np3_af_za/np3_af_za.rc""\r\n" +#elif defined(MUI_BASE_LNG_BE_BY) + "#include ""../language/np3_be_by/np3_be_by.rc""\r\n" #elif defined(MUI_BASE_LNG_DE_DE) "#include ""../language/np3_de_de/np3_de_de.rc""\r\n" +#elif defined(MUI_BASE_LNG_EL_GR) + "#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_FR_FR) "#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n" +#elif defined(MUI_BASE_LNG_HI_IN) + "#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n" +#elif defined(MUI_BASE_LNG_HU_HU) + "#include ""../language/np3_hu_hu/np3_hu_hu.rc""\r\n" +#elif defined(MUI_BASE_LNG_ID_ID) + "#include ""../language/np3_id_id/np3_id_id.rc""\r\n" +#elif defined(MUI_BASE_LNG_IT_IT) + "#include ""../language/np3_it_it/np3_it_it.rc""\r\n" +#elif defined(MUI_BASE_LNG_JA_JP) + "#include ""../language/np3_ja_jp/np3_ja_jp.rc""\r\n" +#elif defined(MUI_BASE_LNG_KO_KR) + "#include ""../language/np3_ko_kr/np3_ko_kr.rc""\r\n" +#elif defined(MUI_BASE_LNG_NL_NL) + "#include ""../language/np3_nl_nl/np3_nl_nl.rc""\r\n" +#elif defined(MUI_BASE_LNG_PL_PL) + "#include ""../language/np3_pl_pl/np3_pl_pl.rc""\r\n" +#elif defined(MUI_BASE_LNG_PT_BR) + "#include ""../language/np3_pt_br/np3_pt_br.rc""\r\n" +#elif defined(MUI_BASE_LNG_PT_PT) + "#include ""../language/np3_pr_pt/np3_pt-pt.rc""\r\n" +#elif defined(MUI_BASE_LNG_RU_RU) + "#include ""../language/np3_ru_ru/np3_ru_ru.rc""\r\n" +#elif defined(MUI_BASE_LNG_SK_SK) + "#include ""../language/np3_sk_sk/np3_sk_sk.rc""\r\n" +#elif defined(MUI_BASE_LNG_SV_SE) + "#include ""../language/np3_sv_se/np3_sv_se.rc""\r\n" +#elif defined(MUI_BASE_LNG_TR_TR) + "#include ""../language/np3_tr_tr/np3_tr_tr.rc""\r\n" +#elif defined(MUI_BASE_LNG_VI_VN) + "#include ""../language/np3_vi_vn/np3_vi_vn.rc""\r\n" +#elif defined(MUI_BASE_LNG_ZH_CN) + "#include ""../language/np3_zh_cn/np3_zh_cn.rc""\r\n" +#elif defined(MUI_BASE_LNG_ZH_TW) + "#include ""../language/np3_zh_tw/np3_zh_tw.rc""\r\n" #endif "\0" @@ -429,14 +473,59 @@ END // Generated from the TEXTINCLUDE 3 resource. // #include "Notepad3.ver" + #if defined(MUI_BASE_LNG_EN_US) -#include "../language/np3_en_us/np3_en_us.rc" + #include "../language/np3_en_us/np3_en_us.rc" #elif defined(MUI_BASE_LNG_AF_ZA) -#include "../language/np3_af_za/np3_af_za.rc" + #include "../language/np3_af_za/np3_af_za.rc" +#elif defined(MUI_BASE_LNG_BE_BY) + #include "../language/np3_be_by/np3_be_by.rc" #elif defined(MUI_BASE_LNG_DE_DE) -#include "../language/np3_de_de/np3_de_de.rc" + #include "../language/np3_de_de/np3_de_de.rc" +#elif defined(MUI_BASE_LNG_EL_GR) + #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_FR_FR) -#include "../language/np3_fr_fr/np3_fr_fr.rc" + #include "../language/np3_fr_fr/np3_fr_fr.rc" +#elif defined(MUI_BASE_LNG_HI_IN) + #include "../language/np3_fr_fr/np3_fr_fr.rc" +#elif defined(MUI_BASE_LNG_HU_HU) + #include "../language/np3_hu_hu/np3_hu_hu.rc" +#elif defined(MUI_BASE_LNG_ID_ID) + #include "../language/np3_id_id/np3_id_id.rc" +#elif defined(MUI_BASE_LNG_IT_IT) + #include "../language/np3_it_it/np3_it_it.rc" +#elif defined(MUI_BASE_LNG_JA_JP) + #include "../language/np3_ja_jp/np3_ja_jp.rc" +#elif defined(MUI_BASE_LNG_KO_KR) + #include "../language/np3_ko_kr/np3_ko_kr.rc" +#elif defined(MUI_BASE_LNG_NL_NL) + #include "../language/np3_nl_nl/np3_nl_nl.rc" +#elif defined(MUI_BASE_LNG_PL_PL) + #include "../language/np3_pl_pl/np3_pl_pl.rc" +#elif defined(MUI_BASE_LNG_PT_BR) + #include "../language/np3_pt_br/np3_pt_br.rc" +#elif defined(MUI_BASE_LNG_PT_PT) + #include "../language/np3_pr_pt/np3_pt-pt.rc" +#elif defined(MUI_BASE_LNG_RU_RU) + #include "../language/np3_ru_ru/np3_ru_ru.rc" +#elif defined(MUI_BASE_LNG_SK_SK) + #include "../language/np3_sk_sk/np3_sk_sk.rc" +#elif defined(MUI_BASE_LNG_SV_SE) + #include "../language/np3_sv_se/np3_sv_se.rc" +#elif defined(MUI_BASE_LNG_TR_TR) + #include "../language/np3_tr_tr/np3_tr_tr.rc" +#elif defined(MUI_BASE_LNG_VI_VN) + #include "../language/np3_vi_vn/np3_vi_vn.rc" +#elif defined(MUI_BASE_LNG_ZH_CN) + #include "../language/np3_zh_cn/np3_zh_cn.rc" +#elif defined(MUI_BASE_LNG_ZH_TW) + #include "../language/np3_zh_tw/np3_zh_tw.rc" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/src/resource.h b/src/resource.h index 8dc9d809c..27c5b5315 100644 --- a/src/resource.h +++ b/src/resource.h @@ -10,20 +10,44 @@ #endif // ========================================== - +// 1. To build a NON MUI Notepad3, Comment-Out the following line #define HAVE_DYN_LOAD_LIBS_MUI_LNGS 1 // ------------------------------------------ -/// - extent Notepad3.rc file accordingly +// - extent Notepad3.rc file accordingly // ------------------------------------------ #ifdef HAVE_DYN_LOAD_LIBS_MUI_LNGS // currently only en-US allowed // for Base-Lng in MUI env #define MUI_BASE_LNG_EN_US 1 #else +// 2. To build a NON MUI Notepad3, Comment-Out the following line #define MUI_BASE_LNG_EN_US 1 +// 3. And Uncommentt one of the following lines //#define MUI_BASE_LNG_AF_ZA 1 + //#define MUI_BASE_LNG_BE_BY 1 //#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_FR_FR 1 + //#define MUI_BASE_LNG_HI_IN 1 + //#define MUI_BASE_LNG_HU_HU 1 + //#define MUI_BASE_LNG_ID_ID 1 + //#define MUI_BASE_LNG_IT_IT 1 + //#define MUI_BASE_LNG_JA_JP 1 + //#define MUI_BASE_LNG_KO_KR 1 + //#define MUI_BASE_LNG_NL_NL 1 + //#define MUI_BASE_LNG_PL_PL 1 + //#define MUI_BASE_LNG_PT_BR 1 + //#define MUI_BASE_LNG_PT_PT 1 + //#define MUI_BASE_LNG_RU_RU 1 + //#define MUI_BASE_LNG_SK_SK 1 + //#define MUI_BASE_LNG_SV_SE 1 + //#define MUI_BASE_LNG_TR_TR 1 + //#define MUI_BASE_LNG_VI_VN 1 + //#define MUI_BASE_LNG_ZH_CN 1 + //#define MUI_BASE_LNG_ZH_TW 1 #endif // ========================================== From 6ae0dfe47cd7f0180b76e2215a3b4118a85cab1e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 26 Mar 2021 19:53:02 +0100 Subject: [PATCH 3/8] MUI - Small correction --- language/np3_af_za/lexer_af_za.rc | 2 +- language/np3_be_by/lexer_be_by.rc | 2 +- language/np3_de_de/lexer_de_de.rc | 2 +- language/np3_el_gr/lexer_el_gr.rc | 2 +- language/np3_en_gb/lexer_en_gb.rc | 2 +- language/np3_en_us/lexer_en_us.rc | 2 +- language/np3_es_419/lexer_es_419.rc | 2 +- language/np3_es_es/lexer_es_es.rc | 2 +- language/np3_fr_fr/lexer_fr_fr.rc | 2 +- language/np3_hi_in/lexer_hi_in.rc | 2 +- language/np3_hu_hu/lexer_hu_hu.rc | 2 +- language/np3_id_id/lexer_id_id.rc | 2 +- language/np3_it_it/lexer_it_it.rc | 2 +- language/np3_ja_jp/lexer_ja_jp.rc | 2 +- language/np3_ko_kr/lexer_ko_kr.rc | 2 +- language/np3_nl_nl/lexer_nl_nl.rc | 2 +- language/np3_pl_pl/lexer_pl_pl.rc | 2 +- language/np3_pt_br/lexer_pt_br.rc | 2 +- language/np3_pt_pt/lexer_pt_pt.rc | 2 +- language/np3_ru_ru/lexer_ru_ru.rc | 2 +- language/np3_sk_sk/lexer_sk_sk.rc | 2 +- language/np3_sv_se/lexer_sv_se.rc | 2 +- language/np3_tr_tr/lexer_tr_tr.rc | 2 +- language/np3_vi_vn/lexer_vi_vn.rc | 2 +- language/np3_zh_cn/lexer_zh_cn.rc | 2 +- language/np3_zh_tw/lexer_zh_tw.rc | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc index a305c54b1..cdcd328da 100644 --- a/language/np3_af_za/lexer_af_za.rc +++ b/language/np3_af_za/lexer_af_za.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolom 0" + IDS_LEX_CSV_COL_0 "Kolom 0" IDS_LEX_CSV_COL_1 "Kolom 1" IDS_LEX_CSV_COL_2 "Kolom 2" IDS_LEX_CSV_COL_3 "Kolom 3" diff --git a/language/np3_be_by/lexer_be_by.rc b/language/np3_be_by/lexer_be_by.rc index 751175ebb..97a390b81 100644 --- a/language/np3_be_by/lexer_be_by.rc +++ b/language/np3_be_by/lexer_be_by.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Слупок 0" + IDS_LEX_CSV_COL_0 "Слупок 0" IDS_LEX_CSV_COL_1 "Слупок 1" IDS_LEX_CSV_COL_2 "Слупок 2" IDS_LEX_CSV_COL_3 "Слупок 3" diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index ed12a5b5b..c9c2677d0 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_el_gr/lexer_el_gr.rc b/language/np3_el_gr/lexer_el_gr.rc index a5fe701ae..8ab03388b 100644 --- a/language/np3_el_gr/lexer_el_gr.rc +++ b/language/np3_el_gr/lexer_el_gr.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc index 015faca84..dc900f539 100644 --- a/language/np3_en_gb/lexer_en_gb.rc +++ b/language/np3_en_gb/lexer_en_gb.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 21644299d..0f7d91016 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_es_419/lexer_es_419.rc b/language/np3_es_419/lexer_es_419.rc index d2137f602..51d76a729 100644 --- a/language/np3_es_419/lexer_es_419.rc +++ b/language/np3_es_419/lexer_es_419.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Columna 0" + IDS_LEX_CSV_COL_0 "Columna 0" IDS_LEX_CSV_COL_1 "Columna 1" IDS_LEX_CSV_COL_2 "Columna 2" IDS_LEX_CSV_COL_3 "Columna 3" diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc index 366102f7e..77d0465f2 100644 --- a/language/np3_es_es/lexer_es_es.rc +++ b/language/np3_es_es/lexer_es_es.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Columna 0" + IDS_LEX_CSV_COL_0 "Columna 0" IDS_LEX_CSV_COL_1 "Columna 1" IDS_LEX_CSV_COL_2 "Columna 2" IDS_LEX_CSV_COL_3 "Columna 3" diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc index bcdd4a12e..a3741ff07 100644 --- a/language/np3_fr_fr/lexer_fr_fr.rc +++ b/language/np3_fr_fr/lexer_fr_fr.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Colonne 0" + IDS_LEX_CSV_COL_0 "Colonne 0" IDS_LEX_CSV_COL_1 "Colonne 1" IDS_LEX_CSV_COL_2 "Colonne 2" IDS_LEX_CSV_COL_3 "Colonne 3" diff --git a/language/np3_hi_in/lexer_hi_in.rc b/language/np3_hi_in/lexer_hi_in.rc index 44c3c0abf..155ee2e48 100644 --- a/language/np3_hi_in/lexer_hi_in.rc +++ b/language/np3_hi_in/lexer_hi_in.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "खंड 0" + IDS_LEX_CSV_COL_0 "खंड 0" IDS_LEX_CSV_COL_1 "खंड 1" IDS_LEX_CSV_COL_2 "खंड 2" IDS_LEX_CSV_COL_3 "खंड 3" diff --git a/language/np3_hu_hu/lexer_hu_hu.rc b/language/np3_hu_hu/lexer_hu_hu.rc index d19d436db..973cb8a7d 100644 --- a/language/np3_hu_hu/lexer_hu_hu.rc +++ b/language/np3_hu_hu/lexer_hu_hu.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Oszlop 0" + IDS_LEX_CSV_COL_0 "Oszlop 0" IDS_LEX_CSV_COL_1 "Oszlop 1" IDS_LEX_CSV_COL_2 "Oszlop 2" IDS_LEX_CSV_COL_3 "Oszlop 3" diff --git a/language/np3_id_id/lexer_id_id.rc b/language/np3_id_id/lexer_id_id.rc index bfd3a9528..6d6fc85c4 100644 --- a/language/np3_id_id/lexer_id_id.rc +++ b/language/np3_id_id/lexer_id_id.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_it_it/lexer_it_it.rc b/language/np3_it_it/lexer_it_it.rc index 0d5bd9ee2..29488a386 100644 --- a/language/np3_it_it/lexer_it_it.rc +++ b/language/np3_it_it/lexer_it_it.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Colonna 0" + IDS_LEX_CSV_COL_0 "Colonna 0" IDS_LEX_CSV_COL_1 "Colonna 1" IDS_LEX_CSV_COL_2 "Colonna 2" IDS_LEX_CSV_COL_3 "Colonna 3" diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index 040bc8211..0589593a1 100644 --- a/language/np3_ja_jp/lexer_ja_jp.rc +++ b/language/np3_ja_jp/lexer_ja_jp.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "列 0" + IDS_LEX_CSV_COL_0 "列 0" IDS_LEX_CSV_COL_1 "列 1" IDS_LEX_CSV_COL_2 "列 2" IDS_LEX_CSV_COL_3 "列 3" diff --git a/language/np3_ko_kr/lexer_ko_kr.rc b/language/np3_ko_kr/lexer_ko_kr.rc index b92e15df9..d65862907 100644 --- a/language/np3_ko_kr/lexer_ko_kr.rc +++ b/language/np3_ko_kr/lexer_ko_kr.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "열 0" + IDS_LEX_CSV_COL_0 "열 0" IDS_LEX_CSV_COL_1 "열 1" IDS_LEX_CSV_COL_2 "열 2" IDS_LEX_CSV_COL_3 "열 3" diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc index a8d7165de..9cac28e7e 100644 --- a/language/np3_nl_nl/lexer_nl_nl.rc +++ b/language/np3_nl_nl/lexer_nl_nl.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolom 0" + IDS_LEX_CSV_COL_0 "Kolom 0" IDS_LEX_CSV_COL_1 "Kolom 1" IDS_LEX_CSV_COL_2 "Kolom 2" IDS_LEX_CSV_COL_3 "Kolom 3" diff --git a/language/np3_pl_pl/lexer_pl_pl.rc b/language/np3_pl_pl/lexer_pl_pl.rc index 37e302804..0823ca24c 100644 --- a/language/np3_pl_pl/lexer_pl_pl.rc +++ b/language/np3_pl_pl/lexer_pl_pl.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolumna 0" + IDS_LEX_CSV_COL_0 "Kolumna 0" IDS_LEX_CSV_COL_1 "Kolumna 1" IDS_LEX_CSV_COL_2 "Kolumna 2" IDS_LEX_CSV_COL_3 "Kolumna 3" diff --git a/language/np3_pt_br/lexer_pt_br.rc b/language/np3_pt_br/lexer_pt_br.rc index b9047d2b4..c84efce57 100644 --- a/language/np3_pt_br/lexer_pt_br.rc +++ b/language/np3_pt_br/lexer_pt_br.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Coluna 0" + IDS_LEX_CSV_COL_0 "Coluna 0" IDS_LEX_CSV_COL_1 "Coluna 1" IDS_LEX_CSV_COL_2 "Coluna 2" IDS_LEX_CSV_COL_3 "Coluna 3" diff --git a/language/np3_pt_pt/lexer_pt_pt.rc b/language/np3_pt_pt/lexer_pt_pt.rc index f7a5cf989..6463c4bdc 100644 --- a/language/np3_pt_pt/lexer_pt_pt.rc +++ b/language/np3_pt_pt/lexer_pt_pt.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Coluna 0" + IDS_LEX_CSV_COL_0 "Coluna 0" IDS_LEX_CSV_COL_1 "Coluna 1" IDS_LEX_CSV_COL_2 "Coluna 2" IDS_LEX_CSV_COL_3 "Coluna 3" diff --git a/language/np3_ru_ru/lexer_ru_ru.rc b/language/np3_ru_ru/lexer_ru_ru.rc index 5306416bb..cdf83d038 100644 --- a/language/np3_ru_ru/lexer_ru_ru.rc +++ b/language/np3_ru_ru/lexer_ru_ru.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Колонка 0" + IDS_LEX_CSV_COL_0 "Колонка 0" IDS_LEX_CSV_COL_1 "Колонка 1" IDS_LEX_CSV_COL_2 "Колонка 2" IDS_LEX_CSV_COL_3 "Колонка 3" diff --git a/language/np3_sk_sk/lexer_sk_sk.rc b/language/np3_sk_sk/lexer_sk_sk.rc index 9faa1b1ad..921daf42a 100644 --- a/language/np3_sk_sk/lexer_sk_sk.rc +++ b/language/np3_sk_sk/lexer_sk_sk.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Stĺpec 0" + IDS_LEX_CSV_COL_0 "Stĺpec 0" IDS_LEX_CSV_COL_1 "Stĺpec 1" IDS_LEX_CSV_COL_2 "Stĺpec 2" IDS_LEX_CSV_COL_3 "Stĺpec 3" diff --git a/language/np3_sv_se/lexer_sv_se.rc b/language/np3_sv_se/lexer_sv_se.rc index d0315d5a8..dc4c7a20c 100644 --- a/language/np3_sv_se/lexer_sv_se.rc +++ b/language/np3_sv_se/lexer_sv_se.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Kolumn 0" + IDS_LEX_CSV_COL_0 "Kolumn 0" IDS_LEX_CSV_COL_1 "Kolumn 1" IDS_LEX_CSV_COL_2 "Kolumn 2" IDS_LEX_CSV_COL_3 "Kolumn 3" diff --git a/language/np3_tr_tr/lexer_tr_tr.rc b/language/np3_tr_tr/lexer_tr_tr.rc index 3ed5aefe4..0051d5482 100644 --- a/language/np3_tr_tr/lexer_tr_tr.rc +++ b/language/np3_tr_tr/lexer_tr_tr.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_vi_vn/lexer_vi_vn.rc b/language/np3_vi_vn/lexer_vi_vn.rc index efc3c0bf3..d3d5fe481 100644 --- a/language/np3_vi_vn/lexer_vi_vn.rc +++ b/language/np3_vi_vn/lexer_vi_vn.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_zh_cn/lexer_zh_cn.rc b/language/np3_zh_cn/lexer_zh_cn.rc index 9eea819e8..62a128e5c 100644 --- a/language/np3_zh_cn/lexer_zh_cn.rc +++ b/language/np3_zh_cn/lexer_zh_cn.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" diff --git a/language/np3_zh_tw/lexer_zh_tw.rc b/language/np3_zh_tw/lexer_zh_tw.rc index 199d88a16..5ff2b4905 100644 --- a/language/np3_zh_tw/lexer_zh_tw.rc +++ b/language/np3_zh_tw/lexer_zh_tw.rc @@ -481,7 +481,7 @@ END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" + IDS_LEX_CSV_COL_0 "Column 0" IDS_LEX_CSV_COL_1 "Column 1" IDS_LEX_CSV_COL_2 "Column 2" IDS_LEX_CSV_COL_3 "Column 3" From 671650cba40d7ed14a1cab50d1c8520809a3c0eb Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 27 Mar 2021 09:20:03 +0100 Subject: [PATCH 4/8] MUI - Minor correction and add some info comment lines --- src/Notepad3.rc | 8 ++++---- src/resource.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 607b391e6..a7e3177fd 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -54,7 +54,7 @@ BEGIN #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) - "#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n" + "#include ""../language/np3_hi_in/np3_hi_in.rc""\r\n" #elif defined(MUI_BASE_LNG_HU_HU) "#include ""../language/np3_hu_hu/np3_hu_hu.rc""\r\n" #elif defined(MUI_BASE_LNG_ID_ID) @@ -72,7 +72,7 @@ BEGIN #elif defined(MUI_BASE_LNG_PT_BR) "#include ""../language/np3_pt_br/np3_pt_br.rc""\r\n" #elif defined(MUI_BASE_LNG_PT_PT) - "#include ""../language/np3_pr_pt/np3_pt-pt.rc""\r\n" + "#include ""../language/np3_pt_pt/np3_pt_pt.rc""\r\n" #elif defined(MUI_BASE_LNG_RU_RU) "#include ""../language/np3_ru_ru/np3_ru_ru.rc""\r\n" #elif defined(MUI_BASE_LNG_SK_SK) @@ -493,7 +493,7 @@ END #elif defined(MUI_BASE_LNG_FR_FR) #include "../language/np3_fr_fr/np3_fr_fr.rc" #elif defined(MUI_BASE_LNG_HI_IN) - #include "../language/np3_fr_fr/np3_fr_fr.rc" + #include "../language/np3_hi_in/np3_hi_in.rc" #elif defined(MUI_BASE_LNG_HU_HU) #include "../language/np3_hu_hu/np3_hu_hu.rc" #elif defined(MUI_BASE_LNG_ID_ID) @@ -511,7 +511,7 @@ END #elif defined(MUI_BASE_LNG_PT_BR) #include "../language/np3_pt_br/np3_pt_br.rc" #elif defined(MUI_BASE_LNG_PT_PT) - #include "../language/np3_pr_pt/np3_pt-pt.rc" + #include "../language/np3_pt_pt/np3_pt_pt.rc" #elif defined(MUI_BASE_LNG_RU_RU) #include "../language/np3_ru_ru/np3_ru_ru.rc" #elif defined(MUI_BASE_LNG_SK_SK) diff --git a/src/resource.h b/src/resource.h index 27c5b5315..2c4bedbc6 100644 --- a/src/resource.h +++ b/src/resource.h @@ -10,7 +10,8 @@ #endif // ========================================== -// 1. To build a NON MUI Notepad3, Comment-Out the following line +// How to build a NON MUI Notepad3 version for desired Language +// 1. Comment-Out the following line #define HAVE_DYN_LOAD_LIBS_MUI_LNGS 1 // ------------------------------------------ // - extent Notepad3.rc file accordingly @@ -20,9 +21,8 @@ // for Base-Lng in MUI env #define MUI_BASE_LNG_EN_US 1 #else -// 2. To build a NON MUI Notepad3, Comment-Out the following line #define MUI_BASE_LNG_EN_US 1 -// 3. And Uncommentt one of the following lines +// 2. Uncomment one of the following lines according of the desired Language //#define MUI_BASE_LNG_AF_ZA 1 //#define MUI_BASE_LNG_BE_BY 1 //#define MUI_BASE_LNG_DE_DE 1 From 2f7e0ead65964e4fc3f4190b34e2159dcfb7430f Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 27 Mar 2021 09:30:41 +0100 Subject: [PATCH 5/8] MUI - Minor correction --- src/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resource.h b/src/resource.h index 2c4bedbc6..93c110498 100644 --- a/src/resource.h +++ b/src/resource.h @@ -22,7 +22,7 @@ #define MUI_BASE_LNG_EN_US 1 #else #define MUI_BASE_LNG_EN_US 1 -// 2. Uncomment one of the following lines according of the desired Language +// 2. Uncomment one of the following lines according to the desired Language //#define MUI_BASE_LNG_AF_ZA 1 //#define MUI_BASE_LNG_BE_BY 1 //#define MUI_BASE_LNG_DE_DE 1 From 62ae27c188774e4875153cafd1945912fa1eceaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20R=C3=BCckert?= Date: Sat, 27 Mar 2021 14:06:59 -0300 Subject: [PATCH 6/8] Update dialogs_pt_br.rc --- language/np3_pt_br/dialogs_pt_br.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc index f77cf88d3..1b0d21e6b 100644 --- a/language/np3_pt_br/dialogs_pt_br.rc +++ b/language/np3_pt_br/dialogs_pt_br.rc @@ -280,9 +280,9 @@ BEGIN CONTROL "&Nenhuma.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10 CONTROL "&Mostrar mensagem.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10 CONTROL "Recarregar &automaticamente.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,120,10 - CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10 + CONTROL "Bloqueio de Arquivo &Exclusivo.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10 CONTROL "&Redefinir se novo arquivo for aberto.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,125,10 - CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10 + CONTROL "Registro de &Monitoramento.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10 DEFPUSHBUTTON "OK",IDOK,127,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14 END From 4b259fe0a41ef75c55e6369ebe0f4f699f104449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20R=C3=BCckert?= Date: Sat, 27 Mar 2021 14:09:25 -0300 Subject: [PATCH 7/8] Update menu_pt_br.rc --- language/np3_pt_br/menu_pt_br.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 0530ada8b..587b93c17 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -64,8 +64,8 @@ BEGIN MENUITEM "Salvar &Cópia...\tCtrl+F6", IDM_FILE_SAVECOPY MENUITEM "Salvar com &Data/Hora do Arquivo Original\tCtrl+Alt+F6", IDM_FILE_PRESERVE_FILEMODTIME MENUITEM SEPARATOR - MENUITEM "Apenas &Leitura File Attribute", IDM_FILE_READONLY - MENUITEM "&Lock File (Read-Shared)", IDM_FILE_LOCK_SHARE_READ + MENUITEM "Atributo de Arquivo Somente &Leitura", IDM_FILE_READONLY + MENUITEM "B&loquear Arquivo (Leitura Compartilhada)", IDM_FILE_LOCK_SHARE_READ MENUITEM SEPARATOR MENUITEM "Definir Senha de Cr&iptografia...", IDM_SETPASS MENUITEM SEPARATOR From ed4fb7ba33e2794d77a584e70c08f9c07febbe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20R=C3=BCckert?= Date: Sat, 27 Mar 2021 14:10:07 -0300 Subject: [PATCH 8/8] Update strings_pt_br.rc --- language/np3_pt_br/strings_pt_br.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 5441dd0b7..050cb0f56 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -178,7 +178,7 @@ BEGIN IDS_MUI_FILECHANGENOTIFY "O presente arquivo foi modificado por um programa externo. Recarregar?" IDS_MUI_FILECHANGENOTIFY2 "O presente arquivo foi apagado. Salvar agora?" - IDS_MUI_FILELOCK_ERROR "Can not acquire exclusive file lock for ""%s""!" + IDS_MUI_FILELOCK_ERROR "Não foi possível adquirir bloqueio de arquivo exclusivo para ""%s""!" IDS_MUI_STICKYWINPOS "Posição de Janela Fixada foi ativada. Qualquer nova janela do Notepad3 usará as configurações de posicionamento de janela correntes." IDS_MUI_SAVEDSETTINGS "As configurações correntes do programa foram gravadas." IDS_MUI_CREATEINI_FAIL "Erro criando arquivo de configuração."