diff --git a/po/ar.po b/po/ar.po
index c7a9d269ac9..b4c560f2e5f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9472,7 +9472,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9494,7 +9494,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9557,7 +9557,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "اح&ذف\tDel"
 
 #: cmd.rc:313
@@ -9618,6 +9618,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 13abd266090..36a6048d528 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9597,7 +9597,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9619,7 +9619,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9682,7 +9682,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Из&трий"
 
 #: cmd.rc:313
@@ -9743,6 +9743,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index c008ee521d9..b7e9d790c14 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9906,7 +9906,8 @@ msgstr ""
 "anteriors.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Esteu segur"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9928,7 +9929,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Cap ordre d'obertura associat amb el tipus de fitxer '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Sobreescriure %1"
 
 #: cmd.rc:296
@@ -9989,8 +9991,9 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Suprimir"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Suprimeix"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10052,6 +10055,16 @@ msgstr "El volum en la unitat %1!c! és %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "El volum en la unitat %1!c! no té etiqueta.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Sí|No)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Sí|No)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Eina Diagnòstica de DirextX"
diff --git a/po/cs.po b/po/cs.po
index 6c275cb4ea3..16a6af7330f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9966,7 +9966,7 @@ msgstr ""
 "příkazů\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9988,7 +9988,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -10051,7 +10051,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Smazat"
 
 #: cmd.rc:313
@@ -10112,6 +10112,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index c45c335d7b1..b4c6f0c27c6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10001,7 +10001,8 @@ msgstr ""
 "Skriv «HELP <kommando>» for mere information om kommandoerne ovenover\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Er du sikker"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10026,7 +10027,7 @@ msgstr "Ingen åbnekommando er tilknyttet filtypene '%s'\n"
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Overskriv %s"
 
 #: cmd.rc:296
@@ -10093,8 +10094,8 @@ msgstr "A"
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
-msgstr "%s, Slet"
+msgid "Delete %1?"
+msgstr "Slet"
 
 #: cmd.rc:313
 #, fuzzy
@@ -10162,6 +10163,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Ja|Nei)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Ja|Nei)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 12a89cfbf96..1098eb076a7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9893,7 +9893,8 @@ msgstr ""
 "obigen Befehle erhalten.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Sind sie sicher"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9915,7 +9916,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Kein Befehl zum Öffnen für Dateityp '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "%1 überschreiben"
 
 #: cmd.rc:296
@@ -9978,8 +9980,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, löschen"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Löschen"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10041,6 +10044,16 @@ msgstr "Datenträger in Laufwerk %1!c! ist %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Datenträger in Laufwerk %1!c! hat keine Bezeichnung.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Ja|Nein)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Ja|Nein)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "DirectX Diagnosewerkzeug"
diff --git a/po/el.po b/po/el.po
index 75c170d3394..f155eea6405 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9460,7 +9460,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9482,7 +9482,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9544,7 +9544,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9605,6 +9605,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index e4030120b8e..0cdc5fb033f 100644
--- a/po/en.po
+++ b/po/en.po
@@ -9605,8 +9605,8 @@ msgstr ""
 "Enter HELP <command> for further information on any of the above commands.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
-msgstr "Are you sure"
+msgid "Are you sure?"
+msgstr "Are you sure?"
 
 #: cmd.rc:291 xcopy.rc:40
 msgctxt "Yes key"
@@ -9627,8 +9627,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "No open command associated with file type '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
-msgstr "Overwrite %1"
+msgid "Overwrite %1?"
+msgstr "Overwrite %1?"
 
 #: cmd.rc:296
 msgid "More..."
@@ -9688,8 +9688,8 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Delete"
+msgid "Delete %1?"
+msgstr "Delete %1?"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9751,6 +9751,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr " (Yes|No)"
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr " (Yes|No|All)"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/en_US.po b/po/en_US.po
index 35984913f8a..096c441095b 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -9792,8 +9792,8 @@ msgstr ""
 "Enter HELP <command> for further information on any of the above commands.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
-msgstr "Are you sure"
+msgid "Are you sure?"
+msgstr "Are you sure?"
 
 #: cmd.rc:291 xcopy.rc:40
 msgctxt "Yes key"
@@ -9814,8 +9814,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "No open command associated with file type '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
-msgstr "Overwrite %1"
+msgid "Overwrite %1?"
+msgstr "Overwrite %1?"
 
 #: cmd.rc:296
 msgid "More..."
@@ -9875,8 +9875,8 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Delete"
+msgid "Delete %1?"
+msgstr "Delete %1?"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9938,6 +9938,14 @@ msgstr "Volume in drive %1!c! is %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Volume in drive %1!c! has no label.\n"
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr " (Yes|No)"
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr " (Yes|No|All)"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "DirectX Diagnostic Tool"
diff --git a/po/eo.po b/po/eo.po
index f2f15160214..623875c8c32 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9616,7 +9616,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9638,7 +9638,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9701,7 +9701,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Forigu\tDel"
 
 #: cmd.rc:313
@@ -9762,6 +9762,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index e7892b6aa88..aad75af11b8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10221,7 +10221,8 @@ msgstr ""
 "de arriba\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Está seguro"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10246,7 +10247,7 @@ msgstr "Ningún comando de apertura asociado con el tipo de archivo '%s'\n"
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Sobrescribir %s"
 
 #: cmd.rc:296
@@ -10313,8 +10314,8 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
-msgstr "%s, Borrar"
+msgid "Delete %1?"
+msgstr "Eliminar"
 
 #: cmd.rc:313
 #, fuzzy
@@ -10382,6 +10383,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "Sobrescribir %s"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "Sobrescribir %s"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index e88337d4059..b79ff5744bb 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9473,7 +9473,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9495,7 +9495,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9558,7 +9558,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "&حذف\tDel"
 
 #: cmd.rc:313
@@ -9619,6 +9619,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 18a3db3f169..abf0ec6aded 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9730,7 +9730,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9752,7 +9752,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9815,7 +9815,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "P&oista"
 
 #: cmd.rc:313
@@ -9876,6 +9876,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b5ac1982386..de9f242cdd6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9938,7 +9938,8 @@ msgstr ""
 "dessus.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Êtes-vous sûr(e)"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9960,7 +9961,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Aucune commande d'ouverture n'est associée au type de fichier « %1 »\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Écraser %1"
 
 #: cmd.rc:296
@@ -10021,8 +10023,9 @@ msgid "A"
 msgstr "T"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Supprimer"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Supprimer"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10084,6 +10087,16 @@ msgstr "Le volume dans le lecteur %1!c! est %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Le volume dans le lecteur %1!c! n'a pas de label.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1 ? (Oui|Non)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1 ? (Oui|Non)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Outil de diagnostic DirectX"
diff --git a/po/he.po b/po/he.po
index a6107c8850f..3163c7c1c95 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9918,7 +9918,8 @@ msgstr ""
 "Enter HELP <command> for further information on any of the above commands.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Are you sure"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9940,7 +9941,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "No open command associated with file type '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Overwrite %1"
 
 #: cmd.rc:296
@@ -10001,8 +10003,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Delete"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "מחיקה"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10064,6 +10067,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Yes|No)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Yes|No)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "כלי ניתוח ה־DirectX"
diff --git a/po/hi.po b/po/hi.po
index a6f47b93302..8df291cbf8d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9325,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9347,7 +9347,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9408,7 +9408,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9469,6 +9469,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index c0984369eb2..c134c3c0e01 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9914,7 +9914,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9936,7 +9936,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -10000,7 +10000,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Törlés"
 
 #: cmd.rc:313
@@ -10062,6 +10062,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 7fa1ddf538f..d9d26462dfa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9889,7 +9889,8 @@ msgstr ""
 "sovrastanti.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Sei sicuro"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9911,7 +9912,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Nessun comando di apertura associato con il tipo di file '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Sovrascrivere %1"
 
 #: cmd.rc:296
@@ -9972,8 +9974,9 @@ msgid "A"
 msgstr "T"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Cancella"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Elimina"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10035,6 +10038,16 @@ msgstr "Il volume nell'unità %1!c! è %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Il volume nell'unità %1!c! non ha etichetta.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Sì|No)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Sì|No)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Strumento di Diagnostica DirectX"
diff --git a/po/ja.po b/po/ja.po
index 5b4a02db979..224001c3e99 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9823,7 +9823,8 @@ msgstr ""
 "い。\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "よろしいですか"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9845,7 +9846,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "ファイル タイプ '%1' に関連付けられた開くコマンドがありません。\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "上書き %1"
 
 #: cmd.rc:296
