From 7090cf7ebc300dc905f9749a84a408fdba15568d Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 22 Jul 2026 00:07:03 +0200 Subject: [PATCH] [USETUP] Enable users to cancel the decision to format a partition --- base/setup/usetup/lang/bg-BG.h | 6 +++--- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/de-DE.h | 2 +- base/setup/usetup/lang/el-GR.h | 4 ++-- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/eu-ES.h | 2 +- base/setup/usetup/lang/fr-FR.h | 2 +- base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/hr-HR.h | 4 ++-- base/setup/usetup/lang/hu-HU.h | 2 +- base/setup/usetup/lang/id-ID.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/ja-JP.h | 6 +++--- base/setup/usetup/lang/lt-LT.h | 4 ++-- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 2 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/pt-PT.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 6 +++--- base/setup/usetup/lang/sq-AL.h | 4 ++-- base/setup/usetup/lang/sv-SE.h | 4 ++-- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 6 +++--- base/setup/usetup/usetup.c | 5 +++++ 31 files changed, 48 insertions(+), 43 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index c4047ffdf9c..d9ee2167743 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1005,7 +1005,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 0, 0, - " \217\256\347\240\252\240\251\342\245...", /* ॢ, ᯨ 﫮 ࠧ */ + " \217\256\347\240\252\240\251\342\245...", /* ����� �� �� � �ॢ����, ���� ᯨ���� � �﫮��� � � ࠧ���� */ TEXT_TYPE_STATUS, TEXT_ID_STATIC }, @@ -1273,7 +1273,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = { 0, 0, - " ENTER = \217\340\256\244\352\253\246\250 F3 = \210\247\345\256\244", + " ENTER = \217\340\256\244\352\253\246\250 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, @@ -1394,7 +1394,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = { 30, 13, - // "࠭ .", + // "���࠭�� �����.", "", TEXT_STYLE_NORMAL, TEXT_ID_STATIC diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index b32da9dac66..58c4db8b6b7 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1257,7 +1257,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = Continue ESC = Cancel F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 0d8680c64b5..17c54a8a59e 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1265,7 +1265,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = { 0, 0, - "ENTER = Pokra\237ovat F3 = Ukon\237it", + "ENTER = Pokra\237ovat ESC = Zru\347it F3 = Ukon\237it", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index ab5f6671775..c7f3916f613 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1259,7 +1259,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = { 0, 0, - "ENTER = Forts\221t F3 = Afslut", + "ENTER = Forts\221t ESC = Annuller F3 = Afslut", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 8e136466df2..61792e589ef 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1259,7 +1259,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { 0, 0, - "ENTER = Fortsetzen F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Abbrechen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index c5dc76a9d29..e6f123ce2e7 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1273,7 +1273,7 @@ static MUI_ENTRY elGRFormatPartitionEntries[] = { 0, 0, - " ENTER = \221\254\244\342\256\234\240\230 F3 = \200\247\246\256\351\250\236\251\236", + " ENTER = \221\254\244\342\256\234\240\230 ESC = \200\241\347\250\340\251\236 F3 = \200\247\246\256\351\250\236\251\236", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, @@ -2230,7 +2230,7 @@ MUI_STRING elGRStrings[] = "\213\342\232\234\237\246\252 \253\246\254 \244\342\246\254 partition:"}, {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, -// "⥘ 㩜 ⤘ partition on"}, +// "����⥘�� �� ��������㩜�� ⤘ �� partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 261cfd34ccc..defa8958413 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1257,7 +1257,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = Continue ESC=Cancel F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 303b94a3453..02075d852c8 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1271,7 +1271,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] = { 0, 0, - " INTRO = Continuar F3 = Salir", + " INTRO = Continuar ESC = Cancelar F3 = Salir", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 3b9f8e3780f..ba42b759133 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1260,7 +1260,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = { 0, 0, - "ENTER = J\204tka F3 = V\204lju", + "ENTER = J\204tka ESC = Katkesta F3 = V\204lju", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 4a8f52a677c..3e9c0b1202e 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1258,7 +1258,7 @@ static MUI_ENTRY euESFormatPartitionEntries[] = { 0, 0, - "SARTU = Jarraitu F3 = Irten", + "SARTU = Jarraitu ESC = Utzi F3 = Irten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index e014a3deb6a..52ab4ac74ef 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1294,7 +1294,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = { 0, 0, - "ENTR\220E = Continuer F3 = Quitter", + "ENTR\220E = Continuer \220CHAP = Annuler F3 = Quitter", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index d0a09734175..f03363e119b 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1261,7 +1261,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] = { 0, 0, - "\204\220\227\232\204 \214\205\210\211\201 = F3 \212\231\216\204 = ENTER", + "\204\220\227\232\204 \214\205\210\211\201 = F3 \214\205\210\211\201 = ESC \212\231\216\204 = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index 8b48be3b02b..67a3dfe9e33 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -133,7 +133,7 @@ static MUI_ENTRY hrHRWelcomePageEntries[] = { 8, 17, - // "\x07 Pritisnite R za popravak ReactOS instalacije koristei Recovery Console.", + // "\x07 Pritisnite R za popravak ReactOS instalacije koriste�i Recovery Console.", "\x07 Pritisnite R za popravak ReactOS instalacije.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -1274,7 +1274,7 @@ static MUI_ENTRY hrHRFormatPartitionEntries[] = { 0, 0, - "ENTER = Nastavi F3 = Iza\320i", + "ENTER = Nastavi ESC = Odustani F3 = Iza\320i", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index b5307a8c6b3..b118844938f 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1151,7 +1151,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = { 0, 0, - "ENTER = Folytat\240s F3 = Kil\202p\202s", + "ENTER = Folytat\240s ESC = M\202gse F3 = Kil\202p\202s", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 035d0c465d6..4abfc0a9423 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1257,7 +1257,7 @@ static MUI_ENTRY idIDFormatPartitionEntries[] = { 0, 0, - "ENTER = Lanjut F3 = Keluar", + "ENTER = Lanjut ESC = Batal F3 = Keluar", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 7b9c2e44ffe..2e4117414bc 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1264,7 +1264,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = { 0, 0, - " INVIO = Continua F3 = Termina", + " INVIO = Continua ESC = Annulla F3 = Termina", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 7aa4cdc64bb..222f8b82724 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -971,7 +971,7 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = 8, 15, "\x07 C \246 \265\276\312\336 \314\337\327\262\317\330\260/\333\335\330 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", -// "\x07 ׼ ߰è C ޻", +// "\x07 ��׼� �߰è��� � ���� ���� C ��� ��� ��޻��", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1260,7 +1260,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = { 0, 0, - "ENTER = \277\336\257\272\263 F3 = \301\255\263\274", + "ENTER = \277\336\257\272\263 ESC = \267\254\335\276\331 F3 = \301\255\263\274", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2218,7 +2218,7 @@ MUI_STRING jaJPStrings[] = "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336:"}, {STRING_CHOOSE_NEW_PARTITION, "\314\337\327\262\317\330\260 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, -// "׼ ߰èݦ · Ķ ϼ:"}, +// "��׼� �߰è��ݦ ·�� ������ �Ķ� ���� ��ϼ�:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\266\270\301\256\263 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index db4cac8d57e..8c98ae57c92 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -6,7 +6,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/setup/usetup/lang/lt-LT.h * PURPOSE: Lithuanian Language File - * TRANSLATOR: Vytis "CMan" Girdijauskas (cman@cman.us) + * TRANSLATOR: Vytis "CMan" Gird�ijauskas (cman@cman.us) * DATE: 2008-01-06 */ @@ -1268,7 +1268,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = { 0, 0, - "ENTER = T\322sti F3 = Baigti", + "ENTER = T\322sti ESC = At\325aukti F3 = Baigti", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 811a38a833d..31e00301d8f 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1256,7 +1256,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = { 0, 0, - "ENTER = Teruskan F3 = Keluar", + "ENTER = Teruskan ESC = Batal F3 = Keluar", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index a0b84a94c59..1c3b75c1701 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1272,7 +1272,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = { 0, 0, - "ENTER = Doorgaan F3 = Afsluiten", + "ENTER = Doorgaan ESC = Annuleren F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 0ad31328b80..010f33fd47a 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1269,7 +1269,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = { 0, 0, - "ENTER = Kontynuacja F3 = Wyj\230cie", + "ENTER = Kontynuacja ESC = Anulowanie F3 = Wyj\230cie", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, 0 }, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index bebc0039e01..ecb8309e670 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1273,7 +1273,7 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] = { 0, 0, - "ENTER=Continuar F3=Sair", + "ENTER=Continuar ESC=Cancelar F3=Sair", TEXT_TYPE_STATUS, 0 }, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index b425bb62dbe..4685a3147fd 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1273,7 +1273,7 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] = { 0, 0, - "ENTER=Continuar F3=Sair", + "ENTER=Continuar ESC=Cancelar F3=Sair", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index f7af3095fc3..a865613cbe2 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1304,7 +1304,7 @@ static MUI_ENTRY roROFormatPartitionEntries[] = { 0, 0, - "ENTER = Continuare F3 = Ie\272ire", + "ENTER = Continuare ESC = Anulare F3 = Ie\272ire", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 3705eea7b29..f3350b52e4d 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1280,7 +1280,7 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] = { 0, 0, - "ENTER = \217\340\256\244\256\253\246\250\342\354 F3 = \202\353\345\256\244", + "ENTER = \217\340\256\244\256\253\246\250\342\354 ESC = \216\342\254\245\255\240 F3 = \202\353\345\256\244", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index b39e794e3eb..ee507233f80 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1266,7 +1266,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = { 0, 0, - "ENTER = Pokra\237ova\234 F3 = Skon\237i\234", + "ENTER = Pokra\237ova\234 ESC = Zru\347i\234 F3 = Skon\237i\234", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1885,7 +1885,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn (neplatn) podpis (znak, zna\237ka, \347ifra) + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn� (neplatn�) podpis (znak, zna\237ka, \347ifra) "ENTER = Re\347tart po\237\241ta\237a" }, { @@ -1921,7 +1921,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_WARN_PARTITION, -// "In\347taltor zistil, e najmenej jeden pevn disk obsahuje nekompatibiln\n" +// "In\347tal�tor zistil, �e najmenej jeden pevn� disk obsahuje nekompatibiln�\n" "In\347tal\240tor na\347iel najmenej na jednom pevnom disku nekompatibiln\243\n" "tabu\226ku oblast\241, s ktorou sa ned\240 spr\240vne zaobch\240dza\234!\n" "\n" diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index ae8a9e79eaa..9854975bc61 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1263,7 +1263,7 @@ static MUI_ENTRY sqALFormatPartitionEntries[] = { 0, 0, - "ENTER = Vazhdo F3 = Dil", + "ENTER = Vazhdo ESC = Anulo F3 = Dil", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2017,7 +2017,7 @@ MUI_ERROR sqALErrorEntries[] = "\211NT\211R = Ristarto kompjuterin" }, { - //RROR_FIND_STUPDATA, + //�RROR_FIND_S�TUPDATA, "Instalimi d\211shtoi p\211r t\211 gjetur seksionin e 'SetupData'\n" "ne TXTSETUP.SIF.\n", "ENTER = Ristarto kompjuterin" diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 6e4a2933264..1c91551f84d 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1266,7 +1266,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = { 0, 0, - " ENTER = Forts\204tt F3 = Avsluta", + " ENTER = Forts\204tt ESC = Avbryt F3 = Avsluta", TEXT_TYPE_STATUS, TEXT_ID_STATIC }, @@ -2224,7 +2224,7 @@ MUI_STRING svSEStrings[] = "Storlek p\206 den nya partitionen:"}, {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, -// "Du har valt att skapa en ny partition p"}, +// "Du har valt att skapa en ny partition p�"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index fdc8e6e0fbe..cc31fa4c4e2 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1248,7 +1248,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = { 0, 0, - "ENTER = Devam Et F3 = \200\215k", + "ENTER = Devam Et ESC = \230ptal F3 = \200\215k", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index fc40aba896f..69409a45b86 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -976,7 +976,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = 8, 15, "\x07 \215\240\342\250\341\255i\342\354 C \351\256\241 \341\342\242\256\340\250\342\250 \257\245\340\242\250\255\255\250\251/\253\256\243i\347\255\250\251 \340\256\247\244i\253.", -// "\x07 i C 鮡 ⢮ ஧i.", +// "\x07 ����i�� C 鮡 �⢮�� ����� ஧�i�.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1265,7 +1265,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = { 0, 0, - "ENTER = \217\340\256\244\256\242\246\250\342\250 F3 = \202\250\251\342\250", + "ENTER = \217\340\256\244\256\242\246\250\342\250 ESC = \221\252\240\341\343\242\240\342\250 F3 = \202\250\251\342\250", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2224,7 +2224,7 @@ MUI_STRING ukUAStrings[] = "\220\256\247\254i\340 \255\256\242\256\243\256 \340\256\247\244i\253\343:"}, {STRING_CHOOSE_NEW_PARTITION, "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 \257\245\340\242\250\255\255\250\251 \340\256\247\244i\253 \255\240"}, -// " ⢮ ஧i "}, +// "�� ��� �⢮�� ����� ஧�i� ��"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 \340\256\247\350\250\340\245\255\250\251 \340\256\247\244i\253 \255\240"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index cd7325ed6f7..8441402f583 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2560,6 +2560,11 @@ Restart: } goto Restart; } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ + { + FsVolContext->NextPageOnAbort = SELECT_PARTITION_PAGE; + return FSVOL_ABORT; + } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN || IsUnattendedSetup) /* ENTER */ { /*