From 5d2d6fb00f3342e94de853f1b29a5dee5f8812ff Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 24 Aug 2020 15:43:39 +0200 Subject: [PATCH 1/3] + upd: Version files and Changes.txt --- Build/Changes.txt | 6 ++++-- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 81415e7a2..a017f76d6 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,13 +33,14 @@ SUP - (S)et(UP) / Installer Package ===================================================== -Current BETA Version 5.20.823.(build_#) (2020-08-23) +Current BETA Version 5.20.824.(build_#) (2020-08-24) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- [.###.#]- +[.824.1]- Focused-View: mode Fold-Only. [.823.1]- Mark Occurrences: show additional Bookmark (Arrows). [.823.1]- Bookmark context menu: clear marker type. [.822.2]- FocusedView Options: Bookmarks/Line-Highlight & Folding. @@ -78,7 +79,7 @@ CHANGES: [.729.1]- DPI-Aware About & Custom.Scheme dialog. [.729.1]- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F". [.723.1]- Review document modified handler (dirty-flag). -[.817.2]- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17). +[.817.2]-- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17). [.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31). [.818.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-08-18). @@ -92,6 +93,7 @@ ENHANCEMENT: FIXES: ----------------------------------------------------- [.###.#]- +[.824.1]- Not intended bookmarker on F/R dialog mark findings. [.823.1]- Bookmark Occurrences too menu checked. [.823.1]- Scroll to cursor for selection start/end jumps. [.823.1]- Not intended "violet" bookmark. diff --git a/Versions/day.txt b/Versions/day.txt index 20f9720bd..2a83cc214 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -823 +824 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 5aa4c323f..439e20941 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 0a345f64d..fc5de9cd5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 823 +#define VERSION_REV 824 #define VERSION_BUILD 1 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 From 1a31602b38923abde6d4d3a7d1b1391ab66d9527 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 24 Aug 2020 17:39:40 +0200 Subject: [PATCH 2/3] MUI - Focused-View: mode Fold-Only --- language/np3_af_za/menu_af_za.rc | 21 +++++++++++++-------- language/np3_be_by/menu_be_by.rc | 17 +++++++++++------ language/np3_en_gb/menu_en_gb.rc | 13 +++++++++---- language/np3_es_es/menu_es_es.rc | 13 +++++++++---- language/np3_es_mx/menu_es_mx.rc | 15 ++++++++++----- language/np3_fr_fr/menu_fr_fr.rc | 13 +++++++++---- language/np3_hi_in/menu_hi_in.rc | 13 +++++++++---- language/np3_hu_hu/menu_hu_hu.rc | 13 +++++++++---- language/np3_id_id/menu_id_id.rc | 13 +++++++++---- language/np3_it_it/menu_it_it.rc | 17 +++++++++++------ language/np3_ja_jp/menu_ja_jp.rc | 21 +++++++++++++-------- language/np3_ko_kr/menu_ko_kr.rc | 13 +++++++++---- language/np3_nl_nl/menu_nl_nl.rc | 13 +++++++++---- language/np3_pl_pl/menu_pl_pl.rc | 21 +++++++++++++-------- language/np3_pt_br/menu_pt_br.rc | 21 +++++++++++++-------- language/np3_pt_pt/menu_pt_pt.rc | 13 +++++++++---- language/np3_ru_ru/menu_ru_ru.rc | 17 +++++++++++------ language/np3_sk_sk/menu_sk_sk.rc | 13 +++++++++---- language/np3_sv_se/menu_sv_se.rc | 13 +++++++++---- language/np3_tr_tr/menu_tr_tr.rc | 13 +++++++++---- language/np3_vi_vn/menu_vi_vn.rc | 13 +++++++++---- language/np3_zh_cn/menu_zh_cn.rc | 15 ++++++++++----- language/np3_zh_tw/menu_zh_tw.rc | 13 +++++++++---- 23 files changed, 231 insertions(+), 116 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 70f50c62d..a308c8ca7 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -326,10 +326,10 @@ BEGIN MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS POPUP "&Kleur Definisie Hotspots", BEGIN - MENUITEM "&AF", IDM_VIEW_COLORDEFHOTSPOTS - MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA - MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB - MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA + MENUITEM "&AF", IDM_VIEW_COLORDEFHOTSPOTS + MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA + MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB + MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA END MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS MENUITEM "&Visuele Hakie Passing\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES @@ -372,15 +372,20 @@ BEGIN POPUP "Ver&toning" BEGIN MENUITEM "Ge&fokusde Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitering Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Rol na Einde Van Die &Lêer", IDM_VIEW_SCROLLPASTEOF MENUITEM "Wys &Hiperskakel Nutsmiddelwenk", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anele" BEGIN MENUITEM "Wys &Menubalk", IDM_VIEW_MENUBAR diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 6ba76bef7..c62e89a03 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -366,21 +366,26 @@ BEGIN MENUITEM "Перайсці да &наступнага блоку\tAlt+ +", CMD_FOLDJUMPDOWN MENUITEM "Перайсці да &папярэдняга блоку\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "Згарнуць &блок\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Разгарнуць блок\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "Згарнуць &блок\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Разгарнуць блок\tAlt+ →", CMD_FOLDEXPAND END POPUP "Пра&цоўная прастора" BEGIN MENUITEM "Факусаваны прагляд\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Назіранне за фа&йлам", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Пракручваць за мяжу апошняга радка", IDM_VIEW_SCROLLPASTEOF MENUITEM "Паказваць &падказку для гіперспасылак", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "П&аліцы" BEGIN MENUITEM "Паказаць паліцу &меню", IDM_VIEW_MENUBAR diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 3924dc1aa..126e5d3f7 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Display" BEGIN MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anels" BEGIN MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index d9a1850be..1785f6806 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -372,15 +372,20 @@ BEGIN POPUP "Mos&trar" BEGIN MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Modo: Marcador", IDM_VIEW_FV_BOOKMARK - MENUITEM "Modo: Resaltar", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Modo: Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Modo: Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD + POPUP "Modo de vista" + BEGIN + MENUITEM "Pliegue", IDM_VIEW_FV_FOLD + MENUITEM "Marcador", IDM_VIEW_FV_BOOKMARK + MENUITEM "Resaltar", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF MENUITEM "Mostrar información de &hipervínculos", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&aneles" BEGIN MENUITEM "Mostrar la barra de &menú", IDM_VIEW_MENUBAR diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc index 062c18735..48d14bc0d 100644 --- a/language/np3_es_mx/menu_es_mx.rc +++ b/language/np3_es_mx/menu_es_mx.rc @@ -356,7 +356,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS - MENUITEM "&Margen de marcador,\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN + MENUITEM "&Margen de marcador\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN MENUITEM SEPARATOR POPUP "&Plegable" BEGIN @@ -372,15 +372,20 @@ BEGIN POPUP "Mos&trar" BEGIN MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Modo: Marcador", IDM_VIEW_FV_BOOKMARK - MENUITEM "Modo: Resaltar", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Modo: Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Modo: Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD + POPUP "Modo de vista" + BEGIN + MENUITEM "Pliegue", IDM_VIEW_FV_FOLD + MENUITEM "Marcador", IDM_VIEW_FV_BOOKMARK + MENUITEM "Resaltar", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF MENUITEM "Mostrar información de &hipervínculos", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&aneles" BEGIN MENUITEM "Mostrar la barra de &menú", IDM_VIEW_MENUBAR diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 0771fd9e3..4e127c6ec 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Afficher" BEGIN MENUITEM "Vue Focalisée\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Signet", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Surbrillance", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Signet && Pliage", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Surbrillance && Pliage", IDM_VIEW_FV_HIGHLGFOLD + POPUP "Mode d'affichage" + BEGIN + MENUITEM "Pliage", IDM_VIEW_FV_FOLD + MENUITEM "Signet", IDM_VIEW_FV_BOOKMARK + MENUITEM "Surbrillance", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Signet && Pliage", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Surbrillance && Pliage", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Log de &Contrôle", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Défiler Après la Fin du Fichier", IDM_VIEW_SCROLLPASTEOF MENUITEM "Afficher &Infobulles sur Liens", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anneaux" BEGIN MENUITEM "Afficher la Barre de &Menus", IDM_VIEW_MENUBAR diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index 9c2ba7074..6fe837235 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Display" BEGIN MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anels" BEGIN MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index e60fa4d9f..2e50040ab 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Megjelenítés" BEGIN MENUITEM "Fókuszált nézet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Naplófájl követése", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Görgetés a fájl vége után is", IDM_VIEW_SCROLLPASTEOF MENUITEM "&Hivatkozások címke megjelenítése", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anelek" BEGIN MENUITEM "Menü&sor megjelenítése", IDM_VIEW_MENUBAR diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index 760422bc0..da467a5aa 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Display" BEGIN MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anels" BEGIN MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index a350a7678..1fa1d4cd2 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -366,21 +366,26 @@ BEGIN MENUITEM "Salta al Prossimo Fold\tAlt+ +", CMD_FOLDJUMPDOWN MENUITEM "Salta al Precedente Fold\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND END POPUP "&Display" BEGIN MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scorri oltre la fine del file (EOF)", IDM_VIEW_SCROLLPASTEOF MENUITEM "Mostra Tooltip &Hyperlink", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&annelli" BEGIN MENUITEM "Mostra barra dei &Menu", IDM_VIEW_MENUBAR diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index ba396d5ab..a1025d157 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -363,24 +363,29 @@ BEGIN MENUITEM "コード折りたたみを表示(&F)", IDM_VIEW_FOLDING MENUITEM "すべて折りたたみ(&T)\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS MENUITEM SEPARATOR - MENUITEM "次の折りたたみへ移動(&N)\tAlt+ +", CMD_FOLDJUMPDOWN - MENUITEM "前の折りたたみへ移動(&P)\tAlt+ –", CMD_FOLDJUMPUP + MENUITEM "次の折りたたみへ移動(&N)\tAlt+ +", CMD_FOLDJUMPDOWN + MENUITEM "前の折りたたみへ移動(&P)\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "折りたたむ(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "折りたたみを展開(&E)\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "折りたたむ(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "折りたたみを展開(&E)\tAlt+ →", CMD_FOLDEXPAND END POPUP "表示(&D)" BEGIN MENUITEM "単語一望モード(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "編集制限モード(&M)", IDM_VIEW_CHASING_DOCTAIL MENUITEM "文書の終端以降へスクロール(&S)", IDM_VIEW_SCROLLPASTEOF MENUITEM "ハイパーリンクのツールチップを表示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "ウィンドウ構成(&A)" BEGIN MENUITEM "メニューバーを表示(&M)", IDM_VIEW_MENUBAR diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 2490a0d64..6b05defe3 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -372,15 +372,20 @@ BEGIN POPUP "전시(&D)" BEGIN MENUITEM "집중(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "열람(&M)", IDM_VIEW_CHASING_DOCTAIL MENUITEM "파일 끝 스크롤(&S)", IDM_VIEW_SCROLLPASTEOF MENUITEM "하이퍼 링크 툴팁 보이기(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "표시(&A)" BEGIN MENUITEM "메뉴바 보이기", IDM_VIEW_MENUBAR diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 7cff172d5..d1f3e728c 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Tonen" BEGIN MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Modus: Bladwijzer", IDM_VIEW_FV_BOOKMARK - MENUITEM "Modus: Markeer", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Modus: Bladwijzer && Vouw", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Modus: Markeer && Vouw", IDM_VIEW_FV_HIGHLGFOLD + POPUP "Weergavemodus" + BEGIN + MENUITEM "Vouw", IDM_VIEW_FV_FOLD + MENUITEM "Bladwijzer", IDM_VIEW_FV_BOOKMARK + MENUITEM "Markeer", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bladwijzer && Vouw", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Markeer && Vouw", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scrollen na einde van bes&tand", IDM_VIEW_SCROLLPASTEOF MENUITEM "Toon &hyperlink tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anelen" BEGIN MENUITEM "&Menubalk tonen", IDM_VIEW_MENUBAR diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index cb6451498..295c3034c 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -363,24 +363,29 @@ BEGIN MENUITEM "Składanie kodu", IDM_VIEW_FOLDING MENUITEM "&Przełącz składanie kodu\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS MENUITEM SEPARATOR - MENUITEM "Przeskocz do nast.\tAlt+ +", CMD_FOLDJUMPDOWN - MENUITEM "Przeskocz do poprzed.\tAlt+ –", CMD_FOLDJUMPUP + MENUITEM "Przeskocz do nast.\tAlt+ +", CMD_FOLDJUMPDOWN + MENUITEM "Przeskocz do poprzed.\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "&Zwiń zagięcie\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Rozwiń zagięcie\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "&Zwiń zagięcie\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Rozwiń zagięcie\tAlt+ →", CMD_FOLDEXPAND END POPUP "&Pokaż" BEGIN MENUITEM "Widok skupiony\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Dziennik &monitorowania", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Rozszerzony widok końca dokumentu", IDM_VIEW_SCROLLPASTEOF MENUITEM "Pokaż podpowiedź hiperłącza", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anele" BEGIN MENUITEM "Pokaż pasek menu", IDM_VIEW_MENUBAR diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index dd9aba5e1..c6288ab34 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -363,24 +363,29 @@ BEGIN MENUITEM "Agrupador de &Código", IDM_VIEW_FOLDING MENUITEM "&Alternar Códigos Agrupados\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS MENUITEM SEPARATOR - MENUITEM "&Pular para Próxima Dobra\tAlt+ +", CMD_FOLDJUMPDOWN - MENUITEM "Pular para &Dobra Anterior\tAlt+ –", CMD_FOLDJUMPUP + MENUITEM "&Pular para Próxima Dobra\tAlt+ +", CMD_FOLDJUMPDOWN + MENUITEM "Pular para &Dobra Anterior\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "C&olapsar Dobra\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Expandir Dobra\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "C&olapsar Dobra\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Expandir Dobra\tAlt+ →", CMD_FOLDEXPAND END POPUP "&Exibir" BEGIN MENUITEM "Visão Focada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Log de &Monitoramento", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Rolagem Passa do Fim do Arquivo", IDM_VIEW_SCROLLPASTEOF MENUITEM "Mostrar Dica de &Hyperlink", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&ainéis" BEGIN MENUITEM "Mostrar &Menu", IDM_VIEW_MENUBAR diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 617f07968..50e35b69f 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Exibir" BEGIN MENUITEM "Vista focada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Registo de &monitorização", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Rolagem para além do fim do ficheiro", IDM_VIEW_SCROLLPASTEOF MENUITEM "Mostrar dica da &hiperligação", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&ainéis" BEGIN MENUITEM "Mostrar barra de &menu", IDM_VIEW_MENUBAR diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index ce631f16e..8c9a19e21 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -366,21 +366,26 @@ BEGIN MENUITEM "Перейти к следующему &блоку\tAlt+ +", CMD_FOLDJUMPDOWN MENUITEM "Перейти к &предыдущему блоку\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "&Свернуть блок\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Развернуть блок\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "&Свернуть блок\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Развернуть блок\tAlt+ →", CMD_FOLDEXPAND END POPUP "&Рабо&чая область" BEGIN MENUITEM "Фокусировка просмотра\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Слежение за фа&йлом", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF MENUITEM "Показывать &подсказку для гиперссылок", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "Панел&и" BEGIN MENUITEM "Показать панель &меню", IDM_VIEW_MENUBAR diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 33a95e4be..69d9130a1 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -372,15 +372,20 @@ BEGIN POPUP "Zo&brazenie" BEGIN MENUITEM "Zamerať zobrazenie\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitorovať logovanie", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Rolovanie na koniec súboru", IDM_VIEW_SCROLLPASTEOF MENUITEM "Nápovedný &tip na prepojení", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anely" BEGIN MENUITEM "Zobraziť &textové menu", IDM_VIEW_MENUBAR diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index e9996fc69..ad1904ba8 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -372,15 +372,20 @@ BEGIN POPUP "Visa" BEGIN MENUITEM "Fokuserad vy\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "Logg", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Rulla förbi slutet av filen", IDM_VIEW_SCROLLPASTEOF MENUITEM "Visa verktygstips för hyperlänk", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "Fält" BEGIN MENUITEM "Visa menyfält", IDM_VIEW_MENUBAR diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index e2fface31..b01737fcb 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Display" BEGIN MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anels" BEGIN MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index dcfd52d2d..2ccf74a29 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -372,15 +372,20 @@ BEGIN POPUP "&Display" BEGIN MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "P&anels" BEGIN MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 7fe98f17e..b3650c702 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -372,15 +372,20 @@ BEGIN POPUP "显示(&D)" BEGIN MENUITEM "切换聚焦(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL MENUITEM "允许滚动超过文件尾(&S)", IDM_VIEW_SCROLLPASTEOF MENUITEM "显示超链接提示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "面板(&A)" BEGIN MENUITEM "显示菜单栏(&M)", IDM_VIEW_MENUBAR @@ -390,7 +395,7 @@ BEGIN MENUITEM "加载工具栏主题(&L)...", IDM_VIEW_LOADTHEMETB MENUITEM "自定义工具栏(&C)...", IDM_VIEW_CUSTOMIZETB MENUITEM "切换工具栏(&G)", IDM_VIEW_TOGGLETB - MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB + MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB END POPUP "缩放(&Z)" BEGIN diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index f2a984d09..38f150d19 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -372,15 +372,20 @@ BEGIN POPUP "顯示(&D)" BEGIN MENUITEM "切換聚焦(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK - MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT - MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD - MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + POPUP "View Mode" + BEGIN + MENUITEM "Fold", IDM_VIEW_FV_FOLD + MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK + MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT + MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD + MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD + END MENUITEM SEPARATOR MENUITEM "日誌監控(&M)", IDM_VIEW_CHASING_DOCTAIL MENUITEM "允許滾動超過檔案尾(&S)", IDM_VIEW_SCROLLPASTEOF MENUITEM "顯示超鏈接提示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP END + MENUITEM SEPARATOR POPUP "面板(&A)" BEGIN MENUITEM "顯示選單欄(&M)", IDM_VIEW_MENUBAR From f434e18b6ffdd8210a7a8906057e479722d1438a Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 24 Aug 2020 17:40:08 +0200 Subject: [PATCH 3/3] + upd: Version files and Changes.txt --- Build/Changes.txt | 3 ++- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index a017f76d6..7547587ca 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -63,6 +63,7 @@ NEW: CHANGES: ----------------------------------------------------- [.###.#]- +[.824.2]- grepWinNP3: Export search result list (NP3 enhancements). [.823.1]- Delete Bookmarks (Alt+F2): 1st delete occurrence markers then std. bookmarks. [.822.1]- Remove max count limitation for "Mark Occurrences" feature. [.821.1]- Bookmark context menu on alpha-blend FocusedView marker line. @@ -79,7 +80,7 @@ CHANGES: [.729.1]- DPI-Aware About & Custom.Scheme dialog. [.729.1]- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F". [.723.1]- Review document modified handler (dirty-flag). -[.817.2]-- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17). +[.824.2]- Update grepWinNP3 (GRE) version 2.1.3.27 (2020-08-24). [.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31). [.818.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-08-18). diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 439e20941..82e43b32f 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 fc5de9cd5..26d7ba0f8 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 824 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27