@@ -9906,8 +9908,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, 削除"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "削除"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9969,6 +9972,16 @@ msgstr "ドライブ %1!c! のボリューム ラベルは %2 です\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "ドライブ %1!c! のボリュームラベルがありません。\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Yes|No)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Yes|No)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "DirectX 診断ツール"
diff --git a/po/ko.po b/po/ko.po
index 512840bb934..a6aa9132b30 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9786,7 +9786,8 @@ msgstr ""
 "HELP <명령>을 치면 그 명령의 상세한 정보를 보여줌\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "당신은 확신합니까?"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9808,7 +9809,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다.'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "%1 덮어쓰기"
 
 #: cmd.rc:296
@@ -9869,8 +9871,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, 삭제"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "지우기"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9930,6 +9933,16 @@ msgstr "드라이브 %1!c!의 볼륨은 %2임\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "드라이브 %1!c!는 라벨을 가지고 있지 않습니다.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (예|아니오)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (예|아니오)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "다이렉트엑스 진단 도구"
diff --git a/po/lt.po b/po/lt.po
index 32f364956d4..8b01b1be165 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9843,7 +9843,8 @@ msgstr ""
 "gauti.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Ar tikrai"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9865,7 +9866,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Jokia atvėrimo komanda nesusieta su failo tipu „%1“\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Perrašyti %1"
 
 #: cmd.rc:296
@@ -9926,8 +9928,9 @@ msgid "A"
 msgstr "V"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, šalinti"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Šalinti"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9989,6 +9992,16 @@ msgstr "Tomas diske %1!c! yra %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Tomas diske %1!c! neturi vardo.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Taip|Ne)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Taip|Ne)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "DirectX diagnostikos įrankis"
diff --git a/po/ml.po b/po/ml.po
index c47e9cfc885..2f7255453c1 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9325,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9347,7 +9347,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9408,7 +9408,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9469,6 +9469,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index d8ef47786a1..4c55588cfd7 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -10071,7 +10071,8 @@ msgstr ""
 "Skriv «HELP <kommando>» for mer informasjon om kommandoene ovenfor\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Er du sikker"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10096,7 +10097,7 @@ msgstr "Ingen åpnekommando er tilknyttet filtypene '%s'\n"
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Skrive over «%s»? (Ja|Nei|Alle)\n"
 
 #: cmd.rc:296
@@ -10162,7 +10163,7 @@ msgstr "A"
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Slett"
 
 #: cmd.rc:313
@@ -10224,6 +10225,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Ja|Nei)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Ja|Nei)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index f2adb14454e..8952efb4b56 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9904,7 +9904,8 @@ msgstr ""
 "type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Bent u zeker"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9926,7 +9927,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Geen open commando verbonden met bestandstype '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Overschrijf %1"
 
 #: cmd.rc:296
@@ -9988,8 +9990,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Verwijderen"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Verwijderen"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10053,6 +10056,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Ja|Nee)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Ja|Nee)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Diagnostisch instrument voor DirectX"
diff --git a/po/or.po b/po/or.po
index 362fa05f407..364be520cb0 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9325,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9347,7 +9347,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9408,7 +9408,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9469,6 +9469,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 62ca91aec94..b7c8cb4f5a0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9325,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9347,7 +9347,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9408,7 +9408,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9469,6 +9469,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5d0f09fea25..cd5afcb8ba5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9879,7 +9879,8 @@ msgstr ""
 "poleceń.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Czy jesteś pewien?"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9901,7 +9902,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Brak skojarzenia polecenia otwórz z typem plików '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Nadpisz %1"
 
 #: cmd.rc:296
@@ -9962,8 +9964,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Usuń"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Usuń"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10025,6 +10028,16 @@ msgstr "Wolumen w napędzie %1!c! to %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Wolumen w napędzie %1!c! nie ma etykiety.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Tak|Nie)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Tak|Nie)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Narzędzie diagnostyki DirectX"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f70c57228d9..ca5da360880 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9882,7 +9882,8 @@ msgstr ""
 "acima.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Tem certeza"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9904,7 +9905,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Nenhum comando de abertura associado ao tipo de arquivo '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Sobrescrever %1"
 
 #: cmd.rc:296
@@ -9965,8 +9967,9 @@ msgid "A"
 msgstr "T"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Excluir"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Excluir"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -10028,6 +10031,16 @@ msgstr "O volume na unidade %1!c! é %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "O volume na unidade %1!c! não tem rótulo.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Sim|Não)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Sim|Não)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Ferramenta de Diagnóstico do DirectX"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 128dd29d70e..55180d3146d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -10119,7 +10119,7 @@ msgstr ""
 "Digite HELP <comando> para mais informações sobre alguns dos comandos acima\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10142,7 +10142,7 @@ msgstr ""
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Reescrever %s? (Yes|No|All)\n"
 
 #: cmd.rc:296
@@ -10208,7 +10208,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Excluir"
 
 #: cmd.rc:313
@@ -10270,6 +10270,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Yes|No)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Yes|No)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/rm.po b/po/rm.po
index 644eb1d84e6..bc54a0cc3d3 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -9385,7 +9385,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9407,7 +9407,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9469,7 +9469,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9530,6 +9530,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 0f1bf2c553f..e7f33a0eb12 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10350,7 +10350,8 @@ msgstr ""
 "comenzile de mai sus\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Sunteți sigur"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10376,7 +10377,7 @@ msgstr ""
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Suprascrie %s"
 
 #: cmd.rc:296
@@ -10444,8 +10445,8 @@ msgstr "T"
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
-msgstr "%s, Șterge"
+msgid "Delete %1?"
+msgstr "Șterge"
 
 #: cmd.rc:313
 #, fuzzy
@@ -10513,6 +10514,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Da|Nu)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Da|Nu)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2c518b5adbe..2ec0dc90d0b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9839,7 +9839,8 @@ msgstr ""
 "командам.\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Вы уверены"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9861,7 +9862,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Не работает команда, ассоциированная с типом файлов '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Перезаписать %1"
 
 #: cmd.rc:296
@@ -9922,8 +9924,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Удалить"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Удалить"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9985,6 +9988,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1? (Y - Да|N - Нет)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1? (Y - Да|N - Нет)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Утилита диагностики DirectX"
diff --git a/po/sk.po b/po/sk.po
index 9ed4453036c..2f0cec6f41b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9488,7 +9488,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9510,7 +9510,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9573,7 +9573,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 "#-#-#-#-#  sk.po (Wine)  #-#-#-#-#\n"
 "&Delete\n"
@@ -9638,6 +9638,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 75124e016fd..b7839bfa594 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9834,7 +9834,8 @@ msgstr ""
 "ukazov\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Ali ste prepričani?"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9856,7 +9857,8 @@ msgid "No open command associated with file type '%1'\n"
 msgstr "Noben ukaz za odprtje ni povezan z vrsto datotek '%1'\n"
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+#, fuzzy
+msgid "Overwrite %1?"
 msgstr "Prepiši %1"
 
 #: cmd.rc:296
@@ -9917,8 +9919,9 @@ msgid "A"
 msgstr "A"
 
 #: cmd.rc:312
-msgid "%1, Delete"
-msgstr "%1, Izbriši"
+#, fuzzy
+msgid "Delete %1?"
+msgstr "Izbriši"
 
 #: cmd.rc:313
 msgid "Echo is %1\n"
@@ -9980,6 +9983,16 @@ msgstr "Nosilec v pogonu %1!c! je %2\n"
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr "Nosilec v pogonu %1!c! nima oznake.\n"
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%1 (Da|Ne)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%1 (Da|Ne)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Orodje za diagnostiko DirectX"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 1b65f214e18..481a0105d91 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -9776,7 +9776,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9799,7 +9799,7 @@ msgstr ""
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Заменити %s? (Да|Не|Све)\n"
 
 #: cmd.rc:296
@@ -9864,7 +9864,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "&Избриши"
 
 #: cmd.rc:313
@@ -9925,6 +9925,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Да|Не)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Да|Не)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index b3950aa5a4f..4260b8ee2ec 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -9876,7 +9876,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9899,7 +9899,7 @@ msgstr ""
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Zameniti %s? (Da|Ne|Sve)\n"
 
 #: cmd.rc:296
@@ -9964,7 +9964,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "&Izbriši"
 
 #: cmd.rc:313
@@ -10025,6 +10025,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Da|Ne)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Da|Ne)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 176fe4f852a..d2d594155fb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9807,7 +9807,8 @@ msgstr ""
 "Skriv HELP <command> för mer information om något av kommandona ovanför\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Är du säker?"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9832,7 +9833,7 @@ msgstr "Ingen kommando förknippat med filtyp '%s'\n"
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Skriva över %s"
 
 #: cmd.rc:296
@@ -9899,8 +9900,8 @@ msgstr "A"
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
-msgstr "%s, ta bort"
+msgid "Delete %1?"
+msgstr "Ta bort"
 
 #: cmd.rc:313
 #, fuzzy
@@ -9967,6 +9968,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "%s? (Ja|Nej)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "%s? (Ja|Nej)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index e4317aa1713..d7b364d33f6 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9325,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9347,7 +9347,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9408,7 +9408,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9469,6 +9469,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 260dd91a60e..314c120071f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9486,7 +9486,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9508,7 +9508,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9571,7 +9571,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "ลบ\tDel"
 
 #: cmd.rc:313
@@ -9632,6 +9632,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 272e90167a1..e2b01afc604 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10084,7 +10084,7 @@ msgstr ""
 "Yukarıdaki komutlar hakkında daha fazla bilgi için HELP <komut> girin\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -10106,7 +10106,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -10169,7 +10169,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "Sil"
 
 #: cmd.rc:313
@@ -10230,6 +10230,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 70c506ca0ab..94ff62824aa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9812,7 +9812,8 @@ msgstr ""
 "Введіть HELP <команда> для детальнішої інформації про вищенаведені команди\n"
 
 #: cmd.rc:290
-msgid "Are you sure"
+#, fuzzy
+msgid "Are you sure?"
 msgstr "Ви впевнені"
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9837,7 +9838,7 @@ msgstr "Немає команди відкриття, асоційованої 
 
 #: cmd.rc:295
 #, fuzzy
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr "Перезаписати %s"
 
 #: cmd.rc:296
@@ -9904,8 +9905,8 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
-msgstr "%s, Видалити"
+msgid "Delete %1?"
+msgstr "Видалити"
 
 #: cmd.rc:313
 #, fuzzy
@@ -9973,6 +9974,16 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+#, fuzzy
+msgid " (Yes|No)"
+msgstr "Переписати %s? (Yes|No|All)\n"
+
+#: cmd.rc:328
+#, fuzzy
+msgid " (Yes|No|All)"
+msgstr "Переписати %s? (Yes|No|All)\n"
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr "Утиліта Діагностики DirectX"
diff --git a/po/wa.po b/po/wa.po
index 95bc5dc53f2..36560152cb1 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9432,7 +9432,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9454,7 +9454,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9516,7 +9516,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "&Rafacer\tDel"
 
 #: cmd.rc:313
@@ -9577,6 +9577,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index 8a18d176ac6..9b9a4528da6 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -9271,7 +9271,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9293,7 +9293,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9354,7 +9354,7 @@ msgid "A"
 msgstr ""
 
 #: cmd.rc:312
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr ""
 
 #: cmd.rc:313
@@ -9415,6 +9415,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e5cb4271c6e..955ae2e8174 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9724,7 +9724,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9746,7 +9746,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9810,7 +9810,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "删除"
 
 #: cmd.rc:313
@@ -9871,6 +9871,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2621f6bb936..3e7127a585e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9776,7 +9776,7 @@ msgid ""
 msgstr ""
 
 #: cmd.rc:290
-msgid "Are you sure"
+msgid "Are you sure?"
 msgstr ""
 
 #: cmd.rc:291 xcopy.rc:40
@@ -9798,7 +9798,7 @@ msgid "No open command associated with file type '%1'\n"
 msgstr ""
 
 #: cmd.rc:295
-msgid "Overwrite %1"
+msgid "Overwrite %1?"
 msgstr ""
 
 #: cmd.rc:296
@@ -9862,7 +9862,7 @@ msgstr ""
 
 #: cmd.rc:312
 #, fuzzy
-msgid "%1, Delete"
+msgid "Delete %1?"
 msgstr "刪除"
 
 #: cmd.rc:313
@@ -9923,6 +9923,14 @@ msgstr ""
 msgid "Volume in drive %1!c! has no label.\n"
 msgstr ""
 
+#: cmd.rc:327
+msgid " (Yes|No)"
+msgstr ""
+
+#: cmd.rc:328
+msgid " (Yes|No|All)"
+msgstr ""
+
 #: dxdiag.rc:27
 msgid "DirectX Diagnostic Tool"
 msgstr ""
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index ca486b47fec..ad5fee01cce 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -118,15 +118,20 @@ static BOOL verify_mode = FALSE;
 static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText,
                               BOOL *optionAll) {
 
-    WCHAR  msgbuffer[MAXSTRING];
-    WCHAR  Ybuffer[MAXSTRING];
-    WCHAR  Nbuffer[MAXSTRING];
-    WCHAR  Abuffer[MAXSTRING];
-    WCHAR  answer[MAX_PATH] = {'\0'};
+    UINT msgid;
+    WCHAR confirm[MAXSTRING];
+    WCHAR options[MAXSTRING];
+    WCHAR Ybuffer[MAXSTRING];
+    WCHAR Nbuffer[MAXSTRING];
+    WCHAR Abuffer[MAXSTRING];
+    WCHAR answer[MAX_PATH] = {'\0'};
     DWORD count = 0;
 
-    /* Load the translated 'Are you sure', plus valid answers */
-    LoadStringW(hinst, WCMD_CONFIRM, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR));
+    /* Load the translated valid answers */
+    if (showSureText)
+      LoadStringW(hinst, WCMD_CONFIRM, confirm, sizeof(confirm)/sizeof(WCHAR));
+    msgid = optionAll ? WCMD_YESNOALL : WCMD_YESNO;
+    LoadStringW(hinst, msgid, options, sizeof(options)/sizeof(WCHAR));
     LoadStringW(hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)/sizeof(WCHAR));
     LoadStringW(hinst, WCMD_NO,  Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR));
     LoadStringW(hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR));
@@ -134,23 +139,12 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText,
     /* Loop waiting on a valid answer */
     if (optionAll)
         *optionAll = FALSE;
-    while (1) {
-      static const WCHAR startBkt[] = {' ','(','\0'};
-      static const WCHAR endBkt[]   = {')','?','\0'};
-
+    while (1)
+    {
       WCMD_output_asis (message);
-      if (showSureText) {
-        WCMD_output_asis (msgbuffer);
-      }
-      WCMD_output_asis (startBkt);
-      WCMD_output_asis (Ybuffer);
-      WCMD_output_asis (fslashW);
-      WCMD_output_asis (Nbuffer);
-      if (optionAll) {
-          WCMD_output_asis (fslashW);
-          WCMD_output_asis (Abuffer);
-      }
-      WCMD_output_asis (endBkt);
+      if (showSureText)
+        WCMD_output_asis (confirm);
+      WCMD_output_asis (options);
       WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count);
       answer[0] = toupperW(answer[0]);
       if (answer[0] == Ybuffer[0])
diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc
index 89db9619c57..801839857c7 100644
--- a/programs/cmd/cmd.rc
+++ b/programs/cmd/cmd.rc
@@ -287,12 +287,12 @@ XCOPY\t\tCopy source files or directory trees to a destination\n\
 EXIT\t\tClose down CMD\n\n\
 Enter HELP <command> for further information on any of the above commands.\n"
 
-  WCMD_CONFIRM, "Are you sure"
+  WCMD_CONFIRM, "Are you sure?"
   WCMD_YES, "#msgctxt#Yes key#Y"
   WCMD_NO, "#msgctxt#No key#N"
   WCMD_NOASSOC, "File association missing for extension %1\n"
   WCMD_NOFTYPE, "No open command associated with file type '%1'\n"
-  WCMD_OVERWRITE, "Overwrite %1"
+  WCMD_OVERWRITE, "Overwrite %1?"
   WCMD_MORESTR, "More..."
   WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n"
   WCMD_NYI, "Not Yet Implemented\n\n"
@@ -309,7 +309,7 @@ Enter HELP <command> for further information on any of the above commands.\n"
   WCMD_READFAIL, "Failed to open '%1'\n"
   WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n"
   WCMD_ALL, "#msgctxt#All key#A"
-  WCMD_DELPROMPT, "%1, Delete"
+  WCMD_DELPROMPT, "Delete %1?"
   WCMD_ECHOPROMPT, "Echo is %1\n"
   WCMD_VERIFYPROMPT, "Verify is %1\n"
   WCMD_VERIFYERR, "Verify must be ON or OFF\n"
@@ -324,4 +324,6 @@ Enter HELP <command> for further information on any of the above commands.\n"
   WCMD_LINETOOLONG, "The input line is too long.\n"
   WCMD_VOLUMELABEL, "Volume in drive %1!c! is %2\n"
   WCMD_VOLUMENOLABEL, "Volume in drive %1!c! has no label.\n"
+  WCMD_YESNO, " (Yes|No)"
+  WCMD_YESNOALL, " (Yes|No|All)"
 }
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index 7ffa5227ff6..d83d7385091 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -279,3 +279,5 @@ extern WCHAR version_string[];
 #define WCMD_LINETOOLONG      1035
 #define WCMD_VOLUMELABEL      1036
 #define WCMD_VOLUMENOLABEL    1037
+#define WCMD_YESNO            1038
+#define WCMD_YESNOALL         1039