diff --git a/Build/Changes.txt b/Build/Changes.txt index afde14bfa..a448cf738 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.326.(build_#) (2021-03-26) +Current BETA/RC Version 5.21.329.(build_#) (2021-03-29) ======================================================== -------------------------------------------------------- @@ -55,6 +55,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[.329.1]- Turning "Line Comment Block Edit" from option into command (Ctrl+Alt+Q). [.326.1]- Kotlin & Dart Lexer from Zufuliu's source. [.323.1]- File Lock: exclusive write/change, shared read. [.323.1]- Style color for triple strings in Python Lexer. diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt index 19a9ea324..e858c224b 100644 --- a/Build/Docs/KeyboardShortcuts.txt +++ b/Build/Docs/KeyboardShortcuts.txt @@ -112,6 +112,7 @@ Selection --------- Ctrl+Q Block Comment (Toggle). + Ctrl+Alt+Q Line Comment Block Edit Ctrl+Shift+Q Stream Comment. Ctrl+D Duplicate Selection or Line. Alt+B Pad with Blanks. diff --git a/Versions/day.txt b/Versions/day.txt index d1e85f890..6489928e1 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -326 +329 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index ce29671cd..f263d3083 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "&Ontkeep", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "L&yn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "A&ktiveer Wysiging van reël en Kommentaarblok", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Wysiging van Lyn Kommentaarblok\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index e2056de68..63dd8ea61 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Дадаць водступ", IDM_EDIT_INDENT MENUITEM "&Выдаліць водступ", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Блокавае рэдагаванне каментарыяў", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Блокавае рэдагаванне каментарыяў\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index c82a7d07a..381634652 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "Text &Rückzug", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "&Zeilenkommentar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Erweiterter Zeilenkommentar\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Erweiterter Zeilenkommentar\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Mehrzeilenkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc index 896f12fd5..60224fb81 100644 --- a/language/np3_el_gr/menu_el_gr.rc +++ b/language/np3_el_gr/menu_el_gr.rc @@ -201,7 +201,7 @@ BEGIN MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "Selectio&n" diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index c982cfd35..d0b00700a 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -201,7 +201,7 @@ BEGIN MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "Selectio&n" diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc index 8ba5f5753..afb938784 100644 --- a/language/np3_es_419/menu_es_419.rc +++ b/language/np3_es_419/menu_es_419.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Editar bloque de &comentario de línea\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index b9fbcb977..fbfc57bbd 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Editar bloque de &comentario de línea\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 61749df11..56122b57a 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "&Réduire le Retrait", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "&Commentaire de Ligne (Alterner)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Activer Édition de bloc de Lignes de &Commentaires", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Éditer bloc de Lignes de &Commentaires\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index 608a8c25e..d7119198c 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -200,19 +200,19 @@ BEGIN MENUITEM SEPARATOR MENUITEM "खाली रेखाएं मिलाएं (&G)\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "रिक्त रेखाएं मिलाएं (&K)\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES - MENUITEM "खाली रेखाएं हटाएं (&R)\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "रिक्त रेखाएं हटाएं (&B)\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES - MENUITEM "प्रतिरूप रेखाएं मिटाएं (&O)\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES + MENUITEM "खाली रेखाएं हटाएं (&R)\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES + MENUITEM "रिक्त रेखाएं हटाएं (&B)\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "प्रतिरूप रेखाएं मिटाएं (&O)\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "चुनाव (&N)" BEGIN - MENUITEM "इंडेंट (&I)", IDM_EDIT_INDENT - MENUITEM "इंडेंट हटाएं (&U)", IDM_EDIT_UNINDENT + MENUITEM "इंडेंट (&I)", IDM_EDIT_INDENT + MENUITEM "इंडेंट हटाएं (&U)", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "रेखा ब्लॉक-टिप्पणी परिमार्जन समर्थ करें (&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "लाइन टिप्पणी ब्लॉक संपादित करें (&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "चुनाव संलग्न करें (&E)" BEGIN @@ -225,7 +225,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4 MENUITEM SEPARATOR - MENUITEM "इसके साथ (W)...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION + MENUITEM "इसके साथ (&W)...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION END MENUITEM "चुनाव/रेखा की प्रतिलिपि (&D)/Line\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 9be425115..a737707e8 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Behúzás", IDM_EDIT_INDENT MENUITEM "Behúzás törlése", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Sor megjegyzés (váltás)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Sor-megjegyzés függőleges szerkesztésének engedélyezése", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Sor megjegyzés (váltás)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Vonal megjegyzés bl&okk szerkesztése\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Blokk megjegyzés\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index 3b9528d9b..6b54ce95d 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -201,18 +201,18 @@ BEGIN MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "Selectio&n" BEGIN - MENUITEM "&Indent", IDM_EDIT_INDENT - MENUITEM "&Unindent", IDM_EDIT_UNINDENT + MENUITEM "&Indent", IDM_EDIT_INDENT + MENUITEM "&Unindent", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "&Enclose Selection" BEGIN diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 8a63b010c..2248a99fe 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Indenta", IDM_EDIT_INDENT MENUITEM "&Rimuovi indentazione", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Abilita modifica blocco commenti di linea", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Modifica blocco commenti di linea\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Commento multi-riga\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index e50f710e6..77a3d7c53 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "逆インデント(&U)\tShift+Tab", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "行コメント(切替)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "矩形/複数選択時もコメント切替(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "行コメントブロック編集(&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "ブロックコメント(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 1c69b45d3..8f95839b6 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "내어쓰기(&U)", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "줄 주석 (전환)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "줄 주석 블록 편집 활성화(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "줄 주석 블록 편집(&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "스트림 주석(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index e47232578..4b95fb93c 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Schakel bewerken van lijn &commentaarblok in", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Lijn &commentaarblok bewerken\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index c7319cb5e..cbe183893 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Wcięcie", IDM_EDIT_INDENT MENUITEM "&Bez wcięcia", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Włącz edycję wierszy bloku komentarzy", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Edycję wierszy bloku komentarzy\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 23e61020b..ec761f9e6 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -209,10 +209,10 @@ BEGIN MENUITEM "&Indentar", IDM_EDIT_INDENT MENUITEM "&Remover Indentar", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Habilitar Edição de Bloco de Linha &Comentário", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Edição de Bloco de Linha &Comentário\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "&Incluir na Seleção" BEGIN diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 6be1955de..b29f450bc 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -209,10 +209,10 @@ BEGIN MENUITEM "&Indentar", IDM_EDIT_INDENT MENUITEM "&Desindentar", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Activar edição de bloco de &comentário de linha", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Edição de bloco de &comentário de linha\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "&Incluir selecção" BEGIN diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 479b7e7f0..8f0f4a8ff 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Добавить отступ", IDM_EDIT_INDENT MENUITEM "&Удалить отступ", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Блочное редактирование &комментариев", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Блочное редактирование &комментариев\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "&Блочный комментарий\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 1a290d8ca..e3a80e5c7 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -209,8 +209,8 @@ BEGIN MENUITEM "&Odsadenie", IDM_EDIT_INDENT MENUITEM "Z&rušiť odsadenie", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Povoliť úpravu bloku &komentárov riadka", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Úpravu bloku &komentárov riadka\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "Pr&enos komentára\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index cf332c5a7..4463bc388 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "Ta bort indrag", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "Linjekommentar (växla)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Redigering av radkommentar", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Redigering av radkommentar\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "Strömkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index cd6af546a..82c068712 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -201,18 +201,18 @@ BEGIN MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "Selectio&n" BEGIN - MENUITEM "&Indent", IDM_EDIT_INDENT - MENUITEM "&Unindent", IDM_EDIT_UNINDENT + MENUITEM "&Indent", IDM_EDIT_INDENT + MENUITEM "&Unindent", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "&Enclose Selection" BEGIN diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index e988e4498..dcf2cafdc 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -201,18 +201,18 @@ BEGIN MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "Selectio&n" BEGIN - MENUITEM "&Indent", IDM_EDIT_INDENT - MENUITEM "&Unindent", IDM_EDIT_UNINDENT + MENUITEM "&Indent", IDM_EDIT_INDENT + MENUITEM "&Unindent", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR - MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR POPUP "&Enclose Selection" BEGIN diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 1fc83f750..21228b132 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "减少缩进(&U)", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "切换行注释(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "使用矩形编辑模式修改行注释(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "行注释块编辑(&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "添加块注释(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index 9d7e132e1..c3404f5b0 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -210,7 +210,7 @@ BEGIN MENUITEM "減少縮排(&U)", IDM_EDIT_UNINDENT MENUITEM SEPARATOR MENUITEM "切換行註釋(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT - //MENUITEM "使用矩形編輯模式修改行註釋(O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "行註釋塊編輯(&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT MENUITEM SEPARATOR MENUITEM "新增塊註釋(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 3d1653c2f..015489337 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 b3ea1802b..6f7529028 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 326 +#define VERSION_REV 329 #define VERSION_BUILD 1 #define SCINTILLA_VER 500 #define LEXILLA_VER 500