ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
February 2021
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
30 participants
434 discussions
Start a n
N
ew thread
[reactos] 01/05: Revert "[SYSDM] Fix version string cutoff CORE-17429"
by Colin Finck
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1356e8d47bc8d281362f…
commit c1356e8d47bc8d281362f2cbd721494e7fe25bb0 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sun Jan 31 08:13:36 2021 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Mon Feb 1 07:32:14 2021 +0100 Revert "[SYSDM] Fix version string cutoff CORE-17429" This reverts commit be2518704e2c3d8b21e2edb469bd622b17b61619. --- boot/bootdata/readme.txt | 81 ++-------------- dll/cpl/sysdm/general.c | 144 ++++++++++++++++++++++++++++- dll/cpl/sysdm/lang/bg-BG.rc | 29 +++--- dll/cpl/sysdm/lang/cs-CZ.rc | 29 +++--- dll/cpl/sysdm/lang/da-DK.rc | 29 +++--- dll/cpl/sysdm/lang/de-DE.rc | 31 ++++--- dll/cpl/sysdm/lang/el-GR.rc | 29 +++--- dll/cpl/sysdm/lang/en-US.rc | 29 +++--- dll/cpl/sysdm/lang/es-ES.rc | 29 +++--- dll/cpl/sysdm/lang/fr-FR.rc | 29 +++--- dll/cpl/sysdm/lang/he-IL.rc | 29 +++--- dll/cpl/sysdm/lang/hu-HU.rc | 29 +++--- dll/cpl/sysdm/lang/id-ID.rc | 29 +++--- dll/cpl/sysdm/lang/it-IT.rc | 29 +++--- dll/cpl/sysdm/lang/ja-JP.rc | 29 +++--- dll/cpl/sysdm/lang/nl-NL.rc | 29 +++--- dll/cpl/sysdm/lang/no-NO.rc | 29 +++--- dll/cpl/sysdm/lang/pl-PL.rc | 29 +++--- dll/cpl/sysdm/lang/pt-PT.rc | 29 +++--- dll/cpl/sysdm/lang/ro-RO.rc | 29 +++--- dll/cpl/sysdm/lang/ru-RU.rc | 29 +++--- dll/cpl/sysdm/lang/sk-SK.rc | 29 +++--- dll/cpl/sysdm/lang/sq-AL.rc | 29 +++--- dll/cpl/sysdm/lang/sv-SE.rc | 29 +++--- dll/cpl/sysdm/lang/tr-TR.rc | 29 +++--- dll/cpl/sysdm/lang/uk-UA.rc | 29 +++--- dll/cpl/sysdm/lang/zh-CN.rc | 29 +++--- dll/cpl/sysdm/lang/zh-TW.rc | 29 +++--- dll/cpl/sysdm/resource.h | 2 + dll/cpl/sysdm/resources/rosbitmap.bmp | Bin 38454 -> 152694 bytes dll/cpl/sysdm/resources/rosbitmap_mask.bmp | Bin 13878 -> 51958 bytes 31 files changed, 540 insertions(+), 443 deletions(-) diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt index cb8d10902a4..cf8353a1a34 100644 --- a/boot/bootdata/readme.txt +++ b/boot/bootdata/readme.txt @@ -1,6 +1,6 @@ ======================== ReactOS™ Version 0.4.x -Updated January 20, 2021 +Updated August 31, 2016 ======================== 1. What is ReactOS? @@ -70,77 +70,8 @@ In addition, the ReactOS forum:
https://reactos.org/forum/
may contain complementary, yet non-official, information. -8. Authors and Credits ----------------------- - -Aleksandar Andrejevic -Aleksey Bragin -Alex Ionescu -Alexander Shaposhnikov -Amine Khaldi -Andrew Greenwood -Andrey Korotaev -Art Yerkes -Benedikt Freisen -Brandon Turner -Brian Palmer -Cameron Gutman -Casper Hornstrup -Christoph von Wittich -Colin Finck -Daniel Reimer -David Quintana -David Welch -Dmitry Chapyshev -Emanuele Aliberti -Eric Kohl -Filip Navara -Ged Murphy -Gé van Geldorp -Giannis Adamopoulos -Gregor Anich -Gregor Brunmar -Gunnar Dalsnes -Hermès Bélusca-Maïto -Hervé Poussineau -Jaix Bly -James Tabor -Jason Filby -Jeffrey Morlan -Jens Collin -Jérôme Gardou -Joachim Henze -Johannes Anderwald -Kamil Hornícek -Katayama Hirofumi MZ -KJK::Hyperion -Klemens Friedl -Maarten Bosma -Magnus Olsen -Marc Piulachs -Mark Jansen -Martin Fuchs -Matthias Kupfer -Michael Wirth -Mike Nordell -Mindflyer -Nathan Woods -Peter Hater -Peter Ward -Pierre Schweitzer -Rex Jolliff -Robert Dickenson -Royce Mitchell III -Saveliy Tretiakov -Stanislav Motylkov -Stefan Ginsberg -Sylvain Petreolle -Thomas Blümel -Thomas Faber -Timo Kreuzer -Vadim Galyant -Vizzini -Wierd_W -Z98 - -Further thanks go to all Contributors and the Wine Team +8. Authors +---------- + +This document was originally written by Jason Filby (jasonfilby(a)yahoo.com) +and is now occasionally updated by various contributors. diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 8d9187964a7..938cb820e8c 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -16,6 +16,9 @@ #include <buildno.h> #include <strsafe.h> +#define ANIM_STEP 2 +#define ANIM_TIME 50 + typedef struct _IMGINFO { HBITMAP hBitmap; @@ -132,8 +135,135 @@ Cleanup: LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static UINT timerid = 0, top = 0, offset; + static HBITMAP hCreditsBitmap; + switch (uMsg) { + case WM_LBUTTONDBLCLK: + if (wParam & (MK_CONTROL | MK_SHIFT)) + { + if (timerid == 0) + { + HDC hCreditsDC, hLogoDC; + HDC hDC = GetDC(NULL); + HFONT hFont = NULL; + NONCLIENTMETRICS ncm; + RECT rcCredits; + TCHAR szCredits[2048]; + INT iDevsHeight; + + if (hDC == NULL) + goto Cleanup; + + top = 0; + offset = 0; + hCreditsDC = CreateCompatibleDC(hDC); + hLogoDC = CreateCompatibleDC(hCreditsDC); + + if (hCreditsDC == NULL || hLogoDC == NULL) + goto Cleanup; + + SetRect(&rcCredits, 0, 0, 0, 0); + + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + + hFont = CreateFontIndirect(&ncm.lfMessageFont); + if (!hFont) + goto Cleanup; + SelectObject(hCreditsDC, hFont); + + LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR)); + DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CALCRECT); + + iDevsHeight = rcCredits.bottom - rcCredits.top; + + hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); + + if (!hCreditsBitmap) + goto Cleanup; + + SelectObject(hLogoDC, pImgInfo->hBitmap); + SelectObject(hCreditsDC, hCreditsBitmap); + + offset += pImgInfo->cySource; + + SetRect(&rcCredits, 0, 0, pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1); + FillRect(hCreditsDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); + + SetRect(&rcCredits, 0, offset, pImgInfo->cxSource, offset + iDevsHeight + 1); + SetBkMode(hCreditsDC, TRANSPARENT); + + OffsetRect(&rcCredits, 1, 1); + SetTextColor(hCreditsDC, GetSysColor(COLOR_BTNSHADOW)); + DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER); + + OffsetRect(&rcCredits, -1, -1); + SetTextColor(hCreditsDC, GetSysColor(COLOR_WINDOWTEXT)); + DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER); + + offset += iDevsHeight; + + AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); + AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); + + timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); + +Cleanup: + if (hFont != NULL) DeleteObject(hFont); + if (hLogoDC != NULL) DeleteDC(hLogoDC); + if (hCreditsDC != NULL) DeleteDC(hCreditsDC); + if (hDC != NULL) ReleaseDC(NULL, hDC); + } + } + break; + case WM_LBUTTONDOWN: + if (timerid) + { + RECT rcCredits; + HDC hDC = GetDC(hwnd); + if (hDC != NULL) + { + GetClientRect(hwnd, &rcCredits); + SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); + FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); + ReleaseDC(hwnd, hDC); + } + KillTimer(hwnd, timerid); + if (hCreditsBitmap != NULL) + DeleteObject(hCreditsBitmap); + + top = 0; + timerid = 0; + } + + InvalidateRect(hwnd, NULL, FALSE); + break; + case WM_TIMER: + top += ANIM_STEP; + + if (top > offset) + { + RECT rcCredits; + HDC hDC = GetDC(hwnd); + if (hDC != NULL) + { + GetClientRect(hwnd, &rcCredits); + SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); + FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); + ReleaseDC(hwnd, hDC); + } + KillTimer(hwnd, timerid); + if (hCreditsBitmap != NULL) + DeleteObject(hCreditsBitmap); + + top = 0; + timerid = 0; + } + + InvalidateRect(hwnd, NULL, FALSE); + break; case WM_PAINT: { PAINTSTRUCT PS; @@ -150,9 +280,17 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (hdcMem != NULL) { - SelectObject(hdcMem, pImgInfo->hBitmap); - /* FIXME: We should not rely on AlphaBlend and we should not import MSIMG32 solely for that function */ - AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); + if(timerid != 0) + { + SelectObject(hdcMem, hCreditsBitmap); + BitBlt(hdc, left, PS.rcPaint.top, PS.rcPaint.right - PS.rcPaint.left, PS.rcPaint.top + pImgInfo->cySource, hdcMem, 0, top, SRCCOPY); + } + else + { + SelectObject(hdcMem, pImgInfo->hBitmap); + AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); + } + DeleteDC(hdcMem); } diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index c873ac00011..ee8647e713b 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общи" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Уредба:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Версия:", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Машина:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Уредба:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Машина:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Посетете <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Разрешителното", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Няма" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index eb0d0e122e8..a87f40e9c72 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -10,20 +10,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Verze", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Navštívit <A HREF=""
https://reactos.org/
"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 198, 78, 15 END @@ -344,6 +344,7 @@ BEGIN IDS_PAGEFILE_NONE "Není" IDS_PAGEFILE_SYSTEM "Spravováno systémem" IDS_INFOREBOOT "Změny se projeví po restartování počítače." + IDS_DEVS "\nTým ReactOS\n\nPKoordinátor\n\nAleksey Bragin\n\nVývojáři\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Ho [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Potvrďte smazání profilu" IDS_HWPROFILE_CONFIRM_DELETE "Opravdu chcete odstranit hardwarový profil ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Zadané jméno profilu se již používá." diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 9e3f06e021e..0a9d6f3c862 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generelt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index ec635f2e81e..b6800123402 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Computer:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Computer:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""
https://reactos.org/
"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 198, 78, 15 END @@ -319,7 +319,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Tage, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)" @@ -348,6 +348,7 @@ BEGIN IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet" IDS_INFOREBOOT "Sie müssen den Computer neu starten, damit die Änderung wirksam wird." + IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderw [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen" IDS_HWPROFILE_CONFIRM_DELETE "Sind Sie sicher, dass das Hardwareprofil ""%s"" gelöscht werden soll?" IDS_HWPROFILE_ALREADY_IN_USE "Der Profilname wird bereits verwendet." diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index cd800feac4a..1f884f97574 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Γενικά" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Σύστημα:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Έκδοση", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Υπολογιστής:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 44, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Επισκευτείτε την <A HREF=""
https://reactos.org/
"">Ιστοσελίδα του ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Προβολή άδειας...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Κανένα" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 594e6b29166..1c041539b96 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &license...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 6f4cea10fe7..2f667bbb2d8 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistema operativo:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versión", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Tiempo de operación:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Equipo:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Tiempo de operación:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Equipo:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visite la <A HREF=""
https://reactos.org/
"">página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,6 +341,7 @@ BEGIN IDS_PAGEFILE_NONE "Ninguno" IDS_PAGEFILE_SYSTEM "Administrado por el sistema" IDS_INFOREBOOT "Es necesario reiniciar el equipo para que se apliquen los cambios." + IDS_DEVS "\nEquipo de ReactOS\n\nCoordinador del proyecto\n\nAleksey Bragin\n\nEquipo de desarrollo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar el borrado del perfil" IDS_HWPROFILE_CONFIRM_DELETE "¿Seguro que quiere borrar el perfil de hardware «%s»?" IDS_HWPROFILE_ALREADY_IN_USE "El nombre de perfil ya está en uso." diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 0149f137759..825bd0c87a7 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Système d'exploitation :", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Temps d'activité :", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 75, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Temps d'activité :", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Machine :", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visiter la <A HREF=""
https://reactos.org/
"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Aucun" IDS_PAGEFILE_SYSTEM "Géré par le système" IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmation de suppression" IDS_HWPROFILE_CONFIRM_DELETE "Êtes-vous sûre de vouloir supprimer le profil matériel ""%s"" ?" IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé." diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index e2e0ced1e8a..ff7c6c74f18 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "כללי" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "מערכת:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "גרסה", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "מכונה:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "מערכת:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "מכונה:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "בקר את <A HREF=""
https://reactos.org/
"">דף הבית של ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,6 +341,7 @@ BEGIN IDS_PAGEFILE_NONE "ללא" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 191676d6b79..5ce370811cc 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Általános" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Operációs rendszer:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Verzió", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Rendszer üzemidő:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Számítógép:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 68, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Rendszer üzemidő:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Számítógép:", IDC_STATIC, 124, 116, 40, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "A <A HREF=""
https://reactos.org/
"">ReactOS honlapjának</A> meglátogatása", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licenc megtekintése...", IDC_LICENCE, 166, 198, 82, 15 END @@ -341,6 +341,7 @@ BEGIN IDS_PAGEFILE_NONE "nincs" IDS_PAGEFILE_SYSTEM "Rendszer által kezelt" IDS_INFOREBOOT "A változtatások életbe lépéséhez újra kell indítania a számítógépet." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Profil törlésének megerősítése" IDS_HWPROFILE_CONFIRM_DELETE "Biztosan törölni szeretné a(z) ""%s"" hardverprofilt?" IDS_HWPROFILE_ALREADY_IN_USE "Ez a profilnév már használatban van." diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 54cfec53ae6..d230820376a 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versi", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Waktu hidup sistem:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Mesin:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Waktu hidup sistem:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Mesin:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Kunjungi <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Tidak ada" IDS_PAGEFILE_SYSTEM "Diatur Sistem" IDS_INFOREBOOT "Anda harus memulai ulang komputer untuk menerapkan perubahan." + IDS_DEVS "\nReactOS Team\n\nKoordinator Proyek\n\nAleksey Bragin\n\nTim Pengembangan\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Ande [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Konfirmasi Penghapusan Profil" IDS_HWPROFILE_CONFIRM_DELETE "Anda yakin ingin menghapus profil perangkat keras ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Nama profil telah digunakan." diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index e594ba6689b..a3b9b67cb48 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versione", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Macchina:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Macchina:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visita <A HREF=""
https://reactos.org/
"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwal [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 6a926e71d0e..3999c837a49 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "システム:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "バージョン", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "起動してからの時間:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "マシン:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "システム:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "バージョン", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "起動してからの時間:", IDC_STATIC, 4, 148, 95, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "マシン:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""
https://reactos.org/
"">ReactOS ホームページ</A>へ行く", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 150, 10 PUSHBUTTON "ライセンスを表示(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "なし" IDS_PAGEFILE_SYSTEM "システム管理" IDS_INFOREBOOT "変更を適用するには、コンピュータを再起動する必要があります。" + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "プロファイル削除の確認" IDS_HWPROFILE_CONFIRM_DELETE "ハードウェア プロファイル ""%s"" を削除してもよいですか?" IDS_HWPROFILE_ALREADY_IN_USE "プロファイル名は使用中です。" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 5437d9f7b5b..1bdd57389cd 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Besturingssysteem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versie", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 649a4a6bcf3..060461ba3d6 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versjon", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Maskin:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Maskin:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Besøk <A HREF=""
https://reactos.org/no/index.html
"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Ingen" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 6e1c4c9d41e..454e119055f 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Wersja", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Czas pracy systemu:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Komputer:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Wersja", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Czas pracy systemu:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Komputer:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Odwiedź <A HREF=""
https://reactos.org/
"">Stronę domową ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Wyświetl &licencję...", IDC_LICENCE, 170, 198, 78, 15 END @@ -348,6 +348,7 @@ BEGIN IDS_PAGEFILE_NONE "Brak" IDS_PAGEFILE_SYSTEM "Kontrolowany przez system" IDS_INFOREBOOT "Musisz ponownie uruchomić komputer, aby zastosować zmiany." + IDS_DEVS "\nZespół ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nZespół Programistów\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohann [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Potwierdź usunięcie profilu" IDS_HWPROFILE_CONFIRM_DELETE "Czy napewno chcesz usunąć profil sprzętu ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Nazwa profilu jest już w użyciu." diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 5d3174cdb2e..10b4bc218c1 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -9,20 +9,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versão", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Ultima actualização:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Computador:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versão", IDC_ROSVERSION, 10, 137, 120, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 130, 9 + LTEXT "Ultima actualização:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Computador:", IDC_STATIC, 135, 116, 40, 9 + LTEXT "", IDC_MACHINELINE1, 140, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 140, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 140, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 140, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 140, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 140, 173, 118, 9 CONTROL "Visite <A HREF=""
https://reactos.org/
"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 159, 10 PUSHBUTTON "Ver &licença...", IDC_LICENCE, 170, 198, 78, 15 END @@ -343,6 +343,7 @@ BEGIN IDS_PAGEFILE_NONE "Nenhum" IDS_PAGEFILE_SYSTEM "Sistema gerenciado" IDS_INFOREBOOT "Precisa reiniciar o computador para aplicar as alterações." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar exclusão do perfil" IDS_HWPROFILE_CONFIRM_DELETE "Tem certeza de que deseja excluir o perfil de hardware ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "O nome do perfil já está em uso." diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 24e7c9db7eb..3b54123c373 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versiune", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Timp de operare:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Calculator:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versiune", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Timp de operare:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Calculator:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Vizitați<A HREF=""
https://reactos.org/
""> pagina web ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licență…", IDC_LICENCE, 170, 198, 78, 15 END @@ -348,6 +348,7 @@ BEGIN IDS_PAGEFILE_NONE "Nespecificat" IDS_PAGEFILE_SYSTEM "Gestionat de sistem" IDS_INFOREBOOT "Pentru aplicarea modificărilor este necesară repornirea calculatorului." + IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJoh [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmați eliminarea profilului" IDS_HWPROFILE_CONFIRM_DELETE "Sigur doriți eliminarea profilului de dispozitive „%s”?" IDS_HWPROFILE_ALREADY_IN_USE "Profilul este deja în uz." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 6da46351bf6..e317bab9af2 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общие" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Операционная система:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Версия", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Время работы системы:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Компьютер:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Операционная система:", IDC_STATIC, 4, 116, 87, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версия", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Время работы системы:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Компьютер:", IDC_STATIC, 124, 116, 40, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Посетите <A HREF=""
https://reactos.org/
"">домашнюю страницу ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Лицензия...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Нет" IDS_PAGEFILE_SYSTEM "По выбору системы" IDS_INFOREBOOT "Необходимо перезагрузить компьютер для применения изменений." + IDS_DEVS "\nКоманда ReactOS\n\nКоординатор проекта\n\nАлексей Брагин\n\nКоллектив разработчиков\n\nАлександр Андреевич\nАлексей Брагин\nАлександр Шапошников\nАмин Халди\nЭндрю Гринвуд\nАндрей Коротаев\nАрт Йеркс\nБенедикт Фрейзен\nКамерон Гутман\nКристоф фон Виттих\nКолин Финк\nДаниэль Раймер\nДэвид Кинтана\nДмитрий Чапышев\nЭрик Коль\nГед Мёрфи\nЯннис Адамопулос\nГрегор Брюнмар\nГермес Белуска-Майто\nЭрве Поссино\nДжеймс Тэбор\nДжеффри Морлан\nЖером Гарду\nЙоханнес Андервальд\nКамил [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления профиля" IDS_HWPROFILE_CONFIRM_DELETE "Вы уверены что хотите удалить профиль оборудования ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Профиль с таким названием уже существует." diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 287f5aa9662..b4d0639832c 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Všeobecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Verzia", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verzia", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Navštívte <A HREF=""
https://reactos.org/
"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobraziť &licenciu...", IDC_LICENCE, 170, 198, 78, 15 END @@ -347,6 +347,7 @@ BEGIN IDS_PAGEFILE_NONE "Žiadne" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 261bac6756d..cee888f41c4 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistemi:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Versioni", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Makinë:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistemi:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versioni", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Makinë:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Vizitoni <A HREF=""
https://reactos.org/
"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Shiko &licencës...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,6 +339,7 @@ BEGIN IDS_PAGEFILE_NONE "Asnjë" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index c4e28232de7..048fc3a931e 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allmänt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Dator:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Dator:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Besök <A HREF=""
https://reactos.org/
"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,6 +341,7 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index e25cecfab5e..6a38ec18de9 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Genel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Sürüm:", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Makine:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Sürüm:", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Makine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""
https://reactos.org/
"">ReactOS Ana Sayfa</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lisansı Göster...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,6 +341,7 @@ BEGIN IDS_PAGEFILE_NONE "Yok" IDS_PAGEFILE_SYSTEM "Sistem Yönetimli" IDS_INFOREBOOT "Değişiklikleri uygulamak için bilgisayarı yeniden başlatmalısınız." + IDS_DEVS "\nReactOS Takımı\n\nProje Koordinatörü:\n\nAleksey Bragin\n\nGeliştirme Takımı:\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Profil Silmeyi Onayla" IDS_HWPROFILE_CONFIRM_DELETE """%s"" donanım profilini silmeyi istemekten emin misiniz?" IDS_HWPROFILE_ALREADY_IN_USE "Profil adı zaten kullanımda." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 41b9d34be68..bc2a408eb81 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Загальні" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "Операційна система:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "Версія", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "Комп'ютер:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Операційна система:", IDC_STATIC, 4, 116, 82, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версія", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Відвідайте <A HREF=""
https://reactos.org/
"">домашню сторінку ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ліцензія...", IDC_LICENCE, 170, 198, 78, 15 END @@ -347,6 +347,7 @@ BEGIN IDS_PAGEFILE_NONE "Немає" IDS_PAGEFILE_SYSTEM "За вибором системи" IDS_INFOREBOOT "Необхідно перезавантажити комп'ютер для застосування нових параметрів." + IDS_DEVS "\nКоманда ReactOS\n\nКординатор проекту\n\nОлексій Брагін\n\nКоманда розробників\n\nОлександр Андрійович\nОлексій Брагін\nОлександр Шапошніков\nАмін Халді\nЕндрю Грінвуд\nАндрій Коротаєв\nАрт Єркс\nБенедикт Фрейзен\nКамерон Гутман\nКрістоф фон Віттіх\nКолін Фінк\nДаніель Реймер\nДевід Кінтана\nДмитро Чапишев\nЕрік Коль\nГед Мерфі\nЯніс Адамопулос\nГрегор Брунмар\nГермес Белуска-Маіто\nЕрве Пуссіно\nДжеймс Табор\nДжеффрі Морлан\nЖером Гарду\nЙоганнес Андервальд\nКаміль Хорні [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Підтвердження видалення профілю" IDS_HWPROFILE_CONFIRM_DELETE "Ви дійсно хочете видалити профіль обладнання ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Ім'я вже зайнято." diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 4f80009f762..3ecff0f5636 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" FONT 9, "宋体", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "系统:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "开机时间:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "计算机:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "系统:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "开机时间:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "计算机:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "访问<A HREF=""
https://reactos.org/
"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -342,6 +342,7 @@ BEGIN IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" IDS_INFOREBOOT "您必须重新启动计算机,才能应用更改。" + IDS_DEVS "\nReactOS Team\n\n项目协调员\n\nAleksey Bragin\n\n开发组\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKat [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "确认配置文件删除" IDS_HWPROFILE_CONFIRM_DELETE "你确定你想要删除的硬件配置文件? ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "配置式名称已在使用。" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 3d4c162f84f..abe5c107d67 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 - LTEXT "系統:", IDC_STATIC, 114, 16, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 - LTEXT "系統啟動時間:", IDC_STATIC, 114, 158, 95, 9 - LTEXT "", IDC_UPTIME, 120, 170, 116, 9 - LTEXT "電腦:", IDC_STATIC, 114, 75, 44, 9 - LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 - LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 - LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 - LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 - LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 - LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "系統:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "系統啟動時間:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 + LTEXT "電腦:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "請訪問<A HREF=""
https://reactos.org/
"">ReactOS 首頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "查看著作權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -342,6 +342,7 @@ BEGIN IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理" IDS_INFOREBOOT "您必須重新啓動電腦,才能套用更改。" + IDS_DEVS "\nReactOS 團隊\n\n項目協調員\n\nAleksey Bragin\n\n開發團隊\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKata [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "確認設定檔刪除" IDS_HWPROFILE_CONFIRM_DELETE "你確定你想要刪除的硬件設定檔? ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "配置式名稱已在使用。" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 20481bf2fa1..94744806b0a 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -209,3 +209,5 @@ #define IDC_LICENCEEDIT 1501 #define RC_LICENSE 1502 #define RTDATA 1503 + +#define IDS_DEVS 2000 diff --git a/dll/cpl/sysdm/resources/rosbitmap.bmp b/dll/cpl/sysdm/resources/rosbitmap.bmp index 10830dc590e..ee5891c3ccc 100644 Binary files a/dll/cpl/sysdm/resources/rosbitmap.bmp and b/dll/cpl/sysdm/resources/rosbitmap.bmp differ diff --git a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp index 0b7d0820f1b..9e0ef218561 100644 Binary files a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp and b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp differ
3 years, 10 months
1
0
0
0
[reactos] 03/03: [USETUP] Only check whether the system partition is of recognized type and if not, install FreeLdr on floppy/removable media.
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3405cab9dd3873eb5e663…
commit 3405cab9dd3873eb5e663be6d754eb495d648b36 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 31 20:19:19 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 1 01:48:15 2021 +0100 [USETUP] Only check whether the system partition is of recognized type and if not, install FreeLdr on floppy/removable media. --- base/setup/usetup/usetup.c | 53 ++++------------------------------------------ 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index ccde8792db7..e1bc3884f96 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3873,8 +3873,6 @@ RegistryPage(PINPUT_RECORD Ir) static PAGE_NUMBER BootLoaderPage(PINPUT_RECORD Ir) { - UCHAR PartitionType; - BOOLEAN InstallOnFloppy; USHORT Line = 12; WCHAR PathBuffer[MAX_PATH]; @@ -3891,8 +3889,6 @@ BootLoaderPage(PINPUT_RECORD Ir) RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer); DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath); - PartitionType = SystemPartition->PartitionType; - /* For unattended setup, skip MBR installation or install on floppy if needed */ if (IsUnattendedSetup) { @@ -3905,52 +3901,11 @@ BootLoaderPage(PINPUT_RECORD Ir) /* * We may install an MBR or VBR, but before that, check whether - * we need to actually install the VBR on floppy. + * we need to actually install the VBR on floppy/removable media + * if the system partition is not recognized. */ - if (PartitionType == PARTITION_ENTRY_UNUSED) - { - DPRINT("Error: system partition invalid (unused)\n"); - InstallOnFloppy = TRUE; - } - else if (PartitionType == PARTITION_OS2BOOTMGR) - { - /* OS/2 boot manager partition */ - DPRINT("Found OS/2 boot manager partition\n"); - InstallOnFloppy = TRUE; - } - else if (PartitionType == PARTITION_LINUX) - { - /* Linux partition */ - DPRINT("Found Linux native partition (ext2/ext3/ReiserFS/BTRFS/etc)\n"); - InstallOnFloppy = FALSE; - } - else if (PartitionType == PARTITION_IFS) - { - /* NTFS partition */ - DPRINT("Found NTFS partition\n"); - - // FIXME: Make it FALSE when we'll support NTFS installation! - InstallOnFloppy = TRUE; - } - else if ((PartitionType == PARTITION_FAT_12) || - (PartitionType == PARTITION_FAT_16) || - (PartitionType == PARTITION_HUGE) || - (PartitionType == PARTITION_XINT13) || - (PartitionType == PARTITION_FAT32) || - (PartitionType == PARTITION_FAT32_XINT13)) - { - DPRINT("Found FAT partition\n"); - InstallOnFloppy = FALSE; - } - else - { - /* Unknown partition */ - DPRINT("Unknown partition found\n"); - InstallOnFloppy = TRUE; - } - - /* We should install on floppy */ - if (InstallOnFloppy) + if ((SystemPartition->DiskEntry->DiskStyle != PARTITION_STYLE_MBR) || + !IsRecognizedPartition(SystemPartition->PartitionType)) { USetupData.MBRInstallType = 1; goto Quit;
3 years, 10 months
1
0
0
0
[reactos] 02/03: [SETUPLIB][REACTOS][USETUP] Move partition types information to its dedicated file; update MBR partition types and add GPT GUID partition types.
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74c0a37e2f85e5a5e1737…
commit 74c0a37e2f85e5a5e173713998b88171daa21b44 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 11 01:37:16 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 1 01:48:14 2021 +0100 [SETUPLIB][REACTOS][USETUP] Move partition types information to its dedicated file; update MBR partition types and add GPT GUID partition types. --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/setuplib.h | 1 + base/setup/lib/utils/partinfo.c | 787 ++++++++++++++++++++++++++++++++++++++++ base/setup/lib/utils/partinfo.h | 32 ++ base/setup/lib/utils/partlist.c | 179 --------- base/setup/lib/utils/partlist.h | 12 - base/setup/reactos/drivepage.c | 27 +- base/setup/usetup/partlist.c | 27 +- 8 files changed, 867 insertions(+), 199 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 68b00922b14..a79bebf4940 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND SOURCE utils/inicache.c utils/ntverrsrc.c utils/osdetect.c + utils/partinfo.c utils/partlist.c utils/regutil.c bootcode.c diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 2dcb349f369..5d643ec3458 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -35,6 +35,7 @@ extern HANDLE ProcessHeap; #include "utils/fsrec.h" #include "utils/genlist.h" #include "utils/inicache.h" +#include "utils/partinfo.h" #include "utils/partlist.h" #include "utils/arcname.h" #include "utils/osdetect.h" diff --git a/base/setup/lib/utils/partinfo.c b/base/setup/lib/utils/partinfo.c new file mode 100644 index 00000000000..bf6d98fde24 --- /dev/null +++ b/base/setup/lib/utils/partinfo.c @@ -0,0 +1,787 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (
https://spdx.org/licenses/GPL-2.0+
) + * PURPOSE: MBR and GPT Partition types + * COPYRIGHT: Copyright 2018-2020 Hermes Belusca-Maito + */ + +#include "precomp.h" +#include "partinfo.h" + +/* MBR PARTITION TYPES ******************************************************/ + +/* + * This partition type list is based from: + * - the kernelDisk.c module of the Visopsys Operating System (see license below), + * - Paragon Hard-Disk Manager, + * - Haiku OS (Copyright 2003-2011, Haiku, Inc., under the terms of the MIT License) + *
https://git.haiku-os.org/haiku/tree/src/add-ons/kernel/partitioning_systems…
+ * - and the following websites: + *
http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
+ *
https://en.wikipedia.org/wiki/Partition_type#List_of_partition_IDs
+ *
https://www.magnumdb.com/search?q=PARTITION_*
+ */ +/* + * kernelDisk.c + * + * Visopsys Operating System + * Copyright (C) 1998-2020 J. Andrew McLaughlin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* Known MBR partition type codes and descriptions */ +const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES] = +{ + { 0x00, "(Empty)" }, // PARTITION_ENTRY_UNUSED + { 0x01, "FAT12" }, // PARTITION_FAT_12 + { 0x02, "XENIX root" }, // PARTITION_XENIX_1 - "XENIX Type 1" + { 0x03, "XENIX /usr" }, // PARTITION_XENIX_2 - "XENIX Type 2" + { 0x04, "FAT16 (< 32 MB)" }, // PARTITION_FAT_16 + { 0x05, "Extended" }, // PARTITION_EXTENDED - "Extended partition MS-DOS V4" + { 0x06, "FAT16" }, // PARTITION_HUGE - "Huge partition MS-DOS V4" + { 0x07, "NTFS/HPFS/exFAT" }, // PARTITION_IFS + { 0x08, "OS/2 or AIX boot partition" }, + { 0x09, "AIX data partition" }, + { 0x0A, "OS/2 Boot Manager" }, // PARTITION_OS2BOOTMGR - "OS/2 Boot Manager/OPUS/Coherent swap" + { 0x0B, "FAT32" }, // PARTITION_FAT32 + { 0x0C, "FAT32 (LBA)" }, // PARTITION_FAT32_XINT13 + { 0x0E, "FAT16 (LBA)" }, // PARTITION_XINT13 + { 0x0F, "Extended (LBA)" }, // PARTITION_XINT13_EXTENDED + { 0x10, "OPUS" }, + { 0x11, "Hidden FAT12" }, + { 0x12, "FAT diagnostic (Compaq)" }, // PARTITION_EISA - "EISA partition" + { 0x13, "BTRON" }, + { 0x14, "Hidden FAT16 (< 32 MB)" }, + { 0x16, "Hidden FAT16" }, + { 0x17, "Hidden NTFS/HPFS" }, + { 0x18, "AST SmartSleep" }, + { 0x1B, "Hidden FAT32" }, + { 0x1C, "Hidden FAT32 (LBA)" }, + { 0x1E, "Hidden FAT16 (LBA)" }, + { 0x24, "NEC DOS 3.x" }, + { 0x27, "Microsoft Recovery partition" }, // PARTITION_MSFT_RECOVERY - "Microsoft recovery partition" + { 0x28, "Main OS partition" }, // PARTITION_MAIN_OS - "Main OS partition" + { 0x29, "OS Data partition" }, // PARTIITON_OS_DATA - "OS data partition" + { 0x2A, "AtheOS File System (AFS)" }, // PARTITION_PRE_INSTALLED - "PreInstalled partition" + { 0x2B, "SyllableSecure (SylStor)" }, // PARTITION_BSP - "BSP partition" + { 0x2C, "DPP partition" }, // PARTITION_DPP - "DPP partition" + { 0x2D, "Windows System partition" }, // PARTITION_WINDOWS_SYSTEM - "Windows system partition" + { 0x32, "NOS" }, + { 0x35, "JFS on OS/2 or eCS" }, + { 0x38, "THEOS v3.2 2GB partition" }, + { 0x39, "Plan 9" }, + { 0x3A, "THEOS v4 4GB partition" }, + { 0x3B, "THEOS v4 extended partition" }, + { 0x3C, "PartitionMagic recovery partition" }, + { 0x3D, "Hidden NetWare" }, + { 0x40, "Venix 80286 or Lynx" }, + { 0x41, "PowerPC PReP boot" }, // PARTITION_PREP - "PowerPC Reference Platform (PReP) Boot Partition" + { 0x42, "Win2K Dynamic Volume extended" }, // PARTITION_LDM - "Logical Disk Manager partition" + { 0x43, "Old Linux" }, + { 0x44, "GoBack" }, + { 0x45, "Priam or Boot-US Boot Manager" }, + { 0x4D, "QNX4.x" }, + { 0x4E, "QNX4.x 2nd partition" }, + { 0x4F, "QNX4.x 3rd partition" }, + { 0x50, "OnTrack Disk Manager R/O" }, + { 0x51, "OnTrack Disk Manager R/W or Novell" }, + { 0x52, "CP/M" }, + { 0x53, "OnTrack DM6 Aux3" }, + { 0x54, "OnTrack DM6 Dynamic Drive Overlay" }, // PARTITION_DM - "OnTrack Disk Manager partition" + { 0x55, "EZ-Drive" }, // PARTITION_EZDRIVE - "EZ-Drive partition" + { 0x56, "Golden Bow VFeature Partitioned Volume" }, + { 0x5C, "Priam EDisk" }, + { 0x61, "SpeedStor" }, + { 0x62, "Pick" }, + { 0x63, "GNU HURD or Unix System V (SCO, ISC Unix, UnixWare)" }, // PARTITION_UNIX + { 0x64, "Novell NetWare 286, 2.xx" }, + { 0x65, "Novell NetWare 386, 3.xx or 4.xx" }, + { 0x66, "Novell NetWare SMS partition" }, + { 0x67, "Novell" }, + { 0x68, "Novell" }, + { 0x69, "Novell NetWare 5+" }, + { 0x70, "DiskSecure Multi-Boot" }, + { 0x75, "IBM PC/IX" }, + { 0x78, "XOSL boot loader" }, + { 0x7E, "Veritas VxVM public" }, + { 0x7F, "Veritas VxVM private" }, + { 0x80, "Old MINIX" }, + { 0x81, "Linux or MINIX" }, + { 0x82, "Linux swap or Solaris" }, + { 0x83, "Linux Native" }, + { 0x84, "Hibernate" }, // PARTITION_HIBERNATION - "Hibernation partition for laptops" + { 0x85, "Linux Extended" }, + { 0x86, "FAT16 mirrored" }, + { 0x87, "NTFS/HPFS mirrored" }, + { 0x88, "Linux plaintext partition table" }, + { 0x8B, "FAT32 mirrored" }, + { 0x8C, "FAT32 (LBA) mirrored" }, + { 0x8E, "Linux LVM" }, + { 0x93, "Hidden Linux or Amoeba" }, + { 0x94, "Amoeba Bad Block Table" }, + { 0x96, "CDFS/ISO-9660" }, + { 0x9F, "BSD/OS" }, + { 0xA0, "Laptop Hibernate" }, // PARTITION_DIAGNOSTIC - "Diagnostic partition on some HP notebooks" + { 0xA1, "Laptop Hibernate (NEC 6000H)" }, + { 0xA5, "BSD, NetBSD, FreeBSD" }, + { 0xA6, "OpenBSD" }, + { 0xA7, "NeXTStep" }, + { 0xA8, "Darwin UFS" }, // Also known as "MacOS-X" + { 0xA9, "NetBSD" }, + { 0xAB, "Darwin boot" }, + { 0xAF, "Apple HFS/HFS+" }, + { 0xB1, "QNX6.x" }, + { 0xB2, "QNX6.x" }, + { 0xB3, "QNX6.x" }, + { 0xB6, "NT FAT16 corrupt mirror" }, + { 0xB7, "BSDI BSD/386 FS" }, // Alternatively, "NT NTFS corrupt mirror" + { 0xB8, "BSDI BSD/386 swap" }, + { 0xBB, "Boot Wizard hidden" }, + { 0xBC, "Paragon Backup capsule" }, + { 0xBE, "Solaris 8 boot partition" }, + { 0xBF, "Solaris 10 x86" }, + { 0xC0, "NTFT" }, // Alternatively, "CTOS" or "REAL/32 or DR-DOS or Novell-DOS secure partition" + { 0xC1, "DR-DOS FAT12" }, + { 0xC2, "Hidden Linux" }, + { 0xC3, "Hidden Linux swap" }, + { 0xC4, "DR-DOS FAT16 (< 32 MB)" }, + { 0xC5, "DR-DOS Extended" }, + { 0xC6, "DR-DOS FAT16" }, + { 0xC7, "HPFS mirrored" }, // Alternatively, "Syrinx boot" + { 0xCB, "DR-DOS FAT32" }, + { 0xCC, "DR-DOS FAT32 (LBA)" }, + { 0xCE, "DR-DOS FAT16 (LBA)" }, + { 0xD0, "MDOS" }, + { 0xD1, "MDOS FAT12" }, + { 0xD4, "MDOS FAT16 (< 32 MB)" }, + { 0xD5, "MDOS Extended" }, + { 0xD6, "MDOS FAT16" }, + { 0xD7, "Microsoft Storage Spaces Data" }, // PARTITION_SPACES_DATA - "Storage Spaces protective partition" + { 0xD8, "CP/M-86" }, + { 0xDB, "Digital Research CP/M" }, + { 0xDE, "Dell OEM" }, // PARTITION_DELL - "Dell partition" + { 0xDF, "BootIt EMBRM (FAT16/32)" }, + { 0xE1, "SpeedStor FAT12" }, + { 0xE3, "SpeedStor (0xE3)" }, + { 0xE4, "SpeedStor FAT16" }, + { 0xE5, "Tandy MSDOS" }, + { 0xE6, "SpeedStor (0xE6)" }, + { 0xE7, "Microsoft Storage Spaces Protective" }, // PARTITION_SPACES - "Storage Spaces protective partition" + { 0xE8, "Linux Unified Key Setup partition" }, + { 0xEA, "Rufus private partition" }, + { 0xEB, "BeOS/Haiku BFS" }, + { 0xEC, "SkyOS SkyFS" }, + { 0xEE, "EFI GPT protective" }, // PARTITION_GPT - "GPT protective partition" + { 0xEF, "EFI System partition" }, // PARTITION_SYSTEM - "System partition" + { 0xF0, "Linux/PA-RISC boot loader" }, + { 0xF1, "SpeedStor (0xF1)" }, + { 0xF2, "DOS 3.3+ second" }, + { 0xF4, "SpeedStor (0xF4)" }, + { 0xF5, "SpeedStor (0xF5)" }, + { 0xF6, "SpeedStor (0xF6)" }, + { 0xFA, "Bochs" }, + { 0xFB, "VMware FS" }, + { 0xFC, "VMware swap/VMKCORE" }, + { 0xFD, "Linux RAID auto" }, + { 0xFE, "NT hidden or IBM PS/2 IML or Veritas VM" }, // PARTITION_IBM - "IBM IML partition" + { 0xFF, "XENIX Bad Block Table or Veritas VM" }, +}; + + +/* GPT PARTITION TYPES ******************************************************/ + +#define GUID_CONST(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } + +#if 0 +// +// NOTE: For information only: The uncommented GUIDs below +// are new ones defined in diskguid.h in Windows 10. +// + +/* Partition GUIDs */ +#include <initguid.h> +#include <diskguid.h> + +/* + * EFI specification + */ +// DEFINE_GUID(PARTITION_ENTRY_UNUSED_GUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // Entry unused +// DEFINE_GUID(PARTITION_SYSTEM_GUID, 0xC12A7328, 0xF81F, 0x11D2, 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B); // EFI system partition +DEFINE_GUID(PARTITION_LEGACYMBR_GUID, 0x024DEE41, 0x33E7, 0x11D3, 0x9D, 0x69, 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F); + +/* + * Microsoft Windows / ReactOS + */ +// DEFINE_GUID(PARTITION_BASIC_DATA_GUID, 0xEBD0A0A2, 0xB9E5, 0x4433, 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7); // Basic data partition +DEFINE_GUID(PARTITION_MAIN_OS_GUID, 0x57434F53, 0x8F45, 0x405E, 0x8A, 0x23, 0x18, 0x6D, 0x8A, 0x43, 0x30, 0xD3); // Main OS partition +DEFINE_GUID(PARTITION_OS_DATA_GUID, 0x57434F53, 0x23F2, 0x44D5, 0xA8, 0x30, 0x67, 0xBB, 0xDA, 0xA6, 0x09, 0xF9); // OS data partition +DEFINE_GUID(PARTITION_LEGACY_BL_GUID, 0x424CA0E2, 0x7CB2, 0x4FB9, 0x81, 0x43, 0xC5, 0x2A, 0x99, 0x39, 0x8B, 0xC6); // Legacy boot loader partition +DEFINE_GUID(PARTITION_LEGACY_BL_GUID_BACKUP, 0x424C3E6C, 0xD79F, 0x49CB, 0x93, 0x5D, 0x36, 0xD7, 0x14, 0x67, 0xA2, 0x88); // Legacy boot loader backup partition +/** Logical Disk Manager (LDM) **/ +// DEFINE_GUID(PARTITION_LDM_METADATA_GUID, 0x5808C8AA, 0x7E8F, 0x42E0, 0x85, 0xD2, 0xE1, 0xE9, 0x04, 0x34, 0xCF, 0xB3); // Logical Disk Manager metadata partition +// DEFINE_GUID(PARTITION_LDM_DATA_GUID, 0xAF9B60A0, 0x1431, 0x4F62, 0xBC, 0x68, 0x33, 0x11, 0x71, 0x4A, 0x69, 0xAD); // Logical Disk Manager data partition +// DEFINE_GUID(PARTITION_MSFT_RESERVED_GUID, 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE); // Microsoft reserved space +DEFINE_GUID(PARTITION_MSFT_RECOVERY_GUID, 0xDE94BBA4, 0x06D1, 0x4D40, 0xA1, 0x6A, 0xBF, 0xD5, 0x01, 0x79, 0xD6, 0xAC); // Microsoft recovery partition +DEFINE_GUID(PARTITION_MSFT_SNAPSHOT_GUID, 0xCADDEBF1, 0x4400, 0x4DE8, 0xB1, 0x03, 0x12, 0x11, 0x7D, 0xCF, 0x3C, 0xCF); // Microsoft shadow copy partition +DEFINE_GUID(PARTITION_CLUSTER_GUID, 0xDB97DBA9, 0x0840, 0x4BAE, 0x97, 0xF0, 0xFF, 0xB9, 0xA3, 0x27, 0xC7, 0xE1); // Cluster metadata partition +/** Storage Spaces & Replica **/ +DEFINE_GUID(PARTITION_SPACES_GUID, 0xE75CAF8F, 0xF680, 0x4CEE, 0xAF, 0xA3, 0xB0, 0x01, 0xE5, 0x6E, 0xFC, 0x2D); // Storage Spaces protective partition +DEFINE_GUID(PARTITION_SPACES_DATA_GUID, 0xE7ADDCB4, 0xDC34, 0x4539, 0x9A, 0x76, 0xEB, 0xBD, 0x07, 0xBE, 0x6F, 0x7E); // Storage Spaces protective partition +DEFINE_GUID(PARTITION_STORAGE_REPLICA_GUID, 0x558D43C5, 0xA1AC, 0x43C0, 0xAA, 0xC8, 0xD1, 0x47, 0x2B, 0x29, 0x23, 0xD1); +DEFINE_GUID(PARTITION_PATCH_GUID, 0x8967A686, 0x96AA, 0x6AA8, 0x95, 0x89, 0xA8, 0x42, 0x56, 0x54, 0x10, 0x90); // Patch partition +DEFINE_GUID(PARTITION_PRE_INSTALLED_GUID, 0x57434F53, 0x7FE0, 0x4196, 0x9B, 0x42, 0x42, 0x7B, 0x51, 0x64, 0x34, 0x84); // PreInstalled partition +DEFINE_GUID(PARTITION_WINDOWS_SYSTEM_GUID, 0x57434F53, 0xE3E3, 0x4631, 0xA5, 0xC5, 0x26, 0xD2, 0x24, 0x38, 0x73, 0xAA); // Windows system partition +/** IoT partitions **/ +DEFINE_GUID(PARTITION_BSP_GUID, 0x57434F53, 0x4DF9, 0x45B9, 0x8E, 0x9E, 0x23, 0x70, 0xF0, 0x06, 0x45, 0x7C); // BSP partition +DEFINE_GUID(PARTITION_DPP_GUID, 0x57434F53, 0x94CB, 0x43F0, 0xA5, 0x33, 0xD7, 0x3C, 0x10, 0xCF, 0xA5, 0x7D); // Device provisioning (DPP) partition + +#endif + +/* + * This partition type GUIDs list is based from: + * - the kernelDisk.c and gpt.h modules of the Visopsys Operating System + * (see license above), + * - NetBSD (Copyright (c) 2002 Marcel Moolenaar), + *
http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/sys/disklabel_gpt.h?…
+ * - Haiku OS (Copyright 2003-2011, Haiku, Inc., under the terms of the MIT License) + *
https://git.haiku-os.org/haiku/tree/src/add-ons/kernel/partitioning_systems…
+ * - and the following websites: + *
https://www.liquisearch.com/guid_partition_table/partition_type_guids
+ *
https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs
+ *
https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/
+ *
https://systemd.io/DISCOVERABLE_PARTITIONS/
+ *
https://www.magnumdb.com/search?q=PARTITION_*
+ */ + +/* Known GPT partition type GUIDs and descriptions */ +const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES] = +{ + /* + * EFI specification + */ + { // PARTITION_ENTRY_UNUSED_GUID, + GUID_CONST(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), + "Unused partition" }, // "Unused entry" + { // PARTITION_SYSTEM_GUID, + GUID_CONST(0xC12A7328, 0xF81F, 0x11D2, 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B), + "EFI/GPT System Partition" }, // "GPT Free Block" + { // PARTITION_LEGACYMBR_GUID, + GUID_CONST(0x024DEE41, 0x33E7, 0x11D3, 0x9D, 0x69, 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F), + "Legacy Master Boot Record Partition" }, + + /* + * Various + */ + // GRUB 2 - "Hah!IdontNeedEFI" + { GUID_CONST(0x21686148, 0x6449, 0x6E6F, 0x74, 0x4E, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49), + "GRUB 2 BIOS Boot partition" }, + // Intel Fast Flash (iFFS) partition (for Intel Rapid Start technology) + { GUID_CONST(0xD3BFE2DE, 0x3DAF, 0x11DF, 0xBA, 0x40, 0xE3, 0xA5, 0x56, 0xD8, 0x95, 0x93), + "Intel Fast Flash (iFFS) partition" }, + { GUID_CONST(0xF4019732, 0x066E, 0x4E12, 0x82, 0x73, 0x34, 0x6C, 0x56, 0x41, 0x49, 0x4F), + "Sony boot partition" }, + { GUID_CONST(0xBFBFAFE7, 0xA34F, 0x448A, 0x9A, 0x5B, 0x62, 0x13, 0xEB, 0x73, 0x6C, 0x22), + "Lenovo boot partition" }, + + /* + * Microsoft Windows / ReactOS + */ + { // PARTITION_BASIC_DATA_GUID, + GUID_CONST(0xEBD0A0A2, 0xB9E5, 0x4433, 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7), + "Microsoft Basic Data partition" }, + { // PARTITION_MAIN_OS_GUID, + GUID_CONST(0x57434F53, 0x8F45, 0x405E, 0x8A, 0x23, 0x18, 0x6D, 0x8A, 0x43, 0x30, 0xD3), + "Main OS partition" }, + { // PARTITION_OS_DATA_GUID, + GUID_CONST(0x57434F53, 0x23F2, 0x44D5, 0xA8, 0x30, 0x67, 0xBB, 0xDA, 0xA6, 0x09, 0xF9), + "OS Data partition" }, + { // PARTITION_LEGACY_BL_GUID, + GUID_CONST(0x424CA0E2, 0x7CB2, 0x4FB9, 0x81, 0x43, 0xC5, 0x2A, 0x99, 0x39, 0x8B, 0xC6), + "Microsoft Legacy Boot Loader partition" }, + { // PARTITION_LEGACY_BL_GUID_BACKUP, + GUID_CONST(0x424C3E6C, 0xD79F, 0x49CB, 0x93, 0x5D, 0x36, 0xD7, 0x14, 0x67, 0xA2, 0x88), + "Microsoft Legacy Boot Loader backup partition" }, + { // PARTITION_LDM_METADATA_GUID, + GUID_CONST(0x5808C8AA, 0x7E8F, 0x42E0, 0x85, 0xD2, 0xE1, 0xE9, 0x04, 0x34, 0xCF, 0xB3), + "Microsoft LDM MetaData partition" }, + { // PARTITION_LDM_DATA_GUID, + GUID_CONST(0xAF9B60A0, 0x1431, 0x4F62, 0xBC, 0x68, 0x33, 0x11, 0x71, 0x4A, 0x69, 0xAD), + "Microsoft LDM Data partition" }, + { // PARTITION_MSFT_RESERVED_GUID, + GUID_CONST(0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE), + "Microsoft Reserved partition" }, + { // PARTITION_MSFT_RECOVERY_GUID, + GUID_CONST(0xDE94BBA4, 0x06D1, 0x4D40, 0xA1, 0x6A, 0xBF, 0xD5, 0x01, 0x79, 0xD6, 0xAC), + "Microsoft Recovery partition" }, + { // PARTITION_MSFT_SNAPSHOT_GUID, + GUID_CONST(0xCADDEBF1, 0x4400, 0x4DE8, 0xB1, 0x03, 0x12, 0x11, 0x7D, 0xCF, 0x3C, 0xCF), + "Microsoft Shadow Copy partition" }, + { // PARTITION_CLUSTER_GUID, + GUID_CONST(0xDB97DBA9, 0x0840, 0x4BAE, 0x97, 0xF0, 0xFF, 0xB9, 0xA3, 0x27, 0xC7, 0xE1), + "Microsoft Cluster MetaData partition" }, + { // PARTITION_SPACES_GUID, + GUID_CONST(0xE75CAF8F, 0xF680, 0x4CEE, 0xAF, 0xA3, 0xB0, 0x01, 0xE5, 0x6E, 0xFC, 0x2D), + "Microsoft Storage Spaces partition" }, + { // PARTITION_SPACES_DATA_GUID, + GUID_CONST(0xE7ADDCB4, 0xDC34, 0x4539, 0x9A, 0x76, 0xEB, 0xBD, 0x07, 0xBE, 0x6F, 0x7E), + "Microsoft Storage Spaces Data" }, + { // PARTITION_STORAGE_REPLICA_GUID, + GUID_CONST(0x558D43C5, 0xA1AC, 0x43C0, 0xAA, 0xC8, 0xD1, 0x47, 0x2B, 0x29, 0x23, 0xD1), + "Microsoft Storage Replica partition" }, + { // PARTITION_PATCH_GUID, + GUID_CONST(0x8967A686, 0x96AA, 0x6AA8, 0x95, 0x89, 0xA8, 0x42, 0x56, 0x54, 0x10, 0x90), + "Microsoft Patch partition" }, + { // PARTITION_PRE_INSTALLED_GUID, + GUID_CONST(0x57434F53, 0x7FE0, 0x4196, 0x9B, 0x42, 0x42, 0x7B, 0x51, 0x64, 0x34, 0x84), + "Microsoft PreInstalled partition" }, + { // PARTITION_WINDOWS_SYSTEM_GUID, + GUID_CONST(0x57434F53, 0xE3E3, 0x4631, 0xA5, 0xC5, 0x26, 0xD2, 0x24, 0x38, 0x73, 0xAA), + "Windows System partition" }, + { // PARTITION_BSP_GUID, + GUID_CONST(0x57434F53, 0x4DF9, 0x45B9, 0x8E, 0x9E, 0x23, 0x70, 0xF0, 0x06, 0x45, 0x7C), + "BSP partition" }, + { // PARTITION_DPP_GUID, + GUID_CONST(0x57434F53, 0x94CB, 0x43F0, 0xA5, 0x33, 0xD7, 0x3C, 0x10, 0xCF, 0xA5, 0x7D), + "Device provisioning (DPP) partition" }, + + /* + * IBM + */ + // "IBM General Parallel File System (GPFS) partition" + { GUID_CONST(0x37AFFC90, 0xEF7D, 0x4E96, 0x91, 0xC3, 0x2D, 0x7A, 0xE0, 0x55, 0xB1, 0x74), + "IBM GPFS" }, + { GUID_CONST(0x9E1A2D38, 0xC612, 0x4316, 0xAA, 0x26, 0x8B, 0x49, 0x52, 0x1E, 0x5A, 0x8B), + "IBM PowerPC PReP boot" }, + + /* + * HP-UX + */ + { GUID_CONST(0x75894C1E, 0x3AEB, 0x11D3, 0xB7, 0xC1, 0x7B, 0x03, 0xA0, 0x00, 0x00, 0x00), + "HP-UX Data partition" }, + { GUID_CONST(0xE2A1E728, 0x32E3, 0x11D6, 0xA6, 0x82, 0x7B, 0x03, 0xA0, 0x00, 0x00, 0x00), + "HP-UX Service partition" }, + + /* + *
freedesktop.org
/ systemd + */ + /* Root partitions */ + { GUID_CONST(0x44479540, 0xF297, 0x41B2, 0x9A, 0xF7, 0xD1, 0x31, 0xD5, 0xF0, 0x45, 0x8A), + "Freedesktop Root partition (x86)" }, + { GUID_CONST(0x4F68BCE3, 0xE8CD, 0x4DB1, 0x96, 0xE7, 0xFB, 0xCA, 0xF9, 0x84, 0xB7, 0x09), + "Freedesktop Root partition (x86-64)" }, + { GUID_CONST(0x69DAD710, 0x2CE4, 0x4E3C, 0xB1, 0x6C, 0x21, 0xA1, 0xD4, 0x9A, 0xBE, 0xD3), + "Freedesktop Root partition (32-bit ARM)" }, + { GUID_CONST(0xB921B045, 0x1DF0, 0x41C3, 0xAF, 0x44, 0x4C, 0x6F, 0x28, 0x0D, 0x3F, 0xAE), + "Freedesktop Root partition (64-bit ARM/AArch64)" }, + { GUID_CONST(0x993D8D3D, 0xF80E, 0x4225, 0x85, 0x5A, 0x9D, 0xAF, 0x8E, 0xD7, 0xEA, 0x97), + "Freedesktop Root partition (IA64)" }, + /* Root dm-verity partitions */ + { GUID_CONST(0xD13C5D3B, 0xB5D1, 0x422A, 0xB2, 0x9F, 0x94, 0x54, 0xFD, 0xC8, 0x9D, 0x76), + "Freedesktop Root verity partition (x86)" }, + { GUID_CONST(0x2C7357ED, 0xEBD2, 0x46D9, 0xAE, 0xC1, 0x23, 0xD4, 0x37, 0xEC, 0x2B, 0xF5), + "Freedesktop Root verity partition (x86-64)" }, + { GUID_CONST(0x7386CDF2, 0x203C, 0x47A9, 0xA4, 0x98, 0xF2, 0xEC, 0xCE, 0x45, 0xA2, 0xD6), + "Freedesktop Root verity partition (32-bit ARM)" }, + { GUID_CONST(0xDF3300CE, 0xD69F, 0x4C92, 0x97, 0x8C, 0x9B, 0xFB, 0x0F, 0x38, 0xD8, 0x20), + "Freedesktop Root verity partition (64-bit ARM/AArch64)" }, + { GUID_CONST(0x86ED10D5, 0xB607, 0x45BB, 0x89, 0x57, 0xD3, 0x50, 0xF2, 0x3D, 0x05, 0x71), + "Freedesktop Root verity partition (IA64)" }, + /* User partitions */ + { GUID_CONST(0x75250D76, 0x8CC6, 0x458E, 0xBD, 0x66, 0xBD, 0x47, 0xCC, 0x81, 0xA8, 0x12), + "Freedesktop /usr partition (x86)" }, + { GUID_CONST(0x8484680C, 0x9521, 0x48C6, 0x9C, 0x11, 0xB0, 0x72, 0x06, 0x56, 0xF6, 0x9E), + "Freedesktop /usr partition (x86-64)" }, + { GUID_CONST(0x7D0359A3, 0x02B3, 0x4F0A, 0x86, 0x5C, 0x65, 0x44, 0x03, 0xE7, 0x06, 0x25), + "Freedesktop /usr partition (32-bit ARM)" }, + { GUID_CONST(0xB0E01050, 0xEE5F, 0x4390, 0x94, 0x9A, 0x91, 0x01, 0xB1, 0x71, 0x04, 0xE9), + "Freedesktop /usr partition (64-bit ARM/AArch64)" }, + { GUID_CONST(0x4301D2A6, 0x4E3B, 0x4B2A, 0xBB, 0x94, 0x9E, 0x0B, 0x2C, 0x42, 0x25, 0xEA), + "Freedesktop /usr partition (IA64)" }, + /* User dm-verity partitions */ + { GUID_CONST(0x8F461B0D, 0x14EE, 0x4E81, 0x9A, 0xA9, 0x04, 0x9B, 0x6F, 0xB9, 0x7A, 0xBD), + "Freedesktop /usr verity partition (x86)" }, + { GUID_CONST(0x77FF5F63, 0xE7B6, 0x4633, 0xAC, 0xF4, 0x15, 0x65, 0xB8, 0x64, 0xC0, 0xE6), + "Freedesktop /usr verity partition (x86-64)" }, + { GUID_CONST(0xC215D751, 0x7BCD, 0x4649, 0xBE, 0x90, 0x66, 0x27, 0x49, 0x0A, 0x4C, 0x05), + "Freedesktop /usr verity partition (32-bit ARM)" }, + { GUID_CONST(0x6E11A4E7, 0xFBCA, 0x4DED, 0xB9, 0xE9, 0xE1, 0xA5, 0x12, 0xBB, 0x66, 0x4E), + "Freedesktop /usr verity partition (64-bit ARM/AArch64)" }, + { GUID_CONST(0x6A491E03, 0x3BE7, 0x4545, 0x8E, 0x38, 0x83, 0x32, 0x0E, 0x0E, 0xA8, 0x80), + "Freedesktop /usr verity partition (IA64)" }, + /* Native */ + { GUID_CONST(0x933AC7E1, 0x2EB4, 0x4F13, 0xB8, 0x44, 0x0E, 0x14, 0xE2, 0xAE, 0xF9, 0x15), + "Freedesktop /home partition" }, + { GUID_CONST(0x3B8F8425, 0x20E0, 0x4F3B, 0x90, 0x7F, 0x1A, 0x25, 0xA7, 0x6F, 0x98, 0xE8), + "Freedesktop /srv (server data) partition" }, + /* Variable data */ + { GUID_CONST(0x4D21B016, 0xB534, 0x45C2, 0xA9, 0xFB, 0x5C, 0x16, 0xE0, 0x91, 0xFD, 0x2D), + "Freedesktop /var partition" }, + { GUID_CONST(0x7EC6F557, 0x3BC5, 0x4ACA, 0xB2, 0x93, 0x16, 0xEF, 0x5D, 0xF6, 0x39, 0xD1), + "Freedesktop /var/tmp partition" }, + /* Boot partition */ + // "Extended Boot Loader Partition" / "Shared boot loader configuration" + { GUID_CONST(0xBC13C2FF, 0x59E6, 0x4262, 0xA3, 0x52, 0xB2, 0x75, 0xFD, 0x6F, 0x71, 0x72), + "Freedesktop /boot partition" }, + + /* + * Linux + */ + { GUID_CONST(0x0FC63DAF, 0x8483, 0x4772, 0x8E, 0x79, 0x3D, 0x69, 0xD8, 0x47, 0x7D, 0xE4), + "Linux data" }, + { GUID_CONST(0xA19D880F, 0x05FC, 0x4D3B, 0xA0, 0x06, 0x74, 0x3F, 0x0F, 0x84, 0x91, 0x1E), + "Linux RAID partition" }, + { GUID_CONST(0x0657FD6D, 0xA4AB, 0x43C4, 0x84, 0xE5, 0x09, 0x33, 0xC8, 0x4B, 0x4F, 0x4F), + "Linux Swap partition" }, + // Logical Volume Manager (LVM) + { GUID_CONST(0xE6D6D379, 0xF507, 0x44C2, 0xA2, 0x3C, 0x23, 0x8F, 0x2A, 0x3D, 0xF9, 0x28), + "Linux LVM partition" }, + { GUID_CONST(0x8DA63339, 0x0007, 0x60C0, 0xC4, 0x36, 0x08, 0x3A, 0xC8, 0x23, 0x09, 0x08), + "Linux reserved" }, + { GUID_CONST(0x7FFEC5C9, 0x2D00, 0x49B7, 0x89, 0x41, 0x3E, 0xA1, 0x0A, 0x55, 0x86, 0xB7), + "Linux Plain dm-crypt partition" }, + { GUID_CONST(0xCA7D7CCB, 0x63ED, 0x4C53, 0x86, 0x1C, 0x17, 0x42, 0x53, 0x60, 0x59, 0xCC), + "Linux LUKS partition" }, + + /* + * FreeBSD + */ + { GUID_CONST(0x83BD6B9D, 0x7F41, 0x11DC, 0xBE, 0x0B, 0x00, 0x15, 0x60, 0xB8, 0x4F, 0x0F), + "FreeBSD Boot" }, + { GUID_CONST(0x516E7CB4, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B), + "FreeBSD Data" }, + { GUID_CONST(0x516E7CB5, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B), + "FreeBSD Swap" }, + // Unix File System (UFS) + { GUID_CONST(0x516E7CB6, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B), + "FreeBSD UFS" }, + /* The following is unused but documented here to avoid reuse. + * GUID_CONST(0x516E7CB7, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B); + */ + // Vinum volume manager + { GUID_CONST(0x516E7CB8, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B), + "FreeBSD Vinum" }, + { GUID_CONST(0x516E7CBA, 0x6ECF, 0x11D6, 0x8F, 0xF8, 0x00, 0x02, 0x2D, 0x09, 0x71, 0x2B), + "FreeBSD ZFS" }, + + /* + * MidnightBSD + */ + { GUID_CONST(0x85D5E45E, 0x237C, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD Boot" }, + { GUID_CONST(0x85D5E45A, 0x237C, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD Data" }, + { GUID_CONST(0x85D5E45B, 0x237C, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD Swap" }, + // Unix File System (UFS) + { GUID_CONST(0x0394EF8B, 0x237E, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD UFS" }, + // Vinum volume manager + { GUID_CONST(0x85D5E45C, 0x237C, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD Vinum" }, + { GUID_CONST(0x85D5E45D, 0x237C, 0x11E1, 0xB4, 0xB3, 0xE8, 0x9A, 0x8F, 0x7F, 0xC3, 0xA7), + "MidnightBSD ZFS" }, + + /* + * NetBSD + */ + { GUID_CONST(0x49F48D32, 0xB10E, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD Swap" }, + { GUID_CONST(0x49F48D5A, 0xB10E, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD FFS" }, + { GUID_CONST(0x49F48D82, 0xB10E, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD LFS" }, + // NetBSD RAID Frame + { GUID_CONST(0x49F48DAA, 0xB10E, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD RAID" }, + // NetBSD CCD + { GUID_CONST(0x2DB519C4, 0xB10F, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD Concatenated partition" }, + // NetBSD CGD + { GUID_CONST(0x2DB519EC, 0xB10F, 0x11DC, 0xB9, 0x9B, 0x00, 0x19, 0xD1, 0x87, 0x96, 0x48), + "NetBSD Encrypted partition" }, + + /* + * OpenBSD + */ + { GUID_CONST(0x824CC7A0, 0x36A8, 0x11E3, 0x89, 0x0A, 0x95, 0x25, 0x19, 0xAD, 0x3F, 0x61), + "OpenBSD Data" }, + + /* + * DragonFlyBSD + */ + { GUID_CONST(0x9D087404, 0x1CA5, 0x11DC, 0x88, 0x17, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD L32" }, + { GUID_CONST(0x3D48CE54, 0x1D16, 0x11DC, 0x86, 0x96, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD L64" }, + { GUID_CONST(0xBD215AB2, 0x1D16, 0x11DC, 0x86, 0x96, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Legacy" }, + { GUID_CONST(0xDBD5211B, 0x1CA5, 0x11DC, 0x88, 0x17, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Concatenated partition" }, + { GUID_CONST(0x61DC63AC, 0x6E38, 0x11DC, 0x85, 0x13, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Hammer" }, + { GUID_CONST(0x5CBB9AD1, 0x862D, 0x11DC, 0xA9, 0x4D, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Hammer 2" }, + { GUID_CONST(0x9D58FDBD, 0x1CA5, 0x11DC, 0x88, 0x17, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Swap" }, + // Unix File System (UFS) + { GUID_CONST(0x9D94CE7C, 0x1CA5, 0x11DC, 0x88, 0x17, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD UFS" }, + // Vinum volume manager + { GUID_CONST(0x9DD4478F, 0x1CA5, 0x11DC, 0x88, 0x17, 0x01, 0x30, 0x1B, 0xB8, 0xA9, 0xF5), + "DragonFlyBSD Vinum" }, + + /* + * Apple / MacOS Darwin + */ + { GUID_CONST(0x6A898CC3, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Apple ZFS / Solaris /usr" }, + // APPLE_HFS "Apple data partition" / "Mac OS X Hierarchical File System Plus (HFS+) partition" + { GUID_CONST(0x48465300, 0x0000, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "MacOS X HFS+" }, + // "Apple APFS container" + { GUID_CONST(0x7C3457EF, 0x0000, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "APFS FileVault volume container" }, + { GUID_CONST(0x55465300, 0x0000, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple UFS container" }, + { GUID_CONST(0x52414944, 0x0000, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple RAID" }, + { GUID_CONST(0x52414944, 0x5F4F, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple RAID offline" }, + { GUID_CONST(0x426F6F74, 0x0000, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple Boot partition (Recovery HD)" }, + { GUID_CONST(0x4C616265, 0x6C00, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple Label" }, + { GUID_CONST(0x5265636F, 0x7665, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple TV Recovery partition" }, + { GUID_CONST(0x53746F72, 0x6167, 0x11AA, 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC), + "Apple Core Storage (Lion FileVault) Container" }, + { GUID_CONST(0xB6FA30DA, 0x92D2, 0x4A9A, 0x96, 0xF1, 0x87, 0x1E, 0xC6, 0x48, 0x62, 0x00), + "SoftRAID_Status" }, + { GUID_CONST(0x2E313465, 0x19B9, 0x463F, 0x81, 0x26, 0x8A, 0x79, 0x93, 0x77, 0x38, 0x01), + "SoftRAID_Scratch" }, + { GUID_CONST(0xFA709C7E, 0x65B1, 0x4593, 0xBF, 0xD5, 0xE7, 0x1D, 0x61, 0xDE, 0x9B, 0x02), + "SoftRAID_Volume" }, + { GUID_CONST(0xBBBA6DF5, 0xF46F, 0x4A89, 0x8F, 0x59, 0x87, 0x65, 0xB2, 0x72, 0x75, 0x03), + "SoftRAID_Cache" }, + + /* + * Solaris / Illumos + */ + { GUID_CONST(0x6A82CB45, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Boot" }, + { GUID_CONST(0x6A85CF4D, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Root" }, + { GUID_CONST(0x6A87C46F, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Swap" }, + { GUID_CONST(0x6A8B642B, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Backup" }, + // See MacOS "Apple ZFS partition" + // { GUID_CONST(0x6A898CC3, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + // "Solaris /usr" }, + { GUID_CONST(0x6A8EF2E9, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris /var" }, + { GUID_CONST(0x6A90BA39, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris /home" }, + { GUID_CONST(0x6A9283A5, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Alternate sector" }, + { GUID_CONST(0x6A945A3B, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Reserved" }, + { GUID_CONST(0x6A9630D1, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Reserved" }, + { GUID_CONST(0x6A980767, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Reserved" }, + { GUID_CONST(0x6A96237F, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Reserved" }, + { GUID_CONST(0x6A8D2AC7, 0x1DD2, 0x11B2, 0x99, 0xA6, 0x08, 0x00, 0x20, 0x73, 0x66, 0x31), + "Solaris Reserved" }, + + /* + * ChromeOS + */ + { GUID_CONST(0xFE3A2A5D, 0x4F32, 0x41A7, 0xB7, 0x25, 0xAC, 0xCC, 0x32, 0x85, 0xA3, 0x09), + "ChromeOS kernel" }, + { GUID_CONST(0x3CB8E202, 0x3B7E, 0x47DD, 0x8A, 0x3C, 0x7F, 0xF2, 0xA1, 0x3C, 0xFC, 0xEC), + "ChromeOS rootfs" }, + { GUID_CONST(0x2E0A753D, 0x9E48, 0x43B0, 0x83, 0x37, 0xB1, 0x51, 0x92, 0xCB, 0x1B, 0x5E), + "ChromeOS future use" }, + + /* + * Haiku + */ + { GUID_CONST(0x42465331, 0x3BA3, 0x10F1, 0x80, 0x2A, 0x48, 0x61, 0x69, 0x6B, 0x75, 0x21), + "Haiku BFS" }, + + /* + * Container Linux + */ + { GUID_CONST(0x5DFBF5F4, 0x2848, 0x4BAC, 0xAA, 0x5E, 0x0D, 0x9A, 0x20, 0xB7, 0x45, 0xA6), + "/usr partition (coreos-usr)" }, + { GUID_CONST(0x3884DD41, 0x8582, 0x4404, 0xB9, 0xA8, 0xE9, 0xB8, 0x4F, 0x2D, 0xF5, 0x0E), + "Resizable rootfs (coreos-resize)" }, + { GUID_CONST(0xC95DC21A, 0xDF0E, 0x4340, 0x8D, 0x7B, 0x26, 0xCB, 0xFA, 0x9A, 0x03, 0xE0), + "OEM customizations (coreos-reserved)" }, + { GUID_CONST(0xBE9067B9, 0xEA49, 0x4F15, 0xB4, 0xF6, 0xF3, 0x6F, 0x8C, 0x9E, 0x18, 0x18), + "Root filesystem on RAID (coreos-root-raid)" }, + + /* + * Ceph + */ + { GUID_CONST(0x45B0969E, 0x9B03, 0x4F30, 0xB4, 0xC6, 0xB4, 0xB8, 0x0C, 0xEF, 0xF1, 0x06), + "Ceph Journal" }, + { GUID_CONST(0x45B0969E, 0x9B03, 0x4F30, 0xB4, 0xC6, 0x5E, 0xC0, 0x0C, 0xEF, 0xF1, 0x06), + "dm-crypt journal" }, + { GUID_CONST(0x4FBD7E29, 0x9D25, 0x41B8, 0xAF, 0xD0, 0x06, 0x2C, 0x0C, 0xEF, 0xF0, 0x5D), + "Ceph OSD" }, + { GUID_CONST(0x4FBD7E29, 0x9D25, 0x41B8, 0xAF, 0xD0, 0x5E, 0xC0, 0x0C, 0xEF, 0xF0, 0x5D), + "dm-crypt OSD" }, + { GUID_CONST(0x89C57F98, 0x2FE5, 0x4DC0, 0x89, 0xC1, 0xF3, 0xAD, 0x0C, 0xEF, 0xF2, 0xBE), + "Ceph Disk in creation" }, + { GUID_CONST(0x89C57F98, 0x2FE5, 0x4DC0, 0x89, 0xC1, 0x5E, 0xC0, 0x0C, 0xEF, 0xF2, 0xBE), + "dm-crypt disk in creation" }, + { GUID_CONST(0xCAFECAFE, 0x9B03, 0x4F30, 0xB4, 0xC6, 0xB4, 0xB8, 0x0C, 0xEF, 0xF1, 0x06), + "Ceph Block" }, + { GUID_CONST(0x30CD0809, 0xC2B2, 0x499C, 0x88, 0x79, 0x2D, 0x6B, 0x78, 0x52, 0x98, 0x76), + "Ceph Block DB" }, + { GUID_CONST(0x5CE17FCE, 0x4087, 0x4169, 0xB7, 0xFF, 0x05, 0x6C, 0xC5, 0x84, 0x73, 0xF9), + "Ceph Block write-ahead log" }, + { GUID_CONST(0xFB3AABF9, 0xD25F, 0x47CC, 0xBF, 0x5E, 0x72, 0x1D, 0x18, 0x16, 0x49, 0x6B), + "Lockbox for dm-crypt keys" }, + { GUID_CONST(0x4FBD7E29, 0x8AE0, 0x4982, 0xBF, 0x9D, 0x5A, 0x8D, 0x86, 0x7A, 0xF5, 0x60), + "Ceph Multipath OSD" }, + { GUID_CONST(0x45B0969E, 0x8AE0, 0x4982, 0xBF, 0x9D, 0x5A, 0x8D, 0x86, 0x7A, 0xF5, 0x60), + "Ceph Multipath journal" }, + { GUID_CONST(0xCAFECAFE, 0x8AE0, 0x4982, 0xBF, 0x9D, 0x5A, 0x8D, 0x86, 0x7A, 0xF5, 0x60), + "Ceph Multipath block" }, + { GUID_CONST(0x7F4A666A, 0x16F3, 0x47A2, 0x84, 0x45, 0x15, 0x2E, 0xF4, 0xD0, 0x3F, 0x6C), + "Ceph Multipath block" }, + { GUID_CONST(0xEC6D6385, 0xE346, 0x45DC, 0xBE, 0x91, 0xDA, 0x2A, 0x7C, 0x8B, 0x32, 0x61), + "Ceph Multipath block DB" }, + { GUID_CONST(0x01B41E1B, 0x002A, 0x453C, 0x9F, 0x17, 0x88, 0x79, 0x39, 0x89, 0xFF, 0x8F), + "Ceph Multipath block write-ahead log" }, + { GUID_CONST(0xCAFECAFE, 0x9B03, 0x4F30, 0xB4, 0xC6, 0x5E, 0xC0, 0x0C, 0xEF, 0xF1, 0x06), + "dm-crypt block" }, + { GUID_CONST(0x93B0052D, 0x02D9, 0x4D8A, 0xA4, 0x3B, 0x33, 0xA3, 0xEE, 0x4D, 0xFB, 0xC3), + "dm-crypt block DB" }, + { GUID_CONST(0x306E8683, 0x4FE2, 0x4330, 0xB7, 0xC0, 0x00, 0xA9, 0x17, 0xC1, 0x69, 0x66), + "dm-crypt block write-ahead log" }, + { GUID_CONST(0x45B0969E, 0x9B03, 0x4F30, 0xB4, 0xC6, 0x35, 0x86, 0x5C, 0xEF, 0xF1, 0x06), + "dm-crypt LUKS journal" }, + { GUID_CONST(0xCAFECAFE, 0x9B03, 0x4F30, 0xB4, 0xC6, 0x35, 0x86, 0x5C, 0xEF, 0xF1, 0x06), + "dm-crypt LUKS block" }, + { GUID_CONST(0x166418DA, 0xC469, 0x4022, 0xAD, 0xF4, 0xB3, 0x0A, 0xFD, 0x37, 0xF1, 0x76), + "dm-crypt LUKS block DB" }, + { GUID_CONST(0x86A32090, 0x3647, 0x40B9, 0xBB, 0xBD, 0x38, 0xD8, 0xC5, 0x73, 0xAA, 0x86), + "dm-crypt LUKS block write-ahead log" }, + { GUID_CONST(0x4FBD7E29, 0x9D25, 0x41B8, 0xAF, 0xD0, 0x35, 0x86, 0x5C, 0xEF, 0xF0, 0x5D), + "dm-crypt LUKS OSD" }, + + /* + * QNX + */ + { GUID_CONST(0xCEF5A9AD, 0x73BC, 0x4601, 0x89, 0xF3, 0xCD, 0xEE, 0xEE, 0xE3, 0x21, 0xA1), + "Power-safe (QNX6) file system" }, + + /* + * Plan 9 + */ + { GUID_CONST(0xC91818F9, 0x8025, 0x47AF, 0x89, 0xD2, 0xF0, 0x30, 0xD7, 0x00, 0x0C, 0x2C), + "Plan 9 partition" }, + + /* + * VMware ESX + */ + { GUID_CONST(0xAA31E02A, 0x400F, 0x11DB, 0x95, 0x90, 0x00, 0x0C, 0x29, 0x11, 0xD1, 0xB8), + "VMware VMFS" }, + { GUID_CONST(0x9D275380, 0x40AD, 0x11DB, 0xBF, 0x97, 0x00, 0x0C, 0x29, 0x11, 0xD1, 0xB8), + "VMware VMKCORE" }, + { GUID_CONST(0x9198EFFC, 0x31C0, 0x11DB, 0x8F, 0x78, 0x00, 0x0C, 0x29, 0x11, 0xD1, 0xB8), + "VMware Reserved" }, + { GUID_CONST(0x381CFCCC, 0x7288, 0x11E0, 0x92, 0xEE, 0x00, 0x0C, 0x29, 0x11, 0xD0, 0xB2), + "VMware vSAN" }, + + /* + * Android-IA + */ + { GUID_CONST(0x2568845D, 0x2332, 0x4675, 0xBC, 0x39, 0x8F, 0xA5, 0xA4, 0x74, 0x8D, 0x15), + "Android Bootloader" }, + { GUID_CONST(0x114EAFFE, 0x1552, 0x4022, 0xB2, 0x6E, 0x9B, 0x05, 0x36, 0x04, 0xCF, 0x84), + "Android Bootloader2" }, + { GUID_CONST(0x49A4D17F, 0x93A3, 0x45C1, 0xA0, 0xDE, 0xF5, 0x0B, 0x2E, 0xBE, 0x25, 0x99), + "Android Boot" }, + { GUID_CONST(0x4177C722, 0x9E92, 0x4AAB, 0x86, 0x44, 0x43, 0x50, 0x2B, 0xFD, 0x55, 0x06), + "Android Recovery" }, + { GUID_CONST(0xEF32A33B, 0xA409, 0x486C, 0x91, 0x41, 0x9F, 0xFB, 0x71, 0x1F, 0x62, 0x66), + "Android Misc" }, + { GUID_CONST(0x20AC26BE, 0x20B7, 0x11E3, 0x84, 0xC5, 0x6C, 0xFD, 0xB9, 0x47, 0x11, 0xE9), + "Android Metadata" }, + { GUID_CONST(0x38F428E6, 0xD326, 0x425D, 0x91, 0x40, 0x6E, 0x0E, 0xA1, 0x33, 0x64, 0x7C), + "Android System" }, + { GUID_CONST(0xA893EF21, 0xE428, 0x470A, 0x9E, 0x55, 0x06, 0x68, 0xFD, 0x91, 0xA2, 0xD9), + "Android Cache" }, + { GUID_CONST(0xDC76DDA9, 0x5AC1, 0x491C, 0xAF, 0x42, 0xA8, 0x25, 0x91, 0x58, 0x0C, 0x0D), + "Android Data" }, + { GUID_CONST(0xEBC597D0, 0x2053, 0x4B15, 0x8B, 0x64, 0xE0, 0xAA, 0xC7, 0x5F, 0x4D, 0xB1), + "Android Persistent" }, + { GUID_CONST(0xC5A0AEEC, 0x13EA, 0x11E5, 0xA1, 0xB1, 0x00, 0x1E, 0x67, 0xCA, 0x0C, 0x3C), + "Android Vendor" }, + { GUID_CONST(0xBD59408B, 0x4514, 0x490D, 0xBF, 0x12, 0x98, 0x78, 0xD9, 0x63, 0xF3, 0x78), + "Android Config" }, + { GUID_CONST(0x8F68CC74, 0xC5E5, 0x48DA, 0xBE, 0x91, 0xA0, 0xC8, 0xC1, 0x5E, 0x9C, 0x80), + "Android Factory" }, + { GUID_CONST(0x9FDAA6EF, 0x4B3F, 0x40D2, 0xBA, 0x8D, 0xBF, 0xF1, 0x6B, 0xFB, 0x88, 0x7B), + "Android Factory (alt)" }, + { GUID_CONST(0x767941D0, 0x2085, 0x11E3, 0xAD, 0x3B, 0x6C, 0xFD, 0xB9, 0x47, 0x11, 0xE9), + "Android Fastboot / Tertiary" }, + { GUID_CONST(0xAC6D7924, 0xEB71, 0x4DF8, 0xB4, 0x8D, 0xE2, 0x67, 0xB2, 0x71, 0x48, 0xFF), + "Android OEM" }, + + /* + * Android 6.0+ ARM + */ + { GUID_CONST(0x19A710A2, 0xB3CA, 0x11E4, 0xB0, 0x26, 0x10, 0x60, 0x4B, 0x88, 0x9D, 0xCF), + "Android Meta" }, + { GUID_CONST(0x193D1EA4, 0xB3CA, 0x11E4, 0xB0, 0x75, 0x10, 0x60, 0x4B, 0x88, 0x9D, 0xCF), + "Android EXT" }, + + /* + * ONIE (Open Network Install Environment) + */ + { GUID_CONST(0x7412F7D5, 0xA156, 0x4B13, 0x81, 0xDC, 0x86, 0x71, 0x74, 0x92, 0x93, 0x25), + "ONIE Boot" }, + { GUID_CONST(0xD4E6E2CD, 0x4469, 0x46F3, 0xB5, 0xCB, 0x1B, 0xFF, 0x57, 0xAF, 0xC1, 0x49), + "ONIE Config" }, + + /* + * Atari TOS + */ + { GUID_CONST(0x734E5AFE, 0xF61A, 0x11E6, 0xBC, 0x64, 0x92, 0x36, 0x1F, 0x00, 0x26, 0x71), + "Atari TOS Basic data partition (GEM, BGM, F32)" }, + + /* + * VeraCrypt + */ + { GUID_CONST(0x8C8F8EFF, 0xAC95, 0x4770, 0x81, 0x4A, 0x21, 0x99, 0x4F, 0x2D, 0xBC, 0x8F), + "VeraCrypt Encrypted data partition" }, + + /* + * OS/2 ArcaOS + */ + { GUID_CONST(0x90B6FF38, 0xB98F, 0x4358, 0xA2, 0x1F, 0x48, 0xF3, 0x5B, 0x4A, 0x8A, 0xD3), + "ArcaOS Type 1" }, +}; + +/* EOF */ diff --git a/base/setup/lib/utils/partinfo.h b/base/setup/lib/utils/partinfo.h new file mode 100644 index 00000000000..d1c598aba90 --- /dev/null +++ b/base/setup/lib/utils/partinfo.h @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (
https://spdx.org/licenses/GPL-2.0+
) + * PURPOSE: MBR and GPT Partition types + * COPYRIGHT: Copyright 2018-2020 Hermes Belusca-Maito + */ + +#pragma once + +/* MBR PARTITION TYPES ******************************************************/ + +typedef struct _MBR_PARTITION_TYPE +{ + UCHAR Type; + PCSTR Description; +} MBR_PARTITION_TYPE, *PMBR_PARTITION_TYPE; + +#define NUM_MBR_PARTITION_TYPES 153 +extern const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES]; + +/* GPT PARTITION TYPES ******************************************************/ + +typedef struct _GPT_PARTITION_TYPE +{ + GUID Guid; + PCSTR Description; +} GPT_PARTITION_TYPE, *PGPT_PARTITION_TYPE; + +#define NUM_GPT_PARTITION_TYPES 177 +extern const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES]; + +/* EOF */ diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 008dd9947a9..c917aada568 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -29,185 +29,6 @@ typedef struct _REG_DISK_MOUNT_INFO #include <poppack.h> -/* HELPERS FOR PARTITION TYPES **********************************************/ - -/* - * This partition type list was ripped from the kernelDisk.c module of - * the Visopsys Operating System (see license below), and completed with - * information from Paragon Hard-Disk Manager, and the following websites: - *
http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
- *
https://en.wikipedia.org/wiki/Partition_type#List_of_partition_IDs
- */ -/* - * kernelDisk.c - * - * Visopsys Operating System - * Copyright (C) 1998-2015 J. Andrew McLaughlin - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/* This is a table for keeping known partition type codes and descriptions */ -PARTITION_TYPE PartitionTypes[NUM_PARTITION_TYPE_ENTRIES] = -{ - { 0x00, "(Empty)" }, - { 0x01, "FAT12" }, - { 0x02, "XENIX root" }, - { 0x03, "XENIX usr" }, - { 0x04, "FAT16 (< 32 MB)" }, - { 0x05, "Extended" }, - { 0x06, "FAT16" }, - { 0x07, "NTFS/HPFS/exFAT" }, - { 0x08, "OS/2 or AIX boot" }, - { 0x09, "AIX data" }, - { 0x0A, "OS/2 Boot Manager" }, - { 0x0B, "FAT32" }, - { 0x0C, "FAT32 (LBA)" }, - { 0x0E, "FAT16 (LBA)" }, - { 0x0F, "Extended (LBA)" }, - { 0x10, "OPUS" }, - { 0x11, "Hidden FAT12" }, - { 0x12, "FAT diagnostic (Compaq)" }, - { 0x13, "BTRON" }, - { 0x14, "Hidden FAT16 (< 32 MB)" }, - { 0x16, "Hidden FAT16" }, - { 0x17, "Hidden HPFS or NTFS" }, - { 0x18, "AST SmartSleep" }, - { 0x1B, "Hidden FAT32" }, - { 0x1C, "Hidden FAT32 (LBA)" }, - { 0x1E, "Hidden FAT16 (LBA)" }, - { 0x24, "NEC DOS 3.x" }, - { 0x27, "Hidden WinRE NTFS" }, - { 0x2A, "AtheOS File System (AFS)" }, - { 0x2B, "SyllableSecure (SylStor)" }, - { 0x32, "NOS" }, - { 0x35, "JFS on OS/2 or eCS" }, - { 0x38, "THEOS v3.2 2GB partition" }, - { 0x39, "Plan 9" }, - { 0x3A, "THEOS v4 4GB partition" }, - { 0x3B, "THEOS v4 extended partition" }, - { 0x3C, "PartitionMagic recovery partition" }, - { 0x3D, "Hidden NetWare" }, - { 0x40, "Lynx" }, - { 0x41, "PowerPC PReP boot" }, - { 0x42, "Win2K Dynamic Volume extended" }, - { 0x43, "Old Linux" }, - { 0x44, "GoBack" }, - { 0x45, "Priam or Boot-US Boot Manager" }, - { 0x4D, "QNX4.x" }, - { 0x4E, "QNX4.x 2nd partition" }, - { 0x4F, "QNX4.x 3rd partition" }, - { 0x50, "OnTrack Disk Manager R/O" }, - { 0x51, "OnTrack Disk Manager R/W or Novell" }, - { 0x52, "CP/M" }, - { 0x53, "OnTrack DM6 Aux3" }, - { 0x54, "OnTrack DM6 Dynamic Drive Overlay" }, - { 0x55, "EZ-Drive" }, - { 0x56, "Golden Bow VFeature Partitioned Volume" }, - { 0x5C, "Priam EDisk" }, - { 0x61, "SpeedStor" }, - { 0x62, "Pick" }, - { 0x63, "GNU HURD or Unix System V (SCO, ISC Unix, UnixWare)" }, - { 0x64, "Novell NetWare 286, 2.xx" }, - { 0x65, "Novell NetWare 386, 3.xx or 4.xx" }, - { 0x66, "Novell NetWare SMS Partition" }, - { 0x67, "Novell" }, - { 0x68, "Novell" }, - { 0x69, "Novell NetWare 5+" }, - { 0x70, "DiskSecure Multi-Boot" }, - { 0x75, "IBM PC/IX" }, - { 0x7E, "Veritas VxVM public" }, - { 0x7F, "Veritas VxVM private" }, - { 0x80, "Old MINIX" }, - { 0x81, "Linux or MINIX" }, - { 0x82, "Linux swap or Solaris" }, - { 0x83, "Linux Native" }, - { 0x84, "Hibernate" }, - { 0x85, "Extended Linux" }, - { 0x86, "FAT16 mirrored" }, - { 0x87, "HPFS or NTFS mirrored" }, - { 0x88, "Linux plaintext partition table" }, - { 0x8B, "FAT32 mirrored" }, - { 0x8C, "FAT32 (LBA) mirrored" }, - { 0x8E, "Linux LVM" }, - { 0x93, "Hidden Linux" }, - { 0x94, "Amoeba BBT" }, - { 0x96, "CDFS/ISO-9660" }, - { 0x9F, "BSD/OS" }, - { 0xA0, "Laptop Hibernate" }, - { 0xA1, "Laptop Hibernate (NEC 6000H)" }, - { 0xA5, "BSD, NetBSD, FreeBSD" }, - { 0xA6, "OpenBSD" }, - { 0xA7, "NeXTStep" }, - { 0xA8, "Darwin UFS" }, // Also known as "OS-X" - { 0xA9, "NetBSD" }, - { 0xAB, "Darwin boot" }, - { 0xAF, "Apple HFS" }, - { 0xB6, "NT FAT16 corrupt mirror" }, - { 0xB7, "BSDI BSD/386 FS" }, // Alternatively, "NT NTFS corrupt mirror" - { 0xB8, "BSDI BSD/386 swap" }, - { 0xBB, "Boot Wizard hidden" }, - { 0xBC, "Paragon Backup capsule" }, - { 0xBE, "Solaris 8 boot partition" }, - { 0xBF, "Solaris 10 x86" }, - { 0xC0, "NTFT" }, // Alternatively, "CTOS" or "REAL/32 or DR-DOS or Novell-DOS secure partition" - { 0xC1, "DR-DOS FAT12" }, - { 0xC2, "Hidden Linux" }, - { 0xC3, "Hidden Linux swap" }, - { 0xC4, "DR-DOS FAT16 (< 32 MB)" }, - { 0xC5, "DR-DOS Extended" }, - { 0xC6, "DR-DOS FAT16" }, - { 0xC7, "HPFS mirrored" }, // Alternatively, "Syrinx boot" - { 0xCB, "DR-DOS FAT32" }, - { 0xCC, "DR-DOS FAT32 (LBA)" }, - { 0xCE, "DR-DOS FAT16 (LBA)" }, - { 0xD0, "MDOS" }, - { 0xD1, "MDOS FAT12" }, - { 0xD4, "MDOS FAT16 (< 32 MB)" }, - { 0xD5, "MDOS Extended" }, - { 0xD6, "MDOS FAT16" }, - { 0xD8, "CP/M-86" }, - { 0xDB, "Digital Research CP/M" }, - { 0xDE, "Dell OEM" }, - { 0xDF, "BootIt EMBRM (FAT16/32)" }, - { 0xE1, "SpeedStor FAT12" }, - { 0xE3, "SpeedStor (0xE3)" }, - { 0xE4, "SpeedStor FAT16" }, - { 0xE5, "Tandy MSDOS" }, - { 0xE6, "SpeedStor (0xE6)" }, - { 0xE8, "Linux Unified Key Setup partition" }, - { 0xEA, "Rufus private partition" }, - { 0xEB, "BeOS BFS" }, - { 0xEC, "SkyOS SkyFS" }, - { 0xEE, "EFI GPT protective" }, - { 0xEF, "EFI System partition" }, - { 0xF0, "Linux/PA-RISC boot loader" }, - { 0xF1, "SpeedStor (0xF1)" }, - { 0xF2, "DOS 3.3+ second" }, - { 0xF4, "SpeedStor (0xF4)" }, - { 0xF5, "SpeedStor (0xF5)" }, - { 0xF6, "SpeedStor (0xF6)" }, - { 0xFA, "Bochs" }, - { 0xFB, "VMware FS" }, - { 0xFC, "VMware swap" }, - { 0xFD, "Linux RAID auto" }, - { 0xFE, "NT hidden partition" }, - { 0xFF, "XENIX Bad Block Table" }, -}; - - /* FUNCTIONS ****************************************************************/ #ifdef DUMP_PARTITION_TABLE diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 2669b9ecdef..cce21d2eede 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -8,18 +8,6 @@ #pragma once -/* HELPERS FOR PARTITION TYPES **********************************************/ - -typedef struct _PARTITION_TYPE -{ - UCHAR Type; - PCHAR Description; -} PARTITION_TYPE, *PPARTITION_TYPE; - -#define NUM_PARTITION_TYPE_ENTRIES 143 -extern PARTITION_TYPE PartitionTypes[NUM_PARTITION_TYPE_ENTRIES]; - - /* EXTRA HANDFUL MACROS *****************************************************/ // NOTE: They should be moved into some global header. diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index ef26d2af38a..dd14e330779 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -254,14 +254,33 @@ GetPartitionTypeString( UINT i; /* Do the table lookup */ - for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) + if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) { - if (PartEntry->PartitionType == PartitionTypes[i].Type) + for (i = 0; i < ARRAYSIZE(MbrPartitionTypes); ++i) { - StringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description); - return; + if (PartEntry->PartitionType == MbrPartitionTypes[i].Type) + { + StringCchCopyA(strBuffer, cchBuffer, + MbrPartitionTypes[i].Description); + return; + } + } + } +#if 0 // TODO: GPT support! + else if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + for (i = 0; i < ARRAYSIZE(GptPartitionTypes); ++i) + { + if (IsEqualPartitionType(PartEntry->PartitionType, + GptPartitionTypes[i].Guid)) + { + StringCchCopyA(strBuffer, cchBuffer, + GptPartitionTypes[i].Description); + return; + } } } +#endif /* We are here because the partition type is unknown */ if (cchBuffer > 0) *strBuffer = '\0'; diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index d10f6c3af6a..879a8015f07 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -52,14 +52,33 @@ GetPartitionTypeString( UINT i; /* Do the table lookup */ - for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) + if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) { - if (PartEntry->PartitionType == PartitionTypes[i].Type) + for (i = 0; i < ARRAYSIZE(MbrPartitionTypes); ++i) { - RtlStringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description); - return; + if (PartEntry->PartitionType == MbrPartitionTypes[i].Type) + { + RtlStringCchCopyA(strBuffer, cchBuffer, + MbrPartitionTypes[i].Description); + return; + } } } +#if 0 // TODO: GPT support! + else if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + for (i = 0; i < ARRAYSIZE(GptPartitionTypes); ++i) + { + if (IsEqualPartitionType(PartEntry->PartitionType, + GptPartitionTypes[i].Guid)) + { + RtlStringCchCopyA(strBuffer, cchBuffer, + GptPartitionTypes[i].Description); + return; + } + } + } +#endif /* We are here because the partition type is unknown */ if (cchBuffer > 0) *strBuffer = '\0';
3 years, 10 months
1
0
0
0
[reactos] 01/03: [USETUP] Add partition and disk description helpers to get standardized description strings. Replace and simplify USETUP code.
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f61f5c0047e956a26b89…
commit 8f61f5c0047e956a26b89866c6b8c127a73e4a8d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 23 19:49:25 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 1 01:48:10 2021 +0100 [USETUP] Add partition and disk description helpers to get standardized description strings. Replace and simplify USETUP code. --- base/setup/reactos/drivepage.c | 66 +++--- base/setup/usetup/lang/bg-BG.h | 32 +-- base/setup/usetup/lang/bn-BD.h | 36 +--- base/setup/usetup/lang/cs-CZ.h | 32 +-- base/setup/usetup/lang/da-DK.h | 32 +-- base/setup/usetup/lang/de-DE.h | 32 +-- base/setup/usetup/lang/el-GR.h | 32 +-- base/setup/usetup/lang/en-US.h | 36 +--- base/setup/usetup/lang/es-ES.h | 32 +-- base/setup/usetup/lang/et-EE.h | 32 +-- base/setup/usetup/lang/eu-ES.h | 36 +--- base/setup/usetup/lang/fr-FR.h | 32 +-- base/setup/usetup/lang/he-IL.h | 36 +--- base/setup/usetup/lang/hu-HU.h | 32 +-- base/setup/usetup/lang/id-ID.h | 36 +--- base/setup/usetup/lang/it-IT.h | 32 +-- base/setup/usetup/lang/ja-JP.h | 32 +-- base/setup/usetup/lang/lt-LT.h | 32 +-- base/setup/usetup/lang/ms-MY.h | 32 +-- base/setup/usetup/lang/nl-NL.h | 32 +-- base/setup/usetup/lang/pl-PL.h | 32 +-- base/setup/usetup/lang/pt-BR.h | 32 +-- base/setup/usetup/lang/pt-PT.h | 32 +-- base/setup/usetup/lang/ro-RO.h | 32 +-- base/setup/usetup/lang/ru-RU.h | 32 +-- base/setup/usetup/lang/sk-SK.h | 32 +-- base/setup/usetup/lang/sq-AL.h | 32 +-- base/setup/usetup/lang/sv-SE.h | 32 +-- base/setup/usetup/lang/tr-TR.h | 32 +-- base/setup/usetup/lang/uk-UA.h | 32 +-- base/setup/usetup/mui.h | 12 +- base/setup/usetup/partlist.c | 422 +++++++++++++++++++++++++------------- base/setup/usetup/partlist.h | 20 +- base/setup/usetup/usetup.c | 451 ++++------------------------------------- 34 files changed, 692 insertions(+), 1227 deletions(-) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 65ad2b927ba..ef26d2af38a 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -234,20 +234,20 @@ TreeListAddItem(IN HWND hTreeList, VOID -GetPartTypeStringFromPartitionType( - IN UCHAR partitionType, - OUT PCHAR strPartType, - IN ULONG cchPartType) +GetPartitionTypeString( + IN PPARTENTRY PartEntry, + OUT PSTR strBuffer, + IN ULONG cchBuffer) { - /* Determine partition type */ - - if (IsContainerPartition(partitionType)) + if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED) { - StringCchCopyA(strPartType, cchPartType, "Extended Partition" /* MUIGetString(STRING_EXTENDED_PARTITION) */); + StringCchCopyA(strBuffer, cchBuffer, + "Unused" /* MUIGetString(STRING_FORMATUNUSED) */); } - else if (partitionType == PARTITION_ENTRY_UNUSED) + else if (IsContainerPartition(PartEntry->PartitionType)) { - StringCchCopyA(strPartType, cchPartType, "Unused" /* MUIGetString(STRING_FORMATUNUSED) */); + StringCchCopyA(strBuffer, cchBuffer, + "Extended Partition" /* MUIGetString(STRING_EXTENDED_PARTITION) */); } else { @@ -256,15 +256,23 @@ GetPartTypeStringFromPartitionType( /* Do the table lookup */ for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) { - if (partitionType == PartitionTypes[i].Type) + if (PartEntry->PartitionType == PartitionTypes[i].Type) { - StringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description); + StringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description); return; } } /* We are here because the partition type is unknown */ - StringCchCopyA(strPartType, cchPartType, "Unknown" /* MUIGetString(STRING_FORMATUNKNOWN) */); + if (cchBuffer > 0) *strBuffer = '\0'; + } + + if ((cchBuffer > 0) && (*strBuffer == '\0')) + { + StringCchPrintfA(strBuffer, cchBuffer, + // MUIGetString(STRING_PARTTYPE), + "Type 0x%02x", + PartEntry->PartitionType); } } @@ -315,25 +323,15 @@ PrintPartitionData( } else if (PartEntry->IsPartitioned == TRUE) { - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); - PartType = PartTypeString; + GetPartitionTypeString(PartEntry, + PartTypeString, + ARRAYSIZE(PartTypeString)); + PartType = PartTypeString; } - if (strcmp(PartType, "Unknown" /* MUIGetString(STRING_FORMATUNKNOWN) */) == 0) - { - StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - // MUIGetString(STRING_HDDINFOUNK5), - L"Type 0x%02x", - PartEntry->PartitionType); - } - else - { - StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - L"%S", - PartType); - } + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + L"%S", + PartType); } TreeList_SetItemText(hWndList, htiPart, 1, LineBuffer); @@ -453,7 +451,7 @@ PrintDiskData( if (DiskEntry->DriverName.Length > 0) { StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - // MUIGetString(STRING_HDINFOPARTSELECT_1), + // MUIGetString(STRING_HDDINFO_1), L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu) on %wZ", DiskEntry->DiskNumber, DiskName, @@ -465,7 +463,7 @@ PrintDiskData( else { StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - // MUIGetString(STRING_HDINFOPARTSELECT_2), + // MUIGetString(STRING_HDDINFO_2), L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu)", DiskEntry->DiskNumber, DiskName, @@ -479,7 +477,7 @@ PrintDiskData( if (DiskEntry->DriverName.Length > 0) { StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - // MUIGetString(STRING_HDINFOPARTSELECT_1), + // MUIGetString(STRING_HDDINFO_1), L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", DiskEntry->DiskNumber, DiskEntry->Port, @@ -490,7 +488,7 @@ PrintDiskData( else { StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), - // MUIGetString(STRING_HDINFOPARTSELECT_2), + // MUIGetString(STRING_HDDINFO_2), L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", DiskEntry->DiskNumber, DiskEntry->Port, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 3b9f0bab118..06fe37aecf8 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -2252,31 +2252,21 @@ MUI_STRING bgBGStrings[] = {STRING_KEEPFORMAT, " \207\240\257\240\247\242\240\255\245 \255\240 \344\240\251\253\256\242\240\342\240 \343\340\245\244\241\240 (\241\245\247 \257\340\256\254\245\255\250) "}, {STRING_HDINFOPARTCREATE_1, - "%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_HDINFOPARTCREATE_2, - "%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_HDDINFOUNK2, - " %c%c \242\250\244 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "\255\240 %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_HDINFOPARTDELETE_2, - "\255\240 %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_HDINFOPARTZEROED_1, - "\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]."}, - {STRING_HDDINFOUNK4, - "%c%c \242\250\244 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "\255\240 \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]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %s\242\250\244 %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %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_HDINFOPARTSELECT_2, - "%6lu %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]"}, + "\255\240: %s."}, + {STRING_PARTTYPE, + "\242\250\244 0x%02x"}, + {STRING_HDDINFO_1, + // "\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, + // "\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, - " %s\215\245\340\240\247\257\340\245\244\245\253\245\255\256 \254\357\341\342\256%s %6lu %s"}, + "\215\245\340\240\247\257\340\245\244\245\253\245\255\256 \254\357\341\342\256"}, {STRING_MAXSIZE, "\214\201 (\244\256 %lu \214\201)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index a59d8577fec..fd2632e75dd 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -2237,35 +2237,21 @@ MUI_STRING bnBDStrings[] = {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTZEROED_2, - // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTEXISTS_2, - // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUnpartitioned space%s %6lu %s"}, + "Unpartitioned space"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 73ae0058045..f4d6193b360 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -2245,31 +2245,21 @@ MUI_STRING csCZStrings[] = {STRING_KEEPFORMAT, " Ponechat sou\237asn\354 souborov\354 syst\202m (bez zm\330ny) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Typ 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "na: %s."}, + {STRING_PARTTYPE, + "Typ 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sM\241sto bez odd\241l\205%s %6lu %s"}, + "M\241sto bez odd\241l\205"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 9640b2e7815..364b65fdf2a 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -2240,31 +2240,21 @@ MUI_STRING daDKStrings[] = {STRING_KEEPFORMAT, " Behold nuv\221rende filsystem (ingen \221ndringer) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "p\206 %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "p\206 %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "p\206 harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %stype %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "p\206 %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUpartitioneret plads%s %6lu %s"}, + "Upartitioneret plads"}, {STRING_MAXSIZE, "MB (maks %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index c5a83d18def..3bcf9f53356 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -2242,31 +2242,21 @@ MUI_STRING deDEStrings[] = {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Ver\204nderungen) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Typ 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "auf %s."}, + {STRING_PARTTYPE, + "Typ 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUnpartitionierter Speicher%s %6lu %s"}, + "Unpartitionierter Speicher"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 2a63ff6691f..53d1310a000 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -2255,31 +2255,21 @@ MUI_STRING elGRStrings[] = {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, - "%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_HDINFOPARTCREATE_2, - "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %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_HDINFOPARTSELECT_2, - "%6lu %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "\251\253\246: %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "\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, + // "\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, - " %sUnpartitioned space%s %6lu %s"}, + "Unpartitioned space"}, {STRING_MAXSIZE, "MB (\243\234\232. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 84e5d047b90..5c86e6b9951 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -2237,35 +2237,21 @@ MUI_STRING enUSStrings[] = {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTZEROED_2, - // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTEXISTS_2, - // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUnpartitioned space%s %6lu %s"}, + "Unpartitioned space"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index f8577625af2..414acb71579 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -2243,31 +2243,21 @@ MUI_STRING esESStrings[] = {STRING_KEEPFORMAT, " Mantener el sistema de archivos actual (sin cambios) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tipo 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "en %I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "en %I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "en Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]"}, + "en %s."}, + {STRING_PARTTYPE, + "Tipo 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sEspacio sin particionar%s %6lu %s"}, + "Espacio sin particionar"}, {STRING_MAXSIZE, "MB (m\240x. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index e0ba53ed4ab..835c3411137 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -2239,31 +2239,21 @@ MUI_STRING etEEStrings[] = {STRING_KEEPFORMAT, " \216ra muuda praegust failis\201steemi "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sT\201\201p %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"}, + "%s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sKasutamata kettaruum%s %6lu %s"}, + "Kasutamata kettaruum"}, {STRING_MAXSIZE, "MB (maks. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 735f2ce5104..7c9c1e29f31 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -2238,35 +2238,21 @@ MUI_STRING euESStrings[] = {STRING_KEEPFORMAT, " Mantendu sistemaren fitxategia (aldaketarik ez) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Disko gogorra %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Disko gogorra %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Mota 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "%I64u %s Disko gogorran %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "%I64u %s Disko gogorran %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTZEROED_2, - // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Mota 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "Disko gogorran %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTEXISTS_2, - // "Disko gogor-an %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sMota %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "%s."}, + {STRING_PARTTYPE, + "Mota 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sEzpartizionatu espazio%s %6lu %s"}, + "Ezpartizionatu espazio"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 263e73a62f6..5e3a8711387 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -2274,31 +2274,21 @@ MUI_STRING frFRStrings[] = {STRING_KEEPFORMAT, " Garder le syst\212me de fichiers courant (pas de changements) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "sur le %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sEspace non partitionn\202%s %6lu %s"}, + "Espace non partitionn\202"}, {STRING_MAXSIZE, "Mo (max. %lu Mo)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 2c305dd1cbe..a12dcc5edb2 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -2239,35 +2239,21 @@ MUI_STRING heILStrings[] = {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, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTZEROED_2, - // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTEXISTS_2, - // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUnpartitioned space%s %6lu %s"}, + "Unpartitioned space"}, {STRING_MAXSIZE, "\216\"\201 (\216\227\221. ul% \216\"\201)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 8ddecbbb818..57e72b146d6 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -2128,31 +2128,21 @@ MUI_STRING huHUStrings[] = {STRING_KEEPFORMAT, " Jelenlegi f\240jlrendszer megtart\240sa (nincs v\240ltoztat\240s) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "itt: %I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "itt: %I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "a %lu. merevlemezre (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "itt: %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "%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, + // "%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, - " %sNem particion\240lt ter\201let%s %6lu %s"}, + "Nem particion\240lt ter\201let"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index fc566c19022..fe23c7148cd 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -2237,35 +2237,21 @@ MUI_STRING idIDStrings[] = {STRING_KEEPFORMAT, " Tetapkan sistem berkas seperti ini (tanpa perubahan) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Jenis 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "pada %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "pada %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTZEROED_2, - // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Jenis 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "pada Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - // {STRING_HDINFOPARTEXISTS_2, - // "pada Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sJenis %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "pada %s."}, + {STRING_PARTTYPE, + "Jenis 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUkuran yang belum dipartisi%s %6lu %s"}, + "Ukuran yang belum dipartisi"}, {STRING_MAXSIZE, "MB (maks. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 7d46e399ba3..c87f3993d41 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -2243,31 +2243,21 @@ MUI_STRING itITStrings[] = {STRING_KEEPFORMAT, " Mantieni il file system attuale (nessuna modifica) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tipo 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "su %s."}, + {STRING_PARTTYPE, + "Tipo 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sSpazio non partizionato%s %6lu %s"}, + "Spazio non partizionato"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index d7b6d78bcfa..b2836e6d0ea 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -2242,31 +2242,21 @@ MUI_STRING jaJPStrings[] = {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, - "%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_HDINFOPARTCREATE_2, - "%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_HDDINFOUNK2, - " %c%c \274\255\331\262 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %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_HDINFOPARTDELETE_2, - "on %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_HDINFOPARTZEROED_1, - "\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]."}, - {STRING_HDDINFOUNK4, - "%c%c \274\255\331\262 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on \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]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %s\274\255\331\262 %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %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_HDINFOPARTSELECT_2, - "%6lu %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu, \312\336\275=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "\274\255\331\262 0x%02x"}, + {STRING_HDDINFO_1, + // "\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, + // "\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, - " %s\320\314\336\335\266\302\311 \275\315\337\260\275%s %6lu %s"}, + "\320\314\336\335\266\302\311 \275\315\337\260\275"}, {STRING_MAXSIZE, "MB (\273\262\300\336\262. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index e9f4a8e9779..0a1ad3bf4ea 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -2248,31 +2248,21 @@ MUI_STRING ltLTStrings[] = {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sUnpartitioned space%s %6lu %s"}, + "Unpartitioned space"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index d5c9581c1bf..e0de99c669b 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -2222,31 +2222,21 @@ MUI_STRING msMYStrings[] = {STRING_KEEPFORMAT, " Memastikan sistem fail semasa (tiada perubahan) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sRuang unpartitioned%s %6lu %s"}, + "Ruang unpartitioned"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 547b4229be3..35969d809b4 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -2264,31 +2264,21 @@ MUI_STRING nlNLStrings[] = {STRING_KEEPFORMAT, " Behoud huidig bestandssysteem (geen wijzigingen) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"}, + "op %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sNiet gepartitioneerde ruimte%s %6lu %s"}, + "Niet gepartitioneerde ruimte"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 4f5af3cc482..33dccfe2359 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -2245,31 +2245,21 @@ MUI_STRING plPLStrings[] = {STRING_KEEPFORMAT, " Zachowaj obecny system plik\242w (bez zmian) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Dysku twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Dysk 02 twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c 03Typ 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "na %I64u %s Dysku twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "na %I64u %s Dysku 05 twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c 07Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "na Dysku twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %s09Typ %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Dysk11 twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"}, + "na: %s."}, + {STRING_PARTTYPE, + "Typ 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sMiejsce poza partycjami%s %6lu %s"}, + "Miejsce poza partycjami"}, {STRING_MAXSIZE, "MB (maks. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index ac4265cc5ec..94a52be50fb 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -2277,31 +2277,21 @@ MUI_STRING ptBRStrings[] = {STRING_KEEPFORMAT, " Manter o sistema de arquivos atual (sem altera\207\344es) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tipo 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"}, + "em %s."}, + {STRING_PARTTYPE, + "Tipo 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sEspa\207o n\306o particionado%s %6lu %s"}, + "Espa\207o n\306o particionado"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 189b0bf2067..42b38912341 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -2261,31 +2261,21 @@ MUI_STRING ptPTStrings[] = {STRING_KEEPFORMAT, " Manter o sistema de arquivos actual (sem altera\207\344es) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tipo 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"}, + "em %s."}, + {STRING_PARTTYPE, + "Tipo 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sEspa\207o n\306o particionado%s %6lu %s"}, + "Espa\207o n\306o particionado"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 496d6722502..bb60547c18f 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -2283,31 +2283,21 @@ MUI_STRING roROStrings[] = {STRING_KEEPFORMAT, " P\343streaz\343 sistemul de fi\272iere actual (f\343r\343 schimb\343ri) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tip 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tip 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTip %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"}, + "de pe %s."}, + {STRING_PARTTYPE, + "Tip 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sSpa\376iu neparti\376ionat%s %6lu %s"}, + "Spa\376iu neparti\376ionat"}, {STRING_MAXSIZE, "Mo (max. %lu Mo)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 8636f56777f..07a933ebe26 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -2260,31 +2260,21 @@ MUI_STRING ruRUStrings[] = {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, - "%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_HDINFOPARTCREATE_2, - "%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_HDDINFOUNK2, - " %c%c \207\240\257\250\341\354 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "\255\240 %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_HDINFOPARTDELETE_2, - "\255\240 %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_HDINFOPARTZEROED_1, - "\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]."}, - {STRING_HDDINFOUNK4, - "%c%c \207\240\257\250\341\354 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "\255\240 \246\245\341\342\252\256\254 \244\250\341\252\245 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %s\207\240\257\250\341\354 %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %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_HDINFOPARTSELECT_2, - "%6lu %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]"}, + "\255\240: %s."}, + {STRING_PARTTYPE, + "\207\240\257\250\341\354 0x%02x"}, + {STRING_HDDINFO_1, + // "\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, + // "\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, - " %s\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%s %6lu %s"}, + "\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, "\214\201 (\254\240\252\341. %lu \214\201)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 2d0ddf70c4a..356e67c897d 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -2251,31 +2251,21 @@ MUI_STRING skSKStrings[] = {STRING_KEEPFORMAT, " Ponecha\234 s\243\237asn\354 syst\202m s\243borov (bez zmeny) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c typ 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %styp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "na: %s."}, + {STRING_PARTTYPE, + "Typ 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sMiesto bez oblast\241%s %6lu %s"}, + "Miesto bez oblast\241"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 96d55ff1f36..0af0a33b066 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -2252,31 +2252,21 @@ MUI_STRING sqALStrings[] = {STRING_KEEPFORMAT, " Mbaj dokumentat e sistemit siq jan\211 (pa ndryshime) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Tipi 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Tipi 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTipi %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "on %s."}, + {STRING_PARTTYPE, + "Tipi 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sHap\211sire e papjesesezuar%s %6lu %s"}, + "Hap\211sire e papjesesezuar"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 92e99838fcf..e88feaa8ee7 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -2248,31 +2248,21 @@ MUI_STRING svSEStrings[] = {STRING_KEEPFORMAT, " Beh\206ll nuvarande filsystem (inga f\224r\204ndringar) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c Typ 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "on %I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "on %I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "p\206 H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, + "p\206 %s."}, + {STRING_PARTTYPE, + "Typ 0x%02x"}, + {STRING_HDDINFO_1, + // "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, + // "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, - " %sOpartitionerat utrymme%s %6lu %s"}, + "Opartitionerat utrymme"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 83480a62c94..5d58b79a70c 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -2214,31 +2214,21 @@ MUI_STRING trTRStrings[] = {STRING_KEEPFORMAT, " \236imdiki dosya sistemini koru. (De\247i\237iklik yok.) "}, {STRING_HDINFOPARTCREATE_1, - "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ \201zerinde [%s]."}, - {STRING_HDINFOPARTCREATE_2, - "%I64u %s abit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."}, - {STRING_HDDINFOUNK2, - " %c%c T\201r 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "\232zerinde: %I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ \201zerinde [%s]."}, - {STRING_HDINFOPARTDELETE_2, - "\232zerinde: %I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."}, - {STRING_HDINFOPARTZEROED_1, - "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK4, - "%c%c T\201r 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "\232zerinde: Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sT\201r %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ \201zerinde [%s]"}, - {STRING_HDINFOPARTSELECT_2, - "%6lu %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"}, + "\232zerinde: %s."}, + {STRING_PARTTYPE, + "T\201r 0x%02x"}, + {STRING_HDDINFO_1, + // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]" + "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ \201zerinde [%s]"}, + {STRING_HDDINFO_2, + // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu [%s]" + "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"}, {STRING_NEWPARTITION, "Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"}, {STRING_UNPSPACE, - " %sKullan\215lmayan Bo\237luk%s %6lu %s"}, + "Kullan\215lmayan Bo\237luk"}, {STRING_MAXSIZE, "MB (En \207ok %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 3ee82254bcd..0105c9dfa3b 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -2248,31 +2248,21 @@ MUI_STRING ukUAStrings[] = {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, - "%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_HDINFOPARTCREATE_2, - "%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_HDDINFOUNK2, - " %c%c Type 0x%02X %I64u %s"}, + "%s."}, {STRING_HDINFOPARTDELETE_1, - "\255\240 %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_HDINFOPARTDELETE_2, - "\255\240 %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_HDINFOPARTZEROED_1, - "\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]."}, - {STRING_HDDINFOUNK4, - "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS_1, - "\255\240 \206\256\340\341\342\252\256\254\343 \244\250\341\252\343 %lu (%I64u %s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."}, - {STRING_HDDINFOUNK5, - "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT_1, - "%6lu %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_HDINFOPARTSELECT_2, - "%6lu %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]"}, + "\255\240: %s."}, + {STRING_PARTTYPE, + "Type 0x%02x"}, + {STRING_HDDINFO_1, + // "\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, + // "\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, - " %s\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354%s %6lu %s"}, + "\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354"}, {STRING_MAXSIZE, "MB (\254\240\252\341. %lu MB)"}, {STRING_EXTENDED_PARTITION, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 13bedf61edd..bb158c72bf5 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -150,16 +150,10 @@ MUISetStyledText( #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 #define STRING_HDINFOPARTCREATE_1 36 -#define STRING_HDINFOPARTCREATE_2 37 -#define STRING_HDDINFOUNK2 38 #define STRING_HDINFOPARTDELETE_1 39 -#define STRING_HDINFOPARTDELETE_2 40 -#define STRING_HDINFOPARTZEROED_1 41 -#define STRING_HDDINFOUNK4 42 -#define STRING_HDINFOPARTEXISTS_1 43 -#define STRING_HDDINFOUNK5 44 -#define STRING_HDINFOPARTSELECT_1 45 -#define STRING_HDINFOPARTSELECT_2 46 +#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 diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index f62b75b0595..d10f6c3af6a 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -29,23 +29,23 @@ #define NDEBUG #include <debug.h> -/* HELPERS FOR PARTITION TYPES **********************************************/ +/* HELPERS FOR DISK AND PARTITION DESCRIPTIONS ******************************/ VOID -GetPartTypeStringFromPartitionType( - IN UCHAR partitionType, - OUT PCHAR strPartType, - IN ULONG cchPartType) +GetPartitionTypeString( + IN PPARTENTRY PartEntry, + OUT PSTR strBuffer, + IN ULONG cchBuffer) { - /* Determine partition type */ - - if (IsContainerPartition(partitionType)) + if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED) { - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION)); + RtlStringCchCopyA(strBuffer, cchBuffer, + MUIGetString(STRING_FORMATUNUSED)); } - else if (partitionType == PARTITION_ENTRY_UNUSED) + else if (IsContainerPartition(PartEntry->PartitionType)) { - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED)); + RtlStringCchCopyA(strBuffer, cchBuffer, + MUIGetString(STRING_EXTENDED_PARTITION)); } else { @@ -54,15 +54,274 @@ GetPartTypeStringFromPartitionType( /* Do the table lookup */ for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) { - if (partitionType == PartitionTypes[i].Type) + if (PartEntry->PartitionType == PartitionTypes[i].Type) { - RtlStringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description); + RtlStringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description); return; } } /* We are here because the partition type is unknown */ - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN)); + if (cchBuffer > 0) *strBuffer = '\0'; + } + + if ((cchBuffer > 0) && (*strBuffer == '\0')) + { + RtlStringCchPrintfA(strBuffer, cchBuffer, + MUIGetString(STRING_PARTTYPE), + PartEntry->PartitionType); + } +} + +VOID +PrettifySize1( + IN OUT PULONGLONG Size, + OUT PCSTR* Unit) +{ + ULONGLONG DiskSize = *Size; + + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = RoundingDivide(DiskSize, GB); + *Unit = MUIGetString(STRING_GB); + } + else + { + DiskSize = RoundingDivide(DiskSize, MB); + if (DiskSize == 0) + DiskSize = 1; + *Unit = MUIGetString(STRING_MB); + } + + *Size = DiskSize; +} + +VOID +PrettifySize2( + IN OUT PULONGLONG Size, + OUT PCSTR* Unit) +{ + ULONGLONG PartSize = *Size; + +#if 0 + if (PartSize >= 10 * GB) /* 10 GB */ + { + PartSize = RoundingDivide(PartSize, GB); + *Unit = MUIGetString(STRING_GB); + } + else +#endif + if (PartSize >= 10 * MB) /* 10 MB */ + { + PartSize = RoundingDivide(PartSize, MB); + *Unit = MUIGetString(STRING_MB); + } + else + { + PartSize = RoundingDivide(PartSize, KB); + *Unit = MUIGetString(STRING_KB); + } + + *Size = PartSize; +} + +VOID +PartitionDescription( + IN PPARTENTRY PartEntry, + OUT PSTR strBuffer, + IN SIZE_T cchBuffer) +{ + PSTR pBuffer = strBuffer; + size_t cchBufferSize = cchBuffer; + ULONGLONG PartSize; + PCSTR Unit; + + /* Get the partition size */ + PartSize = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + PrettifySize2(&PartSize, &Unit); + + if (PartEntry->IsPartitioned == FALSE) + { + /* Unpartitioned space: Just display the description and size */ + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchBufferSize, 0, + " %s%-.30s", + PartEntry->LogicalPartition ? " " : "", // Optional indentation + MUIGetString(STRING_UNPSPACE)); + + RtlStringCchPrintfA(pBuffer, cchBufferSize, + "%*s%6I64u %s", + 38 - min(strlen(strBuffer), 38), "", // Indentation + PartSize, + Unit); + return; + } + +// +// NOTE: This could be done with the next case. +// + if ((PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) && + IsContainerPartition(PartEntry->PartitionType)) + { + /* Extended partition container: Just display the partition's type and size */ + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchBufferSize, 0, + " %-.30s", + MUIGetString(STRING_EXTENDED_PARTITION)); + + RtlStringCchPrintfA(pBuffer, cchBufferSize, + "%*s%6I64u %s", + 38 - min(strlen(strBuffer), 38), "", // Indentation + PartSize, + Unit); + return; + } + + /* + * Not an extended partition container. + */ + + /* Drive letter and partition number */ + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchBufferSize, 0, + "%c%c %c %s(%lu) ", + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : ':', + PartEntry->BootIndicator ? '*' : ' ', + PartEntry->LogicalPartition ? " " : "", // Optional indentation + PartEntry->PartitionNumber); + + /* + * If the volume's file system is recognized, display the volume label + * (if any) and the file system name. Otherwise, display the partition + * type if it's not a new partition. + */ + if (!PartEntry->New && *PartEntry->FileSystem && + _wcsicmp(PartEntry->FileSystem, L"RAW") != 0) + { + size_t cchLabelSize = 0; + if (*PartEntry->VolumeLabel) + { + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchLabelSize, 0, + "\"%-.11S\" ", + PartEntry->VolumeLabel); + cchLabelSize = cchBufferSize - cchLabelSize; // Actual length of the label part. + cchBufferSize -= cchLabelSize; // And reset cchBufferSize to what it should be. + } + + // TODO: Group this part together with the similar one + // from below once the strings are in the same encoding... + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchBufferSize, 0, + "[%-.*S]", + /* The minimum length can be at most 11 since + * cchLabelSize can be at most == 11 + 3 == 14 */ + 25 - min(cchLabelSize, 25), + PartEntry->FileSystem); + } + else + { + CHAR PartTypeString[32]; + PCSTR PartType = PartTypeString; + + if (PartEntry->New) + { + /* Use this description if the partition is new (and thus, not formatted) */ + PartType = MUIGetString(STRING_UNFORMATTED); + } + else + { + /* If the partition is not new but its file system is not recognized + * (or is not formatted), use the partition type description. */ + GetPartitionTypeString(PartEntry, + PartTypeString, + ARRAYSIZE(PartTypeString)); + PartType = PartTypeString; + } + if (!PartType || !*PartType) + { + PartType = MUIGetString(STRING_FORMATUNKNOWN); + } + + // TODO: Group this part together with the similar one + // from above once the strings are in the same encoding... + RtlStringCchPrintfExA(pBuffer, cchBufferSize, + &pBuffer, &cchBufferSize, 0, + "[%-.*s]", + 25, + PartType); + } + + /* Show the remaining free space only if a FS is mounted */ + // FIXME: We don't support that yet! +#if 0 + if (*PartEntry->FileSystem) + { + RtlStringCchPrintfA(pBuffer, cchBufferSize, + "%*s%6I64u %s (%6I64u %s %s)", + 38 - min(strlen(strBuffer), 38), "", // Indentation + PartSize, + Unit, + PartFreeSize, + Unit, + "free"); + } + else +#endif + { + RtlStringCchPrintfA(pBuffer, cchBufferSize, + "%*s%6I64u %s", + 38 - min(strlen(strBuffer), 38), "", // Indentation + PartSize, + Unit); + } +} + +VOID +DiskDescription( + IN PDISKENTRY DiskEntry, + OUT PSTR strBuffer, + IN SIZE_T cchBuffer) +{ + ULONGLONG DiskSize; + PCSTR Unit; + + /* Get the disk size */ + DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PrettifySize1(&DiskSize, &Unit); + + // + // FIXME: We *MUST* use TXTSETUP.SIF strings from section "DiskDriverMap" !! + // + if (DiskEntry->DriverName.Length > 0) + { + RtlStringCchPrintfA(strBuffer, cchBuffer, + MUIGetString(STRING_HDDINFO_1), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName, + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); + } + else + { + RtlStringCchPrintfA(strBuffer, cchBuffer, + MUIGetString(STRING_HDDINFO_2), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } } @@ -166,16 +425,14 @@ PrintPartitionData( IN PDISKENTRY DiskEntry, IN PPARTENTRY PartEntry) { - CHAR LineBuffer[128]; COORD coPos; ULONG Written; USHORT Width; USHORT Height; - LARGE_INTEGER PartSize; - PCSTR Unit; UCHAR Attribute; - CHAR PartTypeString[32]; - PCSTR PartType = PartTypeString; + CHAR LineBuffer[100]; + + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); Width = ListUi->Right - ListUi->Left - 1; Height = ListUi->Bottom - ListUi->Top - 2; @@ -183,80 +440,6 @@ PrintPartitionData( coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top + 1 + ListUi->Line; - /* Get the partition size */ - PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); - Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); - Unit = MUIGetString(STRING_KB); - } - - if (PartEntry->IsPartitioned == FALSE) - { - sprintf(LineBuffer, - MUIGetString(STRING_UNPSPACE), - PartEntry->LogicalPartition ? " " : "", - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - else - { - /* Determine partition type */ - PartTypeString[0] = '\0'; - if (PartEntry->New != FALSE) - { - PartType = MUIGetString(STRING_UNFORMATTED); - } - else if (PartEntry->IsPartitioned != FALSE) - { - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); - PartType = PartTypeString; - } - - if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0) - { - sprintf(LineBuffer, - MUIGetString(STRING_HDDINFOUNK5), - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->BootIndicator ? '*' : ' ', - PartEntry->LogicalPartition ? " " : "", - PartEntry->PartitionType, - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - else - { - sprintf(LineBuffer, - "%c%c %c %s%-24s%s %6lu %s", - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->BootIndicator ? '*' : ' ', - PartEntry->LogicalPartition ? " " : "", - PartType, - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - } - Attribute = (ListUi->CurrentDisk == DiskEntry && ListUi->CurrentPartition == PartEntry) ? FOREGROUND_BLUE | BACKGROUND_WHITE : @@ -302,13 +485,13 @@ PrintDiskData( { PPARTENTRY PrimaryPartEntry, LogicalPartEntry; PLIST_ENTRY PrimaryEntry, LogicalEntry; - CHAR LineBuffer[128]; COORD coPos; ULONG Written; USHORT Width; USHORT Height; - ULARGE_INTEGER DiskSize; - PCSTR Unit; + CHAR LineBuffer[100]; + + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); Width = ListUi->Right - ListUi->Left - 1; Height = ListUi->Bottom - ListUi->Top - 2; @@ -316,53 +499,6 @@ PrintDiskData( coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top + 1 + ListUi->Line; - DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize.QuadPart >= 10 * GB) /* 10 GB */ - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, GB); - Unit = MUIGetString(STRING_GB); - } - else - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, MB); - if (DiskSize.QuadPart == 0) - DiskSize.QuadPart = 1; - Unit = MUIGetString(STRING_MB); - } - - // - // FIXME: We *MUST* use TXTSETUP.SIF strings from section "DiskDriverMap" !! - // - if (DiskEntry->DriverName.Length > 0) - { - sprintf(LineBuffer, - MUIGetString(STRING_HDINFOPARTSELECT_1), - DiskSize.u.LowPart, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - else - { - sprintf(LineBuffer, - MUIGetString(STRING_HDINFOPARTSELECT_2), - DiskSize.u.LowPart, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - if (ListUi->Line >= 0 && ListUi->Line <= Height) { FillConsoleOutputAttribute(StdOutput, diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index ea92e756c1d..02972fd8f55 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -71,10 +71,22 @@ typedef struct _PARTLIST_UI VOID -GetPartTypeStringFromPartitionType( - IN UCHAR partitionType, - OUT PCHAR strPartType, - IN ULONG cchPartType); +GetPartitionTypeString( + IN PPARTENTRY PartEntry, + OUT PSTR strBuffer, + IN ULONG cchBuffer); + +VOID +PartitionDescription( + IN PPARTENTRY PartEntry, + OUT PSTR strBuffer, + IN SIZE_T cchBuffer); + +VOID +DiskDescription( + IN PDISKENTRY DiskEntry, + OUT PSTR strBuffer, + IN SIZE_T cchBuffer); VOID InitPartitionListUi( diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 898b5790f65..ccde8792db7 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -419,66 +419,6 @@ PopupError(PCCH Text, } -/** See also usetup:partlist.c!PrintDiskData() **/ -VOID -PrettifySize1( - IN OUT PULONGLONG Size, - OUT PCSTR* Unit) -{ - ULONGLONG DiskSize = *Size; - -#if 0 - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - *Unit = MUIGetString(STRING_GB); - } - else -#endif - { - DiskSize = DiskSize / MB; - if (DiskSize == 0) - DiskSize = 1; - - *Unit = MUIGetString(STRING_MB); - } - - *Size = DiskSize; -} - -/** See also usetup:partlist.c!PrintPartitionData() **/ -VOID -PrettifySize2( - IN OUT PULONGLONG Size, - OUT PCSTR* Unit) -{ - ULONGLONG PartSize = *Size; - -#if 0 - if (PartSize >= 10 * GB) /* 10 GB */ - { - PartSize = PartSize / GB; - *Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize >= 10 * MB) /* 10 MB */ - { - PartSize = PartSize / MB; - *Unit = MUIGetString(STRING_MB); - } - else - { - PartSize = PartSize / KB; - *Unit = MUIGetString(STRING_KB); - } - - // if (PartSize == 0) - // PartSize = 1; - *Size = PartSize; -} - - /* * Confirm quit setup * RETURNS @@ -2137,12 +2077,11 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; - WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; - ULONGLONG DiskSize; ULONGLONG SectorCount; - PCSTR Unit; + WCHAR InputBuffer[50]; + CHAR LineBuffer[100]; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2157,38 +2096,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize1(&DiskSize, &Unit); - - if (DiskEntry->DriverName.Length > 0) - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_1), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - else - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_2), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2285,12 +2195,11 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; - WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; - ULONGLONG DiskSize; ULONGLONG SectorCount; - PCSTR Unit; + WCHAR InputBuffer[50]; + CHAR LineBuffer[100]; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2305,38 +2214,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION)); - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize1(&DiskSize, &Unit); - - if (DiskEntry->DriverName.Length > 0) - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_1), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - else - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_2), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2432,12 +2312,11 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; - WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; - ULONGLONG DiskSize; ULONGLONG SectorCount; - PCSTR Unit; + WCHAR InputBuffer[50]; + CHAR LineBuffer[100]; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2452,38 +2331,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION)); - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize1(&DiskSize, &Unit); - - if (DiskEntry->DriverName.Length > 0) - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_1), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - else - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE_2), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2619,10 +2469,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) { PPARTENTRY PartEntry; PDISKENTRY DiskEntry; - ULONGLONG DiskSize; - ULONGLONG PartSize; - PCSTR Unit; - CHAR PartTypeString[32]; + CHAR LineBuffer[100]; if (PartitionList == NULL || CurrentPartition == NULL) { @@ -2635,67 +2482,12 @@ DeletePartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(DELETE_PARTITION_PAGE); - /* Adjust partition type */ - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 10, " %s", LineBuffer); - PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize2(&PartSize, &Unit); - - if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ?? - { - CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK2), - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->PartitionType, - PartSize, - Unit); - } - else - { - CONSOLE_PrintTextXY(6, 10, - " %c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartTypeString, - PartSize, - Unit); - } - - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize1(&DiskSize, &Unit); - - if (DiskEntry->DriverName.Length > 0) - { - CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDINFOPARTDELETE_1), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } - else - { - CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDINFOPARTDELETE_2), - DiskSize, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); - } + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1), + LineBuffer); while (TRUE) { @@ -2759,13 +2551,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { PPARTENTRY PartEntry; PDISKENTRY DiskEntry; - ULONGLONG DiskSize; - ULONGLONG PartSize; - PCSTR DiskUnit; - PCSTR PartUnit; - CHAR PartTypeString[32]; FORMATMACHINESTATE PreviousFormatState; PCWSTR DefaultFs; + CHAR LineBuffer[100]; DPRINT("SelectFileSystemPage()\n"); @@ -2805,114 +2593,19 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartEntry = PartitionList->SystemPartition; DiskEntry = PartEntry->DiskEntry; - /* Adjust partition size */ - PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (PartSize >= 10 * GB) /* 10 GB */ - { - PartSize = PartSize / GB; - PartUnit = MUIGetString(STRING_GB); - } - else - { - PartSize = PartSize / MB; - PartUnit = MUIGetString(STRING_MB); - } - - /* Adjust partition type */ - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_SetTextXY(8, 10, LineBuffer); - if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ?? - { - CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->PartitionType, - PartSize, - PartUnit); - } - else - { - CONSOLE_PrintTextXY(8, 10, - "%c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartTypeString, - PartSize, - PartUnit); - } - - - /* Adjust disk size */ - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize >= 10 * GB) /* 10 GB */ - { - DiskSize = DiskSize / GB; - DiskUnit = MUIGetString(STRING_GB); - } - else - { - DiskSize = DiskSize / MB; - DiskUnit = MUIGetString(STRING_MB); - } - - CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDINFOPARTZEROED_1), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); PartEntry = SystemPartition; DiskEntry = PartEntry->DiskEntry; - /* Adjust partition size */ - PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (PartSize >= 10 * GB) /* 10 GB */ - { - PartSize = PartSize / GB; - PartUnit = MUIGetString(STRING_GB); - } - else - { - PartSize = PartSize / MB; - PartUnit = MUIGetString(STRING_MB); - } - - /* Adjust partition type */ - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); - - if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ?? - { - CONSOLE_PrintTextXY(8, 23, - MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->PartitionType, - PartSize, - PartUnit); - } - else - { - CONSOLE_PrintTextXY(8, 23, - "%c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartTypeString, - PartSize, - PartUnit); - } - + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_SetTextXY(8, 23, LineBuffer); } while (TRUE) @@ -3119,19 +2812,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); - /* Adjust disk size */ - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize1(&DiskSize, &DiskUnit); - - /* Adjust partition size */ - PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PrettifySize2(&PartSize, &PartUnit); - - /* Adjust partition type */ - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); - MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); if (PartEntry->AutoCreate) @@ -3139,24 +2819,13 @@ SelectFileSystemPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); #if 0 - CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", - PartEntry->PartitionNumber, - PartSize, - PartUnit, - PartTypeString); + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_SetTextXY(8, 10, LineBuffer); #endif - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -3183,17 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) break; } - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1), + LineBuffer); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); } @@ -3201,38 +2862,12 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); - if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ?? - { - CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->PartitionType, - PartSize, - PartUnit); - } - else - { - CONSOLE_PrintTextXY(8, 10, - "%c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartTypeString, - PartSize, - PartUnit); - } - - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS_1), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : - "RAW"); + PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_SetTextXY(8, 10, LineBuffer); + + DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1), + LineBuffer); } ASSERT(FileSystemList == NULL);
3 years, 10 months
1
0
0
0
← Newer
1
...
41
42
43
44
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Results per page:
10
25
50
100
200