diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index b9f149170..9752866d4 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Wys Lyn &Einde\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Kleur Definisie Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Kleur Definisie Hotspots",
+ BEGIN
+ MENUITEM "&AF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ 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
POPUP "Merk Huidi&ge Lyn\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Pas &Geval Sensitief", IDM_VIEW_MARKOCCUR_CASE
POPUP "Pas &Slegs Die Hele Woord Aan"
BEGIN
- MENUITEM "AF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&AF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Pas &Geselekteerde Woord", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Pas &Huidige Woord", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index fccb26662..6a1ac31a7 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Паказваць &канчаткі радкоў\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Адзначаць &гіперспасылкі\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Адзначаць рэгі&ёны вылучэння колера", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "Адзначаць рэгі&ёны вылучэння колера"
+ BEGIN
+ MENUITEM "&Адключыць", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "Адзначаць парныя ду&жкі\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Па&дсвечванне ак&тыўнага радка\tCtrl+Shift+I"
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index acdd30a78..fef0176b8 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -329,7 +329,7 @@ BEGIN
MENUITEM "&AUS", IDM_VIEW_COLORDEFHOTSPOTS
MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
- MENUITEM "&BGR+A" IDM_VIEW_COLOR_BGRA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
END
MENUITEM "&Unicode-Point Indikator", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Zeige passende Klammer\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
@@ -348,7 +348,7 @@ BEGIN
MENUITEM "Berücksichtige Groß-/Kleinschreibung", IDM_VIEW_MARKOCCUR_CASE
POPUP "Nur ganze Wörter"
BEGIN
- MENUITEM "AUS", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&AUS", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Selektiertes Wort", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Aktuelles Wort", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index 1a41fd182..c3a2b2077 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Colour Definition Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Color Definition Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "H&ighlight Current Line\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Case Sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &Whole Word Only"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &Selected Word", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &Current Word", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index 83370db5c..6b5b8d627 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -329,7 +329,7 @@ BEGIN
MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
- MENUITEM "&BGR+A" IDM_VIEW_COLOR_BGRA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index d4dc5e399..f62b58e57 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Mostrar &fin de línea\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Indicar &hipervínculos\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Definición color Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Definición color Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Mostrar &Unicode-Puntos", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual coincidencia de llave\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "&Resaltar la línea actual\tCtrl+Shift+I"
diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc
index 88791753a..564835e1b 100644
--- a/language/np3_es_mx/menu_es_mx.rc
+++ b/language/np3_es_mx/menu_es_mx.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Mostrar &fin de línea\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Indicar &hipervínculos\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Definición color Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Definición color Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual coincidencia de llave\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "&Resaltar la línea actual\tCtrl+Shift+I"
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 0c793acf2..a52fc3495 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -324,8 +324,14 @@ BEGIN
MENUITEM "Afficher les fins de lign&e\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Indicateurs H&yperlink\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Définition couleur Hotspots ", IDM_VIEW_COLORDEFHOTSPOTS
- MENUITEM "Afficher &Unicode-Points", IDM_VIEW_UNICODE_POINTS
+ POPUP "&Définition couleur Hotspots "
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
+ MENUITEM "Afficher &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "Correspondence &visuelle des accolades\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Mise en b&rillance de la ligne actuelle\tCtrl+Shift+I"
BEGIN
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Correspondance &casse sensible", IDM_VIEW_MARKOCCUR_CASE
POPUP "Correpondance &mot entier seul"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Correpondance &mot sélecté", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Correpondance mot &actuel", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index 7b84e88cd..cf6759866 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Colour Definition Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Color Definition Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "H&ighlight Current Line\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Case Sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &Whole Word Only"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &Selected Word", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &Current Word", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 6f956564e..abd913822 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Sorvégek &megjelenítése\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Hivatkoz&ások kiemelése\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Szín&választó területek", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "Szín&választó területek"
+ BEGIN
+ MENUITEM "Kika&pcsolva", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Zárójelpár kiemelés\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Akt&uális sor kiemelése\tCtrl+Shift+I"
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index 69d849cb0..56a96a225 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Colour Definition Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Color Definition Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "H&ighlight Current Line\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Case Sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &Whole Word Only"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &Selected Word", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &Current Word", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 0b178ed14..1161cff20 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Mostra simboli di a capo\tCtrl+Shift+0", IDM_VIEW_WORDWRAPSYMBOLS
MENUITEM SEPARATOR
MENUITEM "Evidenzia h&yperlink\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Hotspot definizione colore", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Hotspot definizione colore"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "Evidenzia &parentesi corrispondente\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Evidenzia riga corrente\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Corrispondenza &case-sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Corrispondenza solo per parole intere"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Corrispondenza parola &selezionata", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Corrispondenza parola &corrente", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index c05751a80..86a95b93d 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "改行コード(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "アドレスをリンク(&H)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "色をプレビュー(&C)", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "色をプレビュー(&C)"
+ BEGIN
+ MENUITEM "オフ(&O)", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "A+RGB(&A)" IDM_VIEW_COLOR_ARGB
+ MENUITEM "RGB+A(&R)" IDM_VIEW_COLOR_RGBA
+ MENUITEM "BGRA(&B)" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Unicode の符号点を強調表示(&U)", IDM_VIEW_UNICODE_POINTS
MENUITEM "対応括弧を強調表示(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "現在の行を強調表示(&G)\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "大文字小文字を区別(&C)", IDM_VIEW_MARKOCCUR_CASE
POPUP "単語単位で一致(&W)"
BEGIN
- MENUITEM "オフ", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "オフ(&O)", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "選択単語に一致(&S)", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "カーソル位置の単語(&C)", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 8d3e269ed..8599a18f6 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "줄 끝 표시(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "하이퍼 링크 핫스팟(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "색상 정의 핫스팟(&C)", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "색상 정의 핫스팟(&C)"
+ BEGIN
+ MENUITEM "사용 안함(&O)", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "A+RGB(&A)" IDM_VIEW_COLOR_ARGB
+ MENUITEM "RGB+A(&R)" IDM_VIEW_COLOR_RGBA
+ MENUITEM "BGRA(&B)" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "괄호 짝 강조(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "현재 줄 강조(&G)\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "대소문자 구별(&C)", IDM_VIEW_MARKOCCUR_CASE
POPUP "단어 단위 일치(&W)"
BEGIN
- MENUITEM "사용 안함", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "사용 안함(&O)", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "선택한 단어 일치(&S)", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "현재 단어와 일치(&R)", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 36024b220..0fdd2c48d 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Tonen de lijn &eindes\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "H&yperlink Indicatoren\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Kleurdefinitie Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Kleurdefinitie Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Tonen &Unicode-Punten", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visuele Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Mar&keer actueel lijn\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Hoofdlettergevoelig", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &alleen hele woord"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &geselecteerde woord", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &huidig woord", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 5819338e5..1583f30af 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Pokaż znaki końca wiersza\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Aktywne miejsca hiperpłącza\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Definicja kolorów Hotspotów", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Definicja kolorów Hotspotów"
+ BEGIN
+ MENUITEM "Wyłączone", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Wyróżnianie pasujących nawiasów\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Wyróżnianie bieżącego wiersza\tCtrl+Shift+I"
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 87a832755..0688464df 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Mostrar &Finais de Linha\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Hotspots de &Hyperlink\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Definiçcão de &Cores dos Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "Definiçcão de &Cores dos Hotspots"
+ BEGIN
+ MENUITEM "Desligado", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visualizar Pares de Chaves Casados\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "D&estacar Linha Atual\tCtrl+Shift+I"
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 8db7820b9..9f8b9b37a 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -323,8 +323,14 @@ BEGIN
MENUITEM "Mostrar espaços\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS
MENUITEM "Mostrar fins d&e linha\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
- MENUITEM "Realçar &hiperligações\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Definição de &cor do realce", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "Realçar &hiperligações\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
+ POPUP "Definição de &cor do realce"
+ BEGIN
+ MENUITEM "Desligado", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "Correspondência &visual das chavetas\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Realçar l&inha actual\tCtrl+Shift+I"
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index cdb40b83c..606cb1c17 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Отображать &окончания строк\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Отмечать &гиперссылки\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Отмечать области выбора &цвета", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "Отмечать области выбора &цвета"
+ BEGIN
+ MENUITEM "&Выключена", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "О&тмечать парные скобки\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Подсветка т&екущей строки\tCtrl+Shift+I"
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 97ec95917..f76fe542d 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Zobraziť &koncovky riadkov\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlinkové prepojenia\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Farba definície prepojenia", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Farba definície prepojenia"
+ BEGIN
+ MENUITEM "&VYP.", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Zvýrazniť &aktuálny riadok\tShift+Ctrl+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Rozlišovať malé a veľké písmo", IDM_VIEW_MARKOCCUR_CASE
POPUP "Priradiť iba celé slovo"
BEGIN
- MENUITEM "VYP.", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&VYP.", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Priradiť &vybrané slovo", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Priradiť &aktuálne slovo", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 58b12ef96..4f7c5da0d 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Visa radslut\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "Hyperlänkpunkt\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "Färgpunkter", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "Färgpunkter"
+ BEGIN
+ MENUITEM "&Av", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Markera &Unicode-punkter", IDM_VIEW_UNICODE_POINTS
MENUITEM "Visuell klammermatchning\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "Markera rad\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Matcha skriftslägeskänsligt", IDM_VIEW_MARKOCCUR_CASE
POPUP "Matcha endast hela ord"
BEGIN
- MENUITEM "Av", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&Av", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Matcha valt ord", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Matcha aktivt ord", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 34cd320d0..ce9f34f2f 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Colour Definition Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Color Definition Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "H&ighlight Current Line\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Case Sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &Whole Word Only"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &Selected Word", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &Current Word", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index 3c639df2f..9e5711c01 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "&Colour Definition Hotspots", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "&Color Definition Hotspots"
+ BEGIN
+ MENUITEM "&OFF", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
+ MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
+ MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "H&ighlight Current Line\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "Match &Case Sensitive", IDM_VIEW_MARKOCCUR_CASE
POPUP "Match &Whole Word Only"
BEGIN
- MENUITEM "OFF", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "Match &Selected Word", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "Match &Current Word", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index d53f688f1..4e5d218eb 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "显示换行符号(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "检测超链接(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "检测 #RRGGBB 颜色(&C)", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "检测 #RRGGBB 颜色(&C)"
+ BEGIN
+ MENUITEM "关闭(&O)", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "A+RGB(&A)" IDM_VIEW_COLOR_ARGB
+ MENUITEM "RGB+A(&R)" IDM_VIEW_COLOR_RGBA
+ MENUITEM "BGRA(&B)" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "提示配对括号(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "高亮当前行(&G)\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "大小写匹配(&C)", IDM_VIEW_MARKOCCUR_CASE
POPUP "全词匹配(&W)"
BEGIN
- MENUITEM "关闭(&F)", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "关闭(&O)", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "匹配选定单词(&S)", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "匹配当前单词(&C)", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index cdd2c5e8d..31bbab50d 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -324,7 +324,13 @@ BEGIN
MENUITEM "顯示換行符號(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
MENUITEM SEPARATOR
MENUITEM "檢測超鏈接(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
- MENUITEM "檢測 #RRGGBB 顏色(&C)", IDM_VIEW_COLORDEFHOTSPOTS
+ POPUP "檢測 #RRGGBB 顏色(&C)"
+ BEGIN
+ MENUITEM "關閉(&O)", IDM_VIEW_COLORDEFHOTSPOTS
+ MENUITEM "A+RGB(&A)" IDM_VIEW_COLOR_ARGB
+ MENUITEM "RGB+A(&R)" IDM_VIEW_COLOR_RGBA
+ MENUITEM "BGRA(&B)" IDM_VIEW_COLOR_BGRA
+ END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "提示符合括號(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
POPUP "高亮目前行(&G)\tCtrl+Shift+I"
@@ -342,7 +348,7 @@ BEGIN
MENUITEM "大小寫匹配(&C)", IDM_VIEW_MARKOCCUR_CASE
POPUP "全詞匹配(&W)"
BEGIN
- MENUITEM "關閉(&F)", IDM_VIEW_MARKOCCUR_WNONE
+ MENUITEM "關閉(&O)", IDM_VIEW_MARKOCCUR_WNONE
MENUITEM "匹配選定單詞(&S)", IDM_VIEW_MARKOCCUR_WORD
MENUITEM "匹配目前單詞(&C)", IDM_VIEW_MARKOCCUR_CURRENT
END
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index c40f19d1e..a1579a1cc 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta