feat(ui): more intuitive :substitute confirm prompt #31787

Problem:  Unknown key mappings listed in substitute confirm message.
Solution: Include hints as to what the key mappings do.

36 files changed, 79 insertions, 75 deletions

diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index 2f55aadef0..98337e4b76 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -192,7 +192,7 @@ following: >
 Vim finds the first occurrence of "Professor" and displays the text it is
 about to change.  You get the following prompt: >
 
-	replace with Teacher (y/n/a/q/l/^E/^Y)?
+	replace with Teacher? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)
 
 At this point, you must enter one of the following answers:
 
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 0510619825..073b9594ed 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3793,10 +3793,11 @@ static int do_sub(exarg_T *eap, const proftime_T timeout, const int cmdpreview_n
 
               curwin->w_p_fen = save_p_fen;
 
-              snprintf(IObuff, IOSIZE, _("replace with %s (y/n/a/q/l/^E/^Y)?"), sub);
-              char *prompt = xstrdup(IObuff);
-              typed = prompt_for_input(prompt, HLF_R, true, NULL);
-              xfree(prompt);
+              char *p = _("replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)");
+              snprintf(IObuff, IOSIZE, p, sub);
+              p = xstrdup(IObuff);
+              typed = prompt_for_input(p, HLF_R, true, NULL);
+              xfree(p);
 
               p_lz = save_p_lz;
               RedrawingDisabled = temp;
diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po
index 64acd93f57..3d537a51f2 100644
--- a/src/nvim/po/af.po
+++ b/src/nvim/po/af.po
@@ -1353,8 +1353,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Patrone kan nie deur letters afgebaken word nie"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "vervang met %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "vervang met %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up (^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Onderbreek) "
diff --git a/src/nvim/po/ca.po b/src/nvim/po/ca.po
index 44975d9161..2162f13592 100644
--- a/src/nvim/po/ca.po
+++ b/src/nvim/po/ca.po
@@ -1241,8 +1241,8 @@ msgstr "E146: Les expressions regulars no poden estar delimitades per lletres"
 # �amb� o �per� + tecles.  eac
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "substituir amb %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "substituir amb %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
index 43b6c82960..4939a150ac 100644
--- a/src/nvim/po/cs.cp1250.po
+++ b/src/nvim/po/cs.cp1250.po
@@ -1255,8 +1255,8 @@ msgstr "E146: Regul�rn� v�razy nesm� b�t odd�leny p�smeny"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradit za %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "nahradit za %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/cs.po b/src/nvim/po/cs.po
index 7df69e061f..9cb552c6de 100644
--- a/src/nvim/po/cs.po
+++ b/src/nvim/po/cs.po
@@ -1255,8 +1255,8 @@ msgstr "E146: Regul�rn� v�razy nesm� b�t odd�leny p�smeny"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradit za %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "nahradit za %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/da.po b/src/nvim/po/da.po
index ed9e357092..8a7bffdd53 100644
--- a/src/nvim/po/da.po
+++ b/src/nvim/po/da.po
@@ -984,8 +984,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Regulære udtryk kan ikke afgrænses af bogstaver"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "erstat med %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "erstat med %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Afbrudt) "
diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po
index 0d1195eecf..0eb72b9565 100644
--- a/src/nvim/po/de.po
+++ b/src/nvim/po/de.po
@@ -666,8 +666,8 @@ msgstr "E146: Regul�re Ausdr�cke k�nnen nicht durch Buchstaben begrenzt werden"
 
 #: ../ex_cmds.c:3958
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "ersetze durch %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "ersetze durch %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4373
 msgid "(Interrupted) "
diff --git a/src/nvim/po/en_GB.po b/src/nvim/po/en_GB.po
index 7b849d4e68..f93dcad206 100644
--- a/src/nvim/po/en_GB.po
+++ b/src/nvim/po/en_GB.po
@@ -1199,8 +1199,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Regular expressions cannot be delimited by letters"
 
 #: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
+#, c-format"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 msgstr ""
 
 #: ../ex_cmds.c:4379
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 5cd18ad24b..4033ff8a43 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -950,8 +950,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Ne eblas limigi regulesprimon per literoj"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "ĉu anstataŭigi per %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "ĉu anstataŭigi per %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Interrompita) "
diff --git a/src/nvim/po/es.po b/src/nvim/po/es.po
index 292ca15264..b67c275bf3 100644
--- a/src/nvim/po/es.po
+++ b/src/nvim/po/es.po
@@ -1243,8 +1243,8 @@ msgstr "E146: Las expresiones regulares no se pueden delimitar con letras"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "¿Reemplazar con %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "¿Reemplazar con %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index c9cad6cc69..e1700d61ff 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -1521,8 +1521,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Säännöllistä ilmausta ei voi rajata kirjaimilla"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "korvaa kohteella %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "korvaa kohteella %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Keskeytetty)"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index b561347ab8..900f5bde03 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -855,8 +855,8 @@ msgstr ""
 "lettres"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "remplacer par %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Interrompu) "
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index 7a5893b5f2..902bf9fae1 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -972,8 +972,8 @@ msgstr ""
 "E146: N� cheada�tear litreacha mar theormharc�ir� ar shloinn ionada�ochta"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "cuir %s ina ionad (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "cuir %s? ina ionad (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Idirbhriste) "
diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po
index d02052ec39..5caaa3c1f0 100644
--- a/src/nvim/po/it.po
+++ b/src/nvim/po/it.po
@@ -1227,8 +1227,8 @@ msgstr "E146: Le espressioni regolari non possono essere delimitate da lettere"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "sostituire con %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "sostituire con %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index 78f927c21d..02bd36efbb 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -867,8 +867,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ����ɽ����ʸ���Ƕ��ڤ뤳�Ȥ��Ǥ��ޤ���"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "%s ���ִ����ޤ���? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(����ޤ�ޤ���) "
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index 1a493c0336..8d417d222a 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -2998,8 +2998,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "%s に置換しますか? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(割込まれました) "
diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index 03dff518f3..66463713d7 100644
--- a/src/nvim/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
@@ -1221,8 +1221,8 @@ msgstr "E146: 정규표현식은 글자로 구분될 수 없습니다"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s(으)로 바꿈 (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "%s(으)로 바꿈? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/nb.po b/src/nvim/po/nb.po
index d512789246..6f10dcc232 100644
--- a/src/nvim/po/nb.po
+++ b/src/nvim/po/nb.po
@@ -1236,8 +1236,8 @@ msgstr "E146: Regul�re uttrykk kan ikke bli adskilt av bokstaver"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Erstatt med %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "Erstatt med %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/nl.po b/src/nvim/po/nl.po
index f6ce5ddc9f..75d516a67d 100644
--- a/src/nvim/po/nl.po
+++ b/src/nvim/po/nl.po
@@ -1223,8 +1223,8 @@ msgstr "E146: reguliere expressies kunnen niet begrensd worden door letters"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "vervang door %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "vervang door %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/no.po b/src/nvim/po/no.po
index d512789246..6f10dcc232 100644
--- a/src/nvim/po/no.po
+++ b/src/nvim/po/no.po
@@ -1236,8 +1236,8 @@ msgstr "E146: Regul�re uttrykk kan ikke bli adskilt av bokstaver"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Erstatt med %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "Erstatt med %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
index b7200a7ba8..521edb383d 100644
--- a/src/nvim/po/pl.UTF-8.po
+++ b/src/nvim/po/pl.UTF-8.po
@@ -1207,8 +1207,8 @@ msgstr "E146: Wzorce regularne nie mogą być rozgraniczane literami"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "zamień na %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "zamień na %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/pt_BR.po b/src/nvim/po/pt_BR.po
index 3f2f87991c..4e7225fc9c 100644
--- a/src/nvim/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
@@ -4216,8 +4216,8 @@ msgstr "E146: Express�es regulares n�o podem ser delimitadas por letras"
 
 #: ../ex_cmds.c:3958
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "substituir por %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "substituir por %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4373
 msgid "(Interrupted) "
diff --git a/src/nvim/po/ru.po b/src/nvim/po/ru.po
index 64c18f890c..90dc5b2d8e 100644
--- a/src/nvim/po/ru.po
+++ b/src/nvim/po/ru.po
@@ -1215,8 +1215,8 @@ msgstr "E146: Регулярные выражения не могут разде
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "заменить на %s? (y/n/a/q/l/^E/^Y)"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "заменить на %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
index 9510a357f0..394b5aff01 100644
--- a/src/nvim/po/sk.cp1250.po
+++ b/src/nvim/po/sk.cp1250.po
@@ -1224,8 +1224,8 @@ msgstr "E146: Regul�rne v�razy nesm� by� oddelen� p�smenami"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradi� %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "nahradi� %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/sk.po b/src/nvim/po/sk.po
index 21791e0061..79ed3e9539 100644
--- a/src/nvim/po/sk.po
+++ b/src/nvim/po/sk.po
@@ -1224,8 +1224,8 @@ msgstr "E146: Regul�rne v�razy nesm� by� oddelen� p�smenami"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradi� %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "nahradi� %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po
index 1cbb37eeb1..79b6747921 100644
--- a/src/nvim/po/sr.po
+++ b/src/nvim/po/sr.po
@@ -1201,8 +1201,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Регуларни изрази не могу да се раздвајају словима"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "заменити са %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "заменити са %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Прекинуто)"
diff --git a/src/nvim/po/sv.po b/src/nvim/po/sv.po
index 89a7717746..285dadb595 100644
--- a/src/nvim/po/sv.po
+++ b/src/nvim/po/sv.po
@@ -2628,8 +2628,8 @@ msgstr "E146: Regulj�ra uttryck kan inte vara �tskilda av bokst�ver"
 
 #: ../ex_cmds.c:3958
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "ers�tt med %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "ers�tt med %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4373
 msgid "(Interrupted) "
diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po
index a4c7926c67..e73c033a4e 100644
--- a/src/nvim/po/tr.po
+++ b/src/nvim/po/tr.po
@@ -1867,8 +1867,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Düzenli ifadeler harflerle sınırlandırılamaz"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s ile değiştir (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "%s ile değiştir? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Yarıda kesildi) "
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index ff6fe9a33e..25b31dac9b 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -3008,8 +3008,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Регулярні вирази не можна розділяти літерами"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Замінити на %s (y/n/a/q/l/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "Замінити на %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(Перервано) "
diff --git a/src/nvim/po/vi.po b/src/nvim/po/vi.po
index bcc1e0af8e..b976d39647 100644
--- a/src/nvim/po/vi.po
+++ b/src/nvim/po/vi.po
@@ -779,8 +779,8 @@ msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Không thể phân cách biểu thức chính quy bằng chữ cái"
 
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "thay thế bằng %s? (y/n/a/q/l/^E/^Y)"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "thay thế bằng %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 msgid "(Interrupted) "
 msgstr "(bị dừng)"
diff --git a/src/nvim/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
index e30fc47806..3593175572 100644
--- a/src/nvim/po/zh_CN.UTF-8.po
+++ b/src/nvim/po/zh_CN.UTF-8.po
@@ -1991,8 +1991,8 @@ msgstr "E146: 正则表达式不能用字母作分界"
 #. Same highlight as wait_return().
 #: ../ex_cmds.c:3952
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "替换为 %s (y/n/a/q/l/^E/^Y)？"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "替换为 %s？(y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4462
 msgid "(Interrupted) "
diff --git a/src/nvim/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
index cbbc4ad6eb..04e11a9193 100644
--- a/src/nvim/po/zh_TW.UTF-8.po
+++ b/src/nvim/po/zh_TW.UTF-8.po
@@ -1267,8 +1267,8 @@ msgstr "E146: Regular expression 無法用字母分隔 (?)"
 
 #: ../ex_cmds.c:3964
 #, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "取代為 %s (y/n/a/q/^E/^Y)?"
+msgid "replace with %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
+msgstr "取代為 %s? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)"
 
 #: ../ex_cmds.c:4379
 msgid "(Interrupted) "
diff --git a/test/functional/legacy/substitute_spec.lua b/test/functional/legacy/substitute_spec.lua
index 0081371f7f..30ff13140f 100644
--- a/test/functional/legacy/substitute_spec.lua
+++ b/test/functional/legacy/substitute_spec.lua
@@ -220,8 +220,10 @@ describe(':substitute', function()
       {2:o}ne                                                         |
       two                                                         |
       three                                                       |
-      {1:~                                                           }|*4
-      {6:replace with     (y/n/a/q/l/^E/^Y)?}^                         |
+      {1:~                                                           }|*2
+      {3:                                                            }|
+      {6:replace with    ? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^}|
+      {6:E)/down(^Y)}^                                                 |
     ]])
   end)
 end)
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 1f7d5525f3..93ea2b9186 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1485,10 +1485,10 @@ describe('cmdheight=0', function()
   it('when substitute text', function()
     command('set cmdheight=0 noruler laststatus=3')
     feed('ifoo<ESC>')
-    screen:try_resize(screen._width, 6)
+    screen:try_resize(screen._width, 7)
     screen:expect([[
       fo^o                      |
-      {1:~                        }|*4
+      {1:~                        }|*5
       {3:[No Name] [+]            }|
     ]])
 
@@ -1497,14 +1497,15 @@ describe('cmdheight=0', function()
       {2:foo}                      |
       {3:                         }|
                                |*2
-      {6:replace with bar (y/n/a/q}|
-      {6:/l/^E/^Y)?}^               |
+      {6:replace with bar? (y)es/(}|
+      {6:n)o/(a)ll/(q)uit/(l)ast/s}|
+      {6:croll up(^E)/down(^Y)}^    |
     ]])
 
     feed('y')
     screen:expect([[
       ^bar                      |
-      {1:~                        }|*4
+      {1:~                        }|*5
       {3:[No Name] [+]            }|
     ]])
 
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 56b2c61fb8..1e51652c4f 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -141,7 +141,7 @@ describe('ui/ext_messages', function()
           content = { { '' } },
           hl_id = 18,
           pos = 0,
-          prompt = 'replace with X (y/n/a/q/l/^E/^Y)?',
+          prompt = 'replace with X? (y)es/(n)o/(a)ll/(q)uit/(l)ast/scroll up(^E)/down(^Y)',
         },
       },
     })