From 7e7dc12bfeff03f1d379724ab32b0fbe18773f2b Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 17 Jan 2021 20:43:56 +0100 Subject: [PATCH 1/2] MUI - Add Show search wrap-around tooltip --- language/np3_af_za/strings_af_za.rc | 2 ++ language/np3_be_by/strings_be_by.rc | 2 ++ language/np3_en_gb/strings_en_gb.rc | 2 ++ language/np3_es_es/strings_es_es.rc | 2 ++ language/np3_es_mx/strings_es_mx.rc | 2 ++ language/np3_fr_fr/strings_fr_fr.rc | 2 ++ language/np3_hi_in/strings_hi_in.rc | 2 ++ language/np3_hu_hu/strings_hu_hu.rc | 2 ++ language/np3_id_id/strings_id_id.rc | 2 ++ language/np3_it_it/strings_it_it.rc | 2 ++ language/np3_ja_jp/strings_ja_jp.rc | 2 ++ language/np3_ko_kr/strings_ko_kr.rc | 2 ++ language/np3_nl_nl/strings_nl_nl.rc | 2 ++ language/np3_pl_pl/strings_pl_pl.rc | 2 ++ language/np3_pt_br/strings_pt_br.rc | 2 ++ language/np3_pt_pt/strings_pt_pt.rc | 2 ++ language/np3_ru_ru/strings_ru_ru.rc | 2 ++ language/np3_sk_sk/strings_sk_sk.rc | 2 ++ language/np3_sv_se/strings_sv_se.rc | 2 ++ language/np3_tr_tr/strings_tr_tr.rc | 2 ++ language/np3_vi_vn/strings_vi_vn.rc | 2 ++ language/np3_zh_cn/strings_zh_cn.rc | 2 ++ language/np3_zh_tw/strings_zh_tw.rc | 2 ++ 23 files changed, 46 insertions(+) diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index b109f535d..729211888 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -261,6 +261,8 @@ BEGIN "Vee geskiedenis uit" IDS_MUI_CLEAR_REPL_HISTORY "Vee die vervang geskiedenis uit" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 45e32e90b..9142ebc61 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -261,6 +261,8 @@ BEGIN "Ачысціць гісторыю пошука" IDS_MUI_CLEAR_REPL_HISTORY "Ачысціць гісторыю замен" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index a4e705d5a..61ce5a58e 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 883b904d2..c6d5bf427 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -261,6 +261,8 @@ BEGIN "Borrar historial de búsqueda" IDS_MUI_CLEAR_REPL_HISTORY "Borrar historial de reemplazo" + IDS_MUI_WRAPSEARCH_FWD "Coincidencia envolvente desde arriba %s" + IDS_MUI_WRAPSEARCH_BCK "Coincidencia envolvente desde abajo %s" END STRINGTABLE diff --git a/language/np3_es_mx/strings_es_mx.rc b/language/np3_es_mx/strings_es_mx.rc index 94b12dba5..4009d3f3c 100644 --- a/language/np3_es_mx/strings_es_mx.rc +++ b/language/np3_es_mx/strings_es_mx.rc @@ -261,6 +261,8 @@ BEGIN "Borrar historial de búsqueda" IDS_MUI_CLEAR_REPL_HISTORY "Borrar historial de reemplazo" + IDS_MUI_WRAPSEARCH_FWD "Coincidencia envolvente desde arriba %s" + IDS_MUI_WRAPSEARCH_BCK "Coincidencia envolvente desde abajo %s" END STRINGTABLE diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index cbb841160..738e4d5e2 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -261,6 +261,8 @@ BEGIN "Effacer l'historique de recherche" IDS_MUI_CLEAR_REPL_HISTORY "Effacer l'historique de remplacement" + IDS_MUI_WRAPSEARCH_FWD "Match enveloppant par le haut %s" + IDS_MUI_WRAPSEARCH_BCK "Match enveloppant par le bas %s" END STRINGTABLE diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc index 7952e48ba..bc5a4f4db 100644 --- a/language/np3_hi_in/strings_hi_in.rc +++ b/language/np3_hi_in/strings_hi_in.rc @@ -261,6 +261,8 @@ BEGIN "ढूँढी हुई फ़ाइलों की जानकारी हटाएं" IDS_MUI_CLEAR_REPL_HISTORY "बदलाव की जानकारी हटाएं" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 100081357..4c7adc545 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -261,6 +261,8 @@ BEGIN "Keresési előzmények törlése" IDS_MUI_CLEAR_REPL_HISTORY "Csere előzmények törlése" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc index 4a6d3f9ff..57b3a1d27 100644 --- a/language/np3_id_id/strings_id_id.rc +++ b/language/np3_id_id/strings_id_id.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 9c27c2410..3b17d3a04 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -261,6 +261,8 @@ BEGIN "Pulisci Cronologia Ricerche" IDS_MUI_CLEAR_REPL_HISTORY "Pulisci Cronologia Sostituzioni" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 670bdb483..b25121332 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -261,6 +261,8 @@ BEGIN "検索履歴を消去" IDS_MUI_CLEAR_REPL_HISTORY "置換履歴を消去" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index c45e2184f..11ea4203d 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -261,6 +261,8 @@ BEGIN "찾기 내역 지우기" IDS_MUI_CLEAR_REPL_HISTORY "바꾸기 내역 지우기" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 08bf7241c..df16a220d 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -261,6 +261,8 @@ BEGIN "Wis zoekgeschiedenis" IDS_MUI_CLEAR_REPL_HISTORY "Wis vervanggeschiedenis" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match van bovenaf %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match van onderaf %s" END STRINGTABLE diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 2c005fbdf..bcf51f7cc 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -261,6 +261,8 @@ BEGIN "Wyczyść Znajdź Historię" IDS_MUI_CLEAR_REPL_HISTORY "Wyczyść Zamień Historię" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index e0128c3e9..6c1de9fff 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_pt_pt/strings_pt_pt.rc b/language/np3_pt_pt/strings_pt_pt.rc index 9e71fca95..5f7514174 100644 --- a/language/np3_pt_pt/strings_pt_pt.rc +++ b/language/np3_pt_pt/strings_pt_pt.rc @@ -261,6 +261,8 @@ BEGIN "Limpar histórico de localizar" IDS_MUI_CLEAR_REPL_HISTORY "Limpar histórico de substituir" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 42cfcdffd..190466b43 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -261,6 +261,8 @@ BEGIN "Очистить историю поиска" IDS_MUI_CLEAR_REPL_HISTORY "Очистить историю замен" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index 193e7b253..d26952fb9 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -261,6 +261,8 @@ BEGIN "Vymazať históriu vyhľadávania" IDS_MUI_CLEAR_REPL_HISTORY "Vymazať históriu nahradenia" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 5be5c1d65..ead12b93a 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -261,6 +261,8 @@ BEGIN "Rensa sökhistorik" IDS_MUI_CLEAR_REPL_HISTORY "Rensa ersättningshistorik" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 424c555db..42130cc31 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc index 6ee4f1942..3bed71eef 100644 --- a/language/np3_vi_vn/strings_vi_vn.rc +++ b/language/np3_vi_vn/strings_vi_vn.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 28ac16afd..cb81e193c 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -261,6 +261,8 @@ BEGIN "清除查找历史" IDS_MUI_CLEAR_REPL_HISTORY "清除替换历史" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE diff --git a/language/np3_zh_tw/strings_zh_tw.rc b/language/np3_zh_tw/strings_zh_tw.rc index 94dc7afcf..45de875ab 100644 --- a/language/np3_zh_tw/strings_zh_tw.rc +++ b/language/np3_zh_tw/strings_zh_tw.rc @@ -261,6 +261,8 @@ BEGIN "Clear Find History" IDS_MUI_CLEAR_REPL_HISTORY "Clear Replace History" + IDS_MUI_WRAPSEARCH_FWD "Wrap-Around match from top %s" + IDS_MUI_WRAPSEARCH_BCK "Wrap-Around match from bottom %s" END STRINGTABLE From 9b221f1f15ddad6c81f8eee74571e8b804543ff6 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 17 Jan 2021 20:44:23 +0100 Subject: [PATCH 2/2] + Upd: Version files and Changes.txt --- Build/Changes.txt | 5 +++-- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 90c136784..126d8ceb9 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,13 +34,14 @@ SUP - (S)et(UP) / Installer Package ======================================================== -Current BETA/RC Version 5.21.116.(build_#) (2021-01-16) +Current BETA/RC Version 5.21.117.(build_#) (2021-01-17) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.xxx.x]- . +[.117.1]- Show search wrap-around tooltip (issue #3038). [1222.1]- Kotlin Source Lexer based on Zufuliu's Kotlin Lexer code base. [1222.1]- Dart Lexer based on Zufuliu's Dart Lexer code base. [1221.1]- TinyExpr: additional number parsing for binary (0b...) and octal (0o...) number formats. @@ -66,7 +67,7 @@ NEW: CHANGES: -------------------------------------------------------- [.xxx.x]- . -[.116.1]- Extent static find / repl / mark occurance pattern buffer to 4095 characters. +[.116.1]- Extent static find/replace/mark occurances pattern buffer to 4095 characters. [1223.1]- Initial start screen resolution independent fixed base font size. [1218.1]- Avoid wrap-around requester if there is no other possible occurrence. [1214.1]- Behavior change: copy to clipboard on empty selection -> don't copy anything if current line is empty. diff --git a/Versions/day.txt b/Versions/day.txt index 4699eb3cc..5bc6609e3 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -116 +117 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index e64e87407..bb48626d7 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 fd0e1cf9a..5acbc3220 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 116 +#define VERSION_REV 117 #define VERSION_BUILD 1 #define SCINTILLA_VER 446 #define ONIGURUMA_REGEX_VER 6.9.6