diff --git a/Build/Changes.txt b/Build/Changes.txt
index ac366f759..dad4043a8 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,7 +32,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
-Current BETA/RC Version 5.21.218.(build_#) (2021-02-18)
+Current BETA/RC Version 5.21.219.(build_#) (2021-02-19)
========================================================
--------------------------------------------------------
@@ -67,6 +67,8 @@ NEW:
CHANGES:
--------------------------------------------------------
[.xxx.x]- .
+[.219.1]- Simple Line Comment Toggle handles each line separately (Line Edit after toggle will still set mode of 1st line = former behavior).
+[.219.1]- Menu move Line/Stream Comment items to Edit -> Selection top.
[.218.1]- Find/Repl dialog - refactoring and minor fixes.
[.213.1]- JSON5 enhancements to Scintilla's original JSON-Lexer.
[.211.1]- Statusbar Selection-Info: switch to byte (instead of character) counting for huge files.
@@ -112,6 +114,9 @@ CHANGES:
FIXES:
--------------------------------------------------------
[.xxx.x]- .
+[.219.1]- Do not move selection on search pattern change if in Replace-Dlg.
+[.219.1]- FJSON Lexer has comments enabled now.
+[.219.1]- F/R-Dialog - allow multi-line clipboard paste to Replace String combobox too.
[.218.2]- F/R: fixes some issues around RegEx zero-length match/findings.
[.218.1]- ReplaceAll. avoid busy loop (infinity) while replacing zero-length-match (RegExpr).
[.218.1]- F/R dialog don't change selection by typing search pattern.
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index dc6f4a877..037ba9719 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-218
+219
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 4c59db4c9..3dacec2bc 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Inkeep", IDM_EDIT_INDENT
MENUITEM "&Ontkeep", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Spring na die &Seleksie Begin\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Sprin&g na die Seleksie Einde\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "L&yn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "A&ktiveer Wysiging van reël en Kommentaarblok", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "Omsluit S&eleksie"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modifiseer Lyne...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Bring Lyne in Lyn...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sorteer Lyne...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Spring na die &Seleksie Begin\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Sprin&g na die Seleksie Einde\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Con&vert"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Tyd/Datum (&Lang Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Huidige &Tydstempel", CMD_INSERT_TIMESTAMP
MENUITEM "&Opdateer Tydstempel\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "L&yn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Diverse"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "O&uto-Voltooi Woorde", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "A&ktiveer Wysiging van reël en Kommentaarblok", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Enkel &Lêer Instansie", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Lêerverandering-&Kennisgewing...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index f62b073ba..b252ba79d 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Дадаць водступ", IDM_EDIT_INDENT
MENUITEM "&Выдаліць водступ", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Перайсці &ў пачатак вылучэння\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Перайсці ў &канец вылучэння\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Блокавае рэдагаванне каментарыяў", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Абгарнуць вылучэнне"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Змяніць радкі...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Выраў&наваць радкі...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Сар&таваць радкі...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Перайсці &ў пачатак вылучэння\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Перайсці ў &канец вылучэння\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Пераўтварэнне"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Час/&дата (доўгая форма)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Цяперашняя метка часу", CMD_INSERT_TIMESTAMP
MENUITEM "&Аднавіць меткі часу\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "Рознае"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Cамадавяр&шэнне слоў", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Cамадавяршэнне на аснове &лексемаў", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Паскораная навігацыя па слова&х\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Блокавае рэдагаванне каментарыяў", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Адзін &экзэмпляр файла", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Паведамленне а&б змяненні файла...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 2ebe258a4..19c5f1811 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Text Einrückung", IDM_EDIT_INDENT
MENUITEM "&Text Rückzug", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Bewege Textcursor zum Anfang\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Bewege Textcursor zum Ende\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Einzeilenkommentar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Editierbarer &Zeilen Block Kommentar", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Mehrzeilenkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Umschließe Selektion"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modifiziere Zeilen...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Zeilen &ausrichten...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sortiere Zeilen...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Bewege Textcursor zum Anfang\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Bewege Textcursor zum Ende\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "&Konvertiere"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Zeit/Datum (&Langform)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Aktueller Zeitstempel", CMD_INSERT_TIMESTAMP
MENUITEM "&Aktualisiere Zeitstempel\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Einzeilenkommentar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Mehrzeilenkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Verschiedenes"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Auto Wort &Vorschläge", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto &Lexer KeyWord Vorschläge", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "&Beschleunigte Wort Navigation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Editierbarer &Zeilen Block Kommentar", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Eine &Instanz per Datei", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Nachricht bei &Dateiänderung...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index e0dc7adcc..45dabd71b 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Con&vert"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Current &Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Update Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Miscellaneous"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Enable Line Comment &Block Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index 32556479a..bf48971e9 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -207,8 +207,10 @@ BEGIN
BEGIN
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 &Block Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 3df670f91..abebd5238 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Aumentar la sangría", IDM_EDIT_INDENT
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Ir al inicio de la selecci&ón\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Ir al final de la selecció&n\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Envolver selección"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modificar líneas...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Alinear l&íneas...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Ordenar líneas...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Ir al inicio de la selecci&ón\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Ir al final de la selecció&n\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Conve&rtir"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Hora/Fecha (&formato largo)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Actual Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "Actualización &Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "Div&erso"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto completar palabras", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Ins&tancia de archivo único", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc
index 61bcd06f7..9b48507fd 100644
--- a/language/np3_es_mx/menu_es_mx.rc
+++ b/language/np3_es_mx/menu_es_mx.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Aumentar la sangría", IDM_EDIT_INDENT
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Ir al inicio de la selecci&ón\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Ir al final de la selecció&n\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Envolver selección"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modificar líneas...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Alinear l&íneas...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Ordenar líneas...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Ir al inicio de la selecci&ón\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Ir al final de la selecció&n\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Conve&rtir"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Hora/Fecha (&formato largo)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Actual Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "Actualización &Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "Div&erso"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto completar palabras", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Ins&tancia de archivo único", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index a8871cf5a..7aee17777 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Mettre en Retrait", IDM_EDIT_INDENT
MENUITEM "&Réduire le Retrait", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Aller au Début de la Séle&ction\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Aller à la Fin de la Sélectio&n\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Commentaire de Ligne (Alterner)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Activer Édition de bloc de Lignes de &Commentaires", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Entourer la Sélection"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modifier les Lignes...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Aligner les Lignes...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Trier les Lignes...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Aller au Début de la Séle&ction\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Aller à la Fin de la Sélectio&n\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Co&nvertir"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Heure/Date (format &long)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Horod&atage courant", CMD_INSERT_TIMESTAMP
MENUITEM "&Mettre à jour l'Horodatage\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Commentaire de Ligne (Alterner)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Divers"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto-complétion des Mots", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto-complétion des &Mots-clés Lexer", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Navi&gation Accélérée par Mot\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Activer Édition de bloc de Lignes de &Commentaires", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Instance de &Fichier Unique", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Notif&ication de Modification de Fichier...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index 253310129..49aaeefcb 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -205,16 +205,18 @@ BEGIN
END
POPUP "चुनाव (&N)"
BEGIN
- MENUITEM "इंडेंट (&I)", IDM_EDIT_INDENT
+ MENUITEM "इंडेंट (&I)", IDM_EDIT_INDENT
MENUITEM "इंडेंट हटाएं (&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "चुनाव के आरंभ में जाएं (&C)\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "चुनाव के अंत में जाएं (&N)\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "रेखा ब्लॉक-टिप्पणी परिमार्जन समर्थ करें (&O)", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "चुनाव संलग्न करें (&E)"
BEGIN
MENUITEM "उद्धरण चिन्ह (&S)\tCtrl+1", CMD_STRINGIFY
- MENUITEM "दोहरा उद्धरण चिन्ह (&D)\tCtrl+2", CMD_STRINGIFY2
+ MENUITEM "दोहरा उद्धरण चिन्ह (&D)\tCtrl+2", CMD_STRINGIFY2
MENUITEM SEPARATOR
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "रेखा परिवर्तित करें (&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "संरेखित करें (&A)...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "रेखा क्रमवार करें (&S)...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "चुनाव के आरंभ में जाएं (&C)\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "चुनाव के अंत में जाएं (&N)\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "बदलें (&V)"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "समय/दिनाँक (विस्तृत प्रकार)(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "आज का समय और दिनाँक डालें (&T)", CMD_INSERT_TIMESTAMP
MENUITEM "समय-दिनाँक अपडेट करें (&U)\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "विविध (&M)"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "शब्द स्वतः पूर्ण करें (&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Lexer-Key-Words स्वतः पूर्ण करें (&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "शब्द यात्रा त्वरित गति (&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "रेखा ब्लॉक-टिप्पणी परिमार्जन समर्थ करें (&B)", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "एकल फ़ाइल अवस्था (&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "फ़ाइल परिवर्तन अधिसूचना (&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 5e461e288..ca506f029 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Behúzás", IDM_EDIT_INDENT
MENUITEM "Behúzás törlése", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Ugrás a kijelölés &elejére\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Ugrás a kijelölés &végére\tCtrl+.", CMD_JUMP2SELEND
+ 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_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Blokk megjegyzés\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Kijelölés körbevétele"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "Sorok &módosítása...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Sorok i&gazítása...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Sorok &rendezése...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Ugrás a kijelölés &elejére\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Ugrás a kijelölés &végére\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Ko&nvertálás"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Dátum/Idő (&hosszú)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Aktuális időbélyeg", CMD_INSERT_TIMESTAMP
MENUITEM "Időbélye&gek frissítése\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Sor megjegyzés (váltás)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Blokk megjegyzés\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Vegyes"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Szó kie&gészítés", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Lexer kul&csszavak kiegészítése", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "G&yorsított szó navigálás\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Sor-megjegyzés függőleges szerkesztésének engedélyezése", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Egyetlen fá&jl példány", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Figyel&meztetés fájl változásról...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index bcd8e0cf1..5d947771f 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Con&vert"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Current &Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Update Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Miscellaneous"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Enable Line Comment &Block Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 6f76bfc02..b98453195 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indenta", IDM_EDIT_INDENT
MENUITEM "&Rimuovi indentazione", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Vai all'&Inizio della selezione\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Vai alla &Fine della selezione\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Abilita modifica blocco commenti di linea", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Commento multi-riga\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Racchiudi selezione"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modifica righe...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Allinea righe...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Ordina righe...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Vai all'&Inizio della selezione\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Vai alla &Fine della selezione\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Co&nverti"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Ora/Data (formato &lungo)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Timestamp &Corrente", CMD_INSERT_TIMESTAMP
MENUITEM "&Aggiorna Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Commento multi-riga\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Altro"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Completamento a&utomatico delle parole", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Completamento automatico &keywords lexer", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Navi&gazione accelerata delle parole\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Abilita modifica blocco commenti di linea", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Im&pedisci di riaprire lo stesso file", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Notifica di modifi&che al file...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 7b326cfca..7e3af1cee 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "インデント(&I)\tTab", IDM_EDIT_INDENT
MENUITEM "逆インデント(&U)\tShift+Tab", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "選択範囲の先頭へ移動(&C)\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "選択範囲の末端へ移動(&N)\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "行コメント(切替)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "矩形/複数選択時もコメント切替(&O)", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "ブロックコメント(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "選択範囲を囲む(&E)"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "行の修飾(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "行の整列(&A)...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "行の並べ替え(&S)...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "選択範囲の先頭へ移動(&C)\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "選択範囲の末端へ移動(&N)\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "変換(&V)"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "日時 年月日(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "日時 (下の更新に対応)(&T)", CMD_INSERT_TIMESTAMP
MENUITEM "日時の更新(&U)\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "行コメント(切替)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "ブロックコメント(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "プログラム(&M)"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "単語補完(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "予約語を自動補完(&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "矩形/複数選択時もコメント切替(&B)", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "単一インスタンスでファイルを開く(&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "ファイルの変更を通知(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 21926cd68..13af78bbc 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -208,13 +208,15 @@ BEGIN
MENUITEM "들여쓰기(&I)", IDM_EDIT_INDENT
MENUITEM "내어쓰기(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "선택 시작으로 이동\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "선택 끝으로 이동\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "줄 주석 (전환)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "줄 주석 블록 편집 활성화(&O)", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "스트림 주석(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "선택 둘러싸기(&E)"
BEGIN
MENUITEM "단일 큰 따옴표(&S)\tCtrl+1", CMD_STRINGIFY
- MENUITEM "이중 큰 따옴표(&D)\tCtrl+2", CMD_STRINGIFY2
+ MENUITEM "이중 큰 따옴표(&D)\tCtrl+2", CMD_STRINGIFY2
MENUITEM SEPARATOR
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "줄 수정(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "줄 맞춤(&N)...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "줄 정렬(&O)...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "선택 시작으로 이동\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "선택 끝으로 이동\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "변환(&V)"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "날짜/시간 (긴 형식)(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "현재 타임스탬프(&C)(&T)", CMD_INSERT_TIMESTAMP
MENUITEM "타임스탬프 업데이트(&U)\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "줄 주석 (전환)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "스트림 주석(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "기타(&I)"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "단어 자동 완성(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "어휘 자동 완성(&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "가속화된 단어 탐색(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "줄 주석 블록 편집 활성화(&B)", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "단일 파일 인스턴스(&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "파일 변경 알림(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 498a5fd15..b0b64d847 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -205,11 +205,13 @@ BEGIN
END
POPUP "&Selectie"
BEGIN
- MENUITEM "&Inspringen", IDM_EDIT_INDENT
- MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT
+ MENUITEM "&Inspringen", IDM_EDIT_INDENT
+ MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Gaan naar begin van sele&ctie\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Gaan naar ei&nde van selectie\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Schakel bewerken van lijn &commentaarblok in", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Omvatten selectie"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Wijzigen lijnen...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Lijnen &uitlijnen...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Sorteren li&jnen...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Gaan naar begin van sele&ctie\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Gaan naar ei&nde van selectie\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Co&nverteren"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Tijd/Datum (&Lange vorm)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Huidige Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Tijdstempels bijwerken\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Overig"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto vervolledigen woorden", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto &vervolledigen 'Lexer' sleutelwoorden", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Versnelde woordnavi&gatie\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Schakel bewerken van lijn &commentaarblok in", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "En&kel bestand instantie", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Bestandswijziging notifi&catie...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index d3068f61a..75eb73cb0 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Wcięcie", IDM_EDIT_INDENT
MENUITEM "&Bez wcięcia", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Skocz na początek wyboru\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Skocz na koniec wyboru\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Włącz edycję wierszy bloku komentarzy", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Ujęcie zaznaczenia"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modyfikuj wiersze...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Wyrównaj wiersze...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Posortuj wiersze...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Skocz na początek wyboru\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Skocz na koniec wyboru\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Ko&nwertuj"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Godzinę/Datę (&długi format)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Bieżący znacznik czasu", CMD_INSERT_TIMESTAMP
MENUITEM "&Aktualizacja znacznika czasu\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Różne"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&utouzupełnianie wyrazów", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Autouzupełnianie Lekserem", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Przyspieszona nawigacja wyrazów\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Włącz edycję wierszy bloku komentarzy", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Jedna Instancja Pliku", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Powiadomienie o zmianie pliku...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 10d46f27d..05f580ac6 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indentar", IDM_EDIT_INDENT
MENUITEM "&Desindentar", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "&Pular para Início da Seleção\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Pular para &Fim da Seleção\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Habilitar Edição de Bloco de Linha &Comentário", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Incluir na Seleção"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modificar Linhas ...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Alinhar Linhas ...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Ordenar Linhas ...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "&Pular para Início da Seleção\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Pular para &Fim da Seleção\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Co&nverter"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Data/Hora (Formato &Longo)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Current Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Atualizar Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Diversos"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Completa Palavras A&utomaticamente", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Completa Automaticamente Palavras-&Chaves-Léxicas", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Nave&gação de Palavra Acelerada\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Habilitar Edição de Bloco de Linha &Comentário", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Instância de &Arquivo Única", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Notificação de &Mudança de Arquivo...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 9699d544d..1ba9eb5a0 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indentar", IDM_EDIT_INDENT
MENUITEM "&Desindentar", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Saltar para o início da sele&cção\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Saltar para o &fim da selecção\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Activar edição de bloco de &comentário de linha", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Incluir selecção"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modificar linhas...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Alinhar linhas...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Ordenar linha&s...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Saltar para o início da sele&cção\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Saltar para o &fim da selecção\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Co&nverter"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Hora/Data (por extenso)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Data/hora a&ctual", CMD_INSERT_TIMESTAMP
MENUITEM "Act&ualizar data/hora\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Diversos"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Conclusão a&utomática das palavras", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Conclusão automática palavras chave Lexer", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Nave&gação acelerada de palavras\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Activar edição de bloco de &comentário de linha", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Instância de &ficheiro único", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Notificação de alteração de fi&cheiro...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 7d15e8bc7..b05aa374c 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Добавить отступ", IDM_EDIT_INDENT
MENUITEM "&Удалить отступ", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Перейти к началу в&ыделения\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Перейти в конец выделени&я\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Блочное редактирование &комментариев", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "&Блочный комментарий\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Обернуть выделение"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Изменить строки...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Выров&нять строки...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Сортировать строки...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Перейти к началу в&ыделения\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Перейти в конец выделени&я\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Преобразование"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Время/&дата (длинная форма)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Текущая метка времени", CMD_INSERT_TIMESTAMP
MENUITEM "&Обновить метки времени\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "&Блочный комментарий\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "Разное"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Авто&завершение слов", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Автозавершение на основе &лексем", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Ускоренная нави&гация по словам\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Блочное редактирование &комментариев", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Один &экземпляр файла", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "&Уведомление об изменении файла...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 11e4302f5..68683efe2 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Odsadenie", IDM_EDIT_INDENT
MENUITEM "Z&rušiť odsadenie", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Prejsť na &začiatok výberu\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Prejsť na &koniec výberu\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Povoliť úpravu bloku &komentárov riadka", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Pr&enos komentára\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Pridať k začiatku a koncu výberu"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Doplnenie riadkov...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Zarovnať riadky...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Zor&adiť riadky...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Prejsť na &začiatok výberu\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Prejsť na &koniec výberu\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "&Konvertovať"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Čas/Dátum (&dlhý)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Aktuálne časové razítko", CMD_INSERT_TIMESTAMP
MENUITEM "&Aktualizovať časové razítka\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Pr&enos komentára\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Rôzne"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&utomatické dokončovanie slov", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto-kompletizácia kľúčových slov &Lexer", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Zrýchlená navi&gácia slov\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Povoliť úpravu bloku &komentárov riadka", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Inštancia &jedného súboru", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "&Oznámenie o zmene súboru...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index a1b7220b5..91fde4bd3 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "Indrag", IDM_EDIT_INDENT
MENUITEM "Ta bort indrag", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Hoppa till början av markeringen\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Hoppa till slutet av markeringen\tCtrl+,", CMD_JUMP2SELEND
+ MENUITEM "Linjekommentar (växla)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Redigering av radkommentar", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "Strömkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "Omslut markering"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "Modifiera rader...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "Justera rader...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "Sortera rader...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Hoppa till början av markeringen\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Hoppa till slutet av markeringen\tCtrl+,", CMD_JUMP2SELEND
END
POPUP "Konvertera"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Tid och datum (lång)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Aktuell tidsstämpel", CMD_INSERT_TIMESTAMP
MENUITEM "Uppdatera tidsstämplar\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Linjekommentar (växla)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "Strömkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "Övrigt"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "Kompletera ord automatiskt", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Komplettera Lexer-&Key-Words automatiskt", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Accelerad ordnavigering\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Redigering av radkommentar", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Endast en instans per fil", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "Notifiering vid filändring...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index a7dc34e8a..a25b0f588 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Con&vert"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Current &Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Update Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Miscellaneous"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Enable Line Comment &Block Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index 3d99ba7f4..803bc02e4 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Con&vert"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "Current &Timestamp", CMD_INSERT_TIMESTAMP
MENUITEM "&Update Timestamps\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "&Miscellaneous"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Enable Line Comment &Block Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 973ac9a53..e6b1185cb 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "增加缩进(&I)", IDM_EDIT_INDENT
MENUITEM "减少缩进(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "跳转到选区开始\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "跳转到选区结束\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "切换行注释(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "使用矩形编辑模式修改行注释(&O)", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "添加块注释(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "围闭选区(&E)"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "修改(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "对齐(&A)...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "排序(&S)...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "跳转到选区开始\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "跳转到选区结束\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "转换(&V)"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "日期和时间（长格式）(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "当前时间戳(&T)", CMD_INSERT_TIMESTAMP
MENUITEM "更新时间戳(&U)\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "切换行注释(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "添加块注释(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "杂项(&M)"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "自动补全单词(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "自动补全语法关键字(&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "加速单词导航(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "使用矩形编辑模式修改行注释(&B)", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "单一文件实例(&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "文件修改通知(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index b272d945d..8c754ecd5 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -208,8 +208,10 @@ BEGIN
MENUITEM "增加縮排(&I)", IDM_EDIT_INDENT
MENUITEM "減少縮排(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "跳到選取區域開始\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "跳到選取區域結束\tCtrl+.", CMD_JUMP2SELEND
+ MENUITEM "切換行註釋(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
+ MENUITEM "使用矩形編輯模式修改行註釋(O)", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM SEPARATOR
+ MENUITEM "新增塊註釋(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "圍閉選取區域(&E)"
BEGIN
@@ -235,6 +237,9 @@ BEGIN
MENUITEM "修改(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "對齊(&A)...\tAlt+J", IDM_EDIT_ALIGN
MENUITEM "排序(&S)...\tAlt+O", IDM_EDIT_SORTLINES
+ MENUITEM SEPARATOR
+ MENUITEM "跳到選取區域開始\tCtrl+,", CMD_JUMP2SELSTART
+ MENUITEM "跳到選取區域結束\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "轉換(&V)"
BEGIN
@@ -269,9 +274,6 @@ BEGIN
MENUITEM "日期和時間（長格式）(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM "&Current Timestamp(&T)", CMD_INSERT_TIMESTAMP
MENUITEM "更新時間戳(&U)\tShift+F5", CMD_UPDATE_TIMESTAMPS
- MENUITEM SEPARATOR
- MENUITEM "切換行註釋(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
- MENUITEM "新增塊註釋(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
END
POPUP "雜項(&M)"
BEGIN
@@ -444,7 +446,6 @@ BEGIN
MENUITEM "自動完成單詞(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "自動完成語法關鍵字(&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "加速單詞導覽(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "使用矩形編輯模式修改行註釋(B)", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
MENUITEM "單一檔案進程(&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "檔案修改通知(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 06665dd08..d52be9b77 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 rc
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 5d4c2c359..cd1c274a2 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
-#define VERSION_REV 218
-#define VERSION_BUILD 2
+#define VERSION_REV 219
+#define VERSION_BUILD 1
#define SCINTILLA_VER 446
#define ONIGURUMA_REGEX_VER 6.9.6
#define UCHARDET_VER 2018.09.27
diff --git a/test/test_files/StyleLexers/styleLexJSON/Sample_JSON.json b/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json
similarity index 100%
rename from test/test_files/StyleLexers/styleLexJSON/Sample_JSON.json
rename to test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json
diff --git a/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt b/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt
new file mode 100644
index 000000000..c72f7f845
--- /dev/null
+++ b/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt
@@ -0,0 +1,22 @@
+1
+1
+1
+start
+1
+1
+start
+1
+1
+1
+start
+1
+1
+1
+start
+1
+1
+1
+end
+1
+1
+