Ros-diffs October 2023

ros-diffs@reactos.org

21 participants
140 discussions

[reactos] 02/03: [BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ab34662df606861b5fa… commit 46ab34662df606861b5fa8d730b19cc67b0f2920 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 28 17:56:55 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:56:55 2023 +0200 [BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals --- dll/win32/browseui/desktopipc.cpp | 2 +- dll/win32/browseui/explorerband.cpp | 2 +- dll/win32/browseui/internettoolbar.cpp | 8 ++++---- dll/win32/browseui/shellbars/CBandSite.cpp | 10 +++++----- dll/win32/browseui/shellbrowser.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 1e7cc68af6e..d8e11d9d65e 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -353,7 +353,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) /* Handle /e parameter */ UINT wFlags = 0; - if ((parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E)) + if (parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E) wFlags |= SBSP_EXPLOREMODE; /* Handle /select parameter */ diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 5dd2614bb54..5c90d5d9dd7 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -566,7 +566,7 @@ HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, return NULL; /* Ignore streams */ - if ((attrs & SFGAO_STREAM)) + if (attrs & SFGAO_STREAM) { TRACE("Ignoring stream\n"); return NULL; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 226a637bc4f..697eb3936a7 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo) bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked) + if ((fFlags & ITF_NOGRIPPER) || fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked) + if ((fFlags & ITF_GRIPPERALWAYS) && !fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -736,9 +736,9 @@ void CInternetToolbar::RefreshLockedToolbarState() if (dockSite != NULL) { rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_NOGRIPPER) || pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS) && !pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 09844fd48f2..632543284c1 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -154,7 +154,7 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi prbi->fStyle |= RBBS_GRIPPERALWAYS; } - if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) + if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) { prbi->fMask |= RBBIM_STYLE; prbi->fStyle |= RBBS_HIDETITLE; @@ -680,9 +680,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbs if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) m_dwState = pbsinfo->dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) m_dwStyle = pbsinfo->dwStyle; _UpdateAllBands(); @@ -694,9 +694,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo) if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) pbsinfo->dwState = m_dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) pbsinfo->dwStyle = m_dwStyle; return S_OK; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 114d6c59553..d24c203c915 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -328,7 +328,7 @@ public: FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar); - BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); + BOOL IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); HRESULT DoFolderOptions();

10 months, 3 weeks

[reactos] 01/03: [BROWSEUI] Fix MSVC compilation warning C4805

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64f40e7f309a9e4974468… commit 64f40e7f309a9e497446846cc18c73633c5d7e0b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 28 17:50:26 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:50:26 2023 +0200 [BROWSEUI] Fix MSVC compilation warning C4805 internettoolbar.cpp(714): warning C4805: '!=': unsafe mix of type 'bool' and type 'BOOL' in operation --- dll/win32/browseui/internettoolbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index b9d3b6273b7..226a637bc4f 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -711,9 +711,9 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) { - if (locked != pSettings->fLocked) + if (locked != !!pSettings->fLocked) { - pSettings->fLocked = locked; + pSettings->fLocked = (BOOL)locked; pSettings->Save(); RefreshLockedToolbarState(); }

10 months, 3 weeks

[reactos] 06/06: [USETUP] Further simplify partition creation UI code (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9c6902f082f928fc105e… commit c9c6902f082f928fc105ee98d7c478ac0b31f143 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 27 17:08:36 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:42 2023 +0200 [USETUP] Further simplify partition creation UI code (#5837) - Use the same keypress 'C' to create either primary or logical partitions. Their type is automatically determined, whether they are created in general unpartitioned space, or space within an extended partition. - Extensively adapt the translations to reflect these changes. --- base/setup/usetup/lang/bg-BG.h | 72 +++++++++++++++++++----------------------- base/setup/usetup/lang/bn-BD.h | 13 ++------ base/setup/usetup/lang/cs-CZ.h | 13 ++------ base/setup/usetup/lang/da-DK.h | 13 ++------ base/setup/usetup/lang/de-DE.h | 15 +++------ base/setup/usetup/lang/el-GR.h | 15 ++------- base/setup/usetup/lang/en-US.h | 13 ++------ base/setup/usetup/lang/es-ES.h | 11 ++----- base/setup/usetup/lang/et-EE.h | 13 ++------ base/setup/usetup/lang/eu-ES.h | 13 ++------ base/setup/usetup/lang/fr-FR.h | 13 ++------ base/setup/usetup/lang/he-IL.h | 13 ++------ base/setup/usetup/lang/hr-HR.h | 15 +++------ base/setup/usetup/lang/hu-HU.h | 13 ++------ base/setup/usetup/lang/id-ID.h | 13 ++------ base/setup/usetup/lang/it-IT.h | 14 +++----- base/setup/usetup/lang/ja-JP.h | 14 ++------ base/setup/usetup/lang/lt-LT.h | 13 ++------ base/setup/usetup/lang/ms-MY.h | 8 ++--- base/setup/usetup/lang/nl-NL.h | 19 ++++------- base/setup/usetup/lang/pl-PL.h | 13 ++------ base/setup/usetup/lang/pt-BR.h | 22 ++++--------- base/setup/usetup/lang/pt-PT.h | 18 +++-------- base/setup/usetup/lang/ro-RO.h | 13 ++------ base/setup/usetup/lang/ru-RU.h | 13 ++------ base/setup/usetup/lang/sk-SK.h | 27 ++++++---------- base/setup/usetup/lang/sq-AL.h | 16 +++------- base/setup/usetup/lang/sv-SE.h | 20 ++++-------- base/setup/usetup/lang/tr-TR.h | 15 +++------ base/setup/usetup/lang/uk-UA.h | 16 +++------- base/setup/usetup/usetup.c | 38 ++++++---------------- 31 files changed, 152 insertions(+), 385 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index d2da19acb5d..8760d607926 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -8,7 +8,7 @@ static MUI_ENTRY bgBGSetupInitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY bgBGLanguagePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -192,7 +192,7 @@ static MUI_ENTRY bgBGIntroPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -279,7 +279,7 @@ static MUI_ENTRY bgBGLicensePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -422,7 +422,7 @@ static MUI_ENTRY bgBGDevicePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -529,7 +529,7 @@ static MUI_ENTRY bgBGRepairPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY bgBGUpgradePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY bgBGComputerPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY bgBGFlushPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY bgBGQuitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY bgBGDisplayPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -984,28 +984,20 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 8, 15, - "\x07 \215\240\342\250\341\255\245\342\245 P \247\240 \341\352\247\244\240\242\240\255\245 \255\240 \243\253\240\242\245\255 \244\357\253.", -// "\x07 ��᭥� C �� ꧤ�� .", + "\x07 \215\240\342\250\341\255\245\342\245 C \247\240 \341\352\247\244\240\242\240\255\245 \255\240 \243\253\240\242\245\255/\253\256\243\250\347\245\341\252\250 \244\357\253.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 \215\240\342\250\341\255\245\342\245 E \247\240 \244\240 \341\352\247\244\240\244\245\342\245 \244\340\343\243 \244\357\253.", + "\x07 \215\240\342\250\341\255\245\342\245 E \247\240 \341\352\247\244\240\242\240\255\245 \255\240 \340\240\247\350\250\340\245\255 \244\357\253.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 \215\240\342\250\341\255\245\342\245 L \247\240 \244\240 \341\352\247\244\240\244\245\342\245 \253\256\243\250\347\245\341\252\250 \244\357\253.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 \215\240\342\250\341\255\245\342\245 D \247\240 \250\247\342\340\250\242\240\255\245 \255\240 \341\352\351\245\341\342\242\343\242\240\351 \244\357\253.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -1152,7 +1144,7 @@ static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1260,7 +1252,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1297,7 +1289,8 @@ static MUI_ENTRY bgBGCheckFSEntries[] = { { 4, - 3, " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + 3, + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1328,7 +1321,7 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1387,7 +1380,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1433,7 +1426,7 @@ static MUI_ENTRY bgBGBootLoaderSelectPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1523,7 +1516,7 @@ static MUI_ENTRY bgBGBootLoaderRemovableDiskPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1576,7 +1569,7 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1635,7 +1628,7 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1695,7 +1688,7 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1727,7 +1720,7 @@ static MUI_ENTRY bgBGSelectFSEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1775,7 +1768,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1827,7 +1820,7 @@ static MUI_ENTRY bgBGRegistryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -2243,10 +2236,9 @@ MUI_STRING bgBGStrings[] = {STRING_PLEASEWAIT, " \214\256\253\357 \250\247\347\240\252\240\251\342\245..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = \210\255\341\342\240\253\250\340\240\251 P = \221\352\247\244\240\251\342\245 \257\352\340\242\250\347\245\255 E = \221\352\247\244\240\251\342\245 \340\240\247\350\250\340\245\255 F3 = \210\247\345\256\244"}, -// " ENTER = �� C = �ꧤ�� F3 = ��室"}, + " ENTER = \210\255\341\342\240\253\250\340\240\251 C = \221\352\247\244\240\251\342\245 \257\352\340\242\250\347\245\255 E = \221\352\247\244\240\251\342\245 \340\240\247\350\250\340\245\255 F3 = \210\247\345\256\244"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = \210\255\341\342\240\253\250\340\240\251 L = \221\352\247\244\240\251 \253\256\243\250\347\245\341\252\250 \257\240\340\342\250\350\352\255 F3 = \210\247\345\256\244"}, + " ENTER = \210\255\341\342\240\253\250\340\240\251 C = \221\352\247\244\240\251 \253\256\243\250\347\245\341\252\250 \257\240\340\342\250\350\352\255 F3 = \210\247\345\256\244"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \210\255\341\342\240\253\250\340\240\251 D = \210\247\342\340\250\242\240\255\245 \255\240 \244\357\253 F3 = \210\247\345\256\244"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 1be6aaa9384..cae01ab8627 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -968,7 +968,7 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -982,13 +982,6 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2218,9 +2211,9 @@ MUI_STRING bnBDStrings[] = {STRING_PLEASEWAIT, " Please wait..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = Install C = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Install C = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 74ebdc9ebf8..dc39496c539 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -976,7 +976,7 @@ static MUI_ENTRY csCZSelectPartitionEntries[] = { 8, 15, - "\x07 Stistknut\241m P vytvo\375\241te prim\240rn\241 odd\241l.", + "\x07 Stistknut\241m C vytvo\375\241te prim\240rn\241/logick\354 odd\241l.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -990,13 +990,6 @@ static MUI_ENTRY csCZSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Stisknut\241m D umo\247n\241te smaz\240n\241 existuj\241c\241ho odd\241lu.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2226,9 +2219,9 @@ MUI_STRING csCZStrings[] = {STRING_PLEASEWAIT, " \254ekejte, pros\241m..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalovat P = Nov\354 prim\240rn\241 E = Nov\354 roz\347\241\375en\354 F3 = Ukon\237it"}, + " ENTER = Instalovat C = Nov\354 prim\240rn\241 E = Nov\354 roz\347\241\375en\354 F3 = Ukon\237it"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Instalovat L = Vytvo\375it logick\354 odd\241l F3 = Ukon\237it"}, + " ENTER = Instalovat C = Vytvo\375it logick\354 odd\241l F3 = Ukon\237it"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalovat D = Odstranit odd\241l F3 = Ukon\237it"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index d388585ff82..b840c30ed36 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -977,7 +977,7 @@ static MUI_ENTRY daDKSelectPartitionEntries[] = { 8, 15, - "\x07 Tryk p\206 P for at lave en ny prim\221r partition.", + "\x07 Tryk p\206 C for at lave en ny prim\221r/logisk partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -991,13 +991,6 @@ static MUI_ENTRY daDKSelectPartitionEntries[] = { 8, 19, - "\x07 Tryk p\206 L for at lave en ny logisk partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Tryk p\206 D for at slette en eksisterende partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2228,9 +2221,9 @@ MUI_STRING daDKStrings[] = {STRING_PLEASEWAIT, " Vent..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = installer P = Lav prim\221r E = Lav udviddet F3 = Afslut"}, + " ENTER = installer C = Lav prim\221r E = Lav udviddet F3 = Afslut"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = installer L = Lav logisk partition F3 = Afslut"}, + " ENTER = installer C = Lav logisk partition F3 = Afslut"}, {STRING_INSTALLDELETEPARTITION, " ENTER = installer D = Slet partition F3 = Afslut"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 16529f96707..01915b9d493 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -963,7 +963,7 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { 8, 15, - "\x07 P erstellt eine prim\204re Partition.", + "\x07 C erstellt eine prim\204re/logische Partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -977,13 +977,6 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { 8, 19, - "\x07 L erstellt eine logische Partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 D l\224scht eine vorhandene Partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2230,9 +2223,9 @@ MUI_STRING deDEStrings[] = {STRING_PLEASEWAIT, " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Installieren P = Prim\204re E = Erweiterte F3 = Installation abbr."}, + " ENTER = Installieren C = Prim\204re E = Erweiterte F3 = Installation abbr."}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Installieren L = Logisches Laufwerk F3 = Installation abbrechen"}, + " ENTER = Installieren C = Logische Partition F3 = Installation abbrechen"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installieren D = Partition l\224schen F3 = Installation abbrechen"}, {STRING_DELETEPARTITION, @@ -2244,7 +2237,7 @@ MUI_STRING deDEStrings[] = {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Eine erweiterte Partition soll hier erstellt werden:"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "Ein logisches Laufwerk soll hier erstellt werden:"}, + "Eine logische Partition soll hier erstellt werden:"}, {STRING_HDPARTSIZE, "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 2a71f69195f..f8fa94c0bda 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -984,8 +984,7 @@ static MUI_ENTRY elGRSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 ��㩫� C �� 㩜�� ⤘ �� ⨠��.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -999,13 +998,6 @@ static MUI_ENTRY elGRSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 \217\230\253\343\251\253\234 D \232\240\230 \244\230 \233\240\230\232\250\341\257\234\253\234 \342\244\230 \254\247\341\250\256\246\244 \233\240\230\243\342\250\240\251\243\230.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2241,10 +2233,9 @@ MUI_STRING elGRStrings[] = {STRING_PLEASEWAIT, " \217\230\250\230\241\230\242\351 \247\234\250\240\243\342\244\234\253\234..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER = ��ᩫ�� C = �� Partition F3 = ��騞��"}, + " ENTER = Install C = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Install C = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \204\232\241\230\253\341\251\253\230\251\236 D = \203\240\230\232\250\230\255\343 Partition F3 = \200\247\246\256\351\250\236\251\236"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 12c893d6d94..78434f0f542 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -968,7 +968,7 @@ static MUI_ENTRY enUSSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -982,13 +982,6 @@ static MUI_ENTRY enUSSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2218,9 +2211,9 @@ MUI_STRING enUSStrings[] = {STRING_PLEASEWAIT, " Please wait..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = Install C = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Install C = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 374182c5c30..a85a8b73992 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -973,7 +973,7 @@ static MUI_ENTRY esESSelectPartitionEntries[] = { 8, 15, - "\x07 Pulse P para crear una Partici\242n Primaria.", + "\x07 Pulse C para crear una Partici\242n Primaria/L\242gica.", // "\x07 Pulse C para crear una Nueva Partici\242n.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -988,13 +988,6 @@ static MUI_ENTRY esESSelectPartitionEntries[] = { 8, 19, - "\x07 Pulse L para crear una Partici\242n L\242gica.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Pulse D para eliminar una Partici\242n existente.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2231,7 +2224,7 @@ MUI_STRING esESStrings[] = {STRING_PLEASEWAIT, " Espere un momento..."}, {STRING_INSTALLCREATEPARTITION, - " INTRO = Instalar P = Crear Primaria E = Crear Extendida F3 = Salir"}, + " INTRO = Instalar C = Crear Primaria E = Crear Extendida F3 = Salir"}, {STRING_INSTALLCREATELOGICAL, " INTRO = Instalar C = Crear Partici\242n L\242gica F3 = Salir"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 8daf974411c..b851eec9780 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -970,7 +970,7 @@ static MUI_ENTRY etEESelectPartitionEntries[] = { 8, 15, - "\x07 Vajuta P uue primaarse partitsiooni loomiseks.", + "\x07 Vajuta C uue primaarse/loogilise partitsiooni loomiseks.", // "\x07 Vajuta C, et teha uus partitsioon.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -985,13 +985,6 @@ static MUI_ENTRY etEESelectPartitionEntries[] = { 8, 19, - "\x07 Vajuta L uue loogilise partitsiooni loomiiseks.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Vajuta D olemasoleva partitsiooni kustutamiseks.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2219,9 +2212,9 @@ MUI_STRING etEEStrings[] = {STRING_PLEASEWAIT, " Palun oota..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Paigalda P = Loo primaarne E = Loo laiendatud F3 = V\204lju"}, + " ENTER = Paigalda C = Loo primaarne E = Loo laiendatud F3 = V\204lju"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Paigalda L = Loo loogiline partitsioon F3 = V\204lju"}, + " ENTER = Paigalda C = Loo loogiline partitsioon F3 = V\204lju"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Paigalda D = Kustuta partitsioon F3 = V\204lju"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 715e941dc7f..346356dfdbf 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -969,7 +969,7 @@ static MUI_ENTRY euESSelectPartitionEntries[] = { 8, 15, - "\x07 Sakatu P partizio nagusi bat sortzeko.", + "\x07 Sakatu C partizio nagusi/logika bat sortzeko.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -983,13 +983,6 @@ static MUI_ENTRY euESSelectPartitionEntries[] = { 8, 19, - "\x07 Sakatu L partizio logika bat sortzeko.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Sakatu D dagoen partizio kentzeko.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2226,9 +2219,9 @@ MUI_STRING euESStrings[] = {STRING_PLEASEWAIT, " Itxaron mesedez..."}, {STRING_INSTALLCREATEPARTITION, - " SARTU = Instalatu P = Sortu Nagusia E = Sortu Luzatuta F3 = Irten"}, + " SARTU = Instalatu C = Sortu Nagusia E = Sortu Luzatuta F3 = Irten"}, {STRING_INSTALLCREATELOGICAL, - " SARTU = Instalatu L = Sortu Partizio Logika F3 = Irten"}, + " SARTU = Instalatu C = Sortu Partizio Logika F3 = Irten"}, {STRING_INSTALLDELETEPARTITION, " SARTU = Instalatu D = Ezabatu Partitioa F3 = Irten"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index a566b159c46..0550291c440 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -991,7 +991,7 @@ static MUI_ENTRY frFRSelectPartitionEntries[] = { 8, 15, - "\x07 Appuyer sur P pour cr\202er une partition primaire.", + "\x07 Appuyer sur C pour cr\202er une partition primaire/logique.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1005,13 +1005,6 @@ static MUI_ENTRY frFRSelectPartitionEntries[] = { 8, 19, - "\x07 Appuyer sur L pour cr\202er une partition logique.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Appuyer sur D pour effacer une partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2255,9 +2248,9 @@ MUI_STRING frFRStrings[] = {STRING_PLEASEWAIT, " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, - " ENTR\220E = Installer P/E = Cr\202er partition Primaire/\220tendue F3 = Quitter"}, + " ENTR\220E = Installer C/E = Cr\202er partition Primaire/\220tendue F3 = Quitter"}, {STRING_INSTALLCREATELOGICAL, - " ENTR\220E = Installer L = Cr\202er partition Logique F3 = Quitter"}, + " ENTR\220E = Installer C = Cr\202er partition Logique F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTR\220E = Installer D = Supprimer partition F3 = Quitter"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 7a149ee68cb..bc689e1d187 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -972,7 +972,7 @@ static MUI_ENTRY heILSelectPartitionEntries[] = { 8, 15, - "\x07 .\232\211\231\200\230 \204\226\211\207\216 \230\205\226\211\214 \211\203\213 P \225\207\214", + "\x07 .\232\211\202\205\214/\232\211\231\200\230 \204\226\211\207\216 \230\205\226\211\214 \211\203\213 C \225\207\214", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -986,13 +986,6 @@ static MUI_ENTRY heILSelectPartitionEntries[] = { 8, 19, - "\x07 .\232\211\202\205\214 \204\226\211\207\216 \230\205\226\211\214 \211\203\213 L \225\207\214", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 .\232\216\211\211\227 \204\226\211\207\216 \227\205\207\216\214 \211\203\213 D \225\207\214", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2220,9 +2213,9 @@ MUI_STRING heILStrings[] = {STRING_PLEASEWAIT, " ...\217\211\232\216\204\214 \200\220"}, {STRING_INSTALLCREATEPARTITION, - " \204\220\227\232\204 \214\205\210\211\201 = F3 \232\201\207\230\205\216 \230\205\226 = E \232\211\231\200\230 \230\205\226 = P \217\227\232\204 = ENTER"}, + " \204\220\227\232\204 \214\205\210\211\201 = F3 \232\201\207\230\205\216 \230\205\226 = E \232\211\231\200\230 \230\205\226 = C \217\227\232\204 = ENTER"}, {STRING_INSTALLCREATELOGICAL, - " \204\220\227\232\204 \214\205\210\211\201 = F3 \232\211\202\205\214 \204\226\211\207\216 \230\205\226 = L \217\227\232\204 = ENTER"}, + " \204\220\227\232\204 \214\205\210\211\201 = F3 \232\211\202\205\214 \204\226\211\207\216 \230\205\226 = C \217\227\232\204 = ENTER"}, {STRING_INSTALLDELETEPARTITION, " \204\220\227\232\204 \214\205\210\211\201 = F3 \204\226\211\207\216 \227\207\216 = D \217\227\232\204 = ENTER"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index a7625d5559b..d03214c678d 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -978,27 +978,20 @@ static MUI_ENTRY hrHRSelectPartitionEntries[] = { 8, 15, - "\x07 Pritisnite P da biste stvorili primarnu particiju.", + "\x07 Pritisnite C da biste stvorili primarnu/logi\237ku particiju.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Pritisnite P da biste stvorili pro\347irenu particiju.", + "\x07 Pritisnite E da biste stvorili pro\347irenu particiju.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Pritisnite P da biste stvorili logi\237ku particiju.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Pritisnite D da biste izbrisali postoje\206u particiju.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2249,9 +2242,9 @@ MUI_STRING hrHRStrings[] = {STRING_PLEASEWAIT, " Molimo pri\237ekajte..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instaliraj P = Stvori Primarnu E = Stvori Pro\347irenu F3 = Iza\320i"}, + " ENTER = Instaliraj C = Stvori Primarnu E = Stvori Pro\347irenu F3 = Iza\320i"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Instaliraj L = Stvori Logi\237ku particiju F3 = Iza\320i"}, + " ENTER = Instaliraj C = Stvori Logi\237ku particiju F3 = Iza\320i"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instaliraj D = Izbri\347i particiju F3 = Iza\320i"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 80c46b1d244..94d08dd0d9e 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -977,7 +977,7 @@ static MUI_ENTRY huHUSelectPartitionEntries[] = { 8, 15, - "\x07 Nyomjon P-t egy els\213dleges part\241ci\242 l\202trehoz\240s\240hoz.", + "\x07 Nyomjon C-t egy els\213dleges/logikai part\241ci\242 l\202trehoz\240s\240hoz.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -991,13 +991,6 @@ static MUI_ENTRY huHUSelectPartitionEntries[] = { 8, 19, - "\x07 Nyomjon L-t egy logikai part\241ci\242 l\202trehoz\240s\240hoz.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Nyomjon D-t egy megl\202v\213 part\241ci\242 t\224rl\202s\202hez.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2116,9 +2109,9 @@ MUI_STRING huHUStrings[] = {STRING_PLEASEWAIT, " K\202rem v\240rjon..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Telep\241t\202s P = \351j els\213dleges E = \351j kiterjesztett F3 = Kil\202p\202s"}, + " ENTER = Telep\241t\202s C = \351j els\213dleges E = \351j kiterjesztett F3 = Kil\202p\202s"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Telep\241t\202s L = Logikai part\241ci\242 l\202trehoz\240sa F3 = Kil\202p\202s"}, + " ENTER = Telep\241t\202s C = Logikai part\241ci\242 l\202trehoz\240sa F3 = Kil\202p\202s"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Telep\241t\202s D = Part\241ci\242 t\224rl\202se F3 = Kil\202p\202s"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index abe1bcb28b3..30e6c219288 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -968,7 +968,7 @@ static MUI_ENTRY idIDSelectPartitionEntries[] = { 8, 15, - "\x07 Tekan P untuk membuat partisi primary.", + "\x07 Tekan C untuk membuat partisi primary/logical.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -982,13 +982,6 @@ static MUI_ENTRY idIDSelectPartitionEntries[] = { 8, 19, - "\x07 Tekan L untuk membuat partisi logical.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Tekan D untuk menghapus partisi yang tersedia.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2225,9 +2218,9 @@ MUI_STRING idIDStrings[] = {STRING_PLEASEWAIT, " Mohon tunggu..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Pasang P = Buat Primary E = Buat Extended F3 = Keluar"}, + " ENTER = Pasang C = Buat Primary E = Buat Extended F3 = Keluar"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Pasang L = Buat Partisi Logical F3 = Keluar"}, + " ENTER = Pasang C = Buat Partisi Logical F3 = Keluar"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Pasang D = Hapus Partisi F3 = Keluar"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 8d49eb82e9f..0ea6e6f42e9 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -967,7 +967,8 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { 8, 15, - "\x07 Premere P per creare una nuova partizione.", + "\x07 Premere C per creare una partizione primaria/logica.", +// "\x07 Premere C per creare una nuova partizione.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -981,13 +982,6 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { 8, 19, - "\x07 Premere L per creare una partizione logica.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Premere D per cancellare una partizione esistente.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2231,9 +2225,9 @@ MUI_STRING itITStrings[] = {STRING_PLEASEWAIT, " Attendere..."}, {STRING_INSTALLCREATEPARTITION, - " INVIO = Installa P = Crea Partizione E = Crea Partizione Estesa F3 = Esci"}, + " INVIO = Installa C = Crea Partizione E = Crea Partizione Estesa F3 = Esci"}, {STRING_INSTALLCREATELOGICAL, - " INVIO = Installa L = Crea Partizione Lgica F3 = Esci"}, + " INVIO = Installa C = Crea Partizione Lgica F3 = Esci"}, {STRING_INSTALLDELETEPARTITION, " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 7d4153bdbab..5723d27af75 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -970,7 +970,7 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = { 8, 15, - "\x07 P \246 \265\276\312\336 \314\337\327\262\317\330\260 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", + "\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 �� ޻��", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -985,13 +985,6 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = { 8, 19, - "\x07 L \246 \265\276\312\336 \333\335\330 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 \267\277\335\311 \312\337\260\303\250\274\256\335\246 \273\270\274\336\256 \275\331\306\312 D \267\260\246 \265\274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2228,10 +2221,9 @@ MUI_STRING jaJPStrings[] = {STRING_PLEASEWAIT, " \265\317\301 \270\300\336\273\262..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = \262\335\275\304\260\331 P = \314\337\327\262\317\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, -// " ENTER = �ݽİ� C = �߰è�� F3 = ��"}, + " ENTER = \262\335\275\304\260\331 C = \314\337\327\262\317\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = \262\335\275\304\260\331 L = \333\335\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, + " ENTER = \262\335\275\304\260\331 C = \333\335\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \262\335\275\304\260\331 D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 050b9ddcbe7..29afade72a2 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -979,7 +979,7 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -993,13 +993,6 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2229,9 +2222,9 @@ MUI_STRING ltLTStrings[] = {STRING_PLEASEWAIT, " Please wait..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = Install C = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Install C = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 69b3a2ccfd9..a128c3d7352 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -967,14 +967,14 @@ static MUI_ENTRY msMYSelectPartitionEntries[] = { 8, 15, - "\x07 Tekan P untuk mencipta partition yang utama.", + "\x07 Tekan C untuk mencipta partition yang utama/logik.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Tekan E untuk mencipta partition yang berpanjangan.", + "\x07 Tekan E untuk mencipta partition yang lanjutan.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -2210,9 +2210,9 @@ MUI_STRING msMYStrings[] = {STRING_PLEASEWAIT, " Sila tunggu..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Pasang P = Mencipta Utama E = Mencipta Dilanjutkan F3 = Keluar"}, + " ENTER = Pasang C = Mencipta Utama E = Mencipta Dilanjutkan F3 = Keluar"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Pasang L = Mencipta Partition Logik F3 = Keluar"}, + " ENTER = Pasang C = Mencipta Partition Logik F3 = Keluar"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Pasang D = Menghapuskan Partition F3 = Keluar"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 950432ee883..7b2c8605af2 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -260,7 +260,7 @@ static MUI_ENTRY nlNLIntroPageEntries[] = { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = Doorgaan F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -982,7 +982,7 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 Druk op C om een primaire/logische partitie aan te maken.", // "\x07 Druk op C om een nieuwe partitie aan te maken.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -990,20 +990,13 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] = { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Druk op E om een uitgebreide partitie aan te maken.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Druk op D om een bestaande partitie te verwijderen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2250,14 +2243,14 @@ MUI_STRING nlNLStrings[] = {STRING_PLEASEWAIT, " Een ogenblik geduld..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = Installeren C = Primaire aanmaken E = Uitgebreide aanmaken F3 = Afsluiten"}, // " ENTER = Installeren C = Partitie aanmaken F3 = Afsluiten"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Installeren C = Logische Partitie aanmaken F3 = Afsluiten"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installeren D = Partitie verwijderen F3 = Afsluiten"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Delete Partition F3 = Afsluiten"}, {STRING_PARTITIONSIZE, "Grootte nieuwe partitie:"}, {STRING_CHOOSE_NEW_PARTITION, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 69df8c5de9b..1fed490bba7 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -980,7 +980,7 @@ static MUI_ENTRY plPLSelectPartitionEntries[] = { 8, 15, - "\x07 Naci\230nij P, by utworzy\206 partycj\251 podstawow\245.", + "\x07 Naci\230nij C, by utworzy\206 partycj\251 podstawow\245/logiczn\245.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -994,13 +994,6 @@ static MUI_ENTRY plPLSelectPartitionEntries[] = { 8, 19, - "\x07 Naci\230nij L, by utworzy\206 partycj\251 logiczn\245.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Naci\230nij D, by usun\245\206 istniej\245c\245 partycj\251.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2237,9 +2230,9 @@ MUI_STRING plPLStrings[] = {STRING_PLEASEWAIT, " Prosz\251 czeka\206..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalacja P = Partycja podstawowa E = Rozszerzona F3 = Wyj\230cie"}, + " ENTER = Instalacja C = Partycja podstawowa E = Rozszerzona F3 = Wyj\230cie"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Instalacja L = Utworzenie partycji logicznej F3 = Wyj\230cie"}, + " ENTER = Instalacja C = Utworzenie partycji logicznej F3 = Wyj\230cie"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalacja D = Usuni\251cie partycji F3 = Wyj\230cie"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 9e1cfc1f03a..c0f2eef479e 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -984,28 +984,20 @@ static MUI_ENTRY ptBRSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Para criar uma parti��o no espa�o n�o particionado, pressione C.", + "\x07 Para criar uma parti\207\306o prim\240ria/l\242gica, pressione C.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Para criar uma parti\207\306o estendida, pressione E.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Para excluir a parti\207\306o selecionada, pressione D.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2263,19 +2255,17 @@ MUI_STRING ptBRStrings[] = {STRING_PLEASEWAIT, " Por favor, aguarde..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER=Instalar C=Criar parti��o F3=Sair"}, + " ENTER = Instalar C = Criar Prim\240ria E = Criar Estendida F3 = Sair"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Instalar C = Criar parti\207\306o L\242gica F3 = Sair"}, {STRING_INSTALLDELETEPARTITION, - " ENTER=Instalar D=Apagar parti\207\306o F3=Sair"}, + " ENTER = Instalar D = Apagar parti\207\306o F3 = Sair"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Apagar parti\207\306o F3 = Quit"}, {STRING_PARTITIONSIZE, "Tamanho da nova parti\207\306o:"}, {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, -// "Voc� solicitou a cria��o de uma nova parti��o em"}, {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/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index ab19b6d38b1..62deb60c0fe 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -984,8 +984,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 8, 15, - "\x07 Para criar uma parti\207\306o prim\240ria, pressione P.", -// "\x07 Para criar uma parti\207\306o no espa\207o n\306o particionado, pressione C.", + "\x07 Para criar uma parti\207\306o prim\240ria/l\242gica, pressione C.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -999,13 +998,6 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 8, 19, - "\x07 Para criar uma parti\207\3060 l\242gica, pressione L.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Para excluir a parti\207\306o seleccionada, pressione D.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2263,13 +2255,13 @@ MUI_STRING ptPTStrings[] = {STRING_PLEASEWAIT, " Por favor, aguarde..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER=Instalar P=Criar Part. Prim\240ria E=Criar Part. Estendida F3=Sair"}, + " ENTER = Instalar C = Criar Prim\240ria E = Criar Estendida F3 = Sair"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Instalar L = Criar Parti\207\306o L\242gica F3 = Sair"}, + " ENTER = Instalar C = Criar parti\207\306o L\242gica F3 = Sair"}, {STRING_INSTALLDELETEPARTITION, - " ENTER=Instalar D=Apagar parti\207\306o F3 = Sair"}, + " ENTER = Instalar D = Apagar parti\207\306o F3 = Sair"}, {STRING_DELETEPARTITION, - " D = Apagar Parti\207\306o F3 = Sair"}, + " D = Apagar parti\207\306o F3 = Sair"}, {STRING_PARTITIONSIZE, "Tamanho da nova parti\207\306o:"}, {STRING_CHOOSE_NEW_PARTITION, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 762cd357331..508a242e0d7 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1015,7 +1015,7 @@ static MUI_ENTRY roROSelectPartitionEntries[] = { 8, 15, - "\x07 Tasta\376i P pentru a crea o parti\376ie primar\343.", + "\x07 Tasta\376i C pentru a crea o parti\376ie primar\343/logic\343.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1029,13 +1029,6 @@ static MUI_ENTRY roROSelectPartitionEntries[] = { 8, 19, - "\x07 Tasta\376i L pentru a crea o parti\376ie logic\343.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Tasta\376i D pentru a \272terge o parti\376ie existent\343.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2286,9 +2279,9 @@ MUI_STRING roROStrings[] = {STRING_PLEASEWAIT, " A\272tepta\376i..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalare P/E = Creare parti\376ie Primar\343/Extins\343 F3 = Ie\272ire"}, + " ENTER = Instalare C/E = Creare parti\376ie Primar\343/Extins\343 F3 = Ie\272ire"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Instalare L = Creare parti\376ie Logic\343 F3 = Ie\272ire"}, + " ENTER = Instalare C = Creare parti\376ie Logic\343 F3 = Ie\272ire"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalare D = \252tergere parti\376ie F3 = Ie\272ire"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 92f04640bc9..22f673024ab 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -991,7 +991,7 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] = { 8, 15, - "\x07 \215\240\246\254\250\342\245 P \244\253\357 \341\256\247\244\240\255\250\357 \257\245\340\242\250\347\255\256\243\256 \340\240\247\244\245\253\240.", + "\x07 \215\240\246\254\250\342\245 C \244\253\357 \341\256\247\244\240\255\250\357 \257\245\340\242\250\347\255\256\243\256/\253\256\243\250\347\245\341\252\256\243\256 \340\240\247\244\245\253\240.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1005,13 +1005,6 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] = { 8, 19, - "\x07 \215\240\246\254\250\342\245 L \244\253\357 \341\256\247\244\240\255\250\357 \253\256\243\250\347\245\341\252\256\243\256 \340\240\247\244\245\253\240.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 \215\240\246\254\250\342\245 D \244\253\357 \343\244\240\253\245\255\250\357 \341\343\351\245\341\342\242\343\356\351\245\243\256 \340\240\247\244\245\253\240.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2248,9 +2241,9 @@ MUI_STRING ruRUStrings[] = {STRING_PLEASEWAIT, " \217\256\246\240\253\343\251\341\342\240, \257\256\244\256\246\244\250\342\245..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = \223\341\342\240\255\256\242\250\342\354 P = \217\245\340\242\250\347\255\353\251 \340\240\247\244\245\253 E = \220\240\341\350\250\340\245\255\255\353\251 F3 = \202\353\345\256\244"}, + " ENTER = \223\341\342\240\255\256\242\250\342\354 C = \217\245\340\242\250\347\255\353\251 \340\240\247\244\245\253 E = \220\240\341\350\250\340\245\255\255\353\251 F3 = \202\353\345\256\244"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = \223\341\342\240\255\256\242\250\342\354 L = \221\256\247\244\240\342\354 \253\256\243\250\347\245\341\252\250\251 \340\240\247\244\245\253 F3 = \202\353\345\256\244"}, + " ENTER = \223\341\342\240\255\256\242\250\342\354 C = \221\256\247\244\240\342\354 \253\256\243\250\347\245\341\252\250\251 \340\240\247\244\245\253 F3 = \202\353\345\256\244"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \223\341\342\240\255\256\242\250\342\354 D = \223\244\240\253\250\342\354 \340\240\247\244\245\253 F3 = \202\353\345\256\244"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 74e50708d2e..95db6e8c74f 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1,7 +1,7 @@ // This file is converted by code7bit. // code7bit: https://github.com/katahiromz/code7bit // To revert conversion, please execute "code7bit -r <file>". -/* TRANSLATOR: M�rio Ka�m�r /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: Mario Kacmar /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) * LastChange: 22-05-2011 @@ -976,8 +976,8 @@ static MUI_ENTRY skSKSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Stla�te C pre vytvorenie novej oblasti.", + "\x07 Press C to create a primary/logical partition.", +// "\x07 Stla\237te C pre vytvorenie novej oblasti.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -991,13 +991,6 @@ static MUI_ENTRY skSKSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Stla\237te D pre vymazanie existuj\243cej oblasti.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -1522,7 +1515,7 @@ static MUI_ENTRY skSKBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza� syst�mu + "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza\237 syst�mu TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1899,7 +1892,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn� (neplatn�) podpis (znak, zna�ka, �ifra) + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn� (neplatn�) podpis (znak, zna\237ka, \347ifra) "ENTER = Re\347tart po\237\241ta\237a" }, { @@ -1935,7 +1928,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_WARN_PARTITION, -// "In�tal�tor 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" @@ -2237,14 +2230,14 @@ MUI_STRING skSKStrings[] = {STRING_PLEASEWAIT, " Po\237kajte, pros\241m ..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER = In�talova� C = Vytvori� oblas� F3 = Skon�i�"}, + " ENTER = In\347talova\234 C = Create Primary E = Create Extended F3 = Skon\237i\234"}, +// " ENTER = In\347talova\234 C = Vytvori\234 oblas\234 F3 = Skon\237i\234"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = In\347talova\234 C = Create Logical Partition F3 = Skon\237i\234"}, {STRING_INSTALLDELETEPARTITION, " ENTER = In\347talova\234 D = Odstr\240ni\234 oblas\234 F3 = Skon\237i\234"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Odstr\240ni\234 oblas\234 F3 = Skon\237i\234"}, {STRING_PARTITIONSIZE, "Ve\226kos\234 novej oblasti:"}, {STRING_CHOOSE_NEW_PARTITION, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 265fb11d62a..c8a59e862d6 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -974,8 +974,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Kiko C p�r t� krijuar nj� particion t� ri.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -989,13 +988,6 @@ static MUI_ENTRY sqALSelectPartitionEntries[] = { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Kliko D p\211r t\211 fshir\211 nj\211 particion ekzistues.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2238,14 +2230,14 @@ MUI_STRING sqALStrings[] = {STRING_PLEASEWAIT, " Ju lutem prisni..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = Instalo C = Create Primary E = Create Extended F3 = Dil"}, // " ENTER = Instalo C = Krijo Particion F3 = Dil"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Instalo C = Create Logical Partition F3 = Dil"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalo D = Fshi Particion F3 = Dil"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Fshi Particion F3 = Dil"}, {STRING_PARTITIONSIZE, "Madh\211sia e particionit t\211 ri:"}, {STRING_CHOOSE_NEW_PARTITION, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 28463ed63ee..74a371aaa5a 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -976,28 +976,21 @@ static MUI_ENTRY svSESelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Tryck C f�r att skapa en ny partition.", + "\x07 Tryck C f\224r att skapa en prim�r/logisk partition.", +// "\x07 Tryck C f\224r att skapa en ny partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Tryck E f\224r att skapa en ut\224kad partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Tryck D f\224r att ta bort en befintlig partititon.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2227,14 +2220,13 @@ MUI_STRING svSEStrings[] = {STRING_PLEASEWAIT, " Var v\204nlig v\204nta..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER = Installera C = Skapa Partition F3 = Avsluta"}, + " ENTER = Installera C = Skapa Prim�r Partition E = Skapa Ut\224kad Partition F3 = Avsluta"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Installera C = Skapa Logisk Partition F3 = Avsluta"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installera D = Ta bort Partition F3 = Avsluta"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Ta bort Partition F3 = Avsluta"}, {STRING_PARTITIONSIZE, "Storlek p\206 den nya partitionen:"}, {STRING_CHOOSE_NEW_PARTITION, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 5c79d50ce18..2508f957a2e 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -966,27 +966,20 @@ static MUI_ENTRY trTRSelectPartitionEntries[] = { 8, 15, - "\x07 Bir ana b\224l\201m olu\237turmak i\207in P'ye bas\215n\215z.", + "\x07 Press C to create a primary/logical partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Bir geni\237letilmi\237 b\224l\201m olu\237turmak i\207in E'ye bas\215n\215z.", + "\x07 Press E to create an extended partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Mant\215ksal bir b\224l\201m olu\237turmak i\207in L'ye bas\215n\215z.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 Var olan bir b\224l\201m\224 silmek i\207in D'ye bas\215n\215z.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2202,9 +2195,9 @@ MUI_STRING trTRStrings[] = {STRING_PLEASEWAIT, " L\201tfen bekleyiniz..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Kur P = Ana B\224l\201m Olu\237tur E = Geni\237letilmi\237 B\224l\201m Olu\237tur F3 = \200\215k"}, + " ENTER = Kur C = Ana B\224l\201m Olu\237tur E = Geni\237letilmi\237 B\224l\201m Olu\237tur F3 = \200\215k"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Kur L = Mant\215ksal B\224l\201m Olu\237tur F3 = \200\215k"}, + " ENTER = Kur C = Mant\215ksal B\224l\201m Olu\237tur F3 = \200\215k"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Kur D = B\224l\201m\201 Sil F3 = \200\215k"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 8100b86f660..c615c0b2ed3 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -975,7 +975,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = { 8, 15, - "\x07 \215\240\342\250\341\255i\342\354 P \351\256\241 \341\342\242\256\340\250\342\250 \257\245\340\242\250\255\255\250\251 \340\256\247\244i\253.", + "\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�.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -983,20 +983,13 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = { 8, 17, - "\x07 \215\240\342\250\341\255i\342\354 E \351\256\241 \341\342\256\242\340\250\342\250 \340\256\247\350\250\340\245\255\250\251 \340\256\247\244i\253.", + "\x07 \215\240\342\250\341\255i\342\354 E \351\256\241 \341\342\242\256\340\250\342\250 \340\256\247\350\250\340\245\255\250\251 \340\256\247\244i\253.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 \215\240\342\250\341\255i\342\354 L \351\256\241 \341\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 \340\256\247\244i\253.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 8, - 21, "\x07 \215\240\342\250\341\255i\342\354 D \351\256\241 \242\250\244\240\253\250\342\250 i\341\255\343\356\347\250\251 \340\256\247\244i\253.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2234,10 +2227,9 @@ MUI_STRING ukUAStrings[] = {STRING_PLEASEWAIT, " \201\343\244\354-\253\240\341\252\240, \247\240\347\245\252\240\251\342\245..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = \202\341\342\240\255\256\242\250\342\250 P = \217\245\340\242\250\255\255\250\251 \340\256\247\244i\253 E = \220\256\247\350\250\340\245\255\250\251 F3 = \202\250\251\342\250"}, -// " ENTER = ��⠭�� C = �⢮�� i� F3 = ��"}, + " ENTER = \202\341\342\240\255\256\242\250\342\250 C = \217\245\340\242\250\255\255\250\251 \340\256\247\244i\253 E = \220\256\247\350\250\340\245\255\250\251 F3 = \202\250\251\342\250"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = \202\341\342\240\255\256\242\250\342\250 L = \221\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 \340\256\247\244i\253 F3 = \202\250\251\342\250"}, + " ENTER = \202\341\342\240\255\256\242\250\342\250 C = \221\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 \340\256\247\244i\253 F3 = \202\250\251\342\250"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \202\341\342\240\255\256\242\250\342\250 D = \202\250\244\240\253\250\342\250 \340\256\247\244i\253 F3 = \202\250\251\342\250"}, {STRING_DELETEPARTITION, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 6cb6cfa720d..47d24464977 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1586,7 +1586,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) InitPartitionListUi(&ListUi, PartitionList, CurrentPartition, - 2, 23, + 2, 21, xScreen - 3, yScreen - 3); DrawPartitionList(&ListUi); @@ -1751,22 +1751,19 @@ SelectPartitionPage(PINPUT_RECORD Ir) InstallPartition = CurrentPartition; return SELECT_FILE_SYSTEM_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'C') /* C */ { ASSERT(CurrentPartition != NULL); - if (CurrentPartition->LogicalPartition == FALSE) + Error = PartitionCreationChecks(CurrentPartition); + if (Error != NOT_AN_ERROR) { - Error = PartitionCreationChecks(CurrentPartition); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - - PartCreateType = PartTypeData; - return CREATE_PARTITION_PAGE; + MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; } + + PartCreateType = PartTypeData; + return CREATE_PARTITION_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E') /* E */ { @@ -1785,23 +1782,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return CREATE_PARTITION_PAGE; } } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ - { - ASSERT(CurrentPartition != NULL); - - if (CurrentPartition->LogicalPartition) - { - Error = PartitionCreationChecks(CurrentPartition); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - - PartCreateType = PartTypeData; - return CREATE_PARTITION_PAGE; - } - } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { UNICODE_STRING CurrentPartitionU;

10 months, 3 weeks

[reactos] 05/06: [USETUP] Blur the boundaries between MBR "Primary" and "Logical" partitions (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebcf3cf38e299311c6b77… commit ebcf3cf38e299311c6b77f9d28a9e04f2d34df51 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 26 21:44:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:41 2023 +0200 [USETUP] Blur the boundaries between MBR "Primary" and "Logical" partitions (#5837) Do not do that yet for extended partitions (containers). This is possible, because when creating partitions, we do that on unpartitioned space that is already "tagged" as either being "logical" or not, and the partition style is inherited from that. The resulting code is simpler, yet working as it should. This will also help in the future for supporting other platforms, where the concept of "primary", "extended" and "logical" partitions do not exist (basically all platforms except BIOS-based PC-AT). --- base/setup/lib/utils/partlist.c | 219 ++++++++++++++++------------------------ base/setup/lib/utils/partlist.h | 43 +++----- base/setup/usetup/usetup.c | 141 ++++++++++---------------- 3 files changed, 158 insertions(+), 245 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index c917aada568..5f1044335ed 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2782,16 +2782,92 @@ GetNextUnpartitionedEntry( return NULL; } +ERROR_NUMBER +PartitionCreationChecks( + _In_ PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } + + /* Fail if the partition is already in use */ + if (PartEntry->IsPartitioned) + return ERROR_NEW_PARTITION; + + /* + * For primary partitions + */ + if (!PartEntry->LogicalPartition) + { + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there are already 4 primary partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) >= 4) + return ERROR_PARTITION_TABLE_FULL; + } + /* + * For logical partitions + */ + else + { + // TODO: Check that we are inside an extended partition!! + // Then the following check will be useless. + + /* Only one (primary) partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + } + + return ERROR_SUCCESS; +} + +ERROR_NUMBER +ExtendedPartitionCreationChecks( + _In_ PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } + + /* Fail if the partition is already in use */ + if (PartEntry->IsPartitioned) + return ERROR_NEW_PARTITION; + + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there are already 4 primary partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) >= 4) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there is another extended partition in the list */ + if (DiskEntry->ExtendedPartition != NULL) + return ERROR_ONLY_ONE_EXTENDED; + + return ERROR_SUCCESS; +} + BOOLEAN -CreatePrimaryPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate) +CreatePartition( + _In_ PPARTLIST List, + _Inout_ PPARTENTRY PartEntry, + _In_ ULONGLONG SectorCount, + _In_ BOOLEAN AutoCreate) { ERROR_NUMBER Error; - DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); + DPRINT1("CreatePartition(%I64u)\n", SectorCount); if (List == NULL || PartEntry == NULL || PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) @@ -2799,10 +2875,10 @@ CreatePrimaryPartition( return FALSE; } - Error = PrimaryPartitionCreationChecks(PartEntry); + Error = PartitionCreationChecks(PartEntry); if (Error != NOT_AN_ERROR) { - DPRINT1("PrimaryPartitionCreationChecks() failed with error %lu\n", Error); + DPRINT1("PartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } @@ -2810,8 +2886,6 @@ CreatePrimaryPartition( if (!InitializePartitionEntry(PartEntry, SectorCount, AutoCreate)) return FALSE; - ASSERT(PartEntry->LogicalPartition == FALSE); - UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2821,7 +2895,7 @@ CreatePrimaryPartition( static VOID AddLogicalDiskSpace( - IN PDISKENTRY DiskEntry) + _In_ PDISKENTRY DiskEntry) { ULONGLONG StartSector; ULONGLONG SectorCount; @@ -2848,9 +2922,9 @@ AddLogicalDiskSpace( BOOLEAN CreateExtendedPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount) + _In_ PPARTLIST List, + _Inout_ PPARTENTRY PartEntry, + _In_ ULONGLONG SectorCount) { ERROR_NUMBER Error; @@ -2900,42 +2974,6 @@ CreateExtendedPartition( return TRUE; } -BOOLEAN -CreateLogicalPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate) -{ - ERROR_NUMBER Error; - - DPRINT1("CreateLogicalPartition(%I64u)\n", SectorCount); - - if (List == NULL || PartEntry == NULL || - PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) - { - return FALSE; - } - - Error = LogicalPartitionCreationChecks(PartEntry); - if (Error != NOT_AN_ERROR) - { - DPRINT1("LogicalPartitionCreationChecks() failed with error %lu\n", Error); - return FALSE; - } - - /* Initialize the partition entry, inserting a new blank region if needed */ - if (!InitializePartitionEntry(PartEntry, SectorCount, AutoCreate)) - return FALSE; - - ASSERT(PartEntry->LogicalPartition == TRUE); - - UpdateDiskLayout(PartEntry->DiskEntry); - AssignDriveLetters(List); - - return TRUE; -} - NTSTATUS DismountVolume( IN PPARTENTRY PartEntry) @@ -3950,87 +3988,6 @@ SetMBRPartitionType( DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } -ERROR_NUMBER -PrimaryPartitionCreationChecks( - IN PPARTENTRY PartEntry) -{ - PDISKENTRY DiskEntry = PartEntry->DiskEntry; - - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - { - DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - return ERROR_WARN_PARTITION; - } - - /* Fail if the partition is already in use */ - if (PartEntry->IsPartitioned) - return ERROR_NEW_PARTITION; - - /* Only one primary partition is allowed on super-floppy */ - if (IsSuperFloppy(DiskEntry)) - return ERROR_PARTITION_TABLE_FULL; - - /* Fail if there are already 4 primary partitions in the list */ - if (GetPrimaryPartitionCount(DiskEntry) >= 4) - return ERROR_PARTITION_TABLE_FULL; - - return ERROR_SUCCESS; -} - -ERROR_NUMBER -ExtendedPartitionCreationChecks( - IN PPARTENTRY PartEntry) -{ - PDISKENTRY DiskEntry = PartEntry->DiskEntry; - - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - { - DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - return ERROR_WARN_PARTITION; - } - - /* Fail if the partition is already in use */ - if (PartEntry->IsPartitioned) - return ERROR_NEW_PARTITION; - - /* Only one primary partition is allowed on super-floppy */ - if (IsSuperFloppy(DiskEntry)) - return ERROR_PARTITION_TABLE_FULL; - - /* Fail if there are already 4 primary partitions in the list */ - if (GetPrimaryPartitionCount(DiskEntry) >= 4) - return ERROR_PARTITION_TABLE_FULL; - - /* Fail if there is another extended partition in the list */ - if (DiskEntry->ExtendedPartition != NULL) - return ERROR_ONLY_ONE_EXTENDED; - - return ERROR_SUCCESS; -} - -ERROR_NUMBER -LogicalPartitionCreationChecks( - IN PPARTENTRY PartEntry) -{ - PDISKENTRY DiskEntry = PartEntry->DiskEntry; - - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - { - DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - return ERROR_WARN_PARTITION; - } - - /* Fail if the partition is already in use */ - if (PartEntry->IsPartitioned) - return ERROR_NEW_PARTITION; - - /* Only one primary partition is allowed on super-floppy */ - if (IsSuperFloppy(DiskEntry)) - return ERROR_PARTITION_TABLE_FULL; - - return ERROR_SUCCESS; -} - BOOLEAN GetNextUnformattedPartition( IN PPARTLIST List, diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index cce21d2eede..c59b5e1f4b7 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -294,25 +294,26 @@ GetPrevPartition( IN PPARTLIST List, IN PPARTENTRY CurrentPart OPTIONAL); -BOOLEAN -CreatePrimaryPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate); +ERROR_NUMBER +PartitionCreationChecks( + _In_ PPARTENTRY PartEntry); + +ERROR_NUMBER +ExtendedPartitionCreationChecks( + _In_ PPARTENTRY PartEntry); BOOLEAN -CreateExtendedPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount); +CreatePartition( + _In_ PPARTLIST List, + _Inout_ PPARTENTRY PartEntry, + _In_ ULONGLONG SectorCount, + _In_ BOOLEAN AutoCreate); BOOLEAN -CreateLogicalPartition( - IN PPARTLIST List, - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate); +CreateExtendedPartition( + _In_ PPARTLIST List, + _Inout_ PPARTENTRY PartEntry, + _In_ ULONGLONG SectorCount); NTSTATUS DismountVolume( @@ -360,18 +361,6 @@ SetMBRPartitionType( IN PPARTENTRY PartEntry, IN UCHAR PartitionType); -ERROR_NUMBER -PrimaryPartitionCreationChecks( - IN PPARTENTRY PartEntry); - -ERROR_NUMBER -ExtendedPartitionCreationChecks( - IN PPARTENTRY PartEntry); - -ERROR_NUMBER -LogicalPartitionCreationChecks( - IN PPARTENTRY PartEntry); - BOOLEAN GetNextUnformattedPartition( IN PPARTLIST List, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 10bf53553dd..6cb6cfa720d 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -75,10 +75,9 @@ static PPARTLIST PartitionList = NULL; /* Currently selected partition entry in the list */ static PPARTENTRY CurrentPartition = NULL; static enum { - PartTypePrimary, - PartTypeExtended, - PartTypeLogical -} PartCreateType = PartTypePrimary; + PartTypeData, // On MBR-disks, primary or logical partition + PartTypeExtended // MBR-disk container +} PartCreateType = PartTypeData; /* List of supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; @@ -1607,20 +1606,10 @@ SelectPartitionPage(PINPUT_RECORD Ir) ASSERT(CurrentPartition != NULL); ASSERT(!IsContainerPartition(CurrentPartition->PartitionType)); - if (CurrentPartition->LogicalPartition) - { - CreateLogicalPartition(PartitionList, - CurrentPartition, - CurrentPartition->SectorCount.QuadPart, - TRUE); - } - else - { - CreatePrimaryPartition(PartitionList, - CurrentPartition, - CurrentPartition->SectorCount.QuadPart, - TRUE); - } + CreatePartition(PartitionList, + CurrentPartition, + CurrentPartition->SectorCount.QuadPart, + TRUE); // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? if (!IsDiskSizeValid(CurrentPartition)) @@ -1654,42 +1643,40 @@ SelectPartitionPage(PINPUT_RECORD Ir) while (TRUE) { + ULONG uID; + CurrentPartition = ListUi.CurrentPartition; /* Update status text */ if (CurrentPartition == NULL) { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); - } - else if (CurrentPartition->LogicalPartition) - { - if (CurrentPartition->IsPartitioned) - { - CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); - } - else - { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATELOGICAL)); - } + // FIXME: If we get a NULL current partition, this means that + // the current disk is of unrecognized type. So we should display + // instead a status string to initialize the disk with one of + // the recognized partitioning schemes (MBR, later: GPT, etc.) + // For the time being we don't have that, so use instead another + // known string. + uID = STRING_INSTALLCREATEPARTITION; } else { if (CurrentPartition->IsPartitioned) { - if (IsContainerPartition(CurrentPartition->PartitionType)) + uID = STRING_INSTALLDELETEPARTITION; + if (!CurrentPartition->LogicalPartition && + IsContainerPartition(CurrentPartition->PartitionType)) { - CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); - } - else - { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); + uID = STRING_DELETEPARTITION; } } else { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); + uID = STRING_INSTALLCREATEPARTITION; + if (CurrentPartition->LogicalPartition) + uID = STRING_INSTALLCREATELOGICAL; } } + CONSOLE_SetStatusText(MUIGetString(uID)); CONSOLE_ConInKey(Ir); @@ -1741,34 +1728,17 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (CurrentPartition->IsPartitioned == FALSE) { - if (CurrentPartition->LogicalPartition) + Error = PartitionCreationChecks(CurrentPartition); + if (Error != NOT_AN_ERROR) { - Error = LogicalPartitionCreationChecks(CurrentPartition); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - - CreateLogicalPartition(PartitionList, - CurrentPartition, - 0ULL, - TRUE); + MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; } - else - { - Error = PrimaryPartitionCreationChecks(CurrentPartition); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - CreatePrimaryPartition(PartitionList, - CurrentPartition, - 0ULL, - TRUE); - } + CreatePartition(PartitionList, + CurrentPartition, + 0ULL, + TRUE); } if (!IsDiskSizeValid(CurrentPartition)) @@ -1787,14 +1757,14 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (CurrentPartition->LogicalPartition == FALSE) { - Error = PrimaryPartitionCreationChecks(CurrentPartition); + Error = PartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } - PartCreateType = PartTypePrimary; + PartCreateType = PartTypeData; return CREATE_PARTITION_PAGE; } } @@ -1821,14 +1791,14 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(CurrentPartition); + Error = PartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } - PartCreateType = PartTypeLogical; + PartCreateType = PartTypeData; return CREATE_PARTITION_PAGE; } } @@ -2102,12 +2072,16 @@ CreatePartitionPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - if (PartCreateType == PartTypePrimary) + if (PartCreateType == PartTypeData) + { uID = STRING_CHOOSE_NEW_PARTITION; - else if (PartCreateType == PartTypeExtended) + if (CurrentPartition->LogicalPartition) + uID = STRING_CHOOSE_NEW_LOGICAL_PARTITION; + } + else // if (PartCreateType == PartTypeExtended) + { uID = STRING_CHOOSE_NEW_EXTENDED_PARTITION; - else // if (PartCreateType == PartTypeLogical) - uID = STRING_CHOOSE_NEW_LOGICAL_PARTITION; + } CONSOLE_SetTextXY(6, 8, MUIGetString(uID)); @@ -2169,26 +2143,19 @@ CreatePartitionPage(PINPUT_RECORD Ir) DPRINT("Partition size: %I64u bytes\n", PartSize); - if (PartCreateType == PartTypePrimary) + if (PartCreateType == PartTypeData) { - CreatePrimaryPartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); + CreatePartition(PartitionList, + CurrentPartition, + SectorCount, + FALSE); } - else if (PartCreateType == PartTypeExtended) + else // if (PartCreateType == PartTypeExtended) { CreateExtendedPartition(PartitionList, CurrentPartition, SectorCount); } - else // if (PartCreateType == PartTypeLogical) - { - CreateLogicalPartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); - } return SELECT_PARTITION_PAGE; } @@ -2443,10 +2410,10 @@ SelectFileSystemPage(PINPUT_RECORD Ir) */ if (!SystemPartition->IsPartitioned) { - CreatePrimaryPartition(PartitionList, - SystemPartition, - 0LL, // SystemPartition->SectorCount.QuadPart, - TRUE); + CreatePartition(PartitionList, + SystemPartition, + 0LL, // SystemPartition->SectorCount.QuadPart, + TRUE); ASSERT(SystemPartition->IsPartitioned); }

10 months, 3 weeks

[reactos] 04/06: [USETUP] Show the partition description (and its disk) being formatted and checked (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ed4bf1ed774f25da8d4c… commit 9ed4bf1ed774f25da8d4c33f5dfaa2d3582f86af Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 25 22:19:39 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:40 2023 +0200 [USETUP] Show the partition description (and its disk) being formatted and checked (#5837) And improve some strings -- Translations need to be rechecked! --- base/setup/usetup/lang/bg-BG.h | 6 +++--- base/setup/usetup/lang/bn-BD.h | 6 +++--- base/setup/usetup/lang/cs-CZ.h | 6 +++--- base/setup/usetup/lang/da-DK.h | 6 +++--- base/setup/usetup/lang/de-DE.h | 6 +++--- base/setup/usetup/lang/el-GR.h | 6 +++--- base/setup/usetup/lang/en-US.h | 6 +++--- base/setup/usetup/lang/es-ES.h | 6 +++--- base/setup/usetup/lang/et-EE.h | 6 +++--- base/setup/usetup/lang/eu-ES.h | 6 +++--- base/setup/usetup/lang/fr-FR.h | 6 +++--- base/setup/usetup/lang/he-IL.h | 6 +++--- base/setup/usetup/lang/hr-HR.h | 6 +++--- base/setup/usetup/lang/hu-HU.h | 6 +++--- base/setup/usetup/lang/id-ID.h | 6 +++--- base/setup/usetup/lang/it-IT.h | 6 +++--- base/setup/usetup/lang/ja-JP.h | 6 +++--- base/setup/usetup/lang/lt-LT.h | 6 +++--- base/setup/usetup/lang/ms-MY.h | 6 +++--- base/setup/usetup/lang/nl-NL.h | 6 +++--- base/setup/usetup/lang/pl-PL.h | 6 +++--- base/setup/usetup/lang/pt-BR.h | 6 +++--- base/setup/usetup/lang/pt-PT.h | 6 +++--- base/setup/usetup/lang/ro-RO.h | 9 ++++++++- base/setup/usetup/lang/ru-RU.h | 6 +++--- base/setup/usetup/lang/sk-SK.h | 6 +++--- base/setup/usetup/lang/sq-AL.h | 6 +++--- base/setup/usetup/lang/sv-SE.h | 6 +++--- base/setup/usetup/lang/tr-TR.h | 6 +++--- base/setup/usetup/lang/uk-UA.h | 6 +++--- base/setup/usetup/usetup.c | 22 ++++++++++++++++++---- 31 files changed, 113 insertions(+), 92 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index f7150ddcaa9..d2da19acb5d 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1273,7 +1273,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = }, { 6, - 10, + 16, "\204\357\253\352\342 \351\245 \241\352\244\245 \344\256\340\254\240\342\250\340\240\255. \215\240\342\250\341\255\245\342\245 ENTER \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2316,9 +2316,9 @@ MUI_STRING bgBGStrings[] = {STRING_CONSOLEFAIL3, "\217\256\244\244\340\352\246\252\240\342\240 \255\240 USB \245 \242\341\245 \256\351\245 \255\245\257\352\253\255\240\r\n"}, {STRING_FORMATTINGPART, - "\224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\250\341\252\240"}, + "\224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240..."}, {STRING_CHECKINGDISK, - "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240"}, + "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240..."}, {STRING_FORMATDISK1, " \224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240 \252\240\342\256 %S \344\240\251\253\256\242\240 \341\250\341\342\245\254\240 (\241\352\340\247\256 \344\256\340\254\240\342\250\340\240\255\245) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index a8ece049194..1be6aaa9384 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1256,7 +1256,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup will now format the partition. Press ENTER to continue.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2290,9 +2290,9 @@ MUI_STRING bnBDStrings[] = {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGPART, - "Setup is formatting your disk"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index e185fa42208..74ebdc9ebf8 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1264,7 +1264,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = }, { 6, - 10, + 16, "Tento odd\241l bude nyn\241 zform\240tov\240n. Stisknut\241m kl\240vesy ENTER za\237nete.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2298,9 +2298,9 @@ MUI_STRING csCZStrings[] = {STRING_CONSOLEFAIL3, "USB kl\240vesnice zat\241m nejsou pln\330 podporov\240ny\r\n"}, {STRING_FORMATTINGPART, - "Instalace form\240tuje disk"}, + "Instalace form\240tuje odd\241l..."}, {STRING_CHECKINGDISK, - "Instalace kontroluje disk"}, + "Instalace kontroluje disk..."}, {STRING_FORMATDISK1, " Zform\240tovat odd\241l na souborov\354 syst\202m %S (rychle) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index ab95b478df8..d388585ff82 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1258,7 +1258,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = }, { 6, - 10, + 16, "Installationen vil nu formatere partitionen. Tryk p\206 ENTER for at forts\221tte.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2300,9 +2300,9 @@ MUI_STRING daDKStrings[] = {STRING_CONSOLEFAIL3, "USB-tastatuere er endnu ikke fuldt underst\233ttet\r\n"}, {STRING_FORMATTINGPART, - "Installationen formatere din disk"}, + "Installationen formaterer partitionen..."}, {STRING_CHECKINGDISK, - "Installationen tjekker din disk"}, + "Installationen tjekker disken..."}, {STRING_FORMATDISK1, " Formater partitionen som %S-filesystemet (hurtigformatering) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 3834815ea04..16529f96707 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1251,7 +1251,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = }, { 6, - 10, + 16, "Die gew\201nschte Partition wird nun formatiert.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2302,9 +2302,9 @@ MUI_STRING deDEStrings[] = {STRING_CONSOLEFAIL3, "USB-Tastaturen werden noch nicht vollst\204ndig unterst\201tzt\r\n"}, {STRING_FORMATTINGPART, - "Ihre Festplatte wird formatiert"}, + "Die Partition wird formatiert..."}, {STRING_CHECKINGDISK, - "Ihre Festplatte wird \201berpr\201ft"}, + "Die Festplatte wird \201berpr\201ft..."}, {STRING_FORMATDISK1, " Partition mit dem %S-Dateisystem formatieren (Schnell) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 6e092a920c7..2a71f69195f 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[] = }, { 6, - 10, + 16, "\206 \234\232\241\230\253\341\251\253\230\251\236 \253\351\250\230 \237\230 \233\240\230\243\246\250\255\351\251\234\240 \253\246 \233\240\230\243\342\250\240\251\243\230 \217\230\253\343\251\253\234 ENTER \232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2315,9 +2315,9 @@ MUI_STRING elGRStrings[] = {STRING_CONSOLEFAIL3, "\222\230 USB \247\242\236\241\253\250\246\242\346\232\240\230 \233\234\244 \234\345\244\230\240 \247\242\343\250\340\252 \254\247\246\251\253\236\250\240\235\346\243\234\244\230 \230\241\346\243\230\r\n"}, {STRING_FORMATTINGPART, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\240\230\243\246\250\255\351\244\234\240 \253\246 \233\345\251\241\246 \251\230\252"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \234\242\342\232\256\234\240 \253\246 \233\345\251\241\246 \251\230\252"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " \203\240\230\243\346\250\255\340\251\236 \253\246\254 partition \340\252 %S \251\347\251\253\236\243\230 \230\250\256\234\345\340\244 (\232\250\343\232\246\250\236 \233\240\230\243\346\250\255\340\251\236) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index ae23370e7fa..12c893d6d94 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1256,7 +1256,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup will now format the partition. Press ENTER to continue.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2290,9 +2290,9 @@ MUI_STRING enUSStrings[] = {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGPART, - "Setup is formatting your disk"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 77e54c61860..374182c5c30 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1262,7 +1262,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] = }, { 6, - 10, + 16, "El instalador formatear\240 la partici\242n. Pulse INTRO para continuar.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2303,9 +2303,9 @@ MUI_STRING esESStrings[] = {STRING_CONSOLEFAIL3, "Todav\241a no hay soporte del todo para los teclados USB\r\n"}, {STRING_FORMATTINGPART, - "El instalador est\240 formateando el disco"}, + "El instalador est\240 formateando la partici\242n..."}, {STRING_CHECKINGDISK, - "El instalador est\240 verificando el disco"}, + "El instalador est\240 verificando el disco..."}, {STRING_FORMATDISK1, " Formatear la partici\242n con sistema de archivos %S (formato r\240pido) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 9e78d2b53c1..8daf974411c 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1259,7 +1259,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = }, { 6, - 10, + 16, "N\201\201d vormindatakse partitsioon. Vajuta ENTER j\204tkamiseks.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2292,9 +2292,9 @@ MUI_STRING etEEStrings[] = {STRING_CONSOLEFAIL3, "USB klaviatuurid ei ole veel toetatud\r\n"}, {STRING_FORMATTINGPART, - "K\344vaketta vormindamine"}, + "Partitsioon vormindamine..."}, {STRING_CHECKINGDISK, - "K\344vaketta kontrollimine"}, + "K\344vaketta kontrollimine..."}, {STRING_FORMATDISK1, " Vorminda partitsioon %S failis\201steemiga (kiire vormindus) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index b225211ebcf..715e941dc7f 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1257,7 +1257,7 @@ static MUI_ENTRY euESFormatPartitionEntries[] = }, { 6, - 10, + 16, "Orain instalazioa formatuko du partizioa. Sakatu SARTU jarraitzeko.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2298,9 +2298,9 @@ MUI_STRING euESStrings[] = {STRING_CONSOLEFAIL3, "USB teklatua ez dago oraindik osoan euskarri\r\n"}, {STRING_FORMATTINGPART, - "Instalazioa zure disko formateatzen ari da"}, + "Instalazioa partizioa formateatzen ari da..."}, {STRING_CHECKINGDISK, - "Instalazioa zure disko ikusten ari da"}, + "Instalazioa diskoa ikusten ari da..."}, {STRING_FORMATDISK1, " Formatu partizioa %S sistemaren fitxategia (format azkar) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 77c51003330..a566b159c46 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1293,7 +1293,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup va formater la partition. Appuyer sur ENTR\220E pour continuer.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2327,9 +2327,9 @@ MUI_STRING frFRStrings[] = {STRING_CONSOLEFAIL3, "Les claviers USB ne sont pas compl\212tement support\202s actuellement\r\n"}, {STRING_FORMATTINGPART, - "Setup formate votre disque"}, + "Setup formate la partition..."}, {STRING_CHECKINGDISK, - "Setup v\202rifie votre disque"}, + "Setup v\202rifie le disque..."}, {STRING_FORMATDISK1, " Formater la partition comme syst\212me de fichiers %S (formatage rapide) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 6b644999fc8..7a149ee68cb 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1260,7 +1260,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] = }, { 6, - 10, + 16, ".\212\211\231\216\204\214 \211\203\213 ENTER \225\207\214 .\204\226\211\207\216\204 \232\200 \214\207\232\200\232 \205\211\231\213\222 \204\220\227\232\204\204", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2292,9 +2292,9 @@ MUI_STRING heILStrings[] = {STRING_CONSOLEFAIL3, "\200\214\216 \217\224\205\200\201 \232\205\213\216\232\220 \200\214 \217\211\211\203\222 USB \232\205\203\214\227\216\r\n"}, {STRING_FORMATTINGPART, - "\217\220\205\213\204 \232\200 \232\214\207\232\200\216 \204\220\227\232\204\204 \232\211\220\213\232"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "\217\220\205\213\204 \232\200 \232\227\203\205\201 \204\220\227\232\204\204 \232\211\220\213\232"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " (\230\211\204\216 \214\205\207\232\200) %S \215\211\226\201\227 \232\213\230\222\216 \215\222 \204\226\211\207\216 \214\205\207\232\200 "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index 9f0c2bd47d8..a7625d5559b 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -1266,7 +1266,7 @@ static MUI_ENTRY hrHRFormatPartitionEntries[] = }, { 6, - 10, + 16, "Instalacijski program \206e sada formatirati particiju.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2321,9 +2321,9 @@ MUI_STRING hrHRStrings[] = {STRING_CONSOLEFAIL3, "USB tipkovnice nisu jo\347 potupuno podr\247ane\r\n"}, {STRING_FORMATTINGPART, - "Instalacijski program formatira va\347 disk"}, + "Instalacijski program formatira particiju..."}, {STRING_CHECKINGDISK, - "Instalacijski sustav provjerava va\347 disk"}, + "Instalacijski program provjerava disk..."}, {STRING_FORMATDISK1, " Formatiraj particiju kao %S sustav datoteka (brzo formatiranje) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index cb913f4b792..80c46b1d244 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1150,7 +1150,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = }, { 6, - 10, + 16, "A telep\241t\213 form\240zni fogja a part\241ci\242t. Nyomjon ENTER-t a folytat\240shoz.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2188,9 +2188,9 @@ MUI_STRING huHUStrings[] = {STRING_CONSOLEFAIL3, "Az USB-s billenty\373zetek m\202g nincsenek teljesen t\240mogatva\r\n"}, {STRING_FORMATTINGPART, - "A telep\241t\213 form\240zza a merevlemezt"}, + "A telep\241t\213 form\240zza a part\241ci\242t..."}, {STRING_CHECKINGDISK, - "A telep\241t\213 ellen\213rzi a merevlemezt"}, + "A telep\241t\213 ellen\213rzi a merevlemezt..."}, {STRING_FORMATDISK1, " Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel (gyorsform\240z\240s) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 1bd19e8a23e..abe1bcb28b3 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1256,7 +1256,7 @@ static MUI_ENTRY idIDFormatPartitionEntries[] = }, { 6, - 10, + 16, "Penyetelan akan memformat partisi. Tekan ENTER untuk lanjut.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2297,9 +2297,9 @@ MUI_STRING idIDStrings[] = {STRING_CONSOLEFAIL3, "Papan ketik USB belum didukung sepenuhnya\r\n"}, {STRING_FORMATTINGPART, - "Penyetelan sedang memformat cakram anda"}, + "Penyetelan sedang memformat partisi..."}, {STRING_CHECKINGDISK, - "Penyetelan sedang memeriksa cakram anda"}, + "Penyetelan sedang memeriksa cakram..."}, {STRING_FORMATDISK1, " Format partisi sebagai sistem berkas %S (format cepat) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index de6aa5c6533..8d49eb82e9f 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1262,7 +1262,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup formatter\x85 la partizione. Premere INVIO per continuare.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2303,9 +2303,9 @@ MUI_STRING itITStrings[] = {STRING_CONSOLEFAIL3, "le tastiere USB non sono ancora completamente supportate\r\n"}, {STRING_FORMATTINGPART, - "Setup sta formattando il disco"}, + "Setup sta formattando la partizione..."}, {STRING_CHECKINGDISK, - "Setup sta controllando il disco"}, + "Setup sta controllando il disco..."}, {STRING_FORMATDISK1, " Formatta la partizione con file system %S (formattazione rapida) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 7c07986a819..7d4153bdbab 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1259,7 +1259,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = }, { 6, - 10, + 16, "\276\257\304\261\257\314\337\312 \312\337\260\303\250\274\256\335\246 \314\253\260\317\257\304 \274\317\275\241 \277\336\257\272\263 \275\331\306\312 ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2302,9 +2302,9 @@ MUI_STRING jaJPStrings[] = {STRING_CONSOLEFAIL3, "USB \267\260\316\336\260\304\336 \312 \317\300\336 \266\335\276\336\335\306 \273\316\337\260\304 \273\332\303 \262\317\276\335\r\n"}, {STRING_FORMATTINGPART, - "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \314\253\260\317\257\304 \274\303\262\317\275"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \271\335\273 \274\303\262\317\275\241"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " \312\337\260\303\250\274\256\335\246 %S \314\247\262\331 \274\275\303\321 \303\336\314\253\260\317\257\304 (\270\262\257\270 \314\253\260\317\257\304) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 345c60d450c..050b9ddcbe7 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1267,7 +1267,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup will now format the partition. Press ENTER to continue.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2301,9 +2301,9 @@ MUI_STRING ltLTStrings[] = {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGPART, - "Setup is formatting your disk"}, + "Setup is formatting the partition..."}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Setup is checking the disk..."}, {STRING_FORMATDISK1, " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 0384a3fc4ef..69b3a2ccfd9 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1248,7 +1248,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = }, { 6, - 10, + 16, "Persediaan sekarang akan format partition. Tekan ENTER untuk teruskan.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2282,9 +2282,9 @@ MUI_STRING msMYStrings[] = {STRING_CONSOLEFAIL3, "Papan kekunci USB tidak disokong sepenuhnya lagi\r\n"}, {STRING_FORMATTINGPART, - "Persediaan sedang format cakera"}, + "Persediaan sedang format partition..."}, {STRING_CHECKINGDISK, - "Persediaan sedang menyemak cakera"}, + "Persediaan sedang menyemak cakera..."}, {STRING_FORMATDISK1, " Format partition seperti sistem fail %S (format ringkas) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index c2f994ac24b..950432ee883 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1271,7 +1271,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = }, { 6, - 10, + 16, "Setup gaat nu de partitie formatteren. Druk op ENTER om door te gaan.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2324,9 +2324,9 @@ MUI_STRING nlNLStrings[] = {STRING_CONSOLEFAIL3, "USB toetsenborden worden nog niet volledig ondersteund.\r\n"}, {STRING_FORMATTINGPART, - "Setup is de vaste schijf aan het formatteren."}, + "Setup is de partitie aan het formatteren..."}, {STRING_CHECKINGDISK, - "Setup is de vaste schijf aan het controleren."}, + "Setup is de vaste schijf aan het controleren..."}, {STRING_FORMATDISK1, " Formatteer partitie als %S bestandssysteem (snel) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 2c616e1bc59..69df8c5de9b 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1268,7 +1268,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = }, { 6, - 10, + 16, "Instalator sformatuje teraz partycj\251. Naci\230nij ENTER, aby kontynuowa\206.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2309,9 +2309,9 @@ MUI_STRING plPLStrings[] = {STRING_CONSOLEFAIL3, "Nie s\245 obecnie w pe\210ni obs\210ugiwane.\r\n"}, {STRING_FORMATTINGPART, - "Instalator formatuje tw\242j dysk"}, + "Instalator formatuje partycj\251..."}, {STRING_CHECKINGDISK, - "Instalator sprawdza tw\242j dysk"}, + "Instalator sprawdza dysk..."}, {STRING_FORMATDISK1, " Formatuj partycj\251 w systemie plik\242w %S (szybkie formatowanie) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index bc897c1d224..9e1cfc1f03a 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[] = }, { 6, - 10, + 16, "O instalador ir\240 formatar a parti\207\306o. Para continuar, pressione ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2337,9 +2337,9 @@ MUI_STRING ptBRStrings[] = {STRING_CONSOLEFAIL3, "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"}, {STRING_FORMATTINGPART, - "O instalador est\240 formatando o disco"}, + "O instalador est\240 formatando a parti\207\306o..."}, {STRING_CHECKINGDISK, - "O instalador est\240 verificando o disco"}, + "O instalador est\240 verificando o disco..."}, {STRING_FORMATDISK1, " Formatar a parti\207\306o utilizando o sistema de arquivos %S (R\240pido) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index f383dbfae68..ab19b6d38b1 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[] = }, { 6, - 10, + 16, "O instalador ir\240 formatar a parti\207\306o. Para continuar, pressione ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2336,9 +2336,9 @@ MUI_STRING ptPTStrings[] = {STRING_CONSOLEFAIL3, "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"}, {STRING_FORMATTINGPART, - "O instalador est\240 a formatar o disco"}, + "O instalador est\240 a formatar a parti\207\306o..."}, {STRING_CHECKINGDISK, - "O instalador est\240 a verificar o disco"}, + "O instalador est\240 a verificar o disco..."}, {STRING_FORMATDISK1, " Formatar a parti\207\306o utilizando o sistema de arquivos %S (R\240pido) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 7cabee005a3..762cd357331 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1297,6 +1297,13 @@ static MUI_ENTRY roROFormatPartitionEntries[] = { 6, 8, + "Urmeaz\343 formatarea parti\376iei.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 16, "Urmeaz\343 formatarea parti\376iei. Tasta\376i ENTER pentru a continua.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2351,7 +2358,7 @@ MUI_STRING roROStrings[] = {STRING_CONSOLEFAIL3, "Tastaturile USB nu sunt \356nc\343 toate acceptate\r\n"}, {STRING_FORMATTINGPART, - "Disc \356n curs de formatare..."}, + "Parti\376ia \356n curs de formatare..."}, {STRING_CHECKINGDISK, "Disc \356n curs de verificare..."}, {STRING_FORMATDISK1, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 683b130eb15..92f04640bc9 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1279,7 +1279,7 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] = }, { 6, - 10, + 16, "\204\253\357 \343\341\342\240\255\256\242\252\250 \340\240\247\244\245\253 \241\343\244\245\342 \256\342\344\256\340\254\240\342\250\340\256\242\240\255. \215\240\246\254\250\342\245 ENTER \244\253\357 \257\340\256\244\256\253\246\245\255\250\357.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2320,9 +2320,9 @@ MUI_STRING ruRUStrings[] = {STRING_CONSOLEFAIL3, "USB \252\253\240\242\250\240\342\343\340\353 \341\245\251\347\240\341 \257\256\244\244\245\340\246\250\242\240\356\342\341\357 \255\245 \257\256\253\255\256\341\342\354\356\r\n"}, {STRING_FORMATTINGPART, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \344\256\340\254\240\342\250\340\343\245\342 \242\240\350 \244\250\341\252"}, + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \344\256\340\254\240\342\250\340\343\245\342 \340\240\247\244\245\253..."}, {STRING_CHECKINGDISK, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \257\340\256\242\245\340\357\245\342 \242\240\350 \244\250\341\252"}, + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \257\340\256\242\245\340\357\245\342 \244\250\341\252..."}, {STRING_FORMATDISK1, " \224\256\340\254\240\342\250\340\256\242\240\255\250\245 \340\240\247\244\245\253\240 \242 \344\240\251\253\256\242\256\251 \341\250\341\342\245\254\245 %S (\241\353\341\342\340\256\245) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 37c06321f56..74e50708d2e 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1265,7 +1265,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = }, { 6, - 10, + 16, "In\347tal\240tor teraz naform\240tuje oblas\234. Stla\237te ENTER pre pokra\237ovanie.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2311,9 +2311,9 @@ MUI_STRING skSKStrings[] = {STRING_CONSOLEFAIL3, "USB kl\240vesnica e\347te nie je plne podporovan\240\r\n"}, {STRING_FORMATTINGPART, - "In\347tal\240tor form\240tuje V\240\347 disk"}, + "In\347tal\240tor form\240tuje oblas\234..."}, {STRING_CHECKINGDISK, - "In\347tal\240tor kontroluje V\240\347 disk"}, + "In\347tal\240tor kontroluje disk..."}, {STRING_FORMATDISK1, " Naform\240tova\234 oblas\234 ako syst\202m s\243borov %S (r\354chly form\240t) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index f5849cade32..265fb11d62a 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[] = }, { 6, - 10, + 16, "Instalimi tani do t\211 formatoj\211 particionin. Kliko ENTER p\211r t\211 vazhduar.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2312,9 +2312,9 @@ MUI_STRING sqALStrings[] = {STRING_CONSOLEFAIL3, "Tastierat USB nuk jan\211 t\211 mb\211shtetura ende plot\211sisht\r\n"}, {STRING_FORMATTINGPART, - "Instalimi po formaton diskun tuaj"}, + "Instalimi po formaton particionin..."}, {STRING_CHECKINGDISK, - "Instalimi \211sht\211 duke kontrolluar diskun tuaj"}, + "Instalimi \211sht\211 duke kontrolluar diskun..."}, {STRING_FORMATDISK1, " Formato particionin si %S dokumentat e sistemit (formatim i shpejt\211) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 95664b2d55a..28463ed63ee 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1265,7 +1265,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = }, { 6, - 10, + 16, "Partitionen kommer nu att formaters Tryck ENTER f\224r att forts\204tta.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2301,9 +2301,9 @@ MUI_STRING svSEStrings[] = {STRING_CONSOLEFAIL3, "USB tangentbord \204r itne helt st\224tt \204n\r\n"}, {STRING_FORMATTINGPART, - "Setup formaterar din disk"}, + "Setup formaterar partitionen..."}, {STRING_CHECKINGDISK, - "Setup under\224ker din disk"}, + "Setup unders\224ker disken..."}, {STRING_FORMATDISK1, " Formaterar partition som %S filsystem (snabbformatering) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 59210fc1a56..5c79d50ce18 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1247,7 +1247,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = }, { 6, - 10, + 16, "Kur, \237imdi b\224l\201m\201 bi\207imlendirecek. Devam etmek i\207in ENTER'e bas\215n\215z.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2274,9 +2274,9 @@ MUI_STRING trTRStrings[] = {STRING_CONSOLEFAIL3, "USB klavye daha t\201m\201yle desteklenmemektedir.\r\n"}, {STRING_FORMATTINGPART, - "Kur, diskinizi bi\207imlendiriyor."}, + "Kur, b\224l\201m\201 bi\207imlendiriyor..."}, {STRING_CHECKINGDISK, - "Kur, diskinizi g\224zden ge\207iriyor."}, + "Kur, diski g\224zden ge\207iriyor..."}, {STRING_FORMATDISK1, " B\224l\201m\201 %S dosya sistemiyle h\215zl\215 bi\207imlendir. "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 1d65687b697..8100b86f660 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1264,7 +1264,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = }, { 6, - 10, + 16, "\207\240\340\240\247 \242\341\342\240\255\256\242\253\356\242\240\347 \242i\244\344\256\340\254\240\342\343\363 \340\256\247\244i\253. \215\240\342\250\341\255i\342\354 ENTER \244\253\357 \257\340\256\244\256\242\246\245\255\255\357.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT @@ -2308,9 +2308,9 @@ MUI_STRING ukUAStrings[] = {STRING_CONSOLEFAIL3, "USB \252\253\240\242i\240\342\343\340\250 \351\245 \255\245 \257i\244\342\340\250\254\343\356\342\354\341\357 \257\256\242\255i\341\342\356\r\n"}, {STRING_FORMATTINGPART, - "\202\341\342\240\255\256\242\253\356\242\240\347 \344\256\340\254\240\342\343\363 \242\240\350 \244\250\341\252"}, + "\202\341\342\240\255\256\242\253\356\242\240\347 \344\256\340\254\240\342\343\363 \340\256\247\244i\253..."}, {STRING_CHECKINGDISK, - "\202\341\342\240\255\256\242\253\356\242\240\347 \257\245\340\245\242i\340\357\363 \242\240\350 \244\250\341\252"}, + "\202\341\342\240\255\256\242\253\356\242\240\347 \257\245\340\245\242i\340\357\363 \244\250\341\252..."}, {STRING_FORMATDISK1, " \224\256\340\254\240\342\343\242\240\342\250 \340\256\247\244i\253 \242 \344\240\251\253\256\242i\251 \341\250\341\342\245\254i %S (\350\242\250\244\252\245 \344\256\340\254\240\342\343\242\240\255\255\357) "}, {STRING_FORMATDISK2, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 492fc9c9d05..10bf53553dd 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2784,8 +2784,6 @@ FormatPartitionPage(PINPUT_RECORD Ir) DPRINT("FormatPartitionPage()\n"); - MUIDisplayPage(FORMAT_PARTITION_PAGE); - if (PartitionList == NULL || TempPartition == NULL) { /* FIXME: show an error dialog */ @@ -2800,6 +2798,15 @@ FormatPartitionPage(PINPUT_RECORD Ir) SelectedFileSystem = FileSystemList->Selected; ASSERT(SelectedFileSystem && SelectedFileSystem->FileSystem); + MUIDisplayPage(FORMAT_PARTITION_PAGE); + + PartitionDescription(PartEntry, Buffer, ARRAYSIZE(Buffer)); + CONSOLE_SetTextXY(6, 10, Buffer); + + DiskDescription(DiskEntry, Buffer, ARRAYSIZE(Buffer)); + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), + Buffer); + while (TRUE) { if (!IsUnattendedSetup) @@ -2929,8 +2936,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; CHAR Buffer[MAX_PATH]; - MUIDisplayPage(CHECK_FILE_SYSTEM_PAGE); - if (PartitionList == NULL) { /* FIXME: show an error dialog */ @@ -2947,6 +2952,15 @@ CheckFileSystemPage(PINPUT_RECORD Ir) DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n", PartEntry->PartitionType, (*PartEntry->FileSystem ? PartEntry->FileSystem : L"n/a")); + MUIDisplayPage(CHECK_FILE_SYSTEM_PAGE); + + PartitionDescription(PartEntry, Buffer, ARRAYSIZE(Buffer)); + CONSOLE_SetTextXY(6, 10, Buffer); + + DiskDescription(PartEntry->DiskEntry, Buffer, ARRAYSIZE(Buffer)); + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), + Buffer); + /* Check the partition */ Status = DoChkdsk(PartEntry); if (Status == STATUS_NOT_SUPPORTED)

10 months, 3 weeks

[reactos] 03/06: [USETUP] Simplify partition creation UI code (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06e4f1365303dfea1c309… commit 06e4f1365303dfea1c30921dec5c37533a8b1358 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 24 22:01:45 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:39 2023 +0200 [USETUP] Simplify partition creation UI code (#5837) Unify CREATE_{PRIMARY,EXTENDED,LOGICAL}_PARTITION_PAGE (i.e. Create{Primary,Extended,Logical}PartitionPage() functions) into a single CREATE_PARTITION_PAGE (i.e. CreatePartitionPage()). A lot of code was duplicated there (display, size input, etc.) just for calling ultimately the Create{Primary,Extended,Logical}Partition() helper functions. This will also help in the future for supporting other platforms, where the concept of "primary", "extended" and "logical" partitions do not exist (basically all platforms except BIOS-based PC-AT). --- base/setup/usetup/usetup.c | 296 +++++++-------------------------------------- base/setup/usetup/usetup.h | 4 +- 2 files changed, 42 insertions(+), 258 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 7f2e07032e2..492fc9c9d05 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -74,6 +74,11 @@ static PPARTLIST PartitionList = NULL; /* Currently selected partition entry in the list */ static PPARTENTRY CurrentPartition = NULL; +static enum { + PartTypePrimary, + PartTypeExtended, + PartTypeLogical +} PartCreateType = PartTypePrimary; /* List of supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; @@ -1524,9 +1529,7 @@ IsDiskSizeValid(PPARTENTRY PartEntry) * Next pages: * SelectFileSystemPage (At once if unattended) * SelectFileSystemPage (Default if free space is selected) - * CreatePrimaryPartitionPage - * CreateExtendedPartitionPage - * CreateLogicalPartitionPage + * CreatePartitionPage * ConfirmDeleteSystemPartitionPage (if the selected partition is the system partition, aka with the boot flag set) * DeletePartitionPage * QuitPage @@ -1791,7 +1794,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - return CREATE_PRIMARY_PARTITION_PAGE; + PartCreateType = PartTypePrimary; + return CREATE_PARTITION_PAGE; } } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E') /* E */ @@ -1807,7 +1811,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - return CREATE_EXTENDED_PARTITION_PAGE; + PartCreateType = PartTypeExtended; + return CREATE_PARTITION_PAGE; } } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ @@ -1823,7 +1828,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - return CREATE_LOGICAL_PARTITION_PAGE; + PartCreateType = PartTypeLogical; + return CREATE_PARTITION_PAGE; } } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ @@ -2066,7 +2072,7 @@ ShowPartitionSizeInputBox(SHORT Left, /* - * Displays the CreatePrimaryPartitionPage. + * Displays the CreatePartitionPage. * * Next pages: * SelectPartitionPage @@ -2077,10 +2083,11 @@ ShowPartitionSizeInputBox(SHORT Left, * Number of the next page. */ static PAGE_NUMBER -CreatePrimaryPartitionPage(PINPUT_RECORD Ir) +CreatePartitionPage(PINPUT_RECORD Ir) { PPARTENTRY PartEntry; PDISKENTRY DiskEntry; + ULONG uID; BOOLEAN Quit; BOOLEAN Cancel; ULONG MaxSize; @@ -2095,126 +2102,18 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - PartEntry = CurrentPartition; - DiskEntry = CurrentPartition->DiskEntry; - - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_PARTITION)); - - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), - LineBuffer); + if (PartCreateType == PartTypePrimary) + uID = STRING_CHOOSE_NEW_PARTITION; + else if (PartCreateType == PartTypeExtended) + uID = STRING_CHOOSE_NEW_EXTENDED_PARTITION; + else // if (PartCreateType == PartTypeLogical) + uID = STRING_CHOOSE_NEW_LOGICAL_PARTITION; - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); - - CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - - PartEntry = CurrentPartition; - while (TRUE) - { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ - - if (MaxSize > PARTITION_MAXSIZE) - MaxSize = PARTITION_MAXSIZE; - - ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ - MaxSize, InputBuffer, &Quit, &Cancel); - - if (Quit) - { - if (ConfirmQuit(Ir)) - return QUIT_PAGE; - - break; - } - else if (Cancel) - { - return SELECT_PARTITION_PAGE; - } - else - { - PartSize = _wcstoui64(InputBuffer, NULL, 10); - - if (PartSize < 1) - { - /* Too small */ - continue; - } - - if (PartSize > MaxSize) - { - /* Too large */ - continue; - } - - /* Convert to bytes */ - if (PartSize == MaxSize) - { - /* Use all of the unpartitioned disk space */ - SectorCount = PartEntry->SectorCount.QuadPart; - } - else - { - /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * MB / DiskEntry->BytesPerSector; - - /* But never get larger than the unpartitioned disk space */ - if (SectorCount > PartEntry->SectorCount.QuadPart) - SectorCount = PartEntry->SectorCount.QuadPart; - } - - DPRINT ("Partition size: %I64u bytes\n", PartSize); - - CreatePrimaryPartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); - - return SELECT_PARTITION_PAGE; - } - } - - return CREATE_PRIMARY_PARTITION_PAGE; -} - - -/* - * Displays the CreateExtendedPartitionPage. - * - * Next pages: - * SelectPartitionPage (default) - * QuitPage - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -CreateExtendedPartitionPage(PINPUT_RECORD Ir) -{ - PPARTENTRY PartEntry; - PDISKENTRY DiskEntry; - BOOLEAN Quit; - BOOLEAN Cancel; - ULONG MaxSize; - ULONGLONG PartSize; - ULONGLONG SectorCount; - WCHAR InputBuffer[50]; - CHAR LineBuffer[100]; - - if (PartitionList == NULL || CurrentPartition == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } + CONSOLE_SetTextXY(6, 8, MUIGetString(uID)); PartEntry = CurrentPartition; DiskEntry = CurrentPartition->DiskEntry; - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION)); - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), LineBuffer); @@ -2223,11 +2122,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - PartEntry = CurrentPartition; while (TRUE) { MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ - if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; @@ -2238,7 +2135,6 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) { if (ConfirmQuit(Ir)) return QUIT_PAGE; - break; } else if (Cancel) @@ -2249,17 +2145,11 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) { PartSize = _wcstoui64(InputBuffer, NULL, 10); + /* Retry if too small or too large */ if (PartSize < 1) - { - /* Too small */ continue; - } - if (PartSize > MaxSize) - { - /* Too large */ continue; - } /* Convert to bytes */ if (PartSize == MaxSize) @@ -2277,130 +2167,34 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) SectorCount = PartEntry->SectorCount.QuadPart; } - DPRINT ("Partition size: %I64u bytes\n", PartSize); - - CreateExtendedPartition(PartitionList, - CurrentPartition, - SectorCount); - - return SELECT_PARTITION_PAGE; - } - } - - return CREATE_EXTENDED_PARTITION_PAGE; -} - - -/* - * Displays the CreateLogicalPartitionPage. - * - * Next pages: - * SelectFileSystemPage (default) - * QuitPage - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -CreateLogicalPartitionPage(PINPUT_RECORD Ir) -{ - PPARTENTRY PartEntry; - PDISKENTRY DiskEntry; - BOOLEAN Quit; - BOOLEAN Cancel; - ULONG MaxSize; - ULONGLONG PartSize; - ULONGLONG SectorCount; - WCHAR InputBuffer[50]; - CHAR LineBuffer[100]; - - if (PartitionList == NULL || CurrentPartition == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - PartEntry = CurrentPartition; - DiskEntry = CurrentPartition->DiskEntry; - - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION)); - - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), - LineBuffer); - - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); - - CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - - PartEntry = CurrentPartition; - while (TRUE) - { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ - - if (MaxSize > PARTITION_MAXSIZE) - MaxSize = PARTITION_MAXSIZE; - - ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ - MaxSize, InputBuffer, &Quit, &Cancel); - - if (Quit) - { - if (ConfirmQuit(Ir)) - return QUIT_PAGE; - - break; - } - else if (Cancel) - { - return SELECT_PARTITION_PAGE; - } - else - { - PartSize = _wcstoui64(InputBuffer, NULL, 10); - - if (PartSize < 1) - { - /* Too small */ - continue; - } + DPRINT("Partition size: %I64u bytes\n", PartSize); - if (PartSize > MaxSize) + if (PartCreateType == PartTypePrimary) { - /* Too large */ - continue; + CreatePrimaryPartition(PartitionList, + CurrentPartition, + SectorCount, + FALSE); } - - /* Convert to bytes */ - if (PartSize == MaxSize) + else if (PartCreateType == PartTypeExtended) { - /* Use all of the unpartitioned disk space */ - SectorCount = PartEntry->SectorCount.QuadPart; + CreateExtendedPartition(PartitionList, + CurrentPartition, + SectorCount); } - else + else // if (PartCreateType == PartTypeLogical) { - /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * MB / DiskEntry->BytesPerSector; - - /* But never get larger than the unpartitioned disk space */ - if (SectorCount > PartEntry->SectorCount.QuadPart) - SectorCount = PartEntry->SectorCount.QuadPart; + CreateLogicalPartition(PartitionList, + CurrentPartition, + SectorCount, + FALSE); } - DPRINT("Partition size: %I64u bytes\n", PartSize); - - CreateLogicalPartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); - return SELECT_PARTITION_PAGE; } } - return CREATE_LOGICAL_PARTITION_PAGE; + return CREATE_PARTITION_PAGE; } @@ -4541,16 +4335,8 @@ RunUSetup(VOID) Page = SelectPartitionPage(&Ir); break; - case CREATE_PRIMARY_PARTITION_PAGE: - Page = CreatePrimaryPartitionPage(&Ir); - break; - - case CREATE_EXTENDED_PARTITION_PAGE: - Page = CreateExtendedPartitionPage(&Ir); - break; - - case CREATE_LOGICAL_PARTITION_PAGE: - Page = CreateLogicalPartitionPage(&Ir); + case CREATE_PARTITION_PAGE: + Page = CreatePartitionPage(&Ir); break; case CONFIRM_DELETE_SYSTEM_PARTITION_PAGE: diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index bc5f9e39ae6..54f3ba771e3 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -94,9 +94,7 @@ typedef enum _PAGE_NUMBER LAYOUT_SETTINGS_PAGE, SELECT_PARTITION_PAGE, - CREATE_PRIMARY_PARTITION_PAGE, - CREATE_EXTENDED_PARTITION_PAGE, - CREATE_LOGICAL_PARTITION_PAGE, + CREATE_PARTITION_PAGE, CHANGE_SYSTEM_PARTITION, CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, DELETE_PARTITION_PAGE,

10 months, 3 weeks

[reactos] 02/06: [USETUP] Simplify display of partitions being formatted (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1899a09399c76a21f27ce… commit 1899a09399c76a21f27ceeb284d8f41190ef9c88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 24 20:15:57 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:39 2023 +0200 [USETUP] Simplify display of partitions being formatted (#5837) --- base/setup/usetup/usetup.c | 54 +++++++++++----------------------------------- 1 file changed, 13 insertions(+), 41 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f0243187454..7f2e07032e2 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2108,11 +2108,6 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); -#if 0 - CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); -#endif - CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); PartEntry = CurrentPartition; @@ -2226,11 +2221,6 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); -#if 0 - CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); -#endif - CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); PartEntry = CurrentPartition; @@ -2343,11 +2333,6 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); -#if 0 - CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); -#endif - CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); PartEntry = CurrentPartition; @@ -2489,7 +2474,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(DELETE_PARTITION_PAGE); PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, " %s", LineBuffer); + CONSOLE_SetTextXY(6, 10, LineBuffer); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), @@ -2822,20 +2807,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) if (PartEntry->AutoCreate) { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); - -#if 0 - PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_SetTextXY(8, 10, LineBuffer); -#endif - - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1), - LineBuffer); - - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); - PartEntry->AutoCreate = FALSE; + + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); } else if (PartEntry->New) { @@ -2857,24 +2831,22 @@ SelectFileSystemPage(PINPUT_RECORD Ir) ASSERT(FALSE); break; } - - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1), - LineBuffer); - - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); } else { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); + } - PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_SetTextXY(8, 10, LineBuffer); + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_SetTextXY(6, 10, LineBuffer); - DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), - LineBuffer); - } + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), + LineBuffer); + + /* Show "This Partition will be formatted next" only if it is unformatted */ + if (PartEntry->New || PartEntry->FormatState == Unformatted) + CONSOLE_SetTextXY(6, 14, MUIGetString(STRING_PARTFORMAT)); ASSERT(FileSystemList == NULL);

10 months, 3 weeks

[reactos] 01/06: [USETUP] Rename some MUI string identifiers (#5837)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d4f001084a8ef4dda4d6… commit 3d4f001084a8ef4dda4d644736105bb9d679b74d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 24 16:22:10 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:08:38 2023 +0200 [USETUP] Rename some MUI string identifiers (#5837) STRING_CHOOSENEWPARTITION --> STRING_CHOOSE_NEW_PARTITION STRING_FORMATTINGDISK --> STRING_FORMATTINGPART STRING_HDDSIZE --> STRING_HDPARTSIZE STRING_HDINFOPARTCREATE_1 --> STRING_HDDISK1 STRING_HDINFOPARTDELETE_1 --> STRING_HDDISK2 STRING_HDDINFO_{1,2} --> STRING_HDDINFO{1,2} Move STRING_NEWPARTITION just before STRING_PARTFORMAT and renumber the STRING_* identifiers. --- base/setup/usetup/format.c | 2 +- base/setup/usetup/lang/bg-BG.h | 18 +++---- base/setup/usetup/lang/bn-BD.h | 18 +++---- base/setup/usetup/lang/cs-CZ.h | 18 +++---- base/setup/usetup/lang/da-DK.h | 18 +++---- base/setup/usetup/lang/de-DE.h | 18 +++---- base/setup/usetup/lang/el-GR.h | 18 +++---- base/setup/usetup/lang/en-US.h | 18 +++---- base/setup/usetup/lang/es-ES.h | 18 +++---- base/setup/usetup/lang/et-EE.h | 18 +++---- base/setup/usetup/lang/eu-ES.h | 18 +++---- base/setup/usetup/lang/fr-FR.h | 18 +++---- base/setup/usetup/lang/he-IL.h | 18 +++---- base/setup/usetup/lang/hr-HR.h | 18 +++---- base/setup/usetup/lang/hu-HU.h | 18 +++---- base/setup/usetup/lang/id-ID.h | 18 +++---- base/setup/usetup/lang/it-IT.h | 18 +++---- base/setup/usetup/lang/ja-JP.h | 18 +++---- base/setup/usetup/lang/lt-LT.h | 18 +++---- base/setup/usetup/lang/ms-MY.h | 18 +++---- base/setup/usetup/lang/nl-NL.h | 18 +++---- base/setup/usetup/lang/pl-PL.h | 18 +++---- base/setup/usetup/lang/pt-BR.h | 18 +++---- base/setup/usetup/lang/pt-PT.h | 18 +++---- base/setup/usetup/lang/ro-RO.h | 18 +++---- base/setup/usetup/lang/ru-RU.h | 18 +++---- base/setup/usetup/lang/sk-SK.h | 18 +++---- base/setup/usetup/lang/sq-AL.h | 18 +++---- base/setup/usetup/lang/sv-SE.h | 18 +++---- base/setup/usetup/lang/tr-TR.h | 18 +++---- base/setup/usetup/lang/uk-UA.h | 18 +++---- base/setup/usetup/mui.h | 114 ++++++++++++++++++++--------------------- base/setup/usetup/partlist.c | 4 +- base/setup/usetup/usetup.c | 24 ++++----- 34 files changed, 342 insertions(+), 342 deletions(-) diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index cc0603ed07b..21d4d1f87d5 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -103,7 +103,7 @@ DoFormat( 10, 24, TRUE, - MUIGetString(STRING_FORMATTINGDISK)); + MUIGetString(STRING_FORMATTINGPART)); ProgressSetStepCount(FormatProgressBar, 100); diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 8537ccdf490..f7150ddcaa9 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -2253,16 +2253,18 @@ MUI_STRING bgBGStrings[] = " D = \210\247\342\340\250\251 \244\357\253 F3 = \210\247\345\256\244"}, {STRING_PARTITIONSIZE, "\220\240\247\254\245\340 \255\240 \255\256\242\250\357 \244\357\253:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "\210\247\241\340\240\253\250 \341\342\245 \244\240 \341\352\247\244\240\244\245\342\245 \255\256\242 \257\352\340\342\250\350\245\255 \244\357\253 \255\240"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\210\247\241\340\240\253\250 \341\342\245 \244\240 \341\352\247\244\240\244\245\342\245 \340\240\247\350\250\340\250\342\245\253\245\255 \244\357\253 \255\240"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "\210\247\241\340\240\253\250 \341\342\245 \244\240 \341\352\247\244\240\244\245\342\245 \253\256\243\250\347\245\341\252\250 \244\357\253 \255\240"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "\202\352\242\245\244\245\342\245 \340\240\247\254\245\340\240 \255\240 \255\256\242\250\357 \244\357\253 (\242 \254\245\243\240\241\240\251\342\250)."}, {STRING_CREATEPARTITION, " ENTER = \221\352\247\244\240\242\240\255\245 \255\240 \244\357\253 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244"}, + {STRING_NEWPARTITION, + "\201\245 \341\352\247\244\240\244\245\255 \255\256\242 \244\357\253 \255\240"}, {STRING_PARTFORMAT, "\217\340\245\244\341\342\256\250 \344\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240."}, {STRING_NONFORMATTEDPART, @@ -2313,7 +2315,7 @@ MUI_STRING bgBGStrings[] = "\222\256\242\240 \341\245 \341\253\343\347\242\240 \255\240\251- \347\245\341\342\256 \257\340\250 \343\257\256\342\340\245\241\240 \255\240 USB \252\253\240\242\250\240\342\343\340\240\r\n"}, {STRING_CONSOLEFAIL3, "\217\256\244\244\340\352\246\252\240\342\240 \255\240 USB \245 \242\341\245 \256\351\245 \255\245\257\352\253\255\240\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\250\341\252\240"}, {STRING_CHECKINGDISK, "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240"}, @@ -2323,20 +2325,18 @@ MUI_STRING bgBGStrings[] = " \224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240 \252\240\342\256 %S \344\240\251\253\256\242\240 \341\250\341\342\245\254\240 "}, {STRING_KEEPFORMAT, " \207\240\257\240\247\242\240\255\245 \255\240 \344\240\251\253\256\242\240\342\240 \341\250\341\342\245\254\240 (\241\245\247 \257\340\256\254\245\255\250) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "\255\240: %s."}, {STRING_PARTTYPE, "\242\250\244 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s), \210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu (%wZ) [%s]" "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s), \210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu [%s]" "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\201\245 \341\352\247\244\240\244\245\255 \255\256\242 \244\357\253 \255\240"}, {STRING_UNPSPACE, "\215\245\247\240\244\245\253\245\255\256 \257\340\256\341\342\340\240\255\341\342\242\256"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index ba42c1a058f..a8ece049194 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -2227,16 +2227,18 @@ MUI_STRING bnBDStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, {STRING_PARTFORMAT, "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, @@ -2287,7 +2289,7 @@ MUI_STRING bnBDStrings[] = "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, "Setup is checking your disk"}, @@ -2297,20 +2299,18 @@ MUI_STRING bnBDStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, "Unpartitioned space"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 9b8092616c1..e185fa42208 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -2235,16 +2235,18 @@ MUI_STRING csCZStrings[] = " D = Odstranit odd\241l F3 = Ukon\237it"}, {STRING_PARTITIONSIZE, "Velikost nov\202ho odd\241lu:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Zvolili jste vytvo\375en\241 nov\202ho prim\240rn\241ho odd\241lu na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Zvolili jste vytvo\375en\241 nov\202ho roz\347\241\375en\202ho odd\241lu na"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Zvolili jste vytvo\375en\241 nov\202ho logick\202ho odd\241lu na"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Zadejte velikost nov\202ho odd\241lu v megabajtech."}, {STRING_CREATEPARTITION, " ENTER = Vytvo\375it odd\241l ESC = Zru\347it F3 = Ukon\237it"}, + {STRING_NEWPARTITION, + "Instalace vytvo\375ila nov\354 odd\241l na"}, {STRING_PARTFORMAT, "Tento odd\241l bude zform\240tov\240n."}, {STRING_NONFORMATTEDPART, @@ -2295,7 +2297,7 @@ MUI_STRING csCZStrings[] = "Nejb\330\247n\330j\347\241 p\375\241\237inou je pou\247\241v\240n\241 USB kl\240vesnice\r\n"}, {STRING_CONSOLEFAIL3, "USB kl\240vesnice zat\241m nejsou pln\330 podporov\240ny\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Instalace form\240tuje disk"}, {STRING_CHECKINGDISK, "Instalace kontroluje disk"}, @@ -2305,20 +2307,18 @@ MUI_STRING csCZStrings[] = " Zform\240tovat odd\241l na souborov\354 syst\202m %S "}, {STRING_KEEPFORMAT, " Ponechat sou\237asn\354 souborov\354 syst\202m (bez zm\330ny) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "na: %s."}, {STRING_PARTTYPE, "Typ 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Instalace vytvo\375ila nov\354 odd\241l na"}, {STRING_UNPSPACE, "M\241sto bez odd\241l\205"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 8485e176eb2..ab95b478df8 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -2237,16 +2237,18 @@ MUI_STRING daDKStrings[] = " D = Slet partition F3 = Afslut"}, {STRING_PARTITIONSIZE, "St\233rrelse p\206 den nye partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Du har valge at lave en ny prim\221r partition p\206"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Du har valgt at lave en ny udviddet partition p\206"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Du har valge at lave en ny logisk partition p\206"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Indtast st\233rrelsen p\206 den nye partition i megabytes."}, {STRING_CREATEPARTITION, " ENTER = Lav partition ESC = Annuller F3 = Afslut"}, + {STRING_NEWPARTITION, + "Installationen har lavet en ny partition p\206"}, {STRING_PARTFORMAT, "Denne partition vil blive formateret som det n\221ste."}, {STRING_NONFORMATTEDPART, @@ -2297,7 +2299,7 @@ MUI_STRING daDKStrings[] = "Dette skykdes ofte at du bruger et USB-tastatur\r\n"}, {STRING_CONSOLEFAIL3, "USB-tastatuere er endnu ikke fuldt underst\233ttet\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Installationen formatere din disk"}, {STRING_CHECKINGDISK, "Installationen tjekker din disk"}, @@ -2307,20 +2309,18 @@ MUI_STRING daDKStrings[] = " Formater partitionen som %S-filesystemet "}, {STRING_KEEPFORMAT, " Behold nuv\221rende filsystem (ingen \221ndringer) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "p\206 %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Installationen har lavet en ny partition p\206"}, {STRING_UNPSPACE, "Upartitioneret plads"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 0d095400c67..3834815ea04 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -2239,16 +2239,18 @@ MUI_STRING deDEStrings[] = " D = Partition l\224schen F3 = Installation abbrechen"}, {STRING_PARTITIONSIZE, "Gr\224\341e der neuen Partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Eine prim\204re Partition soll hier erstellt werden:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Eine erweiterte Partition soll hier erstellt werden:"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Ein logisches Laufwerk soll hier erstellt werden:"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, " ENTER = Partition erstellen ESC = Abbrechen F3 = Installation abbrechen"}, + {STRING_NEWPARTITION, + "Setup erstellte eine neue Partition auf"}, {STRING_PARTFORMAT, "Diese Partition wird als n\204chstes formatiert."}, {STRING_NONFORMATTEDPART, @@ -2299,7 +2301,7 @@ MUI_STRING deDEStrings[] = "Der h\204ufigste Grund hierf\201r ist die Verwendung einer USB-Tastatur\r\n"}, {STRING_CONSOLEFAIL3, "USB-Tastaturen werden noch nicht vollst\204ndig unterst\201tzt\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Ihre Festplatte wird formatiert"}, {STRING_CHECKINGDISK, "Ihre Festplatte wird \201berpr\201ft"}, @@ -2309,20 +2311,18 @@ MUI_STRING deDEStrings[] = " Partition mit dem %S-Dateisystem formatieren "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Ver\204nderungen) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "auf %s."}, {STRING_PARTTYPE, "Typ 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup erstellte eine neue Partition auf"}, {STRING_UNPSPACE, "Unpartitionierter Speicher"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 401f7ae16fc..6e092a920c7 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -2251,17 +2251,19 @@ MUI_STRING elGRStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "\213\342\232\234\237\246\252 \253\246\254 \244\342\246\254 partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "��⥘�� 㩜�� ⤘ �� partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "\217\230\250\230\241\230\242\351 \233\351\251\253\234 \253\246 \243\342\232\234\237\246\252 \253\246\254 partition \251\234 megabytes."}, {STRING_CREATEPARTITION, " ENTER = \203\236\243\240\246\254\250\232\345\230 Partition ESC = \200\241\347\250\340\251\236 F3 = \200\247\246\256\351\250\236\251\236"}, + {STRING_NEWPARTITION, + "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\236\243\240\246\347\250\232\236\251\234 \342\244\230 \244\342\246 partition \251\253\246"}, {STRING_PARTFORMAT, "\200\254\253\346 \253\246 Partition \237\230 \233\240\230\243\246\250\255\340\237\234\345 \243\234\253\341."}, {STRING_NONFORMATTEDPART, @@ -2312,7 +2314,7 @@ MUI_STRING elGRStrings[] = "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, "\222\230 USB \247\242\236\241\253\250\246\242\346\232\240\230 \233\234\244 \234\345\244\230\240 \247\242\343\250\340\252 \254\247\246\251\253\236\250\240\235\346\243\234\244\230 \230\241\346\243\230\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\240\230\243\246\250\255\351\244\234\240 \253\246 \233\345\251\241\246 \251\230\252"}, {STRING_CHECKINGDISK, "\206 \234\232\241\230\253\341\251\253\230\251\236 \234\242\342\232\256\234\240 \253\246 \233\345\251\241\246 \251\230\252"}, @@ -2322,20 +2324,18 @@ MUI_STRING elGRStrings[] = " \203\240\230\243\346\250\255\340\251\236 \253\246\254 partition \340\252 %S \251\347\251\253\236\243\230 \230\250\256\234\345\340\244 "}, {STRING_KEEPFORMAT, " \214\230 \247\230\250\230\243\234\345\244\234\240 \253\246 \251\347\251\253\236\243\230 \230\250\256\234\345\340\244 \340\252 \342\256\234\240 (\241\230\243\345\230 \230\242\242\230\232\343) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "\251\253\246: %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\236\243\240\246\347\250\232\236\251\234 \342\244\230 \244\342\246 partition \251\253\246"}, {STRING_UNPSPACE, "Unpartitioned space"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 3354212a0a2..ae23370e7fa 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -2227,16 +2227,18 @@ MUI_STRING enUSStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, {STRING_PARTFORMAT, "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, @@ -2287,7 +2289,7 @@ MUI_STRING enUSStrings[] = "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, "Setup is checking your disk"}, @@ -2297,20 +2299,18 @@ MUI_STRING enUSStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, "Unpartitioned space"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 6f588779e21..77e54c61860 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -2240,16 +2240,18 @@ MUI_STRING esESStrings[] = " INTRO = Instalar D = Eliminar partici\242n F3 = Salir"}, {STRING_PARTITIONSIZE, "Tama\244o de la nueva Partici\242n:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Ha elegido crear una nueva Partici\242n Primaria en"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Ha elegido crear una nueva Partici\242n Extendida en"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Ha elegido crear una nueva Partici\242n L\242gica en"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Escriba el tama\244o de la nueva Partici\242n en megabytes."}, {STRING_CREATEPARTITION, " INTRO = Crear Partici\242n ESC = Cancelar F3 = Salir"}, + {STRING_NEWPARTITION, + "El instalador ha creado una nueva Partici\242n en"}, {STRING_PARTFORMAT, "A continuaci\242n se formatear\240 esta partici\242n."}, {STRING_NONFORMATTEDPART, @@ -2300,7 +2302,7 @@ MUI_STRING esESStrings[] = "La causa m\240s com\243n es la utilizaci\242n de un teclado USB\r\n"}, {STRING_CONSOLEFAIL3, "Todav\241a no hay soporte del todo para los teclados USB\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "El instalador est\240 formateando el disco"}, {STRING_CHECKINGDISK, "El instalador est\240 verificando el disco"}, @@ -2310,20 +2312,18 @@ MUI_STRING esESStrings[] = " Formatear la partici\242n con sistema de archivos %S "}, {STRING_KEEPFORMAT, " Mantener el sistema de archivos actual (sin cambios) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "en %s."}, {STRING_PARTTYPE, "Tipo 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "El instalador ha creado una nueva Partici\242n en"}, {STRING_UNPSPACE, "Espacio sin particionar"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 881f99de721..9e78d2b53c1 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -2228,17 +2228,19 @@ MUI_STRING etEEStrings[] = " D = Kustuta partitsioon F3 = V\204lju"}, {STRING_PARTITIONSIZE, "Uue partitsiooni suurus:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "Oled valinud kettale uue partitsiooni loomise"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Sisesta uue partitsiooni suurus megabaitides."}, {STRING_CREATEPARTITION, " ENTER = Loo partitsioon ESC = Katkesta F3 = V\204lju"}, + {STRING_NEWPARTITION, + "Loodi uus partitsioon"}, {STRING_PARTFORMAT, "J\204rgmisena vormindatakse seda partitsiooni."}, {STRING_NONFORMATTEDPART, @@ -2289,7 +2291,7 @@ MUI_STRING etEEStrings[] = "T\344en\204oliselt on probleem USB klaviatuuri kasutamises\r\n"}, {STRING_CONSOLEFAIL3, "USB klaviatuurid ei ole veel toetatud\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "K\344vaketta vormindamine"}, {STRING_CHECKINGDISK, "K\344vaketta kontrollimine"}, @@ -2299,20 +2301,18 @@ MUI_STRING etEEStrings[] = " Vorminda partitsioon %S failis\201steemiga "}, {STRING_KEEPFORMAT, " \216ra muuda praegust failis\201steemi "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "%s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]" "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu [%s]" "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Loodi uus partitsioon"}, {STRING_UNPSPACE, "Kasutamata kettaruum"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 0c2688a9d8e..b225211ebcf 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -2235,16 +2235,18 @@ MUI_STRING euESStrings[] = " D = Ezabatu Partitioa F3 = Irten"}, {STRING_PARTITIONSIZE, "Partizio berriaren tamainu:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Zu aukeratu duzu partizio nagusia sortu barruan"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Zu aukeratu duzu partizio luzatuta sortu barruan"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Zu aukeratu duzu partizio logika sortu barruan"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Mezedez osatu tamainua megabytes-en."}, {STRING_CREATEPARTITION, " SARTU = Sortu Partizioa ESC = Utzi F3 = Irten"}, + {STRING_NEWPARTITION, + "Instalazioa sortu du partizio berria barruan"}, {STRING_PARTFORMAT, "Partizio hau izango da formatuta gero."}, {STRING_NONFORMATTEDPART, @@ -2295,7 +2297,7 @@ MUI_STRING euESStrings[] = "Kausa arruntak da USB teklatua erabili\r\n"}, {STRING_CONSOLEFAIL3, "USB teklatua ez dago oraindik osoan euskarri\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Instalazioa zure disko formateatzen ari da"}, {STRING_CHECKINGDISK, "Instalazioa zure disko ikusten ari da"}, @@ -2305,20 +2307,18 @@ MUI_STRING euESStrings[] = " Formatu partizioa %S sistemaren fitxategia "}, {STRING_KEEPFORMAT, " Mantendu sistemaren fitxategia (aldaketarik ez) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "%s."}, {STRING_PARTTYPE, "Mota 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Instalazioa sortu du partizio berria barruan"}, {STRING_UNPSPACE, "Ezpartizionatu espazio"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 4c8d04461f7..77c51003330 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -2264,16 +2264,18 @@ MUI_STRING frFRStrings[] = " D = Supprimer partition F3 = Quitter"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Vous avez choisi de cr\202er une partition primaire sur"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Vous avez choisi de cr\202er une partition \202tendue sur"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Vous avez choisi de cr\202er une partition logique sur"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Veuillez entrer la taille de la nouvelle partition en m\202gaoctets."}, {STRING_CREATEPARTITION, " ENTR\220E = Cr\202er partition \220CHAP = Annuler F3 = Quitter"}, + {STRING_NEWPARTITION, + "Setup a cr\202\202 une nouvelle partition sur"}, {STRING_PARTFORMAT, "Cette partition sera ensuite format\202e."}, {STRING_NONFORMATTEDPART, @@ -2324,7 +2326,7 @@ MUI_STRING frFRStrings[] = "La cause probable est l'utilisation d'un clavier USB\r\n"}, {STRING_CONSOLEFAIL3, "Les claviers USB ne sont pas compl\212tement support\202s actuellement\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup formate votre disque"}, {STRING_CHECKINGDISK, "Setup v\202rifie votre disque"}, @@ -2334,20 +2336,18 @@ MUI_STRING frFRStrings[] = " Formater la partition comme syst\212me de fichiers %S "}, {STRING_KEEPFORMAT, " Garder le syst\212me de fichiers courant (pas de changements) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "sur le %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup a cr\202\202 une nouvelle partition sur"}, {STRING_UNPSPACE, "Espace non partitionn\202"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index d0b6b7a5fda..6b644999fc8 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -2229,16 +2229,18 @@ MUI_STRING heILStrings[] = " \204\220\227\232\204 \214\205\210\211\201 = F3 \204\226\211\207\216 \227\207\216 = D"}, {STRING_PARTITIONSIZE, ":\204\231\203\207 \204\226\211\207\216 \214\231 \214\203\205\202"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "\214\222 \232\211\230\227\211\222 \204\226\211\207\216 \230\205\226\211\214 \232\230\207\201"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\214\222 \232\201\207\230\205\216 \204\226\211\207\216 \230\205\226\211\214 \232\230\207\201"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "\214\222 \232\211\202\205\214 \204\226\211\207\216 \230\205\226\211\214 \232\230\207\201"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, ".\215\211\232\201-\204\202\216\201 \204\231\203\207\204 \204\226\211\207\216\204 \214\231 \214\203\205\202\204 \232\200 \203\214\227\204 \204\231\227\201\201"}, {STRING_CREATEPARTITION, " \204\220\227\232\204 \214\205\210\211\201 = F3 \214\205\210\211\201 = ESC \204\226\211\207\216 \230\205\226 = ENTER"}, + {STRING_NEWPARTITION, + "\214\222 \204\231\203\207 \204\226\211\207\216 \204\230\226\211 \204\220\227\232\204\204 \232\211\220\213\232"}, {STRING_PARTFORMAT, ".\212\231\216\204\201 \214\207\232\205\200\232 \232\200\206\204 \204\226\211\207\216\204"}, {STRING_NONFORMATTEDPART, @@ -2289,7 +2291,7 @@ MUI_STRING heILStrings[] = "USB \232\203\214\227\216\201 \231\205\216\211\231 \200\205\204 \204\206 \214\231 \204\226\205\224\220 \211\213\204 \204\201\211\221\204\r\n"}, {STRING_CONSOLEFAIL3, "\200\214\216 \217\224\205\200\201 \232\205\213\216\232\220 \200\214 \217\211\211\203\222 USB \232\205\203\214\227\216\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\217\220\205\213\204 \232\200 \232\214\207\232\200\216 \204\220\227\232\204\204 \232\211\220\213\232"}, {STRING_CHECKINGDISK, "\217\220\205\213\204 \232\200 \232\227\203\205\201 \204\220\227\232\204\204 \232\211\220\213\232"}, @@ -2299,20 +2301,18 @@ MUI_STRING heILStrings[] = " %S \215\211\226\201\227 \232\213\230\222\216 \215\222 \204\226\211\207\216 \214\205\207\232\200 "}, {STRING_KEEPFORMAT, " (\211\205\220\211\231 \200\214\214( \232\211\207\213\205\220 \215\211\226\201\227 \232\213\230\222\216 \232\230\200\231\204 "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\214\222 \204\231\203\207 \204\226\211\207\216 \204\230\226\211 \204\220\227\232\204\204 \232\211\220\213\232"}, {STRING_UNPSPACE, "Unpartitioned space"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index 798cd0738ee..9f0c2bd47d8 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -2258,16 +2258,18 @@ MUI_STRING hrHRStrings[] = " D = Izbri\347i particiju F3 = Iza\320i"}, {STRING_PARTITIONSIZE, "Veli\237ina nove particije:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Odabrali ste stvoriti primarnu particiju na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Odabrali ste stvoriti pro\347irenu particiju na"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Odabrali ste stvoriti logi\237ku particiju na"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Molimo da unesite veli\237inu nove particije u MB."}, {STRING_CREATEPARTITION, " ENTER = Stvori particiju ESC = Odustani F3 = Iza\320i"}, + {STRING_NEWPARTITION, + "Instalacijski program je stvorio novu particiju na"}, {STRING_PARTFORMAT, "Ova \206e particija biti sljede\206a formatirana."}, {STRING_NONFORMATTEDPART, @@ -2318,7 +2320,7 @@ MUI_STRING hrHRStrings[] = "Naj\237e\347\206i uzrok tome je kori\347tenje USB tipkovnice\r\n"}, {STRING_CONSOLEFAIL3, "USB tipkovnice nisu jo\347 potupuno podr\247ane\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Instalacijski program formatira va\347 disk"}, {STRING_CHECKINGDISK, "Instalacijski sustav provjerava va\347 disk"}, @@ -2328,20 +2330,18 @@ MUI_STRING hrHRStrings[] = " Formatiraj particiju kao %S sustav datoteka "}, {STRING_KEEPFORMAT, " \254uvaj trenutni sustav datoteka (bez promjene) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "na %s."}, {STRING_PARTTYPE, "Vrsta 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Instalacijski program je stvorio novu particiju na"}, {STRING_UNPSPACE, "neparticiranom prostoru"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 84a5335e7d5..cb913f4b792 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -2125,16 +2125,18 @@ MUI_STRING huHUStrings[] = " D = Part\241ci\242 t\224rl\202se F3 = Kil\202p\202s"}, {STRING_PARTITIONSIZE, "Az \243j part\241ci\242 m\202rete:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Egy els\213dleges part\241ci\242 l\202trehoz\240s\240t v\240lasztotta itt:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Egy kiterjesztett part\241ci\242 l\202trehoz\240s\240t v\240lasztotta itt:"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Egy logikai part\241ci\242 l\202trehoz\240s\240t v\240lasztotta itt:"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "K\202rem \241rja be az \243j part\241ci\242 m\202ret\202t megab\240jtban."}, {STRING_CREATEPARTITION, " ENTER = Part\241ci\242 l\202trehoz\240sa ESC = M\202gse F3 = Kil\202p\202s"}, + {STRING_NEWPARTITION, + "A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"}, {STRING_PARTFORMAT, "K\224vetkez\213 l\202p\202sk\202nt ez a part\241ci\242 form\240zva lesz."}, {STRING_NONFORMATTEDPART, @@ -2185,7 +2187,7 @@ MUI_STRING huHUStrings[] = "Ennek leggyakoribb oka az USB-s billenty\373zet haszn\240lata\r\n"}, {STRING_CONSOLEFAIL3, "Az USB-s billenty\373zetek m\202g nincsenek teljesen t\240mogatva\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "A telep\241t\213 form\240zza a merevlemezt"}, {STRING_CHECKINGDISK, "A telep\241t\213 ellen\213rzi a merevlemezt"}, @@ -2195,20 +2197,18 @@ MUI_STRING huHUStrings[] = " Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel "}, {STRING_KEEPFORMAT, " Jelenlegi f\240jlrendszer megtart\240sa (nincs v\240ltoztat\240s) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "itt: %s."}, {STRING_PARTTYPE, "T\241pus 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"}, {STRING_UNPSPACE, "Nem particion\240lt ter\201let"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 676284f7f67..1bd19e8a23e 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -2234,16 +2234,18 @@ MUI_STRING idIDStrings[] = " D = Hapus Partisi F3 = Keluar"}, {STRING_PARTITIONSIZE, "Ukuran partisi baru:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Anda telah memilih untuk membuat partisi primary pada"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Anda telah memilih untuk membuat partisi extended pada"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Anda telah memilih untuk membuat partisi logical pada"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Mohon masukkan ukuran pada partisi baru dalam bentuk megabyte."}, {STRING_CREATEPARTITION, " ENTER = Buat Partisi ESC = Batal F3 = Keluar"}, + {STRING_NEWPARTITION, + "Penyetelan membuat partisi baru pada"}, {STRING_PARTFORMAT, "Partisi ini selanjutnya akan diformat."}, {STRING_NONFORMATTEDPART, @@ -2294,7 +2296,7 @@ MUI_STRING idIDStrings[] = "Secara umum penyebab dari ini adalah menggunakan papan ketik USB\r\n"}, {STRING_CONSOLEFAIL3, "Papan ketik USB belum didukung sepenuhnya\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Penyetelan sedang memformat cakram anda"}, {STRING_CHECKINGDISK, "Penyetelan sedang memeriksa cakram anda"}, @@ -2304,20 +2306,18 @@ MUI_STRING idIDStrings[] = " Format partisi sebagai sistem berkas %S "}, {STRING_KEEPFORMAT, " Tetapkan sistem berkas seperti ini (tanpa perubahan) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "pada %s."}, {STRING_PARTTYPE, "Jenis 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Penyetelan membuat partisi baru pada"}, {STRING_UNPSPACE, "Ukuran yang belum dipartisi"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 8561f381f08..de6aa5c6533 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -2240,16 +2240,18 @@ MUI_STRING itITStrings[] = " D = Elimina Partizione F3 = Esci"}, {STRING_PARTITIONSIZE, "Dimensione nuova partizione:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Si \x8A scelto di creare una nuova partizione primaria su"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Si \x8A scelto di creare una nuova partizione estesa su"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Si \x8A scelto di creare una nuova partizione logica su"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Indicare la dimensione della nuova partizione in megabyte."}, {STRING_CREATEPARTITION, " INVIO = Creare la partizione ESC = Annulla F3 = Esci"}, + {STRING_NEWPARTITION, + "Setup ha creato una nuova partizione su"}, {STRING_PARTFORMAT, "Questa partizione sar\x85 formattata successivamente."}, {STRING_NONFORMATTEDPART, @@ -2300,7 +2302,7 @@ MUI_STRING itITStrings[] = "La causa pi\x97 frequente di questo \x8A l'uso di una tastiera USB\r\n"}, {STRING_CONSOLEFAIL3, "le tastiere USB non sono ancora completamente supportate\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup sta formattando il disco"}, {STRING_CHECKINGDISK, "Setup sta controllando il disco"}, @@ -2310,20 +2312,18 @@ MUI_STRING itITStrings[] = " Formatta la partizione con file system %S "}, {STRING_KEEPFORMAT, " Mantieni il file system attuale (nessuna modifica) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "su %s."}, {STRING_PARTTYPE, "Tipo 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup ha creato una nuova partizione su"}, {STRING_UNPSPACE, "Spazio non partizionato"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 86ba2f45f9b..7c07986a819 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -2238,17 +2238,19 @@ MUI_STRING jaJPStrings[] = " D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_PARTITIONSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336:"}, - {STRING_CHOOSENEWPARTITION, + {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, "\333\335\330 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336\246 \322\266\336\312\336\262\304 \300\335\262\303\336 \306\255\263\330\256\270 \274\303\270\300\336\273\262\241"}, {STRING_CREATEPARTITION, " ENTER = \312\337\260\303\250\274\256\335 \273\270\276\262 ESC = \267\254\335\276\331 F3 = \301\255\263\274"}, + {STRING_NEWPARTITION, + "\276\257\304\261\257\314\337\312 \261\300\327\274\262 \312\337\260\303\250\274\256\335\246 \302\267\336\306 \273\270\276\262\274\317\274\300:"}, {STRING_PARTFORMAT, "\272\311 \312\337\260\303\250\274\256\335\312 \302\267\336\311 \303\274\336\255\335\303\336 \314\253\260\317\257\304 \273\332\317\275\241"}, {STRING_NONFORMATTEDPART, @@ -2299,7 +2301,7 @@ MUI_STRING jaJPStrings[] = "\262\257\312\337\335\303\267\305 \271\336\335\262\335 \304\274\303 USB \267\260\316\336\260\304\336 \246 \302\266\257\303 \262\331\272\304\266\336 \266\335\266\336\264\327\332 \317\275\r\n"}, {STRING_CONSOLEFAIL3, "USB \267\260\316\336\260\304\336 \312 \317\300\336 \266\335\276\336\335\306 \273\316\337\260\304 \273\332\303 \262\317\276\335\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \314\253\260\317\257\304 \274\303\262\317\275"}, {STRING_CHECKINGDISK, "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \271\335\273 \274\303\262\317\275\241"}, @@ -2309,20 +2311,18 @@ MUI_STRING jaJPStrings[] = " \312\337\260\303\250\274\256\335\246 %S \314\247\262\331 \274\275\303\321 \303\336\314\253\260\317\257\304 "}, {STRING_KEEPFORMAT, " \271\336\335\273\336\262\311 \314\247\262\331 \274\275\303\321\311 \317\317 (\315\335\272\263 \274\305\262) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "\274\255\331\262 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu, \312\336\275=%hu, Id=%hu (%wZ) [%s]" "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu, \312\336\275=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu, \312\336\275=%hu, Id=%hu [%s]" "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu, \312\336\275=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\276\257\304\261\257\314\337\312 \261\300\327\274\262 \312\337\260\303\250\274\256\335\246 \302\267\336\306 \273\270\276\262\274\317\274\300:"}, {STRING_UNPSPACE, "\320\314\336\335\266\302\311 \275\315\337\260\275"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 5e98513d4b8..345c60d450c 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -2238,16 +2238,18 @@ MUI_STRING ltLTStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, {STRING_PARTFORMAT, "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, @@ -2298,7 +2300,7 @@ MUI_STRING ltLTStrings[] = "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, "USB keyboards are not fully supported yet\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, "Setup is checking your disk"}, @@ -2308,20 +2310,18 @@ MUI_STRING ltLTStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, "Unpartitioned space"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 50b6aba84f5..0384a3fc4ef 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -2219,16 +2219,18 @@ MUI_STRING msMYStrings[] = " D = Menghapuskan Partition F3 = Keluar"}, {STRING_PARTITIONSIZE, "Saiz partition yang baru:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Anda telah memilih untuk mencipta partition yang utama padanya"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Anda telah memilih untuk mencipta partition yang lanjut padanya"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Anda telah memilih untuk mencipta partition yang logik padanya"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Sila masukkan saiz partition yang baru dalam megabait."}, {STRING_CREATEPARTITION, " ENTER = Mencipta Partition ESC = Batalkan F3 = Keluar"}, + {STRING_NEWPARTITION, + "Persediaan yang dicipta partition yang baru di"}, {STRING_PARTFORMAT, "Partition ini akan diformat seterusnya."}, {STRING_NONFORMATTEDPART, @@ -2279,7 +2281,7 @@ MUI_STRING msMYStrings[] = "Punca paling biasa ini menggunakan papan kekunci yang USB\r\n"}, {STRING_CONSOLEFAIL3, "Papan kekunci USB tidak disokong sepenuhnya lagi\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Persediaan sedang format cakera"}, {STRING_CHECKINGDISK, "Persediaan sedang menyemak cakera"}, @@ -2289,20 +2291,18 @@ MUI_STRING msMYStrings[] = " Format partition seperti sistem fail %S "}, {STRING_KEEPFORMAT, " Memastikan sistem fail semasa (tiada perubahan) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Persediaan yang dicipta partition yang baru di"}, {STRING_UNPSPACE, "Ruang unpartitioned"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index b007421627b..c2f994ac24b 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -2260,17 +2260,19 @@ MUI_STRING nlNLStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Grootte nieuwe partitie:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "U wilt een nieuwe partitie aanmaken op"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Voert u de grootte van de nieuwe partitie in in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Partitie Aanmaken ESC = Annuleren F3 = Afsluiten"}, + {STRING_NEWPARTITION, + "Setup heeft een nieuwe partitie aangemaakt op"}, {STRING_PARTFORMAT, "Deze partitie zal vervolgens geformatteerd worden."}, {STRING_NONFORMATTEDPART, @@ -2321,7 +2323,7 @@ MUI_STRING nlNLStrings[] = "De meest voorkomende oorzaak is het gebruik van een USB toetsenbord.\r\n"}, {STRING_CONSOLEFAIL3, "USB toetsenborden worden nog niet volledig ondersteund.\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup is de vaste schijf aan het formatteren."}, {STRING_CHECKINGDISK, "Setup is de vaste schijf aan het controleren."}, @@ -2331,20 +2333,18 @@ MUI_STRING nlNLStrings[] = " Formatteer partitie als %S bestandssysteem "}, {STRING_KEEPFORMAT, " Behoud huidig bestandssysteem (geen wijzigingen) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "op %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup heeft een nieuwe partitie aangemaakt op"}, {STRING_UNPSPACE, "Niet gepartitioneerde ruimte"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 2c1407ec554..2c616e1bc59 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -2246,16 +2246,18 @@ MUI_STRING plPLStrings[] = " D = Usuni\251cie partycji F3 = Wyj\230cie"}, {STRING_PARTITIONSIZE, "Rozmiar nowej partycji:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Wybrane: utworzenie nowej partycji podstawowej na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Wybrane: utworzenie nowej partycji rozszerzonej na"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Wybrane: utworzenie nowej partycji logicznej na"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Prosz\251 wprowadzi\206 rozmiar nowej partycji w megabajtach."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie partycji ESC = Anulowanie F3 = Wyj\230cie"}, + {STRING_NEWPARTITION, + "Instalator utworzy\210 now\245 partycj\251"}, {STRING_PARTFORMAT, "Nast\251puj\245ca partycja zostanie sformatowana."}, {STRING_NONFORMATTEDPART, @@ -2306,7 +2308,7 @@ MUI_STRING plPLStrings[] = "Najcz\251stsz\245 tego przyczyn\245 jest u\276ycie klawiatury USB.\r\n"}, {STRING_CONSOLEFAIL3, "Nie s\245 obecnie w pe\210ni obs\210ugiwane.\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Instalator formatuje tw\242j dysk"}, {STRING_CHECKINGDISK, "Instalator sprawdza tw\242j dysk"}, @@ -2316,20 +2318,18 @@ MUI_STRING plPLStrings[] = " Formatuj partycj\251 w systemie plik\242w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik\242w (bez zmian) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "na: %s."}, {STRING_PARTTYPE, "Typ 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu [%s]" "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Instalator utworzy\210 now\245 partycj\251"}, {STRING_UNPSPACE, "Miejsce poza partycjami"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index b4d5b5a448b..bc897c1d224 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -2273,17 +2273,19 @@ MUI_STRING ptBRStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Tamanho da nova parti\207\306o:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "Voc� solicitou a cria��o de uma nova parti��o em"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Por favor, insira o tamanho da nova parti\207\306o em megabytes (MB)."}, {STRING_CREATEPARTITION, " ENTER=Criar parti\207\306o ESC=Cancelar F3=Sair"}, + {STRING_NEWPARTITION, + "O instalador criou uma nova parti\207\306o em"}, {STRING_PARTFORMAT, "Esta parti\207\306o ser\240 formatada logo em seguida."}, {STRING_NONFORMATTEDPART, @@ -2334,7 +2336,7 @@ MUI_STRING ptBRStrings[] = "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"}, {STRING_CONSOLEFAIL3, "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "O instalador est\240 formatando o disco"}, {STRING_CHECKINGDISK, "O instalador est\240 verificando o disco"}, @@ -2344,20 +2346,18 @@ MUI_STRING ptBRStrings[] = " Formatar a parti\207\306o utilizando o sistema de arquivos %S "}, {STRING_KEEPFORMAT, " Manter o sistema de arquivos atual (sem altera\207\344es) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "em %s."}, {STRING_PARTTYPE, "Tipo 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]" "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "O instalador criou uma nova parti\207\306o em"}, {STRING_UNPSPACE, "Espa\207o n\306o particionado"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 41cbb66cd13..f383dbfae68 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -2272,17 +2272,19 @@ MUI_STRING ptPTStrings[] = " D = Apagar Parti\207\306o F3 = Sair"}, {STRING_PARTITIONSIZE, "Tamanho da nova parti\207\306o:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "Seleccionou criar uma parti\207\306o prim\240ria"}, // "Voc\210 solicitou a cria\207\306o de uma nova parti\207\306o em"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Seleccionou criar uma parti\207\306o estendida"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "Seleccionou criar uma parti\207\306o l\242gica"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Por favor, insira o tamanho da nova parti\207\306o em megabytes (MB)."}, {STRING_CREATEPARTITION, " ENTER=Criar parti\207\306o ESC=Cancelar F3=Sair"}, + {STRING_NEWPARTITION, + "O instalador criou uma nova parti\207\306o em"}, {STRING_PARTFORMAT, "Esta parti\207\306o ser\240 formatada logo em seguida."}, {STRING_NONFORMATTEDPART, @@ -2333,7 +2335,7 @@ MUI_STRING ptPTStrings[] = "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"}, {STRING_CONSOLEFAIL3, "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "O instalador est\240 a formatar o disco"}, {STRING_CHECKINGDISK, "O instalador est\240 a verificar o disco"}, @@ -2343,20 +2345,18 @@ MUI_STRING ptPTStrings[] = " Formatar a parti\207\306o utilizando o sistema de arquivos %S "}, {STRING_KEEPFORMAT, " Manter o sistema de arquivos actual (sem altera\207\344es) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "em %s."}, {STRING_PARTTYPE, "Tipo 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]" "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "O instalador criou uma nova parti\207\306o em"}, {STRING_UNPSPACE, "Espa\207o n\306o particionado"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 1a543ea2325..7cabee005a3 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -2288,16 +2288,18 @@ MUI_STRING roROStrings[] = " D = \252tergere parti\376ie F3 = Ie\272ire"}, {STRING_PARTITIONSIZE, "M\343rimea noii parti\376ii:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "A\376i ales crearea unei parti\376ii primare pe"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "A\376i ales crearea unei parti\376ii extinse pe"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "A\376i ales crearea unei parti\376ii logice pe"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Introduce\376i m\343rimea noii parti\376ii \356n megaocte\376i."}, {STRING_CREATEPARTITION, " ENTER = Creare parti\376ie ESC = Anulare F3 = Ie\272ire"}, + {STRING_NEWPARTITION, + "O nou\343 parti\376ie a fost creat\343 \356n"}, {STRING_PARTFORMAT, "Aceast\343 parti\376ie urmeaz\343 s\343 fie formatat\343."}, {STRING_NONFORMATTEDPART, @@ -2348,7 +2350,7 @@ MUI_STRING roROStrings[] = "Cea mai frecvent\343 cauz\343 pentru asta este utilizarea unei tastaturi USB\r\n"}, {STRING_CONSOLEFAIL3, "Tastaturile USB nu sunt \356nc\343 toate acceptate\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Disc \356n curs de formatare..."}, {STRING_CHECKINGDISK, "Disc \356n curs de verificare..."}, @@ -2358,20 +2360,18 @@ MUI_STRING roROStrings[] = " Formateaz\343 parti\376ia ca sistem de fi\272iere %S "}, {STRING_KEEPFORMAT, " P\343streaz\343 sistemul de fi\272iere actual (f\343r\343 schimb\343ri) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "de pe %s."}, {STRING_PARTTYPE, "Tip 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu [%s]" "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "O nou\343 parti\376ie a fost creat\343 \356n"}, {STRING_UNPSPACE, "Spa\376iu neparti\376ionat"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index a39c99c22f6..683b130eb15 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -2257,16 +2257,18 @@ MUI_STRING ruRUStrings[] = " D = \223\244\240\253\250\342\354 \340\240\247\244\245\253 F3 = \202\353\345\256\244"}, {STRING_PARTITIONSIZE, "\220\240\247\254\245\340 \255\256\242\256\243\256 \340\240\247\244\245\253\240:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 \257\245\340\242\250\347\255\353\251 \340\240\247\244\245\253 \255\240"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 \340\240\341\350\250\340\245\255\255\353\251 \340\240\247\244\245\253 \255\240"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 \253\256\243\250\347\245\341\252\250\251 \340\240\247\244\245\253 \255\240"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "\217\256\246\240\253\343\251\341\342\240, \242\242\245\244\250\342\245 \340\240\247\254\245\340 \255\256\242\256\243\256 \340\240\247\244\245\253\240 \242 \254\245\243\240\241\240\251\342\240\345."}, {STRING_CREATEPARTITION, " ENTER = \221\256\247\244\240\342\354 \340\240\247\244\245\253 ESC = \216\342\254\245\255\240 F3 = \202\353\345\256\244"}, + {STRING_NEWPARTITION, + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \341\256\247\244\240\253\240 \255\256\242\353\251 \340\240\247\244\245\253 \255\240:"}, {STRING_PARTFORMAT, "\235\342\256\342 \340\240\247\244\245\253 \241\343\244\245\342 \256\342\344\256\340\254\240\342\250\340\256\242\240\255 \244\240\253\245\245."}, {STRING_NONFORMATTEDPART, @@ -2317,7 +2319,7 @@ MUI_STRING ruRUStrings[] = "\215\240\250\241\256\253\245\245 \242\245\340\256\357\342\255\240\357 \257\340\250\347\250\255\240 \355\342\256\243\256 - \250\341\257\256\253\354\247\256\242\240\255\250\245 USB-\252\253\240\242\250\240\342\343\340\353\r\n"}, {STRING_CONSOLEFAIL3, "USB \252\253\240\242\250\240\342\343\340\353 \341\245\251\347\240\341 \257\256\244\244\245\340\246\250\242\240\356\342\341\357 \255\245 \257\256\253\255\256\341\342\354\356\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \344\256\340\254\240\342\250\340\343\245\342 \242\240\350 \244\250\341\252"}, {STRING_CHECKINGDISK, "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \257\340\256\242\245\340\357\245\342 \242\240\350 \244\250\341\252"}, @@ -2327,20 +2329,18 @@ MUI_STRING ruRUStrings[] = " \224\256\340\254\240\342\250\340\256\242\240\255\250\245 \340\240\247\244\245\253\240 \242 \344\240\251\253\256\242\256\251 \341\250\341\342\245\254\245 %S "}, {STRING_KEEPFORMAT, " \216\341\342\240\242\250\342\354 \341\343\351\245\341\342\242\343\356\351\343\356 \344\240\251\253\256\242\343\356 \341\250\341\342\245\254\343 (\241\245\247 \250\247\254\245\255\245\255\250\251) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "\255\240: %s."}, {STRING_PARTTYPE, "\207\240\257\250\341\354 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]" "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]" "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \341\256\247\244\240\253\240 \255\256\242\353\251 \340\240\247\244\245\253 \255\240:"}, {STRING_UNPSPACE, "\215\245\340\240\247\254\245\347\245\255\255\256\245 \257\340\256\341\342\340\240\255\341\342\242\256"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index b8af569276d..37c06321f56 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -2247,17 +2247,19 @@ MUI_STRING skSKStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Ve\226kos\234 novej oblasti:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "Zvolili ste vytvorenie novej oblasti na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Zadajte, pros\241m, ve\226kos\234 novej oblasti v megabajtoch."}, {STRING_CREATEPARTITION, " ENTER = Vytvori\234 oblas\234 ESC = Zru\347i\234 F3 = Skon\237i\234"}, + {STRING_NEWPARTITION, + "In\347tal\240tor vytvoril nov\243 oblas\234 na"}, {STRING_PARTFORMAT, "T\240to oblas\234 sa bude form\240tova\234 ako \324al\347ia."}, {STRING_NONFORMATTEDPART, @@ -2308,7 +2310,7 @@ MUI_STRING skSKStrings[] = "Najbe\247nej\347ou pr\241\237inou tohto je pou\247itie USB kl\240vesnice\r\n"}, {STRING_CONSOLEFAIL3, "USB kl\240vesnica e\347te nie je plne podporovan\240\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "In\347tal\240tor form\240tuje V\240\347 disk"}, {STRING_CHECKINGDISK, "In\347tal\240tor kontroluje V\240\347 disk"}, @@ -2318,20 +2320,18 @@ MUI_STRING skSKStrings[] = " Naform\240tova\234 oblas\234 ako syst\202m s\243borov %S "}, {STRING_KEEPFORMAT, " Ponecha\234 s\243\237asn\354 syst\202m s\243borov (bez zmeny) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "na: %s."}, {STRING_PARTTYPE, "Typ 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "In\347tal\240tor vytvoril nov\243 oblas\234 na"}, {STRING_UNPSPACE, "Miesto bez oblast\241"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 6322664d6a7..f5849cade32 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -2248,17 +2248,19 @@ MUI_STRING sqALStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Madh\211sia e particionit t\211 ri:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, // "You have chosen to create a primary partition on"}, "Ju keni zgjedhur p\211r t\211 krijuar nj\211 ndarje t\211 re n\211"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "Ju lutem, jepini madh\211sin\211 e particionit t\211 ri n\211 megabajt."}, {STRING_CREATEPARTITION, " ENTER = Krijo Particion ESC = Anulo F3 = Dil"}, + {STRING_NEWPARTITION, + "Instalimi krijoj nj\211 particion t\211 ri n\211"}, {STRING_PARTFORMAT, "Ky particion do t\211 formatohet tani."}, {STRING_NONFORMATTEDPART, @@ -2309,7 +2311,7 @@ MUI_STRING sqALStrings[] = "Shkaku m\211 i zakonsh\211m i k\211saj \211sht\211 arsyea e perdorimit t\211 nj\211 tastiere USB\r\n"}, {STRING_CONSOLEFAIL3, "Tastierat USB nuk jan\211 t\211 mb\211shtetura ende plot\211sisht\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Instalimi po formaton diskun tuaj"}, {STRING_CHECKINGDISK, "Instalimi \211sht\211 duke kontrolluar diskun tuaj"}, @@ -2319,20 +2321,18 @@ MUI_STRING sqALStrings[] = " Formato particionin si %S dokumentat e sistemit"}, {STRING_KEEPFORMAT, " Mbaj dokumentat e sistemit siq jan\211 (pa ndryshime) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "on %s."}, {STRING_PARTTYPE, "Tipi 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Instalimi krijoj nj\211 particion t\211 ri n\211"}, {STRING_UNPSPACE, "Hap\211sire e papjesesezuar"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index f070d312bd9..95664b2d55a 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -2237,17 +2237,19 @@ MUI_STRING svSEStrings[] = " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Storlek p\206 den nya partitionen:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "You have chosen to create a primary partition on"}, // "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, "You have chosen to create a logical partition on"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "V\204nligen skriv in storleken av den nya partitionen i megabytes."}, {STRING_CREATEPARTITION, " ENTER = Skapa Partition ESC = Avbryt F3 = Avsluta"}, + {STRING_NEWPARTITION, + "Setup skapade en ny partition p\206"}, {STRING_PARTFORMAT, "Denna Partition kommer att bli formaterad h\204rn\204st."}, {STRING_NONFORMATTEDPART, @@ -2298,7 +2300,7 @@ MUI_STRING svSEStrings[] = "Den vanligaste orsaken till detta \204r att ett USB tangentbord anv\204nds\r\n"}, {STRING_CONSOLEFAIL3, "USB tangentbord \204r itne helt st\224tt \204n\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Setup formaterar din disk"}, {STRING_CHECKINGDISK, "Setup under\224ker din disk"}, @@ -2308,20 +2310,18 @@ MUI_STRING svSEStrings[] = " Formaterar partition som %S filsystem "}, {STRING_KEEPFORMAT, " Beh\206ll nuvarande filsystem (inga f\224r\204ndringar) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "p\206 %s."}, {STRING_PARTTYPE, "Typ 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]" "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Setup skapade en ny partition p\206"}, {STRING_UNPSPACE, "Opartitionerat utrymme"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 3b4a571c66c..59210fc1a56 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -2211,16 +2211,18 @@ MUI_STRING trTRStrings[] = " D = B\224l\201m\201 Sil F3 = \200\215k"}, {STRING_PARTITIONSIZE, "Yeni b\224l\201m\201n b\201y\201kl\201\247\201:"}, - {STRING_CHOOSENEWPARTITION, + {STRING_CHOOSE_NEW_PARTITION, "\232zerinde bir ana b\224l\201m olu\237turmay\215 se\207tiniz:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "\232zerinde bir geni\237letilmi\237 b\224l\201m olu\237turmay\215 se\207tiniz:"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, "\232zerinde bir mant\215ksal b\224l\201m olu\237turmay\215 se\207tiniz:"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "L\201tfen yeni b\224l\201m\201n b\201y\201kl\201\247\201n\201 megabayt olarak giriniz."}, {STRING_CREATEPARTITION, " ENTER = B\224l\201m Olu\237tur ESC = \230ptal F3 = \200\215k"}, + {STRING_NEWPARTITION, + "Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"}, {STRING_PARTFORMAT, "Bu b\224l\201m ileride bi\207imlendirilecektir."}, {STRING_NONFORMATTEDPART, @@ -2271,7 +2273,7 @@ MUI_STRING trTRStrings[] = "Bunun en bilinen nedeni, bir USB klavye kullan\215lmas\215d\215r.\r\n"}, {STRING_CONSOLEFAIL3, "USB klavye daha t\201m\201yle desteklenmemektedir.\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "Kur, diskinizi bi\207imlendiriyor."}, {STRING_CHECKINGDISK, "Kur, diskinizi g\224zden ge\207iriyor."}, @@ -2281,20 +2283,18 @@ MUI_STRING trTRStrings[] = " B\224l\201m\201 %S dosya sistemiyle bi\207imlendir. "}, {STRING_KEEPFORMAT, " \236imdiki dosya sistemini koru. (De\247i\237iklik yok.) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "\232zerinde: %s."}, {STRING_PARTTYPE, "T\201r 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]" "%I64u %s Disk %lu (Giri\237=%hu, VYolu=%hu, Kimlik=%hu), (%wZ) [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu [%s]" "%I64u %s Disk %lu (Giri\237=%hu, VYolu=%hu, Kimlik=%hu) [%s]"}, - {STRING_NEWPARTITION, - "Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"}, {STRING_UNPSPACE, "Kullan\215lmayan Alan"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 2e7ecf94c5f..1d65687b697 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -2244,17 +2244,19 @@ MUI_STRING ukUAStrings[] = " D = \202\250\244\240\253\250\342\250 \340\256\247\244i\253 F3 = \202\250\251\342\250"}, {STRING_PARTITIONSIZE, "\220\256\247\254i\340 \255\256\242\256\243\256 \340\256\247\244i\253\343:"}, - {STRING_CHOOSENEWPARTITION, + {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� ��"}, {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, "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 \340\256\247\244i\253 \255\240"}, - {STRING_HDDSIZE, + {STRING_HDPARTSIZE, "\201\343\244\354-\253\240\341\252\240, \242\242\245\244i\342\354 \340\256\247\254i\340 \255\256\242\256\243\256 \340\256\247\244i\253\343 \242 \254\245\243\240\241\240\251\342\240\345."}, {STRING_CREATEPARTITION, " ENTER = \221\342\242\256\340\250\342\250 \340\256\247\244i\253 ESC = \221\252\240\341\343\242\240\342\250 F3 = \202\250\251\342\250"}, + {STRING_NEWPARTITION, + "\202\341\342\240\255\256\242\253\356\242\240\347 \341\342\242\256\340\250\242 \255\256\242\250\251 \340\256\247\244i\253 \255\240"}, {STRING_PARTFORMAT, "\226\245\251 \340\256\247\244i\253 \241\343\244\245 \242i\244\344\256\340\254\240\342\256\242\240\255\256."}, {STRING_NONFORMATTEDPART, @@ -2305,7 +2307,7 @@ MUI_STRING ukUAStrings[] = "\215\240\251\241i\253\354\350 \251\254\256\242i\340\255\240 \257\340\250\347\250\255\240 \346\354\256\243\256 - \242\250\252\256\340\250\341\342\240\255\255\357 USB \252\253\240\242i\240\342\343\340\250\r\n"}, {STRING_CONSOLEFAIL3, "USB \252\253\240\242i\240\342\343\340\250 \351\245 \255\245 \257i\244\342\340\250\254\343\356\342\354\341\357 \257\256\242\255i\341\342\356\r\n"}, - {STRING_FORMATTINGDISK, + {STRING_FORMATTINGPART, "\202\341\342\240\255\256\242\253\356\242\240\347 \344\256\340\254\240\342\343\363 \242\240\350 \244\250\341\252"}, {STRING_CHECKINGDISK, "\202\341\342\240\255\256\242\253\356\242\240\347 \257\245\340\245\242i\340\357\363 \242\240\350 \244\250\341\252"}, @@ -2315,20 +2317,18 @@ MUI_STRING ukUAStrings[] = " \224\256\340\254\240\342\343\242\240\342\250 \340\256\247\244i\253 \242 \344\240\251\253\256\242i\251 \341\250\341\342\245\254i %S "}, {STRING_KEEPFORMAT, " \207\240\253\250\350\250\342\250 i\341\255\343\356\347\343 \344\240\251\253\256\242\343 \341\250\341\342\245\254\343 (\241\245\247 \247\254i\255) "}, - {STRING_HDINFOPARTCREATE_1, + {STRING_HDDISK1, "%s."}, - {STRING_HDINFOPARTDELETE_1, + {STRING_HDDISK2, "\255\240: %s."}, {STRING_PARTTYPE, "Type 0x%02x"}, - {STRING_HDDINFO_1, + {STRING_HDDINFO1, // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]" "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"}, - {STRING_HDDINFO_2, + {STRING_HDDINFO2, // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]" "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu (\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"}, - {STRING_NEWPARTITION, - "\202\341\342\240\255\256\242\253\356\242\240\347 \341\342\242\256\340\250\242 \255\256\242\250\251 \340\256\247\244i\253 \255\240"}, {STRING_UNPSPACE, "\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354"}, {STRING_MAXSIZE, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 224a679f34c..b2b2dc179a4 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -129,60 +129,60 @@ extern CHAR CharDoubleLowerRightCorner; #define TEXT_ID_FORMAT_PROMPT 1 /* MUI Strings */ -#define STRING_PLEASEWAIT 1 -#define STRING_INSTALLCREATEPARTITION 2 -#define STRING_INSTALLCREATELOGICAL 60 -#define STRING_INSTALLDELETEPARTITION 3 -#define STRING_DELETEPARTITION 59 -#define STRING_PARTITIONSIZE 4 -#define STRING_CHOOSENEWPARTITION 5 -#define STRING_CHOOSE_NEW_EXTENDED_PARTITION 57 -#define STRING_CHOOSE_NEW_LOGICAL_PARTITION 61 -#define STRING_HDDSIZE 6 -#define STRING_CREATEPARTITION 7 -#define STRING_PARTFORMAT 8 -#define STRING_NONFORMATTEDPART 9 -#define STRING_NONFORMATTEDSYSTEMPART 62 -#define STRING_NONFORMATTEDOTHERPART 63 -#define STRING_INSTALLONPART 10 -#define STRING_CONTINUE 12 -#define STRING_QUITCONTINUE 13 -#define STRING_REBOOTCOMPUTER 14 -#define STRING_DELETING 15 -#define STRING_MOVING 16 -#define STRING_RENAMING 17 -#define STRING_COPYING 18 -#define STRING_SETUPCOPYINGFILES 19 -#define STRING_REGHIVEUPDATE 20 -#define STRING_IMPORTFILE 21 -#define STRING_DISPLAYSETTINGSUPDATE 22 -#define STRING_LOCALESETTINGSUPDATE 23 -#define STRING_KEYBOARDSETTINGSUPDATE 24 -#define STRING_CODEPAGEINFOUPDATE 25 -#define STRING_DONE 26 -#define STRING_REBOOTCOMPUTER2 27 -#define STRING_CONSOLEFAIL1 28 -#define STRING_CONSOLEFAIL2 29 -#define STRING_CONSOLEFAIL3 30 -#define STRING_FORMATTINGDISK 31 -#define STRING_CHECKINGDISK 32 -#define STRING_FORMATDISK1 33 -#define STRING_FORMATDISK2 34 -#define STRING_KEEPFORMAT 35 -#define STRING_HDINFOPARTCREATE_1 36 -#define STRING_HDINFOPARTDELETE_1 39 -#define STRING_PARTTYPE 42 -#define STRING_HDDINFO_1 45 -#define STRING_HDDINFO_2 46 -#define STRING_NEWPARTITION 47 -#define STRING_UNPSPACE 48 -#define STRING_MAXSIZE 49 -#define STRING_UNFORMATTED 50 -#define STRING_EXTENDED_PARTITION 58 -#define STRING_FORMATUNUSED 51 -#define STRING_FORMATUNKNOWN 52 -#define STRING_KB 53 -#define STRING_MB 54 -#define STRING_GB 55 -#define STRING_ADDKBLAYOUTS 56 -#define STRING_REBOOTPROGRESSBAR 64 +#define STRING_PLEASEWAIT 1 +#define STRING_INSTALLCREATEPARTITION 2 +#define STRING_INSTALLCREATELOGICAL 3 +#define STRING_INSTALLDELETEPARTITION 4 +#define STRING_DELETEPARTITION 5 +#define STRING_PARTITIONSIZE 6 +#define STRING_CHOOSE_NEW_PARTITION 7 +#define STRING_CHOOSE_NEW_EXTENDED_PARTITION 8 +#define STRING_CHOOSE_NEW_LOGICAL_PARTITION 9 +#define STRING_HDPARTSIZE 10 +#define STRING_CREATEPARTITION 11 +#define STRING_NEWPARTITION 12 +#define STRING_PARTFORMAT 13 +#define STRING_NONFORMATTEDPART 14 +#define STRING_NONFORMATTEDSYSTEMPART 15 +#define STRING_NONFORMATTEDOTHERPART 16 +#define STRING_INSTALLONPART 17 +#define STRING_CONTINUE 18 +#define STRING_QUITCONTINUE 19 +#define STRING_REBOOTCOMPUTER 20 +#define STRING_DELETING 21 +#define STRING_MOVING 22 +#define STRING_RENAMING 23 +#define STRING_COPYING 24 +#define STRING_SETUPCOPYINGFILES 25 +#define STRING_REGHIVEUPDATE 26 +#define STRING_IMPORTFILE 27 +#define STRING_DISPLAYSETTINGSUPDATE 28 +#define STRING_LOCALESETTINGSUPDATE 29 +#define STRING_KEYBOARDSETTINGSUPDATE 30 +#define STRING_CODEPAGEINFOUPDATE 31 +#define STRING_DONE 32 +#define STRING_REBOOTCOMPUTER2 33 +#define STRING_CONSOLEFAIL1 34 +#define STRING_CONSOLEFAIL2 35 +#define STRING_CONSOLEFAIL3 36 +#define STRING_FORMATTINGPART 37 +#define STRING_CHECKINGDISK 38 +#define STRING_FORMATDISK1 39 +#define STRING_FORMATDISK2 40 +#define STRING_KEEPFORMAT 41 +#define STRING_HDDISK1 42 +#define STRING_HDDISK2 43 +#define STRING_PARTTYPE 44 +#define STRING_HDDINFO1 45 +#define STRING_HDDINFO2 46 +#define STRING_UNPSPACE 47 +#define STRING_MAXSIZE 48 +#define STRING_UNFORMATTED 49 +#define STRING_EXTENDED_PARTITION 50 +#define STRING_FORMATUNUSED 51 +#define STRING_FORMATUNKNOWN 52 +#define STRING_KB 53 +#define STRING_MB 54 +#define STRING_GB 55 +#define STRING_ADDKBLAYOUTS 56 +#define STRING_REBOOTPROGRESSBAR 57 diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index d6c934bc47a..5feaf446529 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -316,7 +316,7 @@ DiskDescription( if (DiskEntry->DriverName.Length > 0) { RtlStringCchPrintfA(strBuffer, cchBuffer, - MUIGetString(STRING_HDDINFO_1), + MUIGetString(STRING_HDDINFO1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -331,7 +331,7 @@ DiskDescription( else { RtlStringCchPrintfA(strBuffer, cchBuffer, - MUIGetString(STRING_HDDINFO_2), + MUIGetString(STRING_HDDINFO2), DiskSize, Unit, DiskEntry->DiskNumber, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 2cc425e9ba1..f0243187454 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2100,13 +2100,13 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_PARTITION)); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), LineBuffer); - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", @@ -2221,10 +2221,10 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION)); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), LineBuffer); - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", @@ -2338,10 +2338,10 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION)); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1), LineBuffer); - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", @@ -2492,7 +2492,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) CONSOLE_PrintTextXY(6, 10, " %s", LineBuffer); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), LineBuffer); while (TRUE) @@ -2603,7 +2603,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(8, 10, LineBuffer); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDDISK1), LineBuffer); @@ -2830,7 +2830,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) #endif DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1), LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2859,7 +2859,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1), LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2872,7 +2872,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(8, 10, LineBuffer); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), LineBuffer); }

10 months, 3 weeks

[reactos] 01/01: [SHELL32][SDK] Implement SHStartNetConnectionDialogA (#5847)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=128e7f5aeab55912b3581… commit 128e7f5aeab55912b35814597fcde32c978951dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 28 22:29:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 28 22:29:05 2023 +0900 [SHELL32][SDK] Implement SHStartNetConnectionDialogA (#5847) and add SHStartNetConnectionDialog prototype to <shlobj.h>. --- dll/win32/shell32/stubs.cpp | 20 ++++---------------- dll/win32/shell32/utils.cpp | 26 ++++++++++++++++++++++++++ dll/win32/shell32/wine/shellord.c | 6 ++++++ sdk/include/psdk/shlobj.h | 12 ++++++++++++ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index bae11321006..b1e153fdb67 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -712,22 +712,10 @@ PifMgr_SetProperties(HANDLE hHandle, LPCSTR lpName, LPCVOID lpUnknown, INT iUnkn */ EXTERN_C HRESULT WINAPI -SHStartNetConnectionDialogA(HWND hwnd, - LPCSTR pszRemoteName, - DWORD dwType) -{ - FIXME("SHStartNetConnectionDialogA() stub\n"); - return E_FAIL; -} - -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHStartNetConnectionDialogW(HWND hwnd, - LPCWSTR pszRemoteName, - DWORD dwType) +SHStartNetConnectionDialogW( + _In_ HWND hwnd, + _In_ LPCWSTR pszRemoteName, + _In_ DWORD dwType) { FIXME("SHStartNetConnectionDialogW() stub\n"); return E_FAIL; diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 94b25e49bde..697a4f59cea 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -604,3 +604,29 @@ Activate_RunDLL( GetWindowThreadProcessId(GetShellWindow(), &dwProcessID); return AllowSetForegroundWindow(dwProcessID); } + +/************************************************************************* + * SHStartNetConnectionDialogA (SHELL32.12) + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_c… + */ +EXTERN_C +HRESULT WINAPI +SHStartNetConnectionDialogA( + _In_ HWND hwnd, + _In_ LPCSTR pszRemoteName, + _In_ DWORD dwType) +{ + LPCWSTR pszRemoteNameW = NULL; + CStringW strRemoteNameW; + + TRACE("(%p, %s, %lu)\n", hwnd, debugstr_a(pszRemoteName), dwType); + + if (pszRemoteName) + { + strRemoteNameW = pszRemoteName; + pszRemoteNameW = strRemoteNameW; + } + + return SHStartNetConnectionDialogW(hwnd, pszRemoteNameW, dwType); +} diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 43c3775c0e8..51cbd9e8218 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -2348,9 +2348,15 @@ BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, HRESULT WINAPI SHStartNetConnectionDialog(HWND hwnd, LPCSTR pszRemoteName, DWORD dwType) { +#ifdef __REACTOS__ + if (SHELL_OsIsUnicode()) + return SHStartNetConnectionDialogW(hwnd, (LPCWSTR)pszRemoteName, dwType); + return SHStartNetConnectionDialogA(hwnd, pszRemoteName, dwType); +#else FIXME("%p, %s, 0x%08x - stub\n", hwnd, debugstr_a(pszRemoteName), dwType); return S_OK; +#endif } /************************************************************************* * SHSetLocalizedName (SHELL32.@) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index a9c90ffc137..629d9f4a827 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -390,6 +390,18 @@ SHOpenPropSheetW( #define SHOpenPropSheet WINELIB_NAME_AW(SHOpenPropSheet) +HRESULT WINAPI +SHStartNetConnectionDialogA( + _In_ HWND hwnd, + _In_ LPCSTR pszRemoteName, + _In_ DWORD dwType); + +HRESULT WINAPI +SHStartNetConnectionDialogW( + _In_ HWND hwnd, + _In_ LPCWSTR pszRemoteName, + _In_ DWORD dwType); + /***************************************************************************** * IContextMenu interface */

10 months, 3 weeks

[reactos] 01/01: [SHELL32][SDK] Follow-up of #5840 (ad5df2d)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a52c713755dca32bd4da6… commit a52c713755dca32bd4da647a4a56c416e5ed7ad4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 28 21:31:11 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 28 21:31:11 2023 +0900 [SHELL32][SDK] Follow-up of #5840 (ad5df2d) Fix the parameters of Activate_RunDLL. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/utils.cpp | 24 ++++++++++++------------ sdk/include/reactos/undocshell.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 2aabb8efb2a..dbdbfabd758 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -101,7 +101,7 @@ 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) 103 stdcall SignalFileOpen(ptr) 104 stdcall OpenAs_RunDLLW(long long wstr long) -105 stdcall Activate_RunDLL(long ptr ptr ptr) +105 stdcall Activate_RunDLL(ptr ptr wstr long) 106 stdcall AppCompat_RunDLLW(ptr ptr wstr long) 107 stdcall CheckEscapesA(str long) 108 stdcall CheckEscapesW(wstr long) diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 7007ee78ca2..94b25e49bde 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -587,20 +587,20 @@ SHOpenPropSheetA( EXTERN_C BOOL WINAPI Activate_RunDLL( - _In_ DWORD dwUnused1, - _In_ LPVOID lpUnused2, - _In_ LPVOID lpUnused3, - _In_ LPVOID lpUnused4) + _In_ HWND hwnd, + _In_ HINSTANCE hinst, + _In_ LPCWSTR cmdline, + _In_ INT cmdshow) { - DWORD dwPID; + DWORD dwProcessID; - UNREFERENCED_PARAMETER(dwUnused1); - UNREFERENCED_PARAMETER(lpUnused2); - UNREFERENCED_PARAMETER(lpUnused3); - UNREFERENCED_PARAMETER(lpUnused4); + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(hinst); + UNREFERENCED_PARAMETER(cmdline); + UNREFERENCED_PARAMETER(cmdshow); - TRACE("(%lu, %p, %p, %p)\n", dwUnused1, lpUnused2, lpUnused3, lpUnused4); + TRACE("(%p, %p, %s, %d)\n", hwnd, hinst, debugstr_w(cmdline), cmdline); - GetWindowThreadProcessId(GetShellWindow(), &dwPID); - return AllowSetForegroundWindow(dwPID); + GetWindowThreadProcessId(GetShellWindow(), &dwProcessID); + return AllowSetForegroundWindow(dwProcessID); } diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index b0391380d80..95cc7b6998b 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -722,10 +722,10 @@ BOOL WINAPI IsSuspendAllowed(VOID); BOOL WINAPI Activate_RunDLL( - _In_ DWORD dwUnused1, - _In_ LPVOID lpUnused2, - _In_ LPVOID lpUnused3, - _In_ LPVOID lpUnused4); + _In_ HWND hwnd, + _In_ HINSTANCE hinst, + _In_ LPCWSTR cmdline, + _In_ INT cmdshow); /***************************************************************************** * Shell32 resources

10 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2023