From f117374152ca086139950340a334751887d67d58 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 29 Apr 2021 10:16:34 +0200 Subject: [PATCH 1/2] MUI - Add "Ignore File-Vars" in all Menu_xx_y.rc --- language/np3_af_za/menu_af_za.rc | 1 + language/np3_be_by/menu_be_by.rc | 1 + language/np3_el_gr/menu_el_gr.rc | 1 + language/np3_en_gb/menu_en_gb.rc | 1 + language/np3_es_419/menu_es_419.rc | 1 + language/np3_es_es/menu_es_es.rc | 1 + language/np3_fr_fr/menu_fr_fr.rc | 1 + language/np3_hi_in/menu_hi_in.rc | 1 + language/np3_hu_hu/menu_hu_hu.rc | 1 + language/np3_id_id/menu_id_id.rc | 1 + language/np3_it_it/menu_it_it.rc | 1 + language/np3_ja_jp/menu_ja_jp.rc | 1 + language/np3_ko_kr/menu_ko_kr.rc | 1 + language/np3_nl_nl/menu_nl_nl.rc | 1 + language/np3_pl_pl/menu_pl_pl.rc | 1 + language/np3_pt_br/menu_pt_br.rc | 1 + language/np3_pt_pt/menu_pt_pt.rc | 1 + language/np3_ru_ru/menu_ru_ru.rc | 1 + language/np3_sk_sk/menu_sk_sk.rc | 1 + language/np3_sv_se/menu_sv_se.rc | 1 + language/np3_tr_tr/menu_tr_tr.rc | 1 + language/np3_vi_vn/menu_vi_vn.rc | 1 + language/np3_zh_cn/menu_zh_cn.rc | 1 + language/np3_zh_tw/menu_zh_tw.rc | 1 + 24 files changed, 24 insertions(+) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 2518a3d41..776f4fa73 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Keer terug &van Lêer af\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Enkodering" BEGIN POPUP "&Keer terug van Lêer af as" diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 2a351fea6..9db3a9bbb 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Перазагрузіць файл\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "Кадо&ўка" BEGIN POPUP "&Перазагрузіць файл як" diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc index 281ab2563..077815701 100644 --- a/language/np3_el_gr/menu_el_gr.rc +++ b/language/np3_el_gr/menu_el_gr.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Επανα&φορά από αρχείο\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Κωδικοποίηση" BEGIN POPUP "Επανα&φορά από αρχείο ως" diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 61e4d27e1..bc9f58c52 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&vert from File\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Encoding" BEGIN POPUP "&Revert from File as" diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc index 638f41167..fc2ed2d9d 100644 --- a/language/np3_es_419/menu_es_419.rc +++ b/language/np3_es_419/menu_es_419.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Recargar de archivo\tF5", IDM_FILE_REVERT + MENUITEM "&Ignorar variables de archivo", CMD_IGNORE_FILE_VARS POPUP "C&odificación" BEGIN POPUP "&Revertir de archivo como" diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index b460e2b62..69655fff9 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Recargar de archivo\tF5", IDM_FILE_REVERT + MENUITEM "&Ignorar variables de archivo", CMD_IGNORE_FILE_VARS POPUP "C&odificación" BEGIN POPUP "&Revertir de archivo como" diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 5800f08c3..41e7c90fd 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Rec&harger le Fichier\tF5", IDM_FILE_REVERT + MENUITEM "&Ignorer les Variables de Fichier", CMD_IGNORE_FILE_VARS POPUP "Encoda&ge" BEGIN POPUP "&Recharger le Fichier comme" diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index b8ba188c8..82e5dae51 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "फ़ाइल को वापस लाएं (&V)\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "एन्कोडिंग (&E)" BEGIN POPUP "इस प्रकार से फ़ाइल में वापस लाएं (&R)" diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 637004a03..6c8808dad 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Visszaállás fájlból\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Kódolás" BEGIN POPUP "Visszaállás fájlból másként&" diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index c7703628a..82b8b7d68 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&vert from File\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Encoding" BEGIN POPUP "&Revert from File as" diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 5eaa0c0b4..3a51e2c00 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Ri&pristina dal File\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Codifica" BEGIN POPUP "&Ripristina dal File come" diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index fe53b5942..e2017c8fa 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "ファイルを読み直し(&V)\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "文字コード(&E)" BEGIN POPUP "文字コード指定しファイル読み直し(&R)" diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 7eef60d39..59492a5e4 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "파일에서 되돌리기(&V)\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "인코딩(&E)" BEGIN POPUP "파일에서 다음으로 되돌리기(&R)" diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 3e57fc2fa..55bccce61 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Herladen uit Bestand\tF5", IDM_FILE_REVERT + MENUITEM "&Bestandsvariabelen negeren", CMD_IGNORE_FILE_VARS POPUP "&Encodering" BEGIN POPUP "&Herladen uit Bestand als" diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index e23cd67c4..4f72438d8 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Powróć z pliku\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Kodowanie" BEGIN POPUP "&Powróć z pliku jako" diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 937eb7bf8..ad56172e5 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&verter do Arquivo\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Codificação" BEGIN POPUP "&Reverter do Arquivo Como" diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 1cc2f6a18..469fd1848 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&verter de ficheiro\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Codificação" BEGIN POPUP "&Reverter de ficheiro como" diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index bbd6e1013..ce9181841 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Перезагрузить файл\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "Ко&дировка" BEGIN POPUP "&Перезагрузить файл как" diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 617732585..823962ed7 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Vrátiť zo súboru\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Kódovanie" BEGIN POPUP "V&rátiť zo súboru ako" diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 36735ab95..95b335338 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Återgå till filens version\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "Teckenkodning" BEGIN POPUP "Återgå till filversion som" diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 97f3118b6..db733fe03 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&vert\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Kodlama" BEGIN POPUP "&Revert from File as" diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index dc0bd8679..ee6f0326d 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Re&vert from File\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Encoding" BEGIN POPUP "&Revert from File as" diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index fa6032afd..9114ad776 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "从文件恢复(&V)\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "编码(&E)" BEGIN POPUP "从文件恢复为(&R)" diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index 5b3e9f237..509ccecc7 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -95,6 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Revert from File(&V)\tF5", IDM_FILE_REVERT + MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS POPUP "編碼(&E)" BEGIN POPUP "Revert from File as(&R)" From a55079a5321130f36a922604fca5942273776de0 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 29 Apr 2021 10:17:13 +0200 Subject: [PATCH 2/2] + Upd: Version files and Changes.txt --- Build/Changes.txt | 9 +++++---- Versions/day.txt | 2 +- language/Line numbers to translate.txt | 4 ++-- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 8 ++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 6e42c235c..0caf731bf 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.21.428.(build_#) (2021-04-28) +Current BETA/RC Version 5.21.429.(build_#) (2021-04-29) ======================================================== -------------------------------------------------------- @@ -109,14 +109,15 @@ CHANGES: [.301.1]- Enable Dark Mode feature for Win10 v21H1 insider beta. [.301.1]- EOL-Mode: status-bar double-click : inverted cyclic change rotation CRLF -> LF -> CR. [.411.1]- Update grepWinNP3 (GRE) version 2.1.7.36 (2021-04.07). -[.423.1]- Update Oniguruma Regex (ONI) engine version 6.9.7 RC1 (2021-04-15). -[.415.1]- Update Lexilla Library (LEX) version 5.0.1 (2021-04-09). -[.411.1]- Update Scintilla Library (SCI) version 5.0.1 (2021-04-09). +[.429.1]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-04-26). +[.429.1]- Update Lexilla Library (LEX) version 5.0.2 (2021-04-23). +[.429.1]- Update Scintilla Library (SCI) version 5.0.2 (2021-04-23). -------------------------------------------------------- FIXES: -------------------------------------------------------- [.###.#]- . +[.429.1]- Handling of "File Vars" vs. "Encoding Tags". [.427.1]- Minor fixes around font redrawing. [.423.1]- Add thread COM initializations. [.423.1]- Adding DPI awareness to MiniPath (correct toolbar handling still open point). diff --git a/Versions/day.txt b/Versions/day.txt index 43d371afd..356066671 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -428 +429 diff --git a/language/Line numbers to translate.txt b/language/Line numbers to translate.txt index 497f8b816..ef6ff9b57 100644 --- a/language/Line numbers to translate.txt +++ b/language/Line numbers to translate.txt @@ -3,12 +3,12 @@ == This .txt file is intended for Translators to communicate to them the Line Mumbers of the == == "Added/Modified" items in the Resource files ("xx_yy.rc" and "grepWinNP3.lang"). == == == -== Latest update: "April 2021" on 2021-04-28 == +== Latest update: "April 2021" on 2021-04-29 == ==================================================================================================== March 2021: Line numbers to translate_2021-03.png - https://workupload.com/file/MrtH6U2RhKC -April 2021: Line numbers to translate_2021-04.png - https://workupload.com/file/7YW95GKfMUT (updated) +April 2021: Line numbers to translate_2021-04.png - https://workupload.com/file/jcbdVpEBCfr (updated) May 2021: Line numbers to translate_2021-05.png - diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index d0d121397..0e9c9c8c6 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 223974375..148aa6fd2 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,11 +8,11 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 428 +#define VERSION_REV 429 #define VERSION_BUILD 1 -#define SCINTILLA_VER 501 -#define LEXILLA_VER 501 -#define ONIGURUMA_REGEX_VER 6.9.7 +#define SCINTILLA_VER 502 +#define LEXILLA_VER 502 +#define ONIGURUMA_REGEX_VER 7.0.0 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0