Move "Find and Replace", "Bookmarks" and "Goto" into Search menu, issue #944.

Author: zufuliu

locale/de/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "Zeits&tempel aktualisieren\tShift+F5",	CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "&Suchen...\tStrg+F",						IDM_EDIT_FIND
+		MENUITEM "Suchtext s&peichern\tAlt+F3",				IDM_EDIT_SAVEFIND
+		MENUITEM "&Weitersuchen\tF3",						IDM_EDIT_FINDNEXT
+		MENUITEM "&Vorheriges suchen\tShift+F3",			IDM_EDIT_FINDPREV
+		MENUITEM "&Ersetzen...\tStrg+H",					IDM_EDIT_REPLACE
+		MENUITEM "&Nächstes ersetzen\tF4",					IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "&Klammernpaar anzeigen\tStrg+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "&Auswahl bis Klammerpaar\tStrg+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "W&ort auswählen\tStrg+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "&Zeile auswählen (eweitert Auswahl)\tStrg+Shift+Space",	IDM_EDIT_SELECTLINE
+		MENUITEM "Zeilen im &Textblock auswählen\tAlt+Shift+´",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "Auswahl bis zum Dokumentan&fang",						IDM_EDIT_SELTODOCSTART
+		MENUITEM "Auswahl bis zum &Dokumentende",						IDM_EDIT_SELTODOCEND
+		MENUITEM "Auswahl bis zum näc&hsten\tStrg+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "Auswahl bis zum vo&rherigen\tStrg+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "Suche&n und Ersetzen"
-		BEGIN
-			MENUITEM "&Suchen...\tStrg+F",						IDM_EDIT_FIND
-			MENUITEM "Suchtext s&peichern\tAlt+F3",				IDM_EDIT_SAVEFIND
-			MENUITEM "&Weitersuchen\tF3",						IDM_EDIT_FINDNEXT
-			MENUITEM "&Vorheriges suchen\tShift+F3",			IDM_EDIT_FINDPREV
-			MENUITEM "&Ersetzen...\tStrg+H",					IDM_EDIT_REPLACE
-			MENUITEM "&Nächstes ersetzen\tF4",					IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "&Klammernpaar anzeigen\tStrg+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "&Auswahl bis Klammerpaar\tStrg+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "W&ort auswählen\tStrg+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "&Zeile auswählen (eweitert Auswahl)\tStrg+Shift+Space",	IDM_EDIT_SELECTLINE
-			MENUITEM "Zeilen im &Textblock auswählen\tAlt+Shift+´",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "Auswahl bis zum Dokumentan&fang",						IDM_EDIT_SELTODOCSTART
-			MENUITEM "Auswahl bis zum &Dokumentende",						IDM_EDIT_SELTODOCEND
-			MENUITEM "Auswahl bis zum näc&hsten\tStrg+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "Auswahl bis zum vo&rherigen\tStrg+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "Lesezeic&hen"
 		BEGIN
 			MENUITEM "&Umschalten\tStrg+F2",				BME_EDIT_BOOKMARKTOGGLE

locale/fr/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "Mise à jour des  &Timestamps\tShift+F5",			CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "&Rechercher...\tCtrl+F",				IDM_EDIT_FIND
+		MENUITEM "Sauver la recherche\tAlt+F3",			IDM_EDIT_SAVEFIND
+		MENUITEM "Trouver les occurences précédentes\tF3",					IDM_EDIT_FINDNEXT
+		MENUITEM "Trouver les occurences suivantes\tShift+F3",		IDM_EDIT_FINDPREV
+		MENUITEM "Remplacer...\tCtrl+H",				IDM_EDIT_REPLACE
+		MENUITEM "Remplacer l'occurence suivante\tF4",				IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "Trouver la parenthèse fermante\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "Selectionner entre les parenthèses\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "Sélectionner le mot\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "Sélectionner les lignes (étendre la sélection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
+		MENUITEM "Sélectionner les lignes dans le bloc actuel\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "Sélectionner jusqu'au début du document",					IDM_EDIT_SELTODOCSTART
+		MENUITEM "Sélectionner jusqu'à la fin du document",						IDM_EDIT_SELTODOCEND
+		MENUITEM "Sélectionner jusqu'au suivant\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "Sélectionner jusqu'au précédent\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "&Rechercher et remplacer"
-		BEGIN
-			MENUITEM "&Rechercher...\tCtrl+F",				IDM_EDIT_FIND
-			MENUITEM "Sauver la recherche\tAlt+F3",			IDM_EDIT_SAVEFIND
-			MENUITEM "Trouver les occurences précédentes\tF3",					IDM_EDIT_FINDNEXT
-			MENUITEM "Trouver les occurences suivantes\tShift+F3",		IDM_EDIT_FINDPREV
-			MENUITEM "Remplacer...\tCtrl+H",				IDM_EDIT_REPLACE
-			MENUITEM "Remplacer l'occurence suivante\tF4",				IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "Trouver la parenthèse fermante\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "Selectionner entre les parenthèses\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "Sélectionner le mot\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "Sélectionner les lignes (étendre la sélection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
-			MENUITEM "Sélectionner les lignes dans le bloc actuel\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "Sélectionner jusqu'au début du document",					IDM_EDIT_SELTODOCSTART
-			MENUITEM "Sélectionner jusqu'à la fin du document",						IDM_EDIT_SELTODOCEND
-			MENUITEM "Sélectionner jusqu'au suivant\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "Sélectionner jusqu'au précédent\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "Marque-page"
 		BEGIN
 			MENUITEM "&Activer\tCtrl+F2",			BME_EDIT_BOOKMARKTOGGLE

locale/it/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "Aggiorna s&tampa orario\tShift+F5",			CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "&Trova...\tCtrl+F",				IDM_EDIT_FIND
+		MENUITEM "Sal&va testo trovato\tAlt+F3",			IDM_EDIT_SAVEFIND
+		MENUITEM "Trova il pr&ossimo\tF3",					IDM_EDIT_FINDNEXT
+		MENUITEM "Trova il precedent&e\tShift+F3",		IDM_EDIT_FINDPREV
+		MENUITEM "Sostit&uisci...\tCtrl+H",				IDM_EDIT_REPLACE
+		MENUITEM "Sostituisci il prossi&mo\tF4",				IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "Trova parentesi corrispo&ndente\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "Sele&ziona sino alla parentesi corrispondente\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "Seleziona pa&rola\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "Seleziona &linee (Espandi Selezione)\tCtrl+Shift+Spazio",	IDM_EDIT_SELECTLINE
+		MENUITEM "Seleziona le linee del &blocco corrente\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "Seleziona dall'&inizio del documento",					IDM_EDIT_SELTODOCSTART
+		MENUITEM "Seleziona sino alla &fine del documento",						IDM_EDIT_SELTODOCEND
+		MENUITEM "Seleziona sino al &prossimo\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "&Seleziona dal precedente\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "&Trova e Sostituisci"
-		BEGIN
-			MENUITEM "&Trova...\tCtrl+F",				IDM_EDIT_FIND
-			MENUITEM "Sal&va testo trovato\tAlt+F3",			IDM_EDIT_SAVEFIND
-			MENUITEM "Trova il pr&ossimo\tF3",					IDM_EDIT_FINDNEXT
-			MENUITEM "Trova il precedent&e\tShift+F3",		IDM_EDIT_FINDPREV
-			MENUITEM "Sostit&uisci...\tCtrl+H",				IDM_EDIT_REPLACE
-			MENUITEM "Sostituisci il prossi&mo\tF4",				IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "Trova parentesi corrispo&ndente\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "Sele&ziona sino alla parentesi corrispondente\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "Seleziona pa&rola\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "Seleziona &linee (Espandi Selezione)\tCtrl+Shift+Spazio",	IDM_EDIT_SELECTLINE
-			MENUITEM "Seleziona le linee del &blocco corrente\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "Seleziona dall'&inizio del documento",					IDM_EDIT_SELTODOCSTART
-			MENUITEM "Seleziona sino alla &fine del documento",						IDM_EDIT_SELTODOCEND
-			MENUITEM "Seleziona sino al &prossimo\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "&Seleziona dal precedente\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "Se&gnalibri"
 		BEGIN
 			MENUITEM "&Aggiungi\Rimuovi\tCtrl+F2",			BME_EDIT_BOOKMARKTOGGLE

locale/ja/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "タイムスタンプの更新(&T)\tShift+F5",			CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "検索(&F)...\tCtrl+F",				IDM_EDIT_FIND
+		MENUITEM "検索文字列候補に追加(&V)\tAlt+F3",			IDM_EDIT_SAVEFIND
+		MENUITEM "次を検索(&N)\tF3",					IDM_EDIT_FINDNEXT
+		MENUITEM "前へ検索(&P)\tShift+F3",		IDM_EDIT_FINDPREV
+		MENUITEM "置換(&E)...\tCtrl+H",				IDM_EDIT_REPLACE
+		MENUITEM "置換し次へ(&A)\tF4",				IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "対応括弧に移動(&B)\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "対応括弧まで選択(&R)\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "単語を選択(&W)\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "行を選択(&L)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
+		MENUITEM "現在行のブロックを選択(&C)\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "先頭まで選択(&T)",					IDM_EDIT_SELTODOCSTART
+		MENUITEM "終端まで選択(&D)",						IDM_EDIT_SELTODOCEND
+		MENUITEM "次の検索一致まで選択(&X)\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "前の検索一致まで選択(&S)\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "検索/置換(&F)"
-		BEGIN
-			MENUITEM "検索(&F)...\tCtrl+F",				IDM_EDIT_FIND
-			MENUITEM "検索文字列候補に追加(&V)\tAlt+F3",			IDM_EDIT_SAVEFIND
-			MENUITEM "次を検索(&N)\tF3",					IDM_EDIT_FINDNEXT
-			MENUITEM "前へ検索(&P)\tShift+F3",		IDM_EDIT_FINDPREV
-			MENUITEM "置換(&E)...\tCtrl+H",				IDM_EDIT_REPLACE
-			MENUITEM "置換し次へ(&A)\tF4",				IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "対応括弧に移動(&B)\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "対応括弧まで選択(&R)\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "単語を選択(&W)\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "行を選択(&L)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
-			MENUITEM "現在行のブロックを選択(&C)\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "先頭まで選択(&T)",					IDM_EDIT_SELTODOCSTART
-			MENUITEM "終端まで選択(&D)",						IDM_EDIT_SELTODOCEND
-			MENUITEM "次の検索一致まで選択(&X)\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "前の検索一致まで選択(&S)\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "ブックマーク(しおり)(&K)"
 		BEGIN
 			MENUITEM "指定の切替(&T)\tCtrl+F2",			BME_EDIT_BOOKMARKTOGGLE
@@ -568,7 +568,7 @@ BEGIN
 			//MENUITEM "SVG 文書(&G)",				IDM_LEXER_SVG
 		END
 	END
-	POPUP "設定(&S)"
+	POPUP "設定(&I)"
 	BEGIN
 		MENUITEM "タブキーで空白を入力(&S)",			IDM_VIEW_TABSASSPACES
 		MENUITEM "タブキーの設定(&T)...\tCtrl+T",		IDM_VIEW_TABSETTINGS

locale/ko/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "타임스탬프 업데이트(&T)\tShift+F5",					CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "찾기(&F)...\tCtrl+F",								IDM_EDIT_FIND
+		MENUITEM "찾을 텍스트 저장(&V)\tAlt+F3",						IDM_EDIT_SAVEFIND
+		MENUITEM "다음 찾기(&N)\tF3",								IDM_EDIT_FINDNEXT
+		MENUITEM "이전 찾기(&P)\tShift+F3",							IDM_EDIT_FINDPREV
+		MENUITEM "바꾸기(&E)...\tCtrl+H",							IDM_EDIT_REPLACE
+		MENUITEM "다음 바꾸기(&A)\tF4",								IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "일치하는 중괄호 찾기(&B)\tCtrl+B",					IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "일치하는 중괄호를 선택(&R)\tCtrl+Shift+B",			IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "단어 선택(&W)\tCtrl+Alt+Space",					IDM_EDIT_SELECTWORD
+		MENUITEM "줄 선택 (선택 확장)(&L)\tCtrl+Shift+Space",			IDM_EDIT_SELECTLINE
+		MENUITEM "현재 블록에서 줄 선택(&C)\tAlt+Shift+]",				IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "문서 처음까지 선택(&T)",							IDM_EDIT_SELTODOCSTART
+		MENUITEM "문서 끝까지 선택(&D)",								IDM_EDIT_SELTODOCEND
+		MENUITEM "다음에서 선택(&X)\tCtrl+Alt+F2",					IDM_EDIT_SELTONEXT
+		MENUITEM "이전에서 선택(&S)\tCtrl+Alt+Shift+F2",				IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "찾기 및 바꾸기(&F)"
-		BEGIN
-			MENUITEM "찾기(&F)...\tCtrl+F",								IDM_EDIT_FIND
-			MENUITEM "찾을 텍스트 저장(&V)\tAlt+F3",						IDM_EDIT_SAVEFIND
-			MENUITEM "다음 찾기(&N)\tF3",								IDM_EDIT_FINDNEXT
-			MENUITEM "이전 찾기(&P)\tShift+F3",							IDM_EDIT_FINDPREV
-			MENUITEM "바꾸기(&E)...\tCtrl+H",							IDM_EDIT_REPLACE
-			MENUITEM "다음 바꾸기(&A)\tF4",								IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "일치하는 중괄호 찾기(&B)\tCtrl+B",					IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "일치하는 중괄호를 선택(&R)\tCtrl+Shift+B",			IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "단어 선택(&W)\tCtrl+Alt+Space",					IDM_EDIT_SELECTWORD
-			MENUITEM "줄 선택 (선택 확장)(&L)\tCtrl+Shift+Space",			IDM_EDIT_SELECTLINE
-			MENUITEM "현재 블록에서 줄 선택(&C)\tAlt+Shift+]",				IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "문서 처음까지 선택(&T)",							IDM_EDIT_SELTODOCSTART
-			MENUITEM "문서 끝까지 선택(&D)",								IDM_EDIT_SELTODOCEND
-			MENUITEM "다음에서 선택(&X)\tCtrl+Alt+F2",					IDM_EDIT_SELTONEXT
-			MENUITEM "이전에서 선택(&S)\tCtrl+Alt+Shift+F2",				IDM_EDIT_SELTOPREV
-		END
 		POPUP "책갈피(&K)"
 		BEGIN
 			MENUITEM "전환(&T)\tCtrl+F2",								BME_EDIT_BOOKMARKTOGGLE
@@ -568,7 +568,7 @@ BEGIN
 			//MENUITEM "SVG 문서(&G)",									IDM_LEXER_SVG
 		END
 	END
-	POPUP "설정(&S)"
+	POPUP "설정(&I)"
 	BEGIN
 		MENUITEM "공백으로 탭 삽입(&S)",									IDM_VIEW_TABSASSPACES
 		MENUITEM "탭 설정(&T)...\tCtrl+T",								IDM_VIEW_TABSETTINGS

locale/pl/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "Update &Timestamps\tShift+F5",			CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "&Find...\tCtrl+F",				IDM_EDIT_FIND
+		MENUITEM "Sa&ve Find Text\tAlt+F3",			IDM_EDIT_SAVEFIND
+		MENUITEM "Find &Next\tF3",					IDM_EDIT_FINDNEXT
+		MENUITEM "Find &Previous\tShift+F3",		IDM_EDIT_FINDPREV
+		MENUITEM "R&eplace...\tCtrl+H",				IDM_EDIT_REPLACE
+		MENUITEM "Repl&ace Next\tF4",				IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "Find Matching &Brace\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "Select to Matching B&race\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "Select &Word\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "Select &Lines (Expand Selection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
+		MENUITEM "Select Lines in &Current Block\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "Select to Document Star&t",					IDM_EDIT_SELTODOCSTART
+		MENUITEM "Select to Document En&d",						IDM_EDIT_SELTODOCEND
+		MENUITEM "Select to Ne&xt\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "Select to Previou&s\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "&Find and Replace"
-		BEGIN
-			MENUITEM "&Find...\tCtrl+F",				IDM_EDIT_FIND
-			MENUITEM "Sa&ve Find Text\tAlt+F3",			IDM_EDIT_SAVEFIND
-			MENUITEM "Find &Next\tF3",					IDM_EDIT_FINDNEXT
-			MENUITEM "Find &Previous\tShift+F3",		IDM_EDIT_FINDPREV
-			MENUITEM "R&eplace...\tCtrl+H",				IDM_EDIT_REPLACE
-			MENUITEM "Repl&ace Next\tF4",				IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "Find Matching &Brace\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "Select to Matching B&race\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "Select &Word\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "Select &Lines (Expand Selection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
-			MENUITEM "Select Lines in &Current Block\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "Select to Document Star&t",					IDM_EDIT_SELTODOCSTART
-			MENUITEM "Select to Document En&d",						IDM_EDIT_SELTODOCEND
-			MENUITEM "Select to Ne&xt\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "Select to Previou&s\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "Boo&kmarks"
 		BEGIN
 			MENUITEM "&Toggle\tCtrl+F2",			BME_EDIT_BOOKMARKTOGGLE
@@ -568,7 +568,7 @@ BEGIN
 			//MENUITEM "SV&G Document",				IDM_LEXER_SVG
 		END
 	END
-	POPUP "&Settings"
+	POPUP "Sett&ings"
 	BEGIN
 		MENUITEM "Insert Tabs as &Spaces",			IDM_VIEW_TABSASSPACES
 		MENUITEM "&Tab Settings...\tCtrl+T",		IDM_VIEW_TABSETTINGS

locale/pt-BR/Notepad4.rc

@@ -354,27 +354,27 @@ BEGIN
 			MENUITEM SEPARATOR
 			MENUITEM "Update &Timestamps\tShift+F5",			CMD_TIMESTAMPS
 		END
+	END
+	POPUP "&Search"
+	BEGIN
+		MENUITEM "&Find...\tCtrl+F",				IDM_EDIT_FIND
+		MENUITEM "Sa&ve Find Text\tAlt+F3",			IDM_EDIT_SAVEFIND
+		MENUITEM "Find &Next\tF3",					IDM_EDIT_FINDNEXT
+		MENUITEM "Find &Previous\tShift+F3",		IDM_EDIT_FINDPREV
+		MENUITEM "R&eplace...\tCtrl+H",				IDM_EDIT_REPLACE
+		MENUITEM "Repl&ace Next\tF4",				IDM_EDIT_REPLACENEXT
+		MENUITEM SEPARATOR
+		MENUITEM "Find Matching &Brace\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
+		MENUITEM "Select to Matching B&race\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
+		MENUITEM "Select &Word\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
+		MENUITEM "Select &Lines (Expand Selection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
+		MENUITEM "Select Lines in &Current Block\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
+		MENUITEM SEPARATOR
+		MENUITEM "Select to Document Star&t",					IDM_EDIT_SELTODOCSTART
+		MENUITEM "Select to Document En&d",						IDM_EDIT_SELTODOCEND
+		MENUITEM "Select to Ne&xt\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
+		MENUITEM "Select to Previou&s\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
 		MENUITEM SEPARATOR
-		POPUP "&Find and Replace"
-		BEGIN
-			MENUITEM "&Find...\tCtrl+F",				IDM_EDIT_FIND
-			MENUITEM "Sa&ve Find Text\tAlt+F3",			IDM_EDIT_SAVEFIND
-			MENUITEM "Find &Next\tF3",					IDM_EDIT_FINDNEXT
-			MENUITEM "Find &Previous\tShift+F3",		IDM_EDIT_FINDPREV
-			MENUITEM "R&eplace...\tCtrl+H",				IDM_EDIT_REPLACE
-			MENUITEM "Repl&ace Next\tF4",				IDM_EDIT_REPLACENEXT
-			MENUITEM SEPARATOR
-			MENUITEM "Find Matching &Brace\tCtrl+B",				IDM_EDIT_FINDMATCHINGBRACE
-			MENUITEM "Select to Matching B&race\tCtrl+Shift+B",		IDM_EDIT_SELTOMATCHINGBRACE
-			MENUITEM "Select &Word\tCtrl+Alt+Space",				IDM_EDIT_SELECTWORD
-			MENUITEM "Select &Lines (Expand Selection)\tCtrl+Shift+Space",	IDM_EDIT_SELECTLINE
-			MENUITEM "Select Lines in &Current Block\tAlt+Shift+]",	IDM_EDIT_SELECTLINE_BLOCK
-			MENUITEM SEPARATOR
-			MENUITEM "Select to Document Star&t",					IDM_EDIT_SELTODOCSTART
-			MENUITEM "Select to Document En&d",						IDM_EDIT_SELTODOCEND
-			MENUITEM "Select to Ne&xt\tCtrl+Alt+F2",				IDM_EDIT_SELTONEXT
-			MENUITEM "Select to Previou&s\tCtrl+Alt+Shift+F2",		IDM_EDIT_SELTOPREV
-		END
 		POPUP "Boo&kmarks"
 		BEGIN
 			MENUITEM "&Toggle\tCtrl+F2",			BME_EDIT_BOOKMARKTOGGLE
@@ -568,7 +568,7 @@ BEGIN
 			//MENUITEM "SV&G Document",				IDM_LEXER_SVG
 		END
 	END
-	POPUP "&Settings"
+	POPUP "Sett&ings"
 	BEGIN
 		MENUITEM "Insert Tabs as &Spaces",			IDM_VIEW_TABSASSPACES
 		MENUITEM "&Tab Settings...\tCtrl+T",		IDM_VIEW_TABSETTINGS