Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 01/01: [DISKPART] Get rid of PrintMessageString()
by Eric Kohl 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca51f000495325be75153… commit ca51f000495325be75153238309cd4595a1e6d0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 1 00:46:45 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 1 00:46:45 2022 +0200 [DISKPART] Get rid of PrintMessageString() --- base/system/diskpart/diskpart.h | 4 ---- base/system/diskpart/help.c | 12 ++++++++++-- base/system/diskpart/misc.c | 12 ------------ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index e3b4c247861..755dc7b44c4 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -392,10 +392,6 @@ RoundingDivide( _In_ ULONGLONG Dividend, _In_ ULONGLONG Divisor); -VOID -PrintMessageString( - _In_ DWORD dwMessage); - /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index f2a23960ae0..2caf271e5f2 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -89,7 +89,11 @@ HelpCommand( (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && (cmdptr->help_detail != MSG_NONE)) { - PrintMessageString(cmdptr->help_detail); + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, + cmdptr->help_detail, + LANG_USER_DEFAULT); bSubCommands = TRUE; } } @@ -97,7 +101,11 @@ HelpCommand( if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE)) { - PrintMessageString(pCommand->help_detail); + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, + pCommand->help_detail, + LANG_USER_DEFAULT); } ConPuts(StdOut, L"\n"); diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index ddb2946a840..b46651b670b 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -78,15 +78,3 @@ RoundingDivide( { return (Dividend + Divisor / 2) / Divisor; } - - -VOID -PrintMessageString( - _In_ DWORD dwMessage) -{ - ConMsgPuts(StdOut, - FORMAT_MESSAGE_FROM_HMODULE, - NULL, //hModuleNetMsg, - dwMessage, - LANG_USER_DEFAULT); -}

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW][NTGDI] Implement some DxEng* callbacks (#3638)
by Oleg Dubinskiy 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31139c253f24b2577423d… commit 31139c253f24b2577423d4bc363e55caa5a9d8a0 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Tue May 31 23:58:35 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 1 00:58:35 2022 +0300 [WIN32SS][NTDDRAW][NTGDI] Implement some DxEng* callbacks (#3638) Implement the following DxEng* functions: - DxEngAltLockSurface - DxEngDeleteSurface - DxEngReferenceHdev - DxEngSelectBitmap - DxEngSetBitmapOwner - DxEngUnreferenceHdev Update their prototypes and call the appropriate win32k functions inside them, since they are already implemented. Also get rid of now unused IntGdi(Un)ReferencePdev, whose were called only by dxeng, and whose are not used anymore. In Windows, DxEng(Un)ReferenceHdev calls PDEVOBJ_vReferencePDEV and PDEVOBJ_vDeferencePDEV directly (those correspond to our PDEVOBJ_vReference and PDEVOBJ_vRelease accordingly). Required by MS DirectDraw stack (ddraw.dll & dxg.sys). CORE-17561 --- sdk/include/reactos/drivers/directx/dxeng.h | 8 ++++---- win32ss/gdi/ntgdi/dc.h | 2 -- win32ss/gdi/ntgdi/device.c | 12 ----------- win32ss/reactx/ntddraw/dxeng.c | 32 ++++++++++++++++------------- 4 files changed, 22 insertions(+), 32 deletions(-) diff --git a/sdk/include/reactos/drivers/directx/dxeng.h b/sdk/include/reactos/drivers/directx/dxeng.h index c4ddf18c0c5..8a349ce6507 100644 --- a/sdk/include/reactos/drivers/directx/dxeng.h +++ b/sdk/include/reactos/drivers/directx/dxeng.h @@ -107,11 +107,11 @@ DWORD NTAPI DxEngSpSpritesVisible(DWORD x1); HDC NTAPI DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); BOOLEAN NTAPI DxEngDeleteDC(HDC hdc, BOOL Force); BOOLEAN NTAPI DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); -DWORD NTAPI DxEngSelectBitmap(DWORD x1, DWORD x2); -DWORD NTAPI DxEngSetBitmapOwner(DWORD x1, DWORD x2); -DWORD NTAPI DxEngDeleteSurface(DWORD x1); +HBITMAP NTAPI DxEngSelectBitmap(HDC hdc, HBITMAP hbmp); +BOOLEAN NTAPI DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner); +BOOLEAN NTAPI DxEngDeleteSurface(HSURF hsurf); DWORD NTAPI DxEngGetSurfaceData(DWORD x1, DWORD x2); -DWORD NTAPI DxEngAltLockSurface(DWORD x1); +SURFOBJ * NTAPI DxEngAltLockSurface(HSURF hsurf); DWORD NTAPI DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); DWORD NTAPI DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); DWORD NTAPI DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); diff --git a/win32ss/gdi/ntgdi/dc.h b/win32ss/gdi/ntgdi/dc.h index f18480c5a94..358527103aa 100644 --- a/win32ss/gdi/ntgdi/dc.h +++ b/win32ss/gdi/ntgdi/dc.h @@ -200,8 +200,6 @@ VOID NTAPI DC_vRestoreDC(IN PDC pdc, INT iSaveLevel); VOID NTAPI DC_vFreeDcAttr(PDC pdc); VOID NTAPI DC_vInitDc(PDC pdc, DCTYPE dctype, PPDEVOBJ ppdev); -VOID FASTCALL IntGdiReferencePdev(PPDEVOBJ pPDev); -VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); diff --git a/win32ss/gdi/ntgdi/device.c b/win32ss/gdi/ntgdi/device.c index 9a8bf433374..b9684fe9c9a 100644 --- a/win32ss/gdi/ntgdi/device.c +++ b/win32ss/gdi/ntgdi/device.c @@ -13,18 +13,6 @@ PDC defaultDCstate = NULL; -VOID FASTCALL -IntGdiReferencePdev(PPDEVOBJ ppdev) -{ - UNIMPLEMENTED; -} - -VOID FASTCALL -IntGdiUnreferencePdev(PPDEVOBJ ppdev, DWORD CleanUpType) -{ - UNIMPLEMENTED; -} - BOOL FASTCALL IntCreatePrimarySurface(VOID) { diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index 2b1fe1cbd66..a096bf5f350 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -587,7 +587,7 @@ BOOLEAN APIENTRY DxEngReferenceHdev(HDEV hDev) { - IntGdiReferencePdev((PPDEVOBJ) hDev); + PDEVOBJ_vReference((PPDEVOBJ)hDev); /* ALWAYS return true */ return TRUE; } @@ -689,7 +689,7 @@ BOOLEAN APIENTRY DxEngUnreferenceHdev(HDEV hDev) { - IntGdiUnreferencePdev((PPDEVOBJ) hDev, 0); + PDEVOBJ_vRelease((PPDEVOBJ)hDev); return TRUE; // Always true. } @@ -762,28 +762,31 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) /************************************************************************/ /* DxEngSelectBitmap */ /************************************************************************/ -DWORD APIENTRY DxEngSelectBitmap(DWORD x1, DWORD x2) +HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngSelectBitmap \n"); + + return NtGdiSelectBitmap(hdc, hbmp); } /************************************************************************/ /* DxEngSetBitmapOwner */ /************************************************************************/ -DWORD APIENTRY DxEngSetBitmapOwner(DWORD x1, DWORD x2) +BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngSetBitmapOwner \n"); + + return GreSetBitmapOwner(hbmp, ulOwner); } /************************************************************************/ /* DxEngDeleteSurface */ /************************************************************************/ -DWORD APIENTRY DxEngDeleteSurface(DWORD x1) +BOOLEAN APIENTRY DxEngDeleteSurface(HSURF hsurf) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngDeleteSurface \n"); + + return EngDeleteSurface(hsurf); } /************************************************************************/ @@ -798,10 +801,11 @@ DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2) /************************************************************************/ /* DxEngAltLockSurface */ /************************************************************************/ -DWORD APIENTRY DxEngAltLockSurface(DWORD x1) +SURFOBJ * APIENTRY DxEngAltLockSurface(HSURF hsurf) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngAltLockSurface \n"); + + return EngLockSurface(hsurf); } /************************************************************************/

1 0

[reactos] 01/01: [ROSAPPS] Remove 'theme/dump' reference code
by Mark Jansen 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=491dae17082ff86251d5e… commit 491dae17082ff86251d5e691f1b2eab093fab6f3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 3 17:33:55 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue May 31 23:24:16 2022 +0300 [ROSAPPS] Remove 'theme/dump' reference code --- .../sysutils/utils/theme/dump/themedump.bpr | 116 ---- .../sysutils/utils/theme/dump/themedump.cpp | 642 --------------------- .../sysutils/utils/theme/dump/themedump.rc | 6 - 3 files changed, 764 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr deleted file mode 100644 index 5a4195652b9..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> - -<PROJECT> - <MACROS> - <VERSION value="BCB.06.00"/> - <PROJECT value="themedump.exe"/> - <OBJFILES value="themedump.obj"/> - <RESFILES value="themedump.res"/> - <IDLFILES value=""/> - <IDLGENFILES value=""/> - <DEFFILE value=""/> - <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value=""/> - <LIBRARIES value=""/> - <SPARELIBS value=""/> - <PACKAGES value="vcl.bpi rtl.bpi dbrtl.bpi adortl.bpi vcldb.bpi vclx.bpi bdertl.bpi - ibxpress.bpi cds.bpi dsnap.bpi bdecds.bpi qrpt.bpi teeui.bpi teedb.bpi - tee.bpi vcldbx.bpi dss.bpi teeqr.bpi visualclx.bpi visualdbclx.bpi - dsnapcrba.bpi dsnapcon.bpi bcbsmp.bpi dbexpress.bpi dbxcds.bpi indy.bpi"/> - <PATHCPP value=".;"/> - <PATHPAS value=".;"/> - <PATHRC value=".;"/> - <PATHASM value=".;"/> - <DEBUGLIBPATH value="$(BCB)\lib\debug"/> - <RELEASELIBPATH value="$(BCB)\lib\release"/> - <LINKER value="ilink32"/> - <USERDEFINES value="_DEBUG"/> - <SYSDEFINES value="NO_STRICT;_NO_VCL;USEPACKAGES"/> - <MAINSOURCE value="themedump.cpp"/> - <INCLUDEPATH value=".;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value=".;$(BCB)\lib\obj;$(BCB)\lib"/> - <WARNINGS value="-w-pch -w-par"/> - <OTHERFILES value=""/> - </MACROS> - <OPTIONS> - <IDLCFLAGS value="-I. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/> - <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC - -tWM -c"/> - <PFLAGS value="-$YD -$W -$O- -$A8 -v -JPHNE -M"/> - <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-D"" -ap -Tpe -x -Gn -v"/> - <OTHERFILES value=""/> - </OPTIONS> - <LINKER> - <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> - <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) uxtheme.lib import32.lib cw32mt.lib"/> - <OTHERFILES value=""/> - </LINKER> - <FILELIST> - <FILE FILENAME="themedump.cpp" FORMNAME="" UNITNAME="themedump" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="themedump.rc" FORMNAME="" UNITNAME="themedump.rc" CONTAINERID="RCCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - </FILELIST> - <BUILDTOOLS> - </BUILDTOOLS> - - <IDEOPTIONS> -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1040 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams= -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[CORBA] -AddServerUnit=1 -AddClientUnit=1 -PrecompiledHeaders=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - </IDEOPTIONS> -</PROJECT> \ No newline at end of file diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp deleted file mode 100644 index 7cf284b4e6c..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp +++ /dev/null @@ -1,642 +0,0 @@ -#include <cstdlib> -#include <cstdio> -#include <cwchar> -#include <iostream> -#include <exception> -#include <algorithm> -#include <functional> -#include <list> -#include <string> -#include <map> - -#define WIN32_LEAN_AND_MEAN -#define UNICODE -#include <windows.h> -#include <commctrl.h> -#include <uxtheme.h> -#include <tmschema.h> - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#define SCHEMA_STRINGS -#define TMT_ENUMDEF (0x0D) // undocumented -#define TMT_ENUMVAL (0x0E) // undocumented -#define TMT_ENUM (0x0F) // undocumented -#include <tmschema.h> - -namespace tmdump -{ - typedef std::map<int, std::wstring> tm_enum_t; - typedef std::map<std::wstring, tm_enum_t> tm_enums_t; - - struct tm_property_t - { - std::wstring name; - int id; - int type; - tm_enums_t::iterator enum_type; - }; - - static tm_enums_t tm_enums; - - typedef std::list<tm_property_t> tm_properties_t; - - static tm_properties_t tm_properties; - - typedef std::map<int, std::wstring> tm_states_t; - typedef std::map<std::wstring, tm_states_t> tm_state_enums_t; - - static tm_state_enums_t tm_state_enums; - - struct tm_part_t - { - std::wstring name; - tm_state_enums_t::iterator states; - }; - - typedef std::map<int, tm_part_t> tm_parts_t; - - typedef std::map<std::wstring, tm_parts_t> tm_classes_t; - - static tm_classes_t tm_classes; - - class print - { - protected: - std::FILE * m_out; - - public: - print(std::FILE * out_): m_out(out_) { } - }; - - class property_print: - public print, - public std::unary_function<tm_property_t, void> - { - private: - wchar_t const * type_name(const tm_property_t& property_) - { - switch(property_.type) - { - case TMT_STRING: return L"LPWSTR"; - case TMT_INT: return L"int"; - case TMT_BOOL: return L"BOOL"; - case TMT_COLOR: return L"COLORREF"; - case TMT_MARGINS: return L"MARGINS"; - case TMT_FILENAME: return L"LPWSTR"; - case TMT_SIZE: return L"SIZE"; - case TMT_POSITION: return L"POINT"; - case TMT_RECT: return L"RECT"; - case TMT_FONT: return L"LOGFONT"; - case TMT_INTLIST: return L"INTLIST"; - case TMT_ENUM: return property_.enum_type->first.c_str(); - default: return L"<unknown>"; - } - } - - public: - property_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_property_t& property_) - { - std::fwprintf - ( - m_out, - L"%s\t%s\t%d\n", - type_name(property_), - property_.name.c_str(), - property_.id - ); - } - }; - - class part_print: - public print, - public std::unary_function<tm_parts_t::value_type, void> - { - public: - part_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_parts_t::value_type& part_) - { - std::fwprintf - ( - m_out, - L"\t%s\t%d\t%s\n", - part_.second.name.c_str(), - part_.first, - part_.second.states == tm_state_enums.end() ? - L"-" : - part_.second.states->first.c_str() - ); - } - }; - - class class_print: - public print, - public std::unary_function<tm_classes_t::value_type, void> - { - public: - class_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_classes_t::value_type& class_) - { - std::fwprintf(m_out, L"%s\n", class_.first.c_str()); - - std::for_each - ( - class_.second.begin(), - class_.second.end(), - part_print(m_out) - ); - } - }; - - class schema_scan: public std::unary_function<struct TMPROPINFO, void> - { - private: - enum - { - at_none, - at_enum, - at_parts, - at_states - } - m_state; - - union - { - void * p_none; - tm_enum_t * p_enum; - tm_parts_t * p_class; - tm_states_t * p_states; - } - m_cur; - - bool has_suffix(const std::wstring& name_, const std::wstring& suffix_) - { - if(name_.length() <= suffix_.length()) return false; - - return std::equal - ( - name_.end() - suffix_.length(), - name_.end(), - suffix_.begin() - ); - } - - public: - schema_scan(): m_state(at_none) { } - - void operator()(const struct TMPROPINFO& prop_) - { - static const std::wstring parts_suffix(L"PARTS"); - static const std::wstring states_suffix(L"STATES"); - - std::wstring name(prop_.pszName); - - // Compound declaration - if(prop_.sEnumVal == TMT_ENUMDEF && prop_.bPrimVal == TMT_ENUMDEF) - { - // class - if(has_suffix(name, parts_suffix)) - { - m_state = at_parts; - m_cur.p_class = & - ( - tm_classes - [ - std::wstring(name.begin(), name.end() - parts_suffix.length()) - ] = tm_parts_t() - ); - } - // states - else if(has_suffix(name, states_suffix)) - { - m_state = at_states; - m_cur.p_states = & - ( - tm_state_enums - [ - std::wstring(name.begin(), name.end() - states_suffix.length()) - ] = tm_states_t() - ); - } - // enumeration - else - { - m_state = at_enum; - m_cur.p_enum = &(tm_enums[name] = tm_enum_t()); - } - } - // Enumeration member - else if(prop_.bPrimVal == TMT_ENUMVAL) switch(m_state) - { - // enumeration member - case at_enum: - { - (*m_cur.p_enum)[prop_.sEnumVal] = name; - break; - } - - // class part - case at_parts: - { - tm_part_t part; - part.name = name; - part.states = tm_state_enums.end(); - (*m_cur.p_class)[prop_.sEnumVal] = part; - break; - } - - // state - case at_states: - { - (*m_cur.p_states)[prop_.sEnumVal] = name; - break; - } - } - // Primitive type - else if(prop_.sEnumVal == prop_.bPrimVal) - { - m_state = at_none; - m_cur.p_none = NULL; - } - // Property - else - { - m_state = at_none; - m_cur.p_none = NULL; - - tm_property_t property; - - property.name = name; - property.id = prop_.sEnumVal; - property.type = prop_.bPrimVal; - - if(prop_.bPrimVal == TMT_ENUM) - property.enum_type = tm_enums.find(name); - - tm_properties.push_back(property); - } - } - }; - - struct state_mapping_t - { - LPWSTR classname; - int partid; - LPWSTR states; - }; - - static const tmdump::state_mapping_t state_map[] = - { - { L"BUTTON", 0, NULL }, - { NULL, BP_CHECKBOX, L"CHECKBOX" }, - { NULL, BP_GROUPBOX, L"GROUPBOX" }, - { NULL, BP_PUSHBUTTON, L"PUSHBUTTON" }, - { NULL, BP_RADIOBUTTON, L"RADIOBUTTON" }, - { L"CLOCK", CLP_TIME, L"CLOCK" }, - { L"COMBOBOX", CP_DROPDOWNBUTTON, L"COMBOBOX" }, - { L"EDIT", EP_EDITTEXT, L"EDITTEXT" }, - { L"EXPLORERBAR", 0, NULL }, - { NULL, EBP_HEADERCLOSE, L"HEADERCLOSE" }, - { NULL, EBP_HEADERPIN, L"HEADERPIN" }, - { NULL, EBP_IEBARMENU, L"IEBARMENU" }, - { NULL, EBP_NORMALGROUPCOLLAPSE, L"NORMALGROUPCOLLAPSE" }, - { NULL, EBP_NORMALGROUPEXPAND, L"NORMALGROUPEXPAND" }, - { NULL, EBP_SPECIALGROUPCOLLAPSE, L"SPECIALGROUPCOLLAPSE"}, - { NULL, EBP_SPECIALGROUPEXPAND, L"SPECIALGROUPEXPAND" }, - { L"HEADER", 0, NULL }, - { NULL, HP_HEADERITEM, L"HEADERITEM" }, - { NULL, HP_HEADERITEMLEFT, L"HEADERITEMLEFT" }, - { NULL, HP_HEADERITEMRIGHT, L"HEADERITEMRIGHT" }, - { NULL, HP_HEADERSORTARROW, L"HEADERSORTARROW" }, - { L"LISTVIEW", LVP_LISTITEM, L"LISTITEM " }, - { L"MENU", 0, NULL }, - { NULL, MP_MENUBARDROPDOWN, L"MENU" }, - { NULL, MP_MENUBARITEM, L"MENU" }, - { NULL, MP_CHEVRON, L"MENU" }, - { NULL, MP_MENUDROPDOWN, L"MENU" }, - { NULL, MP_MENUITEM, L"MENU" }, - { NULL, MP_SEPARATOR, L"MENU" }, - { L"MENUBAND", MDP_NEWAPPBUTTON, L"MENUBAND" }, - { L"PAGE", 0, NULL }, - { NULL, PGRP_DOWN, L"DOWN" }, - { NULL, PGRP_DOWNHORZ, L"DOWNHORZ" }, - { NULL, PGRP_UP, L"UP" }, - { NULL, PGRP_UPHORZ, L"UPHORZ" }, - { L"REBAR", RP_CHEVRON, L"CHEVRON" }, - { L"SCROLLBAR", 0, NULL }, - { NULL, SBP_ARROWBTN, L"ARROWBTN" }, - { NULL, SBP_LOWERTRACKHORZ, L"SCROLLBAR" }, - { NULL, SBP_LOWERTRACKVERT, L"SCROLLBAR" }, - { NULL, SBP_THUMBBTNHORZ, L"SCROLLBAR" }, - { NULL, SBP_THUMBBTNVERT, L"SCROLLBAR" }, - { NULL, SBP_UPPERTRACKHORZ, L"SCROLLBAR" }, - { NULL, SBP_UPPERTRACKVERT, L"SCROLLBAR" }, - { NULL, SBP_SIZEBOX, L"SIZEBOX" }, - { L"SPIN", 0, NULL }, - { NULL, SPNP_DOWN, L"DOWN" }, - { NULL, SPNP_DOWNHORZ, L"DOWNHORZ" }, - { NULL, SPNP_UP, L"UP" }, - { NULL, SPNP_UPHORZ, L"UPHORZ" }, - { L"STARTPANEL", 0, NULL }, - { NULL, SPP_LOGOFFBUTTONS, L"LOGOFFBUTTONS" }, - { NULL, SPP_MOREPROGRAMSARROW, L"MOREPROGRAMSARROW" }, - { L"TAB", 0, NULL }, - { NULL, TABP_TABITEM, L"TABITEM" }, - { NULL, TABP_TABITEMBOTHEDGE, L"TABITEMBOTHEDGE" }, - { NULL, TABP_TABITEMLEFTEDGE, L"TABITEMLEFTEDGE" }, - { NULL, TABP_TABITEMRIGHTEDGE, L"TABITEMRIGHTEDGE" }, - { NULL, TABP_TOPTABITEM, L"TOPTABITEM" }, - { NULL, TABP_TOPTABITEMBOTHEDGE, L"TOPTABITEMBOTHEDGE" }, - { NULL, TABP_TOPTABITEMLEFTEDGE, L"TOPTABITEMLEFTEDGE" }, - { NULL, TABP_TOPTABITEMRIGHTEDGE, L"TOPTABITEMRIGHTEDGE" }, - { L"TOOLBAR", 0, NULL }, - { NULL, TP_BUTTON, L"TOOLBAR" }, - { NULL, TP_DROPDOWNBUTTON, L"TOOLBAR" }, - { NULL, TP_SPLITBUTTON, L"TOOLBAR" }, - { NULL, TP_SPLITBUTTONDROPDOWN, L"TOOLBAR" }, - { NULL, TP_SEPARATOR, L"TOOLBAR" }, - { NULL, TP_SEPARATORVERT, L"TOOLBAR" }, - { L"TOOLTIP", 0, NULL }, - { NULL, TTP_BALLOON, L"BALLOON" }, - { NULL, TTP_BALLOONTITLE, L"BALLOON" }, - { NULL, TTP_CLOSE, L"CLOSE" }, - { NULL, TTP_STANDARD, L"STANDARD" }, - { NULL, TTP_STANDARDTITLE, L"STANDARD" }, - { L"TRACKBAR", 0, NULL }, - { NULL, TKP_THUMB, L"THUMB" }, - { NULL, TKP_THUMBBOTTOM, L"THUMBBOTTOM" }, - { NULL, TKP_THUMBLEFT, L"THUMBLEFT" }, - { NULL, TKP_THUMBRIGHT, L"THUMBRIGHT" }, - { NULL, TKP_THUMBTOP, L"THUMBTOP" }, - { NULL, TKP_THUMBVERT, L"THUMBVERT" }, - { NULL, TKP_TICS, L"TICS" }, - { NULL, TKP_TICSVERT, L"TICSVERT" }, - { NULL, TKP_TRACK, L"TRACK" }, - { NULL, TKP_TRACKVERT, L"TRACKVERT" }, - { L"TREEVIEW", 0, NULL }, - { NULL, TVP_GLYPH, L"GLYPH" }, - { NULL, TVP_TREEITEM, L"TREEITEM" }, - { L"WINDOW", 0, NULL }, - { NULL, WP_CAPTION, L"CAPTION" }, - { NULL, WP_CLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_FRAMEBOTTOM, L"FRAME" }, - { NULL, WP_FRAMELEFT, L"FRAME" }, - { NULL, WP_FRAMERIGHT, L"FRAME" }, - { NULL, WP_HELPBUTTON, L"HELPBUTTON" }, - { NULL, WP_HORZSCROLL, L"HORZSCROLL" }, - { NULL, WP_HORZTHUMB, L"HORZTHUMB" }, - { NULL, WP_MAXBUTTON, L"MAXBUTTON" }, - { NULL, WP_MAXCAPTION, L"MAXCAPTION" }, - { NULL, WP_MDICLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_MDIHELPBUTTON, L"HELPBUTTON" }, - { NULL, WP_MDIMINBUTTON, L"MINBUTTON" }, - { NULL, WP_MDIRESTOREBUTTON, L"RESTOREBUTTON" }, - { NULL, WP_MDISYSBUTTON, L"SYSBUTTON" }, - { NULL, WP_MINBUTTON, L"MINBUTTON" }, - { NULL, WP_MINCAPTION, L"MINCAPTION" }, - { NULL, WP_RESTOREBUTTON, L"RESTOREBUTTON" }, - { NULL, WP_SMALLCAPTION, L"CAPTION" }, - { NULL, WP_SMALLCLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_SMALLFRAMEBOTTOM, L"FRAME" }, - { NULL, WP_SMALLFRAMELEFT, L"FRAME" }, - { NULL, WP_SMALLFRAMERIGHT, L"FRAME" }, - { NULL, WP_SMALLMAXCAPTION, L"MAXCAPTION" }, - { NULL, WP_SMALLMINCAPTION, L"MINCAPTION" }, - { NULL, WP_SYSBUTTON, L"SYSBUTTON" }, - { NULL, WP_VERTSCROLL, L"HORZSCROLL" }, - { NULL, WP_VERTTHUMB, L"HORZTHUMB" }, - }; - - class state_link: public std::unary_function<struct state_mapping_t, void> - { - private: - tm_classes_t::iterator m_class; - - public: - void operator()(const struct state_mapping_t& mapping_) - { - // switch to a new class - if(mapping_.classname) - m_class = tm_classes.find(std::wstring(mapping_.classname)); - - // no mapping, or class not found - if(mapping_.states == NULL || m_class == tm_classes.end()) return; - - tm_state_enums_t::iterator states = - tm_state_enums.find(std::wstring(mapping_.states)); - - // unknown set of states - if(states == tm_state_enums.end()) return; - - tm_parts_t::iterator part = m_class->second.find(mapping_.partid); - - // unknown part - if(part == m_class->second.end()) return; - - // success - part->second.states = states; - } - }; -} - -int main(int argc, char * argv[]) -{ - try - { - struct TMSCHEMAINFO const & schema = *GetSchemaInfo(); - - // build the tables of properties, classes, parts and states - std::for_each - ( - schema.pPropTable, - schema.pPropTable + schema.iPropCount, - tmdump::schema_scan() - ); - - // link parts to states - std::for_each - ( - tmdump::state_map, - tmdump::state_map + sizeof(tmdump::state_map) / sizeof(tmdump::state_map[0]), - tmdump::state_link() - ); - - ::InitCommonControls(); - ::SetThemeAppProperties(STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS); - - // dump the current values of all properties - for - ( - tmdump::tm_classes_t::iterator p = tmdump::tm_classes.begin(); - p != tmdump::tm_classes.end(); - ++ p - ) - { - const std::wstring& class_name = p->first; - - // open the theme data for the current class - class htheme_t - { - public: - HTHEME m_handle; - - htheme_t(HTHEME handle_): m_handle(handle_) { } - ~htheme_t() { ::CloseThemeData(m_handle); } - - operator HTHEME() { return m_handle; } - } - data = ::OpenThemeData(NULL, class_name.c_str()); - - // failure - if(data == NULL) - { - std::fwprintf - ( - stderr, - L"OpenThemeData(\"%s\") failed, error %d\n", - class_name.c_str(), - GetLastError() - ); - - continue; - } - - // class name - std::fwprintf(stdout, L"%s\n", p->first.c_str()); - - // dump system properties - for - ( - tmdump::tm_properties_t::iterator p = tmdump::tm_properties.begin(); - p != tmdump::tm_properties.end(); - ++ p - ) - { - switch(p->type) - { - case TMT_POSITION: - case TMT_MARGINS: - case TMT_RECT: - case TMT_INTLIST: - continue; - } - - // property name - std::fwprintf(stdout, L"\t%s = ", p->name.c_str()); - - HRESULT hres; - - switch(p->type) - { - // string - case TMT_STRING: - case TMT_FILENAME: // FIXME - { - WCHAR buffer[256]; - if(FAILED(hres = GetThemeSysString(data, p->id, buffer, 256))) break; - std::fwprintf(stdout, L"string: \"%s\"", buffer); - break; - } - - // integer - case TMT_INT: - { - int val; - if(FAILED(hres = GetThemeSysInt(data, p->id, &val))) break; - std::fwprintf(stdout, L"int: %d", val); - break; - } - - // boolean - case TMT_BOOL: - { - SetLastError(0); - BOOL val = GetThemeSysBool(data, p->id); - if(FAILED(hres = GetLastError())) break; - std::fwprintf(stdout, L"bool: %s", val ? L"true" : L"false"); - break; - } - - // color - case TMT_COLOR: - { - SetLastError(0); - - COLORREF val = GetThemeSysColor(data, p->id); - - if(FAILED(hres = GetLastError())) break; - - std::fwprintf - ( - stdout, - L"rgb: %d, %d, %d", - GetRValue(val), - GetGValue(val), - GetBValue(val) - ); - - break; - } - - // size - case TMT_SIZE: - { - SetLastError(0); - int val = GetThemeSysSize(data, p->id); - if(FAILED(hres = GetLastError())) break; - std::fwprintf(stdout, L"size: %d", val); - break; - } - - // font - case TMT_FONT: - { - LOGFONTW val; - if(FAILED(hres = GetThemeSysFont(data, p->id, &val))) break; - std::fwprintf(stdout, L"font: %s", val.lfFaceName); - break; - } - - // enumerated integer - case TMT_ENUM: - { - int val; - if(FAILED(hres = GetThemeSysInt(data, p->id, &val))) break; - - std::fwprintf(stdout, L"enum(%s): ", p->enum_type->first.c_str()); - - tmdump::tm_enum_t::iterator enumval = p->enum_type->second.find(val); - - if(enumval == p->enum_type->second.end()) - std::fwprintf(stdout, L"<%d>", val); - else - std::fwprintf(stdout, L"%s", enumval->second.c_str()); - - break; - } - } - - if(FAILED(hres)) std::fwprintf(stdout, L"<error %08X>", hres); - - std::fputwc(L'\n', stdout); - } - - } - } - catch(std::exception e) - { - std::cerr << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - -// EOF - diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc deleted file mode 100644 index 8877498af39..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc +++ /dev/null @@ -1,6 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#include <winuser.h> - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" - -// EOF

1 0

[reactos] 01/01: [ROSAPPS] Remove 'stats' utility
by Mark Jansen 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e1199713e5960c0eee6a… commit 9e1199713e5960c0eee6a5190515b98dda2908bd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 3 17:33:38 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue May 31 23:24:01 2022 +0300 [ROSAPPS] Remove 'stats' utility --- .../applications/sysutils/utils/CMakeLists.txt | 1 - .../sysutils/utils/stats/CMakeLists.txt | 5 - .../applications/sysutils/utils/stats/stats.c | 478 --------------------- 3 files changed, 484 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/CMakeLists.txt index 9bc33cc6efc..980239620e2 100644 --- a/modules/rosapps/applications/sysutils/utils/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/utils/CMakeLists.txt @@ -5,5 +5,4 @@ add_subdirectory(objdir) add_subdirectory(partinfo) add_subdirectory(ps) add_subdirectory(rosperf) -add_subdirectory(stats) add_subdirectory(tickcount) diff --git a/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt deleted file mode 100644 index 43787a6827e..00000000000 --- a/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -add_executable(stats stats.c) -set_module_type(stats win32cui UNICODE) -add_importlibs(stats ntdll msvcrt kernel32) -add_cd_file(TARGET stats DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/utils/stats/stats.c b/modules/rosapps/applications/sysutils/utils/stats/stats.c deleted file mode 100644 index 0a8c45f3c34..00000000000 --- a/modules/rosapps/applications/sysutils/utils/stats/stats.c +++ /dev/null @@ -1,478 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS project statistics - * FILE: stats.c - * PURPOSE: Main program file - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/01-2002 Created - */ -#include <windows.h> -#include <tchar.h> -#include <stdio.h> - -typedef struct _EXTENSION_INFO -{ - struct _EXTENSION_INFO * Next; - struct _FILE_INFO * StatInfoList; - TCHAR ExtName[16]; - TCHAR ExpandedExtName[128]; - DWORD nExtensions; - TCHAR Description[256]; - DWORD FileCount; - DWORD LineCount; - DWORD EmptyLines; -} EXTENSION_INFO, *PEXTENSION_INFO; - -typedef struct _FILE_INFO -{ - struct _FILE_INFO * Next; - struct _FILE_INFO * StatInfoListNext; - PEXTENSION_INFO ExtInfo; - TCHAR FileName[MAX_PATH]; - DWORD LineCount; - DWORD EmptyLines; - DWORD FunctionCount; -} FILE_INFO, *PFILE_INFO; - -HANDLE FileHandle; -PEXTENSION_INFO ExtInfoList; -PFILE_INFO StatInfoList; -BOOLEAN SkipEmptyLines, BeSilent; - -#define MAX_OPTIONS 2 -TCHAR *Options[MAX_OPTIONS]; - - -VOID -Initialize(VOID) -{ - ExtInfoList = NULL; - StatInfoList = NULL; -} - - -VOID -Cleanup(VOID) -{ - PEXTENSION_INFO ExtInfo; - PEXTENSION_INFO NextExtInfo; - - ExtInfo = ExtInfoList; - while (ExtInfo != NULL) - { - NextExtInfo = ExtInfo->Next; - HeapFree (GetProcessHeap(), 0, ExtInfo); - ExtInfo = NextExtInfo; - } -} - - -PEXTENSION_INFO -AddExtension(LPTSTR ExtName, - LPTSTR Description) -{ - PEXTENSION_INFO ExtInfo; - PEXTENSION_INFO Info; - TCHAR *t; - DWORD ln; - - ExtInfo = (PEXTENSION_INFO) HeapAlloc (GetProcessHeap(), 0, sizeof (EXTENSION_INFO)); - if (!ExtInfo) - return NULL; - - for(t = ExtName; *t != _T('\0'); t += _tcslen(t) + 1); - ln = (DWORD_PTR)t - (DWORD_PTR)ExtName; - - ZeroMemory (ExtInfo, sizeof (EXTENSION_INFO)); - memcpy (ExtInfo->ExtName, ExtName, ln); - _tcscpy (ExtInfo->Description, Description); - - for(t = ExtInfo->ExtName; *t != _T('\0'); t += _tcslen(t) + 1) - { - if(ExtInfo->nExtensions++ != 0) - _tcscat (ExtInfo->ExpandedExtName, _T(";")); - _tcscat (ExtInfo->ExpandedExtName, _T("*.")); - _tcscat (ExtInfo->ExpandedExtName, t); - } - - if (ExtInfoList) - { - Info = ExtInfoList; - while (Info->Next != NULL) - { - Info = Info->Next; - } - Info->Next = ExtInfo; - } - else - { - ExtInfoList = ExtInfo; - } - - return ExtInfo; -} - - -PFILE_INFO -AddFile(LPTSTR FileName, - PEXTENSION_INFO ExtInfo) -{ - PFILE_INFO StatInfo; - PFILE_INFO Info; - - StatInfo = (PFILE_INFO) HeapAlloc (GetProcessHeap(), 0, sizeof (FILE_INFO)); - if (!StatInfo) - return NULL; - ZeroMemory (StatInfo, sizeof (FILE_INFO)); - _tcscpy (StatInfo->FileName, FileName); - StatInfo->ExtInfo = ExtInfo; - - if (ExtInfo->StatInfoList) - { - Info = ExtInfo->StatInfoList; - while (Info->StatInfoListNext != NULL) - { - Info = Info->StatInfoListNext; - } - Info->StatInfoListNext = StatInfo; - } - else - { - ExtInfo->StatInfoList = StatInfo; - } - - if (StatInfoList) - { - Info = StatInfoList; - while (Info->Next != NULL) - { - Info = Info->Next; - } - Info->Next = StatInfo; - } - else - { - StatInfoList = StatInfo; - } - - return StatInfo; -} - - -VOID -CleanupAfterFile(VOID) -{ - if(FileHandle != INVALID_HANDLE_VALUE) - CloseHandle (FileHandle); -} - - -BOOL -LoadFile(LPTSTR FileName) -{ - LONG FileSize; - - FileHandle = CreateFile (FileName, // Create this file - GENERIC_READ, // Open for reading - 0, // No sharing - NULL, // No security - OPEN_EXISTING, // Open the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return FALSE; - - FileSize = GetFileSize (FileHandle, NULL); - if (FileSize <= 0) - { - CloseHandle (FileHandle); - return FALSE; - } - - return TRUE; -} - - -VOID -ReadLines(PFILE_INFO StatInfo) -{ - DWORD ReadBytes, LineLen; - static char FileBuffer[1024]; - char LastChar = '\0'; - char *Current; - - LineLen = 0; - while(ReadFile (FileHandle, FileBuffer, sizeof(FileBuffer), &ReadBytes, NULL) && ReadBytes >= sizeof(char)) - { - for(Current = FileBuffer; ReadBytes > 0; ReadBytes -= sizeof(char), Current++) - { - if(*Current == '\n' && LastChar == '\r') - { - LastChar = '\0'; - if(!SkipEmptyLines || (LineLen > 0)) - StatInfo->LineCount++; - if(LineLen == 0) - StatInfo->EmptyLines++; - LineLen = 0; - continue; - } - LastChar = *Current; - if(SkipEmptyLines && (*Current == ' ' || *Current == '\t')) - { - continue; - } - if(*Current != '\r') - LineLen++; - } - } - - StatInfo->LineCount += (LineLen > 0); - StatInfo->EmptyLines += ((LastChar != '\0') && (LineLen == 0)); -} - - -VOID -PrintStatistics(VOID) -{ - PEXTENSION_INFO Info; - DWORD TotalFileCount; - DWORD TotalLineCount; - DWORD TotalAvgLF; - DWORD TotalEmptyLines; - - TotalFileCount = 0; - TotalLineCount = 0; - TotalEmptyLines = 0; - Info = ExtInfoList; - - for (Info = ExtInfoList; Info != NULL; Info = Info->Next) - { - TotalFileCount += Info->FileCount; - TotalLineCount += Info->LineCount; - TotalEmptyLines += Info->EmptyLines; - } - - TotalAvgLF = (TotalFileCount ? TotalLineCount / TotalFileCount : 0); - - for (Info = ExtInfoList; Info != NULL; Info = Info->Next) - { - DWORD AvgLF; - - if (Info->FileCount != 0) - { - AvgLF = (Info->FileCount ? Info->LineCount / Info->FileCount : 0); - } - else - { - AvgLF = 0; - } - - _tprintf (_T("\n")); - _tprintf (_T("File extension%c : %s\n"), ((Info->nExtensions > 1) ? _T('s') : _T(' ')), Info->ExpandedExtName); - _tprintf (_T("File ext. description : %s\n"), Info->Description); - _tprintf (_T("Number of files : %lu\n"), Info->FileCount); - _tprintf (_T("Number of lines : %lu\n"), Info->LineCount); - if(SkipEmptyLines) - _tprintf (_T("Number of empty lines : %lu\n"), Info->EmptyLines); - _tprintf (_T("Proportion of lines : %.2f %%\n"), (float)(TotalLineCount ? (((float)Info->LineCount * 100) / (float)TotalLineCount) : 0)); - _tprintf (_T("Average no. lines/file : %lu\n"), AvgLF); - } - - _tprintf (_T("\n")); - _tprintf (_T("Total number of files : %lu\n"), TotalFileCount); - _tprintf (_T("Total number of lines : %lu\n"), TotalLineCount); - if(SkipEmptyLines) - _tprintf (_T("Total number of empty lines : %lu\n"), TotalEmptyLines); - _tprintf (_T("Average no. lines/file : %lu\n"), TotalAvgLF); -} - - -BOOL -ProcessFiles(LPTSTR Path) -{ - WIN32_FIND_DATA FindFile; - PEXTENSION_INFO Info; - TCHAR SearchPath[256]; - TCHAR FileName[256]; - TCHAR *Ext; - HANDLE SearchHandle; - BOOL More; - - Info = ExtInfoList; - while (Info != NULL) - { - Ext = Info->ExtName; - do - { - ZeroMemory (&FindFile, sizeof (FindFile)); - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\*.")); - _tcscat (SearchPath, Ext); - _tcscpy (FindFile.cFileName, SearchPath); - SearchHandle = FindFirstFile (SearchPath, &FindFile); - if (SearchHandle != INVALID_HANDLE_VALUE) - { - More = TRUE; - while (More) - { - if (!(FindFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - { - _tcscpy (FileName, Path); - _tcscat (FileName, _T("\\")); - _tcscat (FileName, FindFile.cFileName); - - if (LoadFile (FileName)) - { - PFILE_INFO StatInfo; - - StatInfo = AddFile (FindFile.cFileName, Info); - if (!StatInfo) - { - _tprintf (_T("Not enough free memory.\n")); - return FALSE; - } - - ReadLines (StatInfo); - - Info->FileCount++; - Info->LineCount += StatInfo->LineCount; - Info->EmptyLines += StatInfo->EmptyLines; - - CleanupAfterFile(); - } - } - More = FindNextFile (SearchHandle, &FindFile); - } - FindClose (SearchHandle); - } - Ext += _tcslen(Ext) + 1; - } while(*Ext != _T('\0')); - Info = Info->Next; - } - return TRUE; -} - - -BOOL -ProcessDirectories(LPTSTR Path) -{ - WIN32_FIND_DATA FindFile; - TCHAR SearchPath[MAX_PATH]; - HANDLE SearchHandle; - BOOL More; - - if(!BeSilent) - { - _tprintf (_T("Processing %s ...\n"), Path); - } - - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\*.*")); - - SearchHandle = FindFirstFileEx (SearchPath, - FindExInfoStandard, - &FindFile, - FindExSearchLimitToDirectories, - NULL, - 0); - if (SearchHandle != INVALID_HANDLE_VALUE) - { - More = TRUE; - while (More) - { - if ((FindFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - && (_tcscmp (FindFile.cFileName, _T(".")) != 0) - && (_tcscmp (FindFile.cFileName, _T("..")) != 0) - && (_tcscmp (FindFile.cFileName, _T("CVS")) != 0) - && (_tcscmp (FindFile.cFileName, _T(".svn")) != 0)) - { - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\")); - _tcscat (SearchPath, FindFile.cFileName); - if (!ProcessDirectories (SearchPath)) - return FALSE; - if (!ProcessFiles (SearchPath)) - return FALSE; - } - More = FindNextFile (SearchHandle, &FindFile); - } - FindClose (SearchHandle); - } - return TRUE; -} - - -VOID -Execute(LPTSTR Path) -{ - if (!ExtInfoList) - { - _tprintf (_T("No extensions specified.\n")); - return; - } - - if (!ProcessDirectories (Path)) - { - _tprintf (_T("Failed to process directories.\n")); - return; - } - - if (!ProcessFiles (Path)) - { - _tprintf (_T("Failed to process files.\n")); - return; - } - - PrintStatistics(); -} - -BOOLEAN -IsOptionSet(TCHAR *Option) -{ - int i; - for(i = 0; i < MAX_OPTIONS; i++) - { - if(!Options[i]) - continue; - - if(!_tcscmp(Options[i], Option)) - return TRUE; - } - return FALSE; -} - - -int _tmain(int argc, _TCHAR * argv[]) -{ - int a; - - _tprintf (_T("ReactOS Project Statistics\n")); - _tprintf (_T("==========================\n\n")); - - if (argc < 2 || argc > 2 + MAX_OPTIONS) - { - _tprintf(_T("Usage: stats [-e] [-s] directory\n")); - _tprintf(_T(" -e: don't count empty lines\n")); - _tprintf(_T(" -s: be silent, don't print directories while processing\n")); - return 1; - } - - Initialize(); - AddExtension (_T("c\0\0"), _T("Ansi C Source files")); - AddExtension (_T("cpp\0cxx\0\0"), _T("C++ Source files")); - AddExtension (_T("h\0\0"), _T("Header files")); - - for(a = 1; a < argc - 1; a++) - { - Options[a - 1] = argv[a]; - } - - SkipEmptyLines = IsOptionSet(_T("-e")); - BeSilent = IsOptionSet(_T("-s")); - - Execute (argv[argc - 1]); - Cleanup(); - - return 0; -}

1 0

[reactos] 01/01: [TRANSLATION] Improve Portuguese (pt-PT) translation (#4522)
by Jose Carlos Jesus 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d432436fedbbe9ed0b966… commit d432436fedbbe9ed0b966069b8e77ac508ebd729 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue May 31 00:04:41 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 31 02:04:41 2022 +0300 [TRANSLATION] Improve Portuguese (pt-PT) translation (#4522) - [REGEDIT] [INTL] [DEVMGR] Improve pt-PT translation - [W32TIME] Add pt-PT translation - [BOOTDATA] Add pt-PT to hivesys.inf --- base/applications/regedit/lang/pt-PT.rc | 146 +++++++++++++++--------------- base/services/w32time/lang/pt-PT.rc | 14 +++ base/services/w32time/w32time.rc | 3 + boot/bootdata/hivesys.inf | 156 ++++++++++++++++++++++++++++++++ dll/cpl/intl/lang/pt-PT.rc | 40 ++++---- dll/win32/devmgr/lang/pt-PT.rc | 38 ++++---- 6 files changed, 285 insertions(+), 112 deletions(-) diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 4f55cd6ffc9..8b65e6cde89 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -14,7 +14,7 @@ END IDC_REGEDIT MENU BEGIN - POPUP "&Arquivo" + POPUP "&Ficheiro" BEGIN MENUITEM "Sai&r", ID_REGISTRY_EXIT END @@ -28,14 +28,14 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Registo" BEGIN - MENUITEM "&Importar arquivo do Registo...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Exportar arquivo do Registo...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Importar ficheiro de Registo...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Exportar ficheiro de Registo...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Carregar ramo de registo...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descarregar ramo de registo...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Ligar Registo da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "&Desligar Registo da rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Ligar ao Registo de rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY + MENUITEM "&Desligar do Registo de rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primir...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -49,24 +49,24 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Valor &Expand. String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Permissões...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE - MENUITEM "&Renomear", ID_EDIT_RENAME + MENUITEM "&Mudar o nome", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME + MENUITEM "&Copiar nome de chave", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Localizar...\tCtrl+F", ID_EDIT_FIND - MENUITEM "L&ocalizar próxima\tF3", ID_EDIT_FINDNEXT + MENUITEM "L&ocalizar seguinte\tF3", ID_EDIT_FINDNEXT END - POPUP "E&xibir" + POPUP "&Ver" BEGIN MENUITEM "&Barra de status", ID_VIEW_STATUSBAR MENUITEM SEPARATOR @@ -81,9 +81,9 @@ BEGIN END POPUP "Aj&uda" BEGIN - MENUITEM "&Topics da Ajuda", ID_HELP_HELPTOPICS + MENUITEM "&Tópicos da Ajuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Sobre o Editor do Registo", ID_HELP_ABOUT + MENUITEM "&Acerca do Editor de Registo", ID_HELP_ABOUT END END @@ -95,7 +95,7 @@ BEGIN MENUITEM "Modificar dados binários", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE - MENUITEM "&Renomear", ID_EDIT_RENAME + MENUITEM "&Mudar o nome", ID_EDIT_RENAME END POPUP "" BEGIN @@ -103,11 +103,11 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -117,16 +117,16 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&Localizar...", ID_EDIT_FIND MENUITEM SEPARATOR - MENUITEM "&Apagar", ID_TREE_DELETE - MENUITEM "&Renomear", ID_TREE_RENAME + MENUITEM "&Eliminar", ID_TREE_DELETE + MENUITEM "&Mudar o nome", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT MENUITEM "&Permissões...", ID_TREE_PERMISSIONS @@ -139,14 +139,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT MENUITEM SEPARATOR - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Descarregar ramo de registo...", ID_REGISTRY_UNLOADHIVE, GRAYED END POPUP "" BEGIN MENUITEM "C&ortar", ID_HEXEDIT_CUT MENUITEM "&Copiar", ID_HEXEDIT_COPY MENUITEM "&Colar", ID_HEXEDIT_PASTE - MENUITEM "&Apagar", ID_HEXEDIT_DELETE + MENUITEM "&Excluir", ID_HEXEDIT_DELETE MENUITEM SEPARATOR MENUITEM "Seleccionar &Tudo", ID_HEXEDIT_SELECT_ALL END @@ -169,26 +169,26 @@ END IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Multi-String" +CAPTION "Editar Multi-Cadeia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 EDITTEXT IDC_VALUE_DATA, 6, 46, 240, 102, ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 - PUSHBUTTON "Cancearl", IDCANCEL, 196, 154, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 196, 154, 50, 14 END IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Binary Value" +CAPTION "Editar valor binário" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 CONTROL "", IDC_VALUE_DATA, "HexEdit32", WS_VSCROLL | WS_BORDER | WS_TABSTOP, 6, 46, 240, 102 DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 196, 154, 50, 14 @@ -196,12 +196,12 @@ END IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit DWORD" +CAPTION "Editar valor DWORD" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 EDITTEXT IDC_VALUE_DATA, 6, 46, 116, 12, ES_AUTOHSCROLL GROUPBOX "Base", IDC_STATIC, 130, 35, 116, 39 AUTORADIOBUTTON "&Hexadecimal", IDC_FORMAT_HEX, 141, 46, 60, 10, WS_GROUP @@ -212,7 +212,7 @@ END IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resource List" +CAPTION "Lista de recursos" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | @@ -223,39 +223,39 @@ END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resources" +CAPTION "Recursos" FONT 8, "MS Shell Dlg" BEGIN LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "Interrupções:", IDC_STATIC, 10, 48, 35, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 - LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8 + LTEXT "Memoria:", IDC_STATIC, 10, 91, 32, 8 CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 - LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8 + LTEXT "Portas:", IDC_STATIC, 10, 134, 38, 8 CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 - LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8 + LTEXT "Dados específicos do dispositivo:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "Usage", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED - LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED - LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED - LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED - RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8 + GROUPBOX "Utilização", IDC_STATIC, 10, 219, 125, 39 + LTEXT "Indeterminado", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "Partilhado", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "Exclusivo do dispositivo", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "Exclusivo do controlador", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "Tipo de Interface:", IDC_STATIC, 144, 220, 58, 8 LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 - RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8 + RTEXT "Bus número:", IDC_STATIC, 151, 230, 51, 8 LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 - RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8 + RTEXT "Versão:", IDC_STATIC, 151, 240, 51, 8 LTEXT "", IDC_VERSION, 205, 240, 66, 8 - RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + RTEXT "Revisão:", IDC_STATIC, 151, 250, 51, 8 LTEXT "", IDC_REVISION, 205, 250, 66, 8 DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14 - PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED + PUSHBUTTON "&Dados...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED END /* String Tables */ @@ -278,7 +278,7 @@ STRINGTABLE BEGIN ID_REGISTRY_MENU "Contém comandos para trabalhar com o Registo inteiro." ID_EDIT_MENU "Contém comandos para edição de valores ou chaves." - ID_VIEW_MENU "Contém comandos para personalização da janela do Registro." + ID_VIEW_MENU "Contém comandos para personalização da janela do Registo." ID_FAVOURITES_MENU "Contém comandos para acessar chaves frequentemente usadas." ID_HELP_MENU "Contém comandos para exibição da ajuda e informações sobre o Editor do Registo." ID_EDIT_NEW_MENU "Contém comandos para criação de novas chaves ou valores" @@ -291,10 +291,10 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto." ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário." ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD." - ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo texto para o registro." - ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um arquivo texto." - ID_REGISTRY_LOADHIVE "Carrega um arquivo de secção no registo" - ID_REGISTRY_UNLOADHIVE "Descarrega um arquivo de seção no registro" + ID_REGISTRY_IMPORTREGISTRYFILE "Importa um ficheiro de texto para o registo." + ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um ficheiro de texto." + ID_REGISTRY_LOADHIVE "Carrega um ficheiro de secção no registo" + ID_REGISTRY_UNLOADHIVE "Descarrega um ficheiro de secção no registo" ID_REGISTRY_CONNECTNETWORKREGISTRY "Liga a um registo num computador remoto." ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Desliga um registo de um computador remoto." ID_REGISTRY_PRINT "Imprime todo ou parte do registo." @@ -307,12 +307,12 @@ BEGIN ID_REGISTRY_EXIT "Encerra o Editor do Registo." ID_FAVOURITES_ADDTOFAVOURITES "Adiciona chaves na lista de favoritos." ID_FAVOURITES_REMOVEFAVOURITE "Remove chaves da lista de favoritos." - ID_VIEW_STATUSBAR "Mostra ou oculta a barra de status." + ID_VIEW_STATUSBAR "Mostra ou oculta a barra de estado." ID_VIEW_SPLIT "Altera a posição da divisão entre os painéis." ID_VIEW_REFRESH "Actualiza a janela." ID_EDIT_DELETE "Exclui a seleccão." ID_EDIT_RENAME "Renomeia a seleccão." - ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a Área de transferência." + ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a área de transferência." ID_EDIT_FIND "Localiza um texto numa chave, valor ou dado." ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto especificado na pesquisa anterior." END @@ -325,19 +325,19 @@ BEGIN IDS_BAD_VALUE "Não pode perguntar o valor '%s'" IDS_UNSUPPORTED_TYPE "Não pode editar chaves deste tipo (%ld)" IDS_TOO_BIG_VALUE "Valor é muito grande (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "Os dados do tipo REG_MULTI_SZ não podem conter strings vazias.\nAs strings vazias foram removidas da lista." + IDS_MULTI_SZ_EMPTY_STRING "Os dados do tipo REG_MULTI_SZ não podem conter cadeias vazias.\nAs cadeias vazias foram removidas da lista." IDS_QUERY_DELETE_KEY_ONE "Tem certeza que deseja excluir esta chave?" IDS_QUERY_DELETE_KEY_MORE "Tem certeza que deseja excluir estas chaves?" IDS_QUERY_DELETE_KEY_CONFIRM "Confirme exclusão da chave" IDS_QUERY_DELETE_ONE "Tem certeza que deseja excluir este valor?" - IDS_QUERY_DELETE_MORE "Tem certeza que deseja excluir estes valores??" + IDS_QUERY_DELETE_MORE "Tem certeza que deseja excluir estes valores?" IDS_QUERY_DELETE_CONFIRM "Confirme a exclusão do Valor" IDS_ERR_DELVAL_CAPTION "Erro ao apagar Valor" IDS_ERR_DELETEVALUE "Não foi possível apagar todos os valores especificados!" IDS_ERR_RENVAL_CAPTION "Erro ao Renomear Valor" IDS_ERR_RENVAL_TOEMPTY "Não foi possível renomear %s. O nome do valor especificado está vazio. Tente outro nome." IDS_QUERY_IMPORT_HIVE_CAPTION "Confirme a restauração da chave" - IDS_QUERY_IMPORT_HIVE_MSG "A chave será restaurada no topo da chave atualmente selecionada.\nTodos os valores e subchaves desta chave serão excluídos.\nDeseja continuar a operação?" + IDS_QUERY_IMPORT_HIVE_MSG "A chave será restaurada no topo da chave actualmente seleccionada.\nTodos os valores e subchaves desta chave serão excluídos.\nDeseja continuar a operação?" IDS_NEW_KEY "Nova chave #%d" IDS_NEW_VALUE "Novo valor #%d" END @@ -345,7 +345,7 @@ END STRINGTABLE BEGIN IDS_BINARY_EMPTY "(valor binário de comprimento zero)" - IDS_DEFAULT_VALUE_NAME "(Por default)" + IDS_DEFAULT_VALUE_NAME "(Predefinição)" IDS_VALUE_NOT_SET "(valor não atribuido)" IDS_UNKNOWN_TYPE "tipo desconhecido: (0x%lx)" IDS_MY_COMPUTER "O meu computador" @@ -358,12 +358,12 @@ END STRINGTABLE BEGIN - IDS_FLT_REGFILE "Arquivo de registo" - IDS_FLT_REGFILES "Arquivos de registo (*.reg)" + IDS_FLT_REGFILE "Ficheiro de registo" + IDS_FLT_REGFILES "Ficheiro de registo (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_HIVFILES "Arquivo de secção do registo (*.*)" + IDS_FLT_HIVFILES "Ficheiro de secção do registo (*.*)" IDS_FLT_HIVFILES_FLT "*.*" - IDS_FLT_REGEDIT4 "Win9x/NT4 Arquivos de registo (REGEDIT4) (*.reg)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Ficheiros de registo (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os ficheiros (*.*)" IDS_FLT_ALLFILES_FLT "*.*" @@ -389,7 +389,7 @@ STRINGTABLE BEGIN IDS_INHERIT_THISKEYONLY "Sómente esta chave" IDS_INHERIT_THISKEYANDSUBKEYS "Esta chave e sub-chave" - IDS_INHERIT_SUBKEYSONLY "Somente sub-chaves" + IDS_INHERIT_SUBKEYSONLY "Sómente sub-chaves" END STRINGTABLE @@ -404,8 +404,8 @@ STRINGTABLE BEGIN IDS_IMPORT_PROMPT "Adicionar informações pode, inadvertidamente, alterar ou excluir valores e fazer com que os componentes parem de funcionar correctamente.\nSe não confiar na fonte dessas informações em '%s', não as adicione ao registro.\n\nTem certeza de que deseja continuar ?" IDS_IMPORT_OK "As chaves e valores contidos em '%s' foram adicionados com sucesso ao registo." - IDS_IMPORT_ERROR "Não é possível importar '%s': Erro ao abrir o arquivo. Pode haver um erro no sistema de ficheiros ou o arquivo pode não existir." - IDS_EXPORT_ERROR "Não é possível exportar '%s': Erro ao criar ou gravar no arquivo. Pode haver um erro no disco ou no sistema de ficheiros." + IDS_IMPORT_ERROR "Não é possível importar '%s': Erro ao abrir o ficheiro. Pode haver um erro no sistema de ficheiros ou o arquivo pode não existir." + IDS_EXPORT_ERROR "Não é possível exportar '%s': Erro ao criar ou gravar no ficheiro. Pode haver um erro no disco ou no sistema de ficheiros." END STRINGTABLE diff --git a/base/services/w32time/lang/pt-PT.rc b/base/services/w32time/lang/pt-PT.rc new file mode 100644 index 00000000000..0b8a90483eb --- /dev/null +++ b/base/services/w32time/lang/pt-PT.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATORS: Copyright 2022 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Serviço de horário" + IDS_DESCRIPTION "Mantém a sincronização de data e hora em todos os clientes e servidores da rede." +END diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc index 2cb5688229e..4177188a782 100644 --- a/base/services/w32time/w32time.rc +++ b/base/services/w32time/w32time.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 7017bb41447..4a447614b8f 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2696,6 +2696,162 @@ US_INTERNATIONAL = "Międzynarodowy (USA)" UZBEK_CYRILLIC = "Uzbecki (Cyrylica)" VIETNAMESE = "Wietnamski" +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0016] + +; Services names and descriptions +AUDIO_SERVICE="Serviços de Audio do ReactOS" +AUDIO_SERVICE_DESCRIPTION="Fornece recursos de áudio para aplicações" + +BITS_SERVICE="Serviço de transferência inteligente em segundo plano" +BITS_SERVICE_DESCRIPTION="Transfere dados entre clientes e servidores em segundo plano." + +BROWSER_SERVICE="Navegador de computador" +BROWSER_SERVICE_DESCRIPTION="Mantém uma lista actualizada de computadores na rede e fornece essa lista aos computadores designados como navegadores." + +DCOMLAUNCH_SERVICE="DCOM - Lançador de processo de servidor" +DCOMLAUNCH_SERVICE_DESCRIPTION="Fornece funcionalidades de lançamento para serviços DCOM." + +EVENTLOG_SERVICE="Registo de Eventos" +EVENTLOG_SERVICE_DESCRIPTION="Regista eventos ou mensagens enviadas pelo sistema operativo num banco de dados acessíveis através do visualizador de eventos." + +MSISERVER_SERVICE="Instalador do ReactOS" +MSISERVER_SERVICE_DESCRIPTION="Controla a instalação, manutenção e remoção de software empacotado como um MSI (Instalador do Windows)." + +NETLOGON_SERVICE="Inicio de sessão de rede" +NETLOGON_SERVICE_DESCRIPTION="Suporta a autenticação pass-through dos eventos de início de sessão de conta para os computadores num domínio." + +PLUGPLAY_SERVICE="Plug and Play" +PLUGPLAY_SERVICE_DESCRIPTION="Permite que o computador identifique e se adapte a alterações de hardware com pouca ou nenhuma intervenção do utilizador." + +RPCSS_SERVICE="Chamada de procedimento remoto (RPC)" +RPCSS_SERVICE_DESCRIPTION="Fornece um mapeador de pontos finais e outros serviços RPC." + +SAMSS_SERVICE="Gestor de contas de segurança" +SAMSS_SERVICE_DESCRIPTION="A iniciação deste serviço sinaliza a outros serviços que o Gestor de contas de segurança (SAM) está pronto para aceitar solicitações. A desactivação deste serviço impedirá que outros serviços no sistema sejam notificados quando o SAM estiver pronto, o que provocará a incorrecta iniciação desses serviços. Este serviço não deve ser desactivado." + +SCHEDULE_SERVICE="Programador de tarefas" +SCHEDULE_SERVICE_DESCRIPTION="Permite ao utilizador configurar e agendar tarefas automatizadas neste computador. Se este serviço estiver parado, estas tarefas não serão executadas nas horas agendadas." + +SECLOGON_SERVICE="Inicio de sessão secundário" +SECLOGON_SERVICE_DESCRIPTION="Activa processos de início sob credenciais alternativas." + +SERVER_SERVICE="Servidor" +SERVER_SERVICE_DESCRIPTION="Suporta a partilha de ficheiros, impressoras e recursos de rede." + +SPOOLER_SERVICE="Spooler de impressão" +SPOOLER_SERVICE_DESCRIPTION="Carrega ficheiros na memória para impressão posterior." + +TCPSVCS_SERVICE="Serviços TCP/IP simples" +TCPSVCS_SERVICE_DECRIPTION="Soporta os seguintes serviços TCP/IP: Chargen, Daytime, Discard, Echo, QOTD." + +TELNETD_SERVICE="Serviço Telnet do ReactOS" +TELNETD_SERVICE_DESCRIPTION="Permite que um utilizador remoto inicie sessão e execute programas neste computador." + +THEMES_SERVICE="Temas" +THEMES_SERVICE_DESCRIPTION="Fornece a gestão de temas por parte dos utilizadores.." + +WINMGMT_SERVICE="Infra-estrutura de gestão do ReactOS" +WINMGMT_SERVICE_DESCRIPTION="Fornece interface para informações de gestão do sistema." + +WLANSVC_SERVICE="Serviço WLAN" +WLANSVC_SERVICE_DESCRIPTION="Serviço de redes inalámbricas WLAN." + +WORKSTATION_SERVICE="Estação de trabalho" +WORKSTATION_SERVICE_DESCRIPTION="Cria e mantém cliente de ligações de rede a servidores remotos." + +WUAUSERV_SERVICE="Actualizações automáticas" +WUAUSERV_SERVICE_DESCRIPTION="Permite a transferência e instalação de actualizações do ReactOS." + +; Keyboard layouts +ALBANIAN = "Albanês" +ARABIC_101 = "Árabe (101)" +ARABIC_102 = "Árabe (102)" +ARABIC_102_AZERTY = "Árabe (102) AZERTY" +ARMENIAN_EASTERN = "Arménio oriental" +ARMENIAN_WESTERN = "Arménio ocidental" +ASSAMESE = "Asamês" +AZERI_CYRILLIC = "Azerí cirílico" +AZERI_LATIN = "Azerí latino" +BELARUSIAN = "Bielorrusso" +BELGIAN_DUTCH = "Belga (Holandês)" +BELGIAN_FRENCH = "Belga (Francês)" +BENGALI = "Bengalí" +BENGALI_INSCRIPT = "Bengalí - INSCRIPT" +BULGARIAN_BDS = "Búlgaro BDS 5237-1978" +BULGARIAN_PHONETIC = "Búlgaro fonético clássico" +BULGARIAN_PHONETIC_BDS = "Búlgaro fonético BDS 5237-2006" +BURMESE = "Birmano" +CANADIAN_FRENCH = "Francês canadense (Herdado)" +CANADIAN_MULTILINGUAL = "Canadense estandarte multilingüe" +CROATIAN = "Croata" +CZECH = "Checo" +CZECH_QWERTY = "Checo (QWERTY)" +DANISH = "Danês" +DEVANAGARI = "Devanagari - INSCRIPT" +DUTCH = "Holandês" +ESPERANTO = "Esperanto" +ESTONIAN = "Estonio" +GERMAN_ERGO = "Alemão (de_ergo)" +GERMAN_NEO = "Alemão (NEO-1.1)" +GERMAN_RISTOME = "Alemão (RISTOME)" +GERMAN = "Alemão" +GREEK = "Grêgo" +GUJARATI = "Gujarati" +IRISH = "Irlandês" +FAEROESE = "Faeroese" +FINNISH = "Finês" +FRENCH = "Francês" +GEORGIAN = "Georgiano" +HEBREW = "Hebreu" +HUNGARIAN = "Húngaro" +ICELANDIC = "Islandês" +ITALIAN = "Italiano" +JAPANESE = "Japonês" +KAZAKH = "Kazajo" +KOREAN = "Coreano" +LATIN_AMERICAN = "Espanhol (America Latina)" +LATVIAN = "Letão" +LATVIAN_QWERTY = "Letão (QWERTY)" +LITHUANIAN = "Lituano" +MACEDONIAN = "Macedonia (FYRO)" +MALAYALAM = "Malabari" +NORWEGIAN = "Norueguês" +POLISH_214 = "Polaco (214)" +POLISH_PROGRAMMERS = "Polaco (Programmers)" +PORTUGESE = "Português (Portugal)" +PORTUGESE_BRAZILIAN = "Português (Brasil ABNT2)" +ROMANIAN_LEGACY = "Romano (Legacy)" +ROMANIAN_STANDARD = "Romano (Standard)" +RUSSIAN = "Russo" +RUSSIAN_TYPEWRITER = "Russo (Máquina de escrever)" +SERBIAN_CYRILLIC = "Sérvio (Cirílico)" +SERBIAN_LATIN = "Sérvio (Latin)" +SLOVAK = "Eslovaco" +SLOVAK_QWERTY = "Eslovaco (QWERTY)" +SPANISH = "Espanhol" +SWEDISH = "Sueco" +SWISS_FRENCH = "Suiço (Francês)" +SWISS_GERMAN = "Suiço (Alemão)" +TATAR = "Tártaro" +THAI_KEDMANEE = "Tailandês Kedmanee" +THAI_KEDMANEE_NON_SHIFTLOCK = "Tailandês Kedmanee (sin-BloqMayus)" +THAI_PATTACHOTE = "Tailandês Pattachote" +THAI_PATTACHOTE_NON_SHIFTLOCK = "Tailandês Pattachote (sin-BloqMayus)" +TURKISH_Q = "Turco Q" +TURKISH_F = "Turco F" +UK = "Reino Unido" +UKRAINIAN = "Ucraniano" +UKRAINIAN_STUDENT = "Ucraniano (Estudantil)" +US = "Estados Unidos" +US_ARABIC = "Inglês EEUU (IBM Arabic 238_L)" +US_DVORAK = "EEUU-Dvorak" +US_DVORAK_LEFT = "EEUU Dvorak para surdos" +US_DVORAK_RIGHT = "EEUU Dvorak para destros" +US_INTERNATIONAL = "EEUU Internacional" +UZBEK_CYRILLIC = "Uzbek (Cyrillic)" +VIETNAMESE = "Vietnamita" + ; LANG_ROMANIAN SUBLANG_NEUTRAL [Strings.0018] diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index f57d9fe6f41..7045b113a2d 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Opções regionais" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Padrões e formatos", -1, 5, 5, 234, 162 - LTEXT "Esta opção influencia a forma como alguns programas formatam números, unidades monetárias, horários e datas.", -1, 14, 17, 220, 25 + LTEXT "Esta opção influencia a forma como alguns programas formatam números, unidades monetárias, datas e horas.", -1, 14, 17, 220, 25 LTEXT "Selecci&one um item para definir as suas preferências ou clique em 'Personalizar' para escolher seus próprios formatos:", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 @@ -22,7 +22,7 @@ BEGIN EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Localização", -1, 5, 172, 234, 55 - LTEXT "Para aj&udar os serviços a fornecer-lhe informações locais, tal como notícias e meteorologia, seleccione a sua localização actual:", -1, 14, 184, 210, 24 + LTEXT "Para aj&udar os serviços a fornecer-lhe informação local, tal como notícias e meteorologia, seleccione a sua localização actual:", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -65,7 +65,7 @@ BEGIN EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Negativo:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Símbolo decimal:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Separador decimal:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Nº de &casas decimais:", -1, 8, 83, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -77,11 +77,11 @@ BEGIN COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Formato de número negativo:", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Exibir &zeros à esquerda:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Apresentar &zeros à esquerda:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Separador de lis&ta:", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Sistema de &medidas:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sistema de &medida:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -97,11 +97,11 @@ BEGIN EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "&Símbolo da unidade monetária:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Formato de moeda &positivo:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Formato monetário &positivo:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Formato de moeda &negativo:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Formato monetário &negativo:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Sím&bolo decimal:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Separador decimal:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Nº de &casas decimais:", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -119,16 +119,16 @@ BEGIN GROUPBOX "Exemplo", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Exemplo de hora:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Formato de hora:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Formato da hora:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Separador de hora:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "&Separador da hora:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Sí&mbolo a.m.:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "Símbolo &AM.:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Sím&bolo p.m.:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "Símbolo &PM.:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE - LTEXT "Notação de formato de hora\nh = hora m = minuto s = segundo t = a.m. ou p.m.\n\nh = 12 horas\nH = 24 horas\n\nhh, mm, ss = com zero à esquerda\nh, m, s = sem zero à esquerda", -1, 13, 150, 214, 66, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Notação do formato da hora\nh = hora m = minuto s = segundo t = AM. ou PM.\n\nh = 12 horas\nH = 24 horas\n\nhh, mm, ss = com zero à esquerda\nh, m, s = sem zero à esquerda", -1, 13, 150, 214, 66, WS_CHILD | WS_VISIBLE | WS_GROUP END IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 @@ -137,12 +137,12 @@ CAPTION "Data" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Calendário", -1, 7, 7, 230, 74 - LTEXT "&Quando for dig. 1 ano de 2 dígitos, interpretá-lo como 1 ano entre:", -1, 13, 18, 215, 8 + LTEXT "&Quando um ano de 2 dígitos é introduzido, interpretar como um ano entre:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED LTEXT "e", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "&Tipo de calendário:", -1, 13, 48, 56, 10 + LTEXT "&Tipo de calendário:", -1, 13, 48, 60, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED LTEXT "Calendário &Hijri:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED @@ -170,8 +170,8 @@ CAPTION "Classificação" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Classificação", -1, 7, 7, 230, 74 - LTEXT "Os métodos de classificação alteram a maneira como os programas classificam caracteres, palavras, arquivos e pastas.", -1, 14, 17, 220, 25 - LTEXT "&Selecione o método de classificação a ser usado com este idioma:", -1, 14, 37, 220, 22 + LTEXT "Os métodos de classificação alteram a maneira como os programas classificam caracteres, palavras, ficheiros e pastas.", -1, 14, 17, 220, 25 + LTEXT "&Seleccione o método de classificação a ser usado com este idioma:", -1, 14, 37, 220, 22 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -180,7 +180,7 @@ BEGIN IDS_CUSTOMIZE_TITLE "Personalizar opções regionais" IDS_SPAIN "Espanhol (Espanha)" IDS_METRIC "Métrico" - IDS_IMPERIAL "Imperial" + IDS_IMPERIAL "Inglês" END STRINGTABLE @@ -201,8 +201,8 @@ STRINGTABLE BEGIN IDS_ERROR "Erro" IDS_ERROR_SYMBOL_SEPARATE "Um ou mais caracteres digitados para Separador de data são inválidos." - IDS_ERROR_SYMBOL_FORMAT_SHORT "Um ou mais caracteres que você digitou para o formato Data abreviada são inválidos." - IDS_ERROR_SYMBOL_FORMAT_LONG "Um ou mais caracteres que você digitou para o formato Data por extenso são inválidos." + IDS_ERROR_SYMBOL_FORMAT_SHORT "Um ou mais caracteres que digitou para o formato Data abreviada são inválidos." + IDS_ERROR_SYMBOL_FORMAT_LONG "Um ou mais caracteres que digitou para o formato Data por extenso são inválidos." IDS_ERROR_OEM_CODE_PAGE "Erro ao ler a tabela de conversão de página de código OEM" IDS_ERROR_ANSI_CODE_PAGE "Erro ao ler a tabela de conversão de página de código ANSI" IDS_ERROR_INT_KEY_REG "Erro ao abrir a chave: HKCU\\Control Panel\\International" diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index f2b8ab3edbf..5870e00a93a 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -43,27 +43,27 @@ BEGIN IDS_DEV_DEVLOADER_FAILED "O ReactOS não pôde carregar o controlador para este dispositivo porque o computador está a reportar dois tipos de barramento %1." IDS_DEV_DEVLOADER_FAILED2 "O(s) carregadore(es) do dispositivo %1 não pôde/puderam carregar o controlador para este dispositivo." IDS_DEV_OUT_OF_MEMORY "O controlador para este dispositivo pode estar danificado, ou o sistema com pouca memória ou insuficiência de outros recursos." - IDS_DEV_ENTRY_IS_WRONG_TYPE "Este dispositivo não está a funcionar correctamente porque um de seus controladores pode estar danificado, ou o registo pode estar danificado." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Este dispositivo não está a funcionar correctamente porque um de seus controladores ou o registo poderão estar danificados." IDS_DEV_LACKED_ARBITRATOR "O controlador para este dispositivo requisitou um recurso que o ReactOS não sabe como manusear." IDS_DEV_BOOT_CONFIG_CONFLICT "Outro dispositivo está a usar os recursos que este dispositivo necessita." IDS_DEV_FAILED_FILTER "Os controladores para este dispositivo precisam ser reinstalados." - IDS_DEV_DEVLOADER_NOT_FOUND "Este dispositivo não está a funcionar correctamente porque o ReactOS não pôde carregar o arquivo %1 que carrega os controladores para o dispositivo." - IDS_DEV_DEVLOADER_NOT_FOUND2 "Este dispositivo não está a funcionar correctamente porque o arquivo %1 que carrega os controladores para este dispositivo está danificado." + IDS_DEV_DEVLOADER_NOT_FOUND "Este dispositivo não está a funcionar correctamente porque o ReactOS não pôde carregar o ficheiro %1 que carrega os controladores para o dispositivo." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Este dispositivo não está a funcionar correctamente porque o ficheiro %1 que carrega os controladores para este dispositivo está danificado." IDS_DEV_DEVLOADER_NOT_FOUND3 "Falha no dispositivo: tente mudar o controlador para este dispositivo. Se isto não funcionar, consulte a documentação do seu hardware." IDS_DEV_INVALID_DATA "Este dispositivo não está a funcionar correctamente porque a BIOS do seu computador está a reportar os recursos para este dispositivo incorrectamente." IDS_DEV_INVALID_DATA2 "Este dispositivo não está a funcionar correctamente porque a BIOS do dispositivo está a reportar os recursos para este dispositivo incorrectamente." IDS_DEV_FAILED_START "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." - IDS_DEV_LIAR "O ReactOS parou de responder enquanto tentava inicializar este dispositivo e em conseqüência não irá mais tentar inicializá-lo." + IDS_DEV_LIAR "O ReactOS parou de responder enquanto tentava iniciar este dispositivo. Em conseqüência não mais o irá iniciar." IDS_DEV_NORMAL_CONFLICT "Este dispositivo não pôde encontrar recursos %1 livres para utilizar." IDS_DEV_NOT_VERIFIED "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." IDS_DEV_NEED_RESTART "Este dispositivo não pode funcionar correctamente até que o computador seja reiniciado." IDS_DEV_REENUMERATION "Este dispositivo está a causar um conflito de recursos." IDS_DEV_PARTIAL_LOG_CONF "O ReactOS não pôde identificar todos os recursos que este dispositivo utiliza." - IDS_DEV_UNKNOWN_RESOURCE "O arquivo %1 de informações de controlador indica que este dispositivo filho utilize um recurso que o dispositivo pai não possui ou reconhece." + IDS_DEV_UNKNOWN_RESOURCE "O ficheiro %1 de informações de controlador indica que este dispositivo filho utiliza um recurso que o dispositivo pai não possui ou reconhece." IDS_DEV_REINSTALL "Os controladores para este dispositivo precisam ser reinstalados." IDS_DEV_REGISTRY "O registo pode estar danificado." IDS_DEV_WILL_BE_REMOVED "O ReactOS está a remover este dispositivo." - IDS_DEV_DISABLED "Este dispositivo não foi inicializado." + IDS_DEV_DISABLED "Este dispositivo não foi iniciado." IDS_DEV_DISABLED2 "Este dispositivo está desactivado." IDS_DEV_DEVLOADER_NOT_READY "Os carregadores para este dispositivo não puderam carregar os controladores necessários." IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ @@ -71,30 +71,30 @@ BEGIN IDS_DEV_DEVICE_NOT_THERE "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." IDS_DEV_MOVED "O ReactOS está no processo de configuração deste dispositivo." IDS_DEV_TOO_EARLY "O ReactOS está no processo de configuração deste dispositivo." - IDS_DEV_NO_VALID_LOG_CONF "O ReactOS não pode especificar os recursos pra este dispositivo." + IDS_DEV_NO_VALID_LOG_CONF "O ReactOS não pode especificar os recursos para este dispositivo." IDS_DEV_FAILED_INSTALL "Os controladores para este dispositivo não estão instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo está desactivado porque a BIOS para o dispositivo não lhe deu nenhum recurso." IDS_DEV_CANT_SHARE_IRQ "Este dispositivo utiliza um recurso de Requisição de Interrupção (IRQ) que está em uso por outro dispositivo e não pode ser compartilhado.\nDeve alterar a configuração conflitante ou remover o controlador de modo real que está a causar o conflito." IDS_DEV_FAILED_ADD "Este dispositivo não está a funcionar correctamente porque %1 não está a funcionar correctamente." IDS_DEV_DISABLED_SERVICE "O ReactOS não pode instalar os controladores para este dispositivo porque não consegue acessar o controlador ou local de rede que possui os ficheiros de configuração." IDS_DEV_TRANSLATION_FAILED "Este dispositivo não está a responder ao seu controlador." - IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize a guia Recursos para definir a configuração." + IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize o guia de recursos para definir a configuração." IDS_DEV_BIOS_TABLE "O firmware de seu sistema não possui informação suficiente para configurar e utilizar este dispositivo correctamente.\nPara utilizar este dispositivo, contacte o fabricante de seu computador para obter uma actualização de firmware ou BIOS." IDS_DEV_IRQ_TRANSLATION_FAILED "Este dispositivo requisita uma interrupção PCI mas está configurado para uma interrupção ISA (ou vice-versa).\nPor favor, utilize o sistema de configuração do computador para reconfigurar a interrupção para este dispositivo." - IDS_DEV_FAILED_DRIVER_ENTRY "O ReactOS não pode inicializar o controlador do dispositivo para este hardware." + IDS_DEV_FAILED_DRIVER_ENTRY "O ReactOS não pode iniciar o controlador do dispositivo para este hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "O ReactOS não pode carregar o controlador do dispositivo para este hardware porque uma instância anterior do controlador do dispositivo ainda está na memória." IDS_DEV_DRIVER_FAILED_LOAD "O ReactOS não pode carregar o controlador do dispositivo para este hardware. O controlador pode estar corrompido ou ausente." - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "O ReactOS não pode acessar este hardware porque suas informações sobre a chave do serviço não estão no Registo ou estão registadas incorrectamente." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "O ReactOS não pode acessar este hardware porque as informações sobre a chave do serviço não estão no registo ou estão registadas incorrectamente." IDS_DEV_LEGACY_SERVICE_NO_DEVICES "O ReactOS carregou o controlador do dispositivo para este hardware correctamente mas não consegue encontrar o dispositivo de hardware." IDS_DEV_DUPLICATE_DEVICE "O ReactOS não pode carregar o controlador do dispositivo para este hardware porque já existe uma instância deste dispositivo em execução no sistema." IDS_DEV_FAILED_POST_START "O ReactOS parou este dispositivo porque ele reportou problemas." IDS_DEV_HALTED "Uma aplicação ou serviço desligou este dispositivo de hardware." IDS_DEV_PHANTOM "No momento, este dispositivo de hardware não está ligado ao computador." IDS_DEV_SYSTEM_SHUTDOWN "O ReactOS não pode obter acesso a este dispositivo de hardware porque o sistema operativo está em processo de desligamento." - IDS_DEV_HELD_FOR_EJECT "O ReactOS não pode utilizar este dispositivo de hardware porque este foi preparado para remoção segura mas não foi removido do computador." - IDS_DEV_DRIVER_BLOCKED "O software para este dispositivo teve sua inicialização bloqueada pois é conhecido por possuir problemas com o ReactOS. Contacte o revendedor do hardware para um novo controlador." - IDS_DEV_REGISTRY_TOO_LARGE "O ReactOS não pode iniciar os novos dispositivos de hardware porque a secção do sistema é muito grande (excede o limite de tamanho do Registo)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS não pôde alterar as configurações para este dispositivo." + IDS_DEV_HELD_FOR_EJECT "O ReactOS não pode utilizar este dispositivo de hardware porque este foi preparado para remoção segura porém, não foi removido do computador." + IDS_DEV_DRIVER_BLOCKED "O software para este dispositivo teve sua iniciação bloqueada pois é conhecido por possuir problemas com o ReactOS. Contacte o revendedor do hardware para um novo controlador." + IDS_DEV_REGISTRY_TOO_LARGE "O ReactOS não pode iniciar os novos dispositivos de hardware porque a secção do sistema é muito grande (excede o limite de tamanho do registo)." + IDS_DEV_SETPROPERTIES_FAILED "O ReactOS não pôde alterar as configurações para este dispositivo." END STRINGTABLE @@ -156,7 +156,7 @@ BEGIN GROUPBOX "Estado do dispositivo", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "&Resolução de problemas...", IDC_DEVPROBLEM, 148, 163, 90, 15 - LTEXT "&Uso do dispositivo:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + LTEXT "&Utilização do dispositivo:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -192,7 +192,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "&Arquivos de controlador:", -1, 7, 36, 204, 8 + LTEXT "&Ficheiros do controlador:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 @@ -227,7 +227,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Definições de recursos:", -1, 7, 36, 204, 8 + LTEXT "Definições do recurso:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 @@ -244,7 +244,7 @@ END IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Confirmar Remoção do dispositivo" +CAPTION "Confirmar remoção do dispositivo" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -317,7 +317,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Abrir caixa de diálogo propriedade para a selecção actual." + IDS_HINT_PROPERTIES " Abrir a caixa de diálogo ""Propriedades"" para a selecção actual." IDS_HINT_SCAN " Verificar se há novos dispositivos plug and play." IDS_HINT_ENABLE " Habilita o dispositivo seleccionado." IDS_HINT_DISABLE " Desabilita o dispositivo seleccionado."

1 0

[reactos] 02/02: [WIN32SS] Add missing code parts for monitor handling
by Stanislav Motylkov 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26b88af6420f1ed707bd9… commit 26b88af6420f1ed707bd978656624868d428f820 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed May 25 00:18:10 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 30 15:28:44 2022 +0300 [WIN32SS] Add missing code parts for monitor handling - [VIDEOPRT] Add stub for IOCTL_VIDEO_ENUM_MONITOR_PDO. - [WIN32SS:ENG] Add missing checks and comments. - [WIN32SS:NTUSER] Add missing monitor handling and comments. Addendum to 31827c43. CORE-18197 CORE-11715 --- win32ss/drivers/videoprt/dispatch.c | 5 +++++ win32ss/gdi/eng/device.c | 28 ++++++++++++++++++++++++++-- win32ss/user/ntuser/display.c | 32 ++++++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index 1878e797550..79a20481b91 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -790,6 +790,11 @@ IntVideoPortDispatchDeviceControl( Status = STATUS_NOT_IMPLEMENTED; break; + case IOCTL_VIDEO_ENUM_MONITOR_PDO: + WARN_(VIDEOPRT, "- IOCTL_VIDEO_ENUM_MONITOR_PDO is UNIMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case IOCTL_VIDEO_INIT_WIN32K_CALLBACKS: INFO_(VIDEOPRT, "- IOCTL_VIDEO_INIT_WIN32K_CALLBACKS\n"); Status = VideoPortInitWin32kCallbacks(DeviceObject, diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index af6bd3e42aa..3bd3827c9e7 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -351,6 +351,19 @@ EngpRegisterGraphicsDevice( // if (Win32kCallbacks.DualviewFlags & ???) pGraphicsDevice->PhysDeviceHandle = Win32kCallbacks.pPhysDeviceObject; + /* FIXME: Enumerate children monitor devices for this video adapter + * + * - Force the adapter to re-enumerate its monitors: + * IoSynchronousInvalidateDeviceRelations(pdo, BusRelations) + * + * - Retrieve all monitor PDOs from VideoPrt: + * EngDeviceIoControl(0x%p, IOCTL_VIDEO_ENUM_MONITOR_PDO) + * + * - Initialize these fields and structures accordingly: + * pGraphicsDevice->dwMonCnt + * pGraphicsDevice->pvMonDev[0..dwMonCnt-1] + */ + /* Copy the device name */ RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, sizeof(pGraphicsDevice->szNtDeviceName), @@ -445,7 +458,7 @@ EngpFindGraphicsDevice( if (pustrDevice && pustrDevice->Buffer) { - /* Loop through the list of devices */ + /* Find specified video adapter by name */ for (pGraphicsDevice = gpGraphicsDeviceFirst; pGraphicsDevice; pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice) @@ -457,10 +470,21 @@ EngpFindGraphicsDevice( break; } } + + if (pGraphicsDevice) + { + /* Validate selected monitor number */ +#if 0 + if (iDevNum >= pGraphicsDevice->dwMonCnt) + pGraphicsDevice = NULL; +#else + /* FIXME: dwMonCnt not initialized, see EngpRegisterGraphicsDevice */ +#endif + } } else { - /* Loop through the list of devices */ + /* Select video adapter by device number */ for (pGraphicsDevice = gpGraphicsDeviceFirst, i = 0; pGraphicsDevice && i < iDevNum; pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice, i++); diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 4d14c6552c1..5feb8077db6 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -237,6 +237,7 @@ UserEnumDisplayDevices( DWORD dwFlags) { PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pdo; PWCHAR pHardwareId; ULONG cbSize, dwLength; HKEY hkey; @@ -284,9 +285,19 @@ UserEnumDisplayDevices( pdispdev->DeviceID[0] = UNICODE_NULL; /* Fill in DeviceID */ - if (pGraphicsDevice->PhysDeviceHandle != NULL) + if (!pustrDevice) + pdo = pGraphicsDevice->PhysDeviceHandle; + else +#if 0 + pdo = pGraphicsDevice->pvMonDev[iDevNum].pdo; +#else + /* FIXME: pvMonDev not initialized, see EngpRegisterGraphicsDevice */ + pdo = NULL; +#endif + + if (pdo != NULL) { - Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + Status = IoGetDeviceProperty(pdo, DevicePropertyHardwareID, 0, NULL, @@ -303,7 +314,7 @@ UserEnumDisplayDevices( return STATUS_INSUFFICIENT_RESOURCES; } - Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + Status = IoGetDeviceProperty(pdo, DevicePropertyHardwareID, dwLength, pHardwareId, @@ -319,10 +330,19 @@ UserEnumDisplayDevices( * which usually is the longest one and unique enough */ RtlStringCbCopyW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); - /* For monitors it should be the first Hardware ID - * concatenated with the unique driver registry key */ + if (pustrDevice) + { + /* For monitors it should be the first Hardware ID, + * which we already have obtained above, + * concatenated with the unique driver registry key */ + + RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), L"\\"); + + /* FIXME: DevicePropertyDriverKeyName string should be appended */ + pHardwareId[0] = UNICODE_NULL; + RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); + } - /* FIXME: Handle monitors! */ TRACE("Hardware ID: %ls\n", pdispdev->DeviceID); }

1 0

[reactos] 01/02: [WIN32SS] EnumDisplayDevices: Fill DeviceID field properly
by Stanislav Motylkov 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31827c43b6faaa88f94da… commit 31827c43b6faaa88f94dad5dd6caf3cbfa6b9925 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 24 02:54:57 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 30 15:28:21 2022 +0300 [WIN32SS] EnumDisplayDevices: Fill DeviceID field properly - [VIDEOPRT] Return the real PhysicalDeviceObject in Win32k callbacks. - [WIN32SS:ENG] Pass PhysDeviceObject into the GraphicsDevice structure and rename the destination field accordingly. - [WIN32SS:NTUSER] Request hardware identifiers from device PDO and fill DISPLAY_DEVICE's DeviceID field with the first identifier. Now it's correctly passed to the usermode, and Desktop Propertes applet can open the video adapter device properties. Thanks to Hervé Poussineau for the help. CORE-18197 CORE-11715 --- win32ss/drivers/videoprt/dispatch.c | 4 ++- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/pdevobj.h | 2 +- win32ss/user/ntuser/display.c | 55 +++++++++++++++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index ac5e5b880d7..1878e797550 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -630,6 +630,8 @@ VideoPortInitWin32kCallbacks( _In_ ULONG BufferLength, _Out_ PULONG_PTR Information) { + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + *Information = sizeof(VIDEO_WIN32K_CALLBACKS); if (BufferLength < sizeof(VIDEO_WIN32K_CALLBACKS)) { @@ -643,7 +645,7 @@ VideoPortInitWin32kCallbacks( /* Return reasonable values to Win32k */ Win32kCallbacks->bACPI = FALSE; - Win32kCallbacks->pPhysDeviceObject = DeviceObject; + Win32kCallbacks->pPhysDeviceObject = DeviceExtension->PhysicalDeviceObject; Win32kCallbacks->DualviewFlags = 0; return STATUS_SUCCESS; diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 2b96ca409c9..af6bd3e42aa 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -349,7 +349,7 @@ EngpRegisterGraphicsDevice( // TODO: Set flags according to the results. // if (Win32kCallbacks.bACPI) // if (Win32kCallbacks.DualviewFlags & ???) - // Win32kCallbacks.pPhysDeviceObject; + pGraphicsDevice->PhysDeviceHandle = Win32kCallbacks.pPhysDeviceObject; /* Copy the device name */ RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index 12673ac20f4..b9d439d3dda 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -61,7 +61,7 @@ typedef struct _GRAPHICS_DEVICE struct _GRAPHICS_DEVICE * pNextGraphicsDevice; struct _GRAPHICS_DEVICE * pVgaDevice; PDEVICE_OBJECT DeviceObject; - PVOID pDeviceHandle; + PDEVICE_OBJECT PhysDeviceHandle; DWORD hkClassDriverConfig; DWORD StateFlags; /* See DISPLAY_DEVICE_* */ ULONG cbdevmodeInfo; diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 8f15a68e1bf..4d14c6552c1 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -237,7 +237,8 @@ UserEnumDisplayDevices( DWORD dwFlags) { PGRAPHICS_DEVICE pGraphicsDevice; - ULONG cbSize; + PWCHAR pHardwareId; + ULONG cbSize, dwLength; HKEY hkey; NTSTATUS Status; @@ -280,9 +281,59 @@ UserEnumDisplayDevices( RtlStringCbCopyW(pdispdev->DeviceName, sizeof(pdispdev->DeviceName), pGraphicsDevice->szWinDeviceName); RtlStringCbCopyW(pdispdev->DeviceString, sizeof(pdispdev->DeviceString), pGraphicsDevice->pwszDescription); pdispdev->StateFlags = pGraphicsDevice->StateFlags; - // FIXME: fill in DEVICE ID pdispdev->DeviceID[0] = UNICODE_NULL; + /* Fill in DeviceID */ + if (pGraphicsDevice->PhysDeviceHandle != NULL) + { + Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + DevicePropertyHardwareID, + 0, + NULL, + &dwLength); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + pHardwareId = ExAllocatePoolWithTag(PagedPool, + dwLength, + USERTAG_DISPLAYINFO); + if (!pHardwareId) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + DevicePropertyHardwareID, + dwLength, + pHardwareId, + &dwLength); + + if (!NT_SUCCESS(Status)) + { + ERR("IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + } + else + { + /* For video adapters it should be the first Hardware ID + * which usually is the longest one and unique enough */ + RtlStringCbCopyW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); + + /* For monitors it should be the first Hardware ID + * concatenated with the unique driver registry key */ + + /* FIXME: Handle monitors! */ + TRACE("Hardware ID: %ls\n", pdispdev->DeviceID); + } + + ExFreePoolWithTag(pHardwareId, USERTAG_DISPLAYINFO); + } + else + { + ERR("IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + } + } + return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [DISKPART] Fix build. Simplify PrintMessageString().
by Hermès Bélusca-Maïto 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee613a18ebed2843e80eb… commit ee613a18ebed2843e80eb8e02bdc8168e3c4b730 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 30 02:41:31 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 30 02:41:31 2022 +0200 [DISKPART] Fix build. Simplify PrintMessageString(). --- base/system/diskpart/CMakeLists.txt | 6 ++++-- base/system/diskpart/misc.c | 21 +++++---------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index 7f31e513b4f..3d2d6cf7a86 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -46,6 +46,10 @@ list(APPEND SOURCE diskpart.h) add_executable(diskpart ${SOURCE} diskpart.rc) +add_pch(diskpart diskpart.h SOURCE) +add_message_headers(UNICODE diskpart_msg.mc) +add_dependencies(diskpart diskpart_msg) + set_module_type(diskpart win32cui UNICODE) target_link_libraries(diskpart conutils ${PSEH_LIB}) add_importlibs(diskpart advapi32 msvcrt kernel32 ntdll) @@ -54,6 +58,4 @@ if(MSVC) add_importlibs(diskpart ntdll) endif() -add_pch(diskpart diskpart.h SOURCE) -add_message_headers(UNICODE diskpart_msg.mc) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index b530f6581df..ddb2946a840 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -84,20 +84,9 @@ VOID PrintMessageString( _In_ DWORD dwMessage) { - PWSTR pBuffer; - - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, //hModuleNetMsg, - dwMessage, - LANG_USER_DEFAULT, - (LPWSTR)&pBuffer, - 0, - NULL); - if (pBuffer) - { - ConPuts(StdOut, pBuffer); - LocalFree(pBuffer); - pBuffer = NULL; - } + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, //hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT); }

1 0

[reactos] 01/01: [DISKPART] Convert command help to messages and fix some texts
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c287c08b278bb9f8998db… commit c287c08b278bb9f8998dbde0f5a21254eaf752c6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 30 01:09:08 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 30 01:09:08 2022 +0200 [DISKPART] Convert command help to messages and fix some texts --- base/system/diskpart/CMakeLists.txt | 1 + base/system/diskpart/detail.c | 4 +- base/system/diskpart/diskpart.h | 5 +- base/system/diskpart/diskpart.rc | 2 + base/system/diskpart/diskpart_msg.mc | 1736 ++++++++++++++++++++++++++++++++++ base/system/diskpart/help.c | 8 +- base/system/diskpart/interpreter.c | 155 +-- base/system/diskpart/lang/en-US.rc | 250 +---- base/system/diskpart/lang/pl-PL.rc | 248 +---- base/system/diskpart/lang/pt-PT.rc | 248 +---- base/system/diskpart/lang/ro-RO.rc | 248 +---- base/system/diskpart/lang/ru-RU.rc | 248 +---- base/system/diskpart/lang/sq-AL.rc | 248 +---- base/system/diskpart/lang/tr-TR.rc | 248 +---- base/system/diskpart/lang/zh-CN.rc | 248 +---- base/system/diskpart/lang/zh-TW.rc | 248 +---- base/system/diskpart/misc.c | 23 + base/system/diskpart/resource.h | 58 +- 18 files changed, 1891 insertions(+), 2335 deletions(-) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index 0c0c9977947..7f31e513b4f 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -55,4 +55,5 @@ if(MSVC) endif() add_pch(diskpart diskpart.h SOURCE) +add_message_headers(UNICODE diskpart_msg.mc) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c index 388cb8a45af..9182a7a46ab 100644 --- a/base/system/diskpart/detail.c +++ b/base/system/diskpart/detail.c @@ -186,7 +186,7 @@ DetailPartition( } if (bVolumeFound == FALSE) - ConPuts(StdOut, L"\nThere is no volume associated with this partition.\n"); + ConResPuts(StdOut, IDS_DETAIL_NO_VOLUME); ConPuts(StdOut, L"\n"); @@ -241,7 +241,7 @@ DetailVolume( } if (bDiskFound == FALSE) - ConPuts(StdOut, L"\nThere are no disks attached to this volume.\n"); + ConResPuts(StdOut, IDS_DETAIL_NO_DISKS); /* TODO: Print more volume details */ diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index c4a4c2fad9e..e3b4c247861 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -57,7 +57,7 @@ typedef struct _COMMAND PWSTR cmd3; BOOL (*func)(INT, WCHAR**); INT help; - INT help_detail; + DWORD help_detail; } COMMAND, *PCOMMAND; extern COMMAND cmds[]; @@ -392,6 +392,9 @@ RoundingDivide( _In_ ULONGLONG Dividend, _In_ ULONGLONG Divisor); +VOID +PrintMessageString( + _In_ DWORD dwMessage); /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/diskpart.rc b/base/system/diskpart/diskpart.rc index a1df42efce4..f0d1dd71690 100644 --- a/base/system/diskpart/diskpart.rc +++ b/base/system/diskpart/diskpart.rc @@ -8,6 +8,8 @@ #define REACTOS_STR_ORIGINAL_COPYRIGHT "(C) 2011 Lee Schroeder" #include <reactos/version.rc> +#include <diskpart_msg.rc> + /* UTF-8 */ #pragma code_page(65001) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc new file mode 100644 index 00000000000..669998227fd --- /dev/null +++ b/base/system/diskpart/diskpart_msg.mc @@ -0,0 +1,1736 @@ + +MessageIdTypedef=DWORD + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + +FacilityNames=(System=0x0:FACILITY_SYSTEM + ) + +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415 + Portugese=0x816:MSG00416 + Romanian=0x418:MSG00418 + Russian=0x419:MSG00419 + Albanian=0x41C:MSG0041C + Turkish=0x41F:MSG0041F + Chinese=0x804:MSG00804 + Taiwanese=0x404:MSG00404 + ) + + +MessageId=10000 +SymbolicName=MSG_COMMAND_ACTIVE +Severity=Informational +Facility=System +Language=English +<Add ACTIVE command help text here> +. +Language=Polish +<Add ACTIVE command help text here> +. +Language=Portugese +<Add ACTIVE command help text here> +. +Language=Romanian +<Add ACTIVE command help text here> +. +Language=Russian +<Add ACTIVE command help text here> +. +Language=Albanian +<Add ACTIVE command help text here> +. +Language=Turkish +<Add ACTIVE command help text here> +. +Language=Chinese +<Add ACTIVE command help text here> +. +Language=Taiwanese +<Add ACTIVE command help text here> +. + + +MessageId=10001 +SymbolicName=MSG_COMMAND_ADD +Severity=Informational +Facility=System +Language=English +<Add ADD command help text here> +. +Language=Polish +<Add ADD command help text here> +. +Language=Portugese +<Add ADD command help text here> +. +Language=Romanian +<Add ADD command help text here> +. +Language=Russian +<Add ADD command help text here> +. +Language=Albanian +<Add ADD command help text here> +. +Language=Turkish +<Add ADD command help text here> +. +Language=Chinese +<Add ADD command help text here> +. +Language=Taiwanese +<Add ADD command help text here> +. + + +MessageId=10002 +SymbolicName=MSG_COMMAND_ASSIGN +Severity=Informational +Facility=System +Language=English +<Add ASSIGN command help text here> +. +Language=Polish +<Add ASSIGN command help text here> +. +Language=Portugese +<Add ASSIGN command help text here> +. +Language=Romanian +<Add ASSIGN command help text here> +. +Language=Russian +<Add ASSIGN command help text here> +. +Language=Albanian +<Add ASSIGN command help text here> +. +Language=Turkish +<Add ASSIGN command help text here> +. +Language=Chinese +<Add ASSIGN command help text here> +. +Language=Taiwanese +<Add ASSIGN command help text here> +. + + +MessageId=10003 +SymbolicName=MSG_COMMAND_ATTACH +Severity=Informational +Facility=System +Language=English +<Add ATTACH command help text here> +. +Language=Polish +<Add ATTACH command help text here> +. +Language=Portugese +<Add ATTACH command help text here> +. +Language=Romanian +<Add ATTACH command help text here> +. +Language=Russian +<Add ATTACH command help text here> +. +Language=Albanian +<Add ATTACH command help text here> +. +Language=Turkish +<Add ATTACH command help text here> +. +Language=Chinese +<Add ATTACH command help text here> +. +Language=Taiwanese +<Add ATTACH command help text here> +. + + +MessageId=10004 +SymbolicName=MSG_COMMAND_ATTRIBUTES +Severity=Informational +Facility=System +Language=English +<Add ATTRIBUTES command help text here> +. +Language=Polish +<Add ATTRIBUTES command help text here> +. +Language=Portugese +<Add ATTRIBUTES command help text here> +. +Language=Romanian +<Add ATTRIBUTES command help text here> +. +Language=Russian +<Add ATTRIBUTES command help text here> +. +Language=Albanian +<Add ATTRIBUTES command help text here> +. +Language=Turkish +<Add ATTRIBUTES command help text here> +. +Language=Chinese +<Add ATTRIBUTES command help text here> +. +Language=Taiwanese +<Add ATTRIBUTES command help text here> +. + + +MessageId=10005 +SymbolicName=MSG_COMMAND_AUTOMOUNT +Severity=Informational +Facility=System +Language=English +<Add AUTOMOUNT command help text here> +. +Language=Polish +<Add AUTOMOUNT command help text here> +. +Language=Portugese +<Add AUTOMOUNT command help text here> +. +Language=Romanian +<Add AUTOMOUNT command help text here> +. +Language=Russian +<Add AUTOMOUNT command help text here> +. +Language=Albanian +<Add AUTOMOUNT command help text here> +. +Language=Turkish +<Add AUTOMOUNT command help text here> +. +Language=Chinese +<Add AUTOMOUNT command help text here> +. +Language=Taiwanese +<Add AUTOMOUNT command help text here> +. + + + +MessageId=10006 +SymbolicName=MSG_COMMAND_BREAK +Severity=Informational +Facility=System +Language=English +<Add BREAK command help text here> +. +Language=Polish +<Add BREAK command help text here> +. +Language=Portugese +<Add BREAK command help text here> +. +Language=Romanian +<Add BREAK command help text here> +. +Language=Russian +<Add BREAK command help text here> +. +Language=Albanian +<Add BREAK command help text here> +. +Language=Turkish +<Add BREAK command help text here> +. +Language=Chinese +<Add BREAK command help text here> +. +Language=Taiwanese +<Add BREAK command help text here> +. + + +MessageId=10007 +SymbolicName=MSG_COMMAND_CLEAN +Severity=Informational +Facility=System +Language=English +<Add CLEAN command help text here> +. +Language=Polish +<Add CLEAN command help text here> +. +Language=Portugese +<Add CLEAN command help text here> +. +Language=Romanian +<Add CLEAN command help text here> +. +Language=Russian +<Add CLEAN command help text here> +. +Language=Albanian +<Add CLEAN command help text here> +. +Language=Turkish +<Add CLEAN command help text here> +. +Language=Chinese +<Add CLEAN command help text here> +. +Language=Taiwanese +<Add CLEAN command help text here> +. + + +MessageId=10008 +SymbolicName=MSG_COMMAND_COMPACT +Severity=Informational +Facility=System +Language=English +<Add COMPACT command help text here> +. +Language=Polish +<Add COMPACT command help text here> +. +Language=Portugese +<Add COMPACT command help text here> +. +Language=Romanian +<Add COMPACT command help text here> +. +Language=Russian +<Add COMPACT command help text here> +. +Language=Albanian +<Add COMPACT command help text here> +. +Language=Turkish +<Add COMPACT command help text here> +. +Language=Chinese +<Add COMPACT command help text here> +. +Language=Taiwanese +<Add COMPACT command help text here> +. + + +MessageId=10010 +SymbolicName=MSG_COMMAND_CONVERT +Severity=Informational +Facility=System +Language=English +<Add CONVERT command help text here> +. +Language=Polish +<Add CONVERT command help text here> +. +Language=Portugese +<Add CONVERT command help text here> +. +Language=Romanian +<Add CONVERT command help text here> +. +Language=Russian +<Add CONVERT command help text here> +. +Language=Albanian +<Add CONVERT command help text here> +. +Language=Turkish +<Add CONVERT command help text here> +. +Language=Chinese +<Add CONVERT command help text here> +. +Language=Taiwanese +<Add CONVERT command help text here> +. + + +MessageId=10011 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_EFI +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION EFI command help text here> +. +Language=Polish +<Add CREATE PARTITION EFI command help text here> +. +Language=Portugese +<Add CREATE PARTITION EFI command help text here> +. +Language=Romanian +<Add CREATE PARTITION EFI command help text here> +. +Language=Russian +<Add CREATE PARTITION EFI command help text here> +. +Language=Albanian +<Add CREATE PARTITION EFI command help text here> +. +Language=Turkish +<Add CREATE PARTITION EFI command help text here> +. +Language=Chinese +<Add CREATE PARTITION EFI command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION EFI command help text here> +. + + +MessageId=10012 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_EXTENDED +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Polish +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Portugese +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Romanian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Russian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Albanian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Turkish +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Chinese +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION EXTENDED command help text here> +. + + +MessageId=10013 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_LOGICAL +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Polish +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Portugese +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Romanian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Russian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Albanian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Turkish +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Chinese +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION LOGICAL command help text here> +. + + +MessageId=10014 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_MSR +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION MSR command help text here> +. +Language=Polish +<Add CREATE PARTITION MSR command help text here> +. +Language=Portugese +<Add CREATE PARTITION MSR command help text here> +. +Language=Romanian +<Add CREATE PARTITION MSR command help text here> +. +Language=Russian +<Add CREATE PARTITION MSR command help text here> +. +Language=Albanian +<Add CREATE PARTITION MSR command help text here> +. +Language=Turkish +<Add CREATE PARTITION MSR command help text here> +. +Language=Chinese +<Add CREATE PARTITION MSR command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION MSR command help text here> +. + + +MessageId=10015 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_PRIMARY +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Polish +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Portugese +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Romanian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Russian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Albanian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Turkish +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Chinese +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION PRIMARY command help text here> +. + + +MessageId=10016 +SymbolicName=MSG_COMMAND_DELETE_DISK +Severity=Informational +Facility=System +Language=English +<Add DELETE DISK command help text here> +. +Language=Polish +<Add DELETE DISK command help text here> +. +Language=Portugese +<Add DELETE DISK command help text here> +. +Language=Romanian +<Add DELETE DISK command help text here> +. +Language=Russian +<Add DELETE DISK command help text here> +. +Language=Albanian +<Add DELETE DISK command help text here> +. +Language=Turkish +<Add DELETE DISK command help text here> +. +Language=Chinese +<Add DELETE DISK command help text here> +. +Language=Taiwanese +<Add DELETE DISK command help text here> +. + + +MessageId=10017 +SymbolicName=MSG_COMMAND_DELETE_PARTITION +Severity=Informational +Facility=System +Language=English +<Add DELETE PARTITION command help text here> +. +Language=Polish +<Add DELETE PARTITION command help text here> +. +Language=Portugese +<Add DELETE PARTITION command help text here> +. +Language=Romanian +<Add DELETE PARTITION command help text here> +. +Language=Russian +<Add DELETE PARTITION command help text here> +. +Language=Albanian +<Add DELETE PARTITION command help text here> +. +Language=Turkish +<Add DELETE PARTITION command help text here> +. +Language=Chinese +<Add DELETE PARTITION command help text here> +. +Language=Taiwanese +<Add DELETE PARTITION command help text here> +. + + +MessageId=10018 +SymbolicName=MSG_COMMAND_DELETE_VOLUME +Severity=Informational +Facility=System +Language=English +<Add DELETE VOLUME command help text here> +. +Language=Polish +<Add DELETE VOLUME command help text here> +. +Language=Portugese +<Add DELETE VOLUME command help text here> +. +Language=Romanian +<Add DELETE VOLUME command help text here> +. +Language=Russian +<Add DELETE VOLUME command help text here> +. +Language=Albanian +<Add DELETE VOLUME command help text here> +. +Language=Turkish +<Add DELETE VOLUME command help text here> +. +Language=Chinese +<Add DELETE VOLUME command help text here> +. +Language=Taiwanese +<Add DELETE VOLUME command help text here> +. + + +MessageId=10019 +SymbolicName=MSG_COMMAND_DETAIL_DISK +Severity=Informational +Facility=System +Language=English +<Add DETAIL DISK command help text here> +. +Language=Polish +<Add DETAIL DISK command help text here> +. +Language=Portugese +<Add DETAIL DISK command help text here> +. +Language=Romanian +<Add DETAIL DISK command help text here> +. +Language=Russian +<Add DETAIL DISK command help text here> +. +Language=Albanian +<Add DETAIL DISK command help text here> +. +Language=Turkish +<Add DETAIL DISK command help text here> +. +Language=Chinese +<Add DETAIL DISK command help text here> +. +Language=Taiwanese +<Add DETAIL DISK command help text here> +. + +MessageId=10020 +SymbolicName=MSG_COMMAND_DETAIL_PARTITION +Severity=Informational +Facility=System +Language=English +<Add DETAIL PARTITION command help text here> +. +Language=Polish +<Add DETAIL PARTITION command help text here> +. +Language=Portugese +<Add DETAIL PARTITION command help text here> +. +Language=Romanian +<Add DETAIL PARTITION command help text here> +. +Language=Russian +<Add DETAIL PARTITION command help text here> +. +Language=Albanian +<Add DETAIL PARTITION command help text here> +. +Language=Turkish +<Add DETAIL PARTITION command help text here> +. +Language=Chinese +<Add DETAIL PARTITION command help text here> +. +Language=Taiwanese +<Add DETAIL PARTITION command help text here> +. + +MessageId=10021 +SymbolicName=MSG_COMMAND_DETAIL_VOLUME +Severity=Informational +Facility=System +Language=English +<Add DETAIL VOLUME command help text here> +. +Language=Polish +<Add DETAIL VOLUME command help text here> +. +Language=Portugese +<Add DETAIL VOLUME command help text here> +. +Language=Romanian +<Add DETAIL VOLUME command help text here> +. +Language=Russian +<Add DETAIL VOLUME command help text here> +. +Language=Albanian +<Add DETAIL VOLUME command help text here> +. +Language=Turkish +<Add DETAIL VOLUME command help text here> +. +Language=Chinese +<Add DETAIL VOLUME command help text here> +. +Language=Taiwanese +<Add DETAIL VOLUME command help text here> +. + + +MessageId=10022 +SymbolicName=MSG_COMMAND_DETACH +Severity=Informational +Facility=System +Language=English +<Add DETACH command help text here> +. +Language=Polish +<Add DETACH command help text here> +. +Language=Portugese +<Add DETACH command help text here> +. +Language=Romanian +<Add DETACH command help text here> +. +Language=Russian +<Add DETACH command help text here> +. +Language=Albanian +<Add DETACH command help text here> +. +Language=Turkish +<Add DETACH command help text here> +. +Language=Chinese +<Add DETACH command help text here> +. +Language=Taiwanese +<Add DETACH command help text here> +. + + +MessageId=10023 +SymbolicName=MSG_COMMAND_EXIT +Severity=Informational +Facility=System +Language=English +<Add EXIT command help text here> +. +Language=Polish +<Add EXIT command help text here> +. +Language=Portugese +<Add EXIT command help text here> +. +Language=Romanian +<Add EXIT command help text here> +. +Language=Russian +<Add EXIT command help text here> +. +Language=Albanian +<Add EXIT command help text here> +. +Language=Turkish +<Add EXIT command help text here> +. +Language=Chinese +<Add EXIT command help text here> +. +Language=Taiwanese +<Add EXIT command help text here> +. + + +MessageId=10024 +SymbolicName=MSG_COMMAND_EXPAND +Severity=Informational +Facility=System +Language=English +<Add EXPAND command help text here> +. +Language=Polish +<Add EXPAND command help text here> +. +Language=Portugese +<Add EXPAND command help text here> +. +Language=Romanian +<Add EXPAND command help text here> +. +Language=Russian +<Add EXPAND command help text here> +. +Language=Albanian +<Add EXPAND command help text here> +. +Language=Turkish +<Add EXPAND command help text here> +. +Language=Chinese +<Add EXPAND command help text here> +. +Language=Taiwanese +<Add EXPAND command help text here> +. + + +MessageId=10025 +SymbolicName=MSG_COMMAND_EXTEND +Severity=Informational +Facility=System +Language=English +<Add EXTEND command help text here> +. +Language=Polish +<Add EXTEND command help text here> +. +Language=Portugese +<Add EXTEND command help text here> +. +Language=Romanian +<Add EXTEND command help text here> +. +Language=Russian +<Add EXTEND command help text here> +. +Language=Albanian +<Add EXTEND command help text here> +. +Language=Turkish +<Add EXTEND command help text here> +. +Language=Chinese +<Add EXTEND command help text here> +. +Language=Taiwanese +<Add EXTEND command help text here> +. + + +MessageId=10026 +SymbolicName=MSG_COMMAND_FILESYSTEMS +Severity=Informational +Facility=System +Language=English +<Add FILESYSTEMS command help text here> +. +Language=Polish +<Add FILESYSTEMS command help text here> +. +Language=Portugese +<Add FILESYSTEMS command help text here> +. +Language=Romanian +<Add FILESYSTEMS command help text here> +. +Language=Russian +<Add FILESYSTEMS command help text here> +. +Language=Albanian +<Add FILESYSTEMS command help text here> +. +Language=Turkish +<Add FILESYSTEMS command help text here> +. +Language=Chinese +<Add FILESYSTEMS command help text here> +. +Language=Taiwanese +<Add FILESYSTEMS command help text here> +. + + +MessageId=10027 +SymbolicName=MSG_COMMAND_FORMAT +Severity=Informational +Facility=System +Language=English +<Add FORMAT command help text here> +. +Language=Polish +<Add FORMAT command help text here> +. +Language=Portugese +<Add FORMAT command help text here> +. +Language=Romanian +<Add FORMAT command help text here> +. +Language=Russian +<Add FORMAT command help text here> +. +Language=Albanian +<Add FORMAT command help text here> +. +Language=Turkish +<Add FORMAT command help text here> +. +Language=Chinese +<Add FORMAT command help text here> +. +Language=Taiwanese +<Add FORMAT command help text here> +. + + +MessageId=10028 +SymbolicName=MSG_COMMAND_GPT +Severity=Informational +Facility=System +Language=English +<Add GPT command help text here> +. +Language=Polish +<Add GPT command help text here> +. +Language=Portugese +<Add GPT command help text here> +. +Language=Romanian +<Add GPT command help text here> +. +Language=Russian +<Add GPT command help text here> +. +Language=Albanian +<Add GPT command help text here> +. +Language=Turkish +<Add GPT command help text here> +. +Language=Chinese +<Add GPT command help text here> +. +Language=Taiwanese +<Add GPT command help text here> +. + + +MessageId=10029 +SymbolicName=MSG_COMMAND_HELP +Severity=Informational +Facility=System +Language=English +<Add HELP command help text here> +. +Language=Polish +<Add HELP command help text here> +. +Language=Portugese +<Add HELP command help text here> +. +Language=Romanian +<Add HELP command help text here> +. +Language=Russian +<Add HELP command help text here> +. +Language=Albanian +<Add HELP command help text here> +. +Language=Turkish +<Add HELP command help text here> +. +Language=Chinese +<Add HELP command help text here> +. +Language=Taiwanese +<Add HELP command help text here> +. + + +MessageId=10030 +SymbolicName=MSG_COMMAND_IMPORT +Severity=Informational +Facility=System +Language=English +<Add IMPORT command help text here> +. +Language=Polish +<Add IMPORT command help text here> +. +Language=Portugese +<Add IMPORT command help text here> +. +Language=Romanian +<Add IMPORT command help text here> +. +Language=Russian +<Add IMPORT command help text here> +. +Language=Albanian +<Add IMPORT command help text here> +. +Language=Turkish +<Add IMPORT command help text here> +. +Language=Chinese +<Add IMPORT command help text here> +. +Language=Taiwanese +<Add IMPORT command help text here> +. + + +MessageId=10031 +SymbolicName=MSG_COMMAND_INACTIVE +Severity=Informational +Facility=System +Language=English +<Add INACTIVE command help text here> +. +Language=Polish +<Add INACTIVE command help text here> +. +Language=Portugese +<Add INACTIVE command help text here> +. +Language=Romanian +<Add INACTIVE command help text here> +. +Language=Russian +<Add INACTIVE command help text here> +. +Language=Albanian +<Add INACTIVE command help text here> +. +Language=Turkish +<Add INACTIVE command help text here> +. +Language=Chinese +<Add INACTIVE command help text here> +. +Language=Taiwanese +<Add INACTIVE command help text here> +. + + +MessageId=10032 +SymbolicName=MSG_COMMAND_LIST_DISK +Severity=Informational +Facility=System +Language=English +<Add LIST DISK command help text here> +. +Language=Polish +<Add LIST DISK command help text here> +. +Language=Portugese +<Add LIST DISK command help text here> +. +Language=Romanian +<Add LIST DISK command help text here> +. +Language=Russian +<Add LIST DISK command help text here> +. +Language=Albanian +<Add LIST DISK command help text here> +. +Language=Turkish +<Add LIST DISK command help text here> +. +Language=Chinese +<Add LIST DISK command help text here> +. +Language=Taiwanese +<Add LIST DISK command help text here> +. + +MessageId=10033 +SymbolicName=MSG_COMMAND_LIST_PARTITION +Severity=Informational +Facility=System +Language=English +<Add LIST PARTITION command help text here> +. +Language=Polish +<Add LIST PARTITION command help text here> +. +Language=Portugese +<Add LIST PARTITION command help text here> +. +Language=Romanian +<Add LIST PARTITION command help text here> +. +Language=Russian +<Add LIST PARTITION command help text here> +. +Language=Albanian +<Add LIST PARTITION command help text here> +. +Language=Turkish +<Add LIST PARTITION command help text here> +. +Language=Chinese +<Add LIST PARTITION command help text here> +. +Language=Taiwanese +<Add LIST PARTITION command help text here> +. + + +MessageId=10034 +SymbolicName=MSG_COMMAND_LIST_VOLUME +Severity=Informational +Facility=System +Language=English +<Add LIST VOLUME command help text here> +. +Language=Polish +<Add LIST VOLUME command help text here> +. +Language=Portugese +<Add LIST VOLUME command help text here> +. +Language=Romanian +<Add LIST VOLUME command help text here> +. +Language=Russian +<Add LIST VOLUME command help text here> +. +Language=Albanian +<Add LIST VOLUME command help text here> +. +Language=Turkish +<Add LIST VOLUME command help text here> +. +Language=Chinese +<Add LIST VOLUME command help text here> +. +Language=Taiwanese +<Add LIST VOLUME command help text here> +. + + +MessageId=10035 +SymbolicName=MSG_COMMAND_LIST_VDISK +Severity=Informational +Facility=System +Language=English +<Add LIST VDISK command help text here> +. +Language=Polish +<Add LIST VDISK command help text here> +. +Language=Portugese +<Add LIST VDISK command help text here> +. +Language=Romanian +<Add LIST VDISK command help text here> +. +Language=Russian +<Add LIST VDISK command help text here> +. +Language=Albanian +<Add LIST VDISK command help text here> +. +Language=Turkish +<Add LIST VDISK command help text here> +. +Language=Chinese +<Add LIST VDISK command help text here> +. +Language=Taiwanese +<Add LIST VDISK command help text here> +. + + +MessageId=10036 +SymbolicName=MSG_COMMAND_MERGE +Severity=Informational +Facility=System +Language=English +<Add MERGE command help text here> +. +Language=Polish +<Add MERGE command help text here> +. +Language=Portugese +<Add MERGE command help text here> +. +Language=Romanian +<Add MERGE command help text here> +. +Language=Russian +<Add MERGE command help text here> +. +Language=Albanian +<Add MERGE command help text here> +. +Language=Turkish +<Add MERGE command help text here> +. +Language=Chinese +<Add MERGE command help text here> +. +Language=Taiwanese +<Add MERGE command help text here> +. + + +MessageId=10037 +SymbolicName=MSG_COMMAND_OFFLINE +Severity=Informational +Facility=System +Language=English +<Add OFFLINE command help text here> +. +Language=Polish +<Add OFFLINE command help text here> +. +Language=Portugese +<Add OFFLINE command help text here> +. +Language=Romanian +<Add OFFLINE command help text here> +. +Language=Russian +<Add OFFLINE command help text here> +. +Language=Albanian +<Add OFFLINE command help text here> +. +Language=Turkish +<Add OFFLINE command help text here> +. +Language=Chinese +<Add OFFLINE command help text here> +. +Language=Taiwanese +<Add OFFLINE command help text here> +. + + +MessageId=10038 +SymbolicName=MSG_COMMAND_ONLINE +Severity=Informational +Facility=System +Language=English +<Add ONLINE command help text here> +. +Language=Polish +<Add ONLINE command help text here> +. +Language=Portugese +<Add ONLINE command help text here> +. +Language=Romanian +<Add ONLINE command help text here> +. +Language=Russian +<Add ONLINE command help text here> +. +Language=Albanian +<Add ONLINE command help text here> +. +Language=Turkish +<Add ONLINE command help text here> +. +Language=Chinese +<Add ONLINE command help text here> +. +Language=Taiwanese +<Add ONLINE command help text here> +. + + +MessageId=10039 +SymbolicName=MSG_COMMAND_RECOVER +Severity=Informational +Facility=System +Language=English +<Add RECOVER command help text here> +. +Language=Polish +<Add RECOVER command help text here> +. +Language=Portugese +<Add RECOVER command help text here> +. +Language=Romanian +<Add RECOVER command help text here> +. +Language=Russian +<Add RECOVER command help text here> +. +Language=Albanian +<Add RECOVER command help text here> +. +Language=Turkish +<Add RECOVER command help text here> +. +Language=Chinese +<Add RECOVER command help text here> +. +Language=Taiwanese +<Add RECOVER command help text here> +. + + +MessageId=10040 +SymbolicName=MSG_COMMAND_REM +Severity=Informational +Facility=System +Language=English +<Add REM command help text here> +. +Language=Polish +<Add REM command help text here> +. +Language=Portugese +<Add REM command help text here> +. +Language=Romanian +<Add REM command help text here> +. +Language=Russian +<Add REM command help text here> +. +Language=Albanian +<Add REM command help text here> +. +Language=Turkish +<Add REM command help text here> +. +Language=Chinese +<Add REM command help text here> +. +Language=Taiwanese +<Add REM command help text here> +. + + +MessageId=10041 +SymbolicName=MSG_COMMAND_REMOVE +Severity=Informational +Facility=System +Language=English +<Add REMOVE command help text here> +. +Language=Polish +<Add REMOVE command help text here> +. +Language=Portugese +<Add REMOVE command help text here> +. +Language=Romanian +<Add REMOVE command help text here> +. +Language=Russian +<Add REMOVE command help text here> +. +Language=Albanian +<Add REMOVE command help text here> +. +Language=Turkish +<Add REMOVE command help text here> +. +Language=Chinese +<Add REMOVE command help text here> +. +Language=Taiwanese +<Add REMOVE command help text here> +. + + +MessageId=10042 +SymbolicName=MSG_COMMAND_REPAIR +Severity=Informational +Facility=System +Language=English +<Add REPAIR command help text here> +. +Language=Polish +<Add REPAIR command help text here> +. +Language=Portugese +<Add REPAIR command help text here> +. +Language=Romanian +<Add REPAIR command help text here> +. +Language=Russian +<Add REPAIR command help text here> +. +Language=Albanian +<Add REPAIR command help text here> +. +Language=Turkish +<Add REPAIR command help text here> +. +Language=Chinese +<Add REPAIR command help text here> +. +Language=Taiwanese +<Add REPAIR command help text here> +. + + +MessageId=10043 +SymbolicName=MSG_COMMAND_RESCAN +Severity=Informational +Facility=System +Language=English +<Add RESCAN command help text here> +. +Language=Polish +<Add RESCAN command help text here> +. +Language=Portugese +<Add RESCAN command help text here> +. +Language=Romanian +<Add RESCAN command help text here> +. +Language=Russian +<Add RESCAN command help text here> +. +Language=Albanian +<Add RESCAN command help text here> +. +Language=Turkish +<Add RESCAN command help text here> +. +Language=Chinese +<Add RESCAN command help text here> +. +Language=Taiwanese +<Add RESCAN command help text here> +. + + +MessageId=10044 +SymbolicName=MSG_COMMAND_RETAIN +Severity=Informational +Facility=System +Language=English +<Add RETAIN command help text here> +. +Language=Polish +<Add RETAIN command help text here> +. +Language=Portugese +<Add RETAIN command help text here> +. +Language=Romanian +<Add RETAIN command help text here> +. +Language=Russian +<Add RETAIN command help text here> +. +Language=Albanian +<Add RETAIN command help text here> +. +Language=Turkish +<Add RETAIN command help text here> +. +Language=Chinese +<Add RETAIN command help text here> +. +Language=Taiwanese +<Add RETAIN command help text here> +. + + +MessageId=10045 +SymbolicName=MSG_COMMAND_SAN +Severity=Informational +Facility=System +Language=English +<Add SAN command help text here> +. +Language=Polish +<Add SAN command help text here> +. +Language=Portugese +<Add SAN command help text here> +. +Language=Romanian +<Add SAN command help text here> +. +Language=Russian +<Add SAN command help text here> +. +Language=Albanian +<Add SAN command help text here> +. +Language=Turkish +<Add SAN command help text here> +. +Language=Chinese +<Add SAN command help text here> +. +Language=Taiwanese +<Add SAN command help text here> +. + + +MessageId=10046 +SymbolicName=MSG_COMMAND_SELECT_DISK +Severity=Informational +Facility=System +Language=English +<Add SELECT DISK command help text here> +. +Language=Polish +<Add SELECT DISK command help text here> +. +Language=Portugese +<Add SELECT DISK command help text here> +. +Language=Romanian +<Add SELECT DISK command help text here> +. +Language=Russian +<Add SELECT DISK command help text here> +. +Language=Albanian +<Add SELECT DISK command help text here> +. +Language=Turkish +<Add SELECT DISK command help text here> +. +Language=Chinese +<Add SELECT DISK command help text here> +. +Language=Taiwanese +<Add SELECT DISK command help text here> +. + + +MessageId=10047 +SymbolicName=MSG_COMMAND_SELECT_PARTITION +Severity=Informational +Facility=System +Language=English +<Add SELECT PARTITION command help text here> +. +Language=Polish +<Add SELECT PARTITION command help text here> +. +Language=Portugese +<Add SELECT PARTITION command help text here> +. +Language=Romanian +<Add SELECT PARTITION command help text here> +. +Language=Russian +<Add SELECT PARTITION command help text here> +. +Language=Albanian +<Add SELECT PARTITION command help text here> +. +Language=Turkish +<Add SELECT PARTITION command help text here> +. +Language=Chinese +<Add SELECT PARTITION command help text here> +. +Language=Taiwanese +<Add SELECT PARTITION command help text here> +. + + +MessageId=10048 +SymbolicName=MSG_COMMAND_SELECT_VOLUME +Severity=Informational +Facility=System +Language=English +<Add SELECT VOLUME command help text here> +. +Language=Polish +<Add SELECT VOLUME command help text here> +. +Language=Portugese +<Add SELECT VOLUME command help text here> +. +Language=Romanian +<Add SELECT VOLUME command help text here> +. +Language=Russian +<Add SELECT VOLUME command help text here> +. +Language=Albanian +<Add SELECT VOLUME command help text here> +. +Language=Turkish +<Add SELECT VOLUME command help text here> +. +Language=Chinese +<Add SELECT VOLUME command help text here> +. +Language=Taiwanese +<Add SELECT VOLUME command help text here> +. + + +MessageId=10049 +SymbolicName=MSG_COMMAND_SELECT_VDISK +Severity=Informational +Facility=System +Language=English +<Add SELECT VDISK command help text here> +. +Language=Polish +<Add SELECT VDISK command help text here> +. +Language=Portugese +<Add SELECT VDISK command help text here> +. +Language=Romanian +<Add SELECT VDISK command help text here> +. +Language=Russian +<Add SELECT VDISK command help text here> +. +Language=Albanian +<Add SELECT VDISK command help text here> +. +Language=Turkish +<Add SELECT VDISK command help text here> +. +Language=Chinese +<Add SELECT VDISK command help text here> +. +Language=Taiwanese +<Add SELECT VDISK command help text here> +. + + +MessageId=10050 +SymbolicName=MSG_COMMAND_SETID +Severity=Informational +Facility=System +Language=English +<Add SETID command help text here> +. +Language=Polish +<Add SETID command help text here> +. +Language=Portugese +<Add SETID command help text here> +. +Language=Romanian +<Add SETID command help text here> +. +Language=Russian +<Add SETID command help text here> +. +Language=Albanian +<Add SETID command help text here> +. +Language=Turkish +<Add SETID command help text here> +. +Language=Chinese +<Add SETID command help text here> +. +Language=Taiwanese +<Add SETID command help text here> +. + + +MessageId=10051 +SymbolicName=MSG_COMMAND_SHRINK +Severity=Informational +Facility=System +Language=English +<Add SHRINK command help text here> +. +Language=Polish +<Add SHRINK command help text here> +. +Language=Portugese +<Add SHRINK command help text here> +. +Language=Romanian +<Add SHRINK command help text here> +. +Language=Russian +<Add SHRINK command help text here> +. +Language=Albanian +<Add SHRINK command help text here> +. +Language=Turkish +<Add SHRINK command help text here> +. +Language=Chinese +<Add SHRINK command help text here> +. +Language=Taiwanese +<Add SHRINK command help text here> +. + + +MessageId=10052 +SymbolicName=MSG_COMMAND_UNIQUEID_DISK +Severity=Informational +Facility=System +Language=English +<Add UNIQUEID DISK command help text here> +. +Language=Polish +<Add UNIQUEID DISK command help text here> +. +Language=Portugese +<Add UNIQUEID DISK command help text here> +. +Language=Romanian +<Add UNIQUEID DISK command help text here> +. +Language=Russian +<Add UNIQUEID DISK command help text here> +. +Language=Albanian +<Add UNIQUEID DISK command help text here> +. +Language=Turkish +<Add UNIQUEID DISK command help text here> +. +Language=Chinese +<Add UNIQUEID DISK command help text here> +. +Language=Taiwanese +<Add UNIQUEID DISK command help text here> +. diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index d271844d0cf..f2a23960ae0 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -87,17 +87,17 @@ HelpCommand( if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && - (cmdptr->help_detail != IDS_NONE)) + (cmdptr->help_detail != MSG_NONE)) { - ConResPuts(StdOut, cmdptr->help_detail); + PrintMessageString(cmdptr->help_detail); bSubCommands = TRUE; } } } - if ((bSubCommands == FALSE) && (pCommand->help_detail != IDS_NONE)) + if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE)) { - ConResPuts(StdOut, pCommand->help_detail); + PrintMessageString(pCommand->help_detail); } ConPuts(StdOut, L"\n"); diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index d2decf537f1..08be9411fdb 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -8,6 +8,7 @@ */ #include "diskpart.h" +#include "diskpart_msg.h" BOOL exit_main(INT argc, LPWSTR *argv); BOOL rem_main(INT argc, LPWSTR *argv); @@ -15,83 +16,83 @@ BOOL rem_main(INT argc, LPWSTR *argv); COMMAND cmds[] = { - {L"ACTIVE", NULL, NULL, active_main, IDS_HELP_ACTIVE, IDS_COMMAND_ACTIVE}, - {L"ADD", NULL, NULL, add_main, IDS_HELP_ADD, IDS_COMMAND_ADD}, - {L"ASSIGN", NULL, NULL, assign_main, IDS_HELP_ASSIGN, IDS_COMMAND_ASSIGN}, - {L"ATTACH", NULL, NULL, attach_main, IDS_HELP_ATTACH, IDS_COMMAND_ATTACH}, - {L"ATTRIBUTES", NULL, NULL, attributes_main, IDS_HELP_ATTRIBUTES, IDS_COMMAND_ATTRIBUTES}, - {L"AUTOMOUNT", NULL, NULL, automount_main, IDS_HELP_AUTOMOUNT, IDS_COMMAND_AUTOMOUNT}, - {L"BREAK", NULL, NULL, break_main, IDS_HELP_BREAK, IDS_COMMAND_BREAK}, - {L"CLEAN", NULL, NULL, clean_main, IDS_HELP_CLEAN, IDS_COMMAND_CLEAN}, - {L"COMPACT", NULL, NULL, compact_main, IDS_HELP_COMPACT, IDS_COMMAND_COMPACT}, - {L"CONVERT", NULL, NULL, convert_main, IDS_HELP_CONVERT, IDS_COMMAND_CONVERT}, - - {L"CREATE", NULL, NULL, NULL, IDS_HELP_CREATE, IDS_NONE}, - {L"CREATE", L"PARTITION", NULL, NULL, IDS_HELP_CREATE_PARTITION, IDS_NONE}, -// {L"CREATE", L"PARTITION", L"EFI", CreateEfiPartition, IDS_HELP_CREATE_PARTITION_EFI, IDS_COMMAND_CREATE_PARTITION_EFI}, - {L"CREATE", L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, IDS_COMMAND_CREATE_PARTITION_EXTENDED}, - {L"CREATE", L"PARTITION", L"LOGICAL", CreateLogicalPartition, IDS_HELP_CREATE_PARTITION_LOGICAL, IDS_COMMAND_CREATE_PARTITION_LOGICAL}, -// {L"CREATE", L"PARTITION", L"MSR", CreateMsrPartition, IDS_HELP_CREATE_PARTITION_MSR, IDS_COMMAND_CREATE_PARTITION_MSR}, - {L"CREATE", L"PARTITION", L"PRIMARY", CreatePrimaryPartition, IDS_HELP_CREATE_PARTITION_PRIMARY, IDS_COMMAND_CREATE_PARTITION_PRIMARY}, - {L"CREATE", L"VOLUME", NULL, NULL, IDS_HELP_CREATE_VOLUME, IDS_NONE}, - {L"CREATE", L"VDISK", NULL, NULL, IDS_HELP_CREATE_VDISK, IDS_NONE}, - - {L"DELETE", NULL, NULL, NULL, IDS_HELP_DELETE, IDS_NONE}, - {L"DELETE", L"DISK", NULL, DeleteDisk, IDS_HELP_DELETE_DISK, IDS_COMMAND_DELETE_DISK}, - {L"DELETE", L"PARTITION", NULL, DeletePartition, IDS_HELP_DELETE_PARTITION, IDS_COMMAND_DELETE_PARTITION}, - {L"DELETE", L"VOLUME", NULL, DeleteVolume, IDS_HELP_DELETE_VOLUME, IDS_COMMAND_DELETE_VOLUME}, - - {L"DETACH", NULL, NULL, detach_main, IDS_HELP_DETACH, IDS_COMMAND_DETACH}, - - {L"DETAIL", NULL, NULL, NULL, IDS_HELP_DETAIL, IDS_NONE}, - {L"DETAIL", L"DISK", NULL, DetailDisk, IDS_HELP_DETAIL_DISK, IDS_COMMAND_DETAIL_DISK}, - {L"DETAIL", L"PARTITION", NULL, DetailPartition, IDS_HELP_DETAIL_PARTITION, IDS_COMMAND_DETAIL_PARTITION}, - {L"DETAIL", L"VOLUME", NULL, DetailVolume, IDS_HELP_DETAIL_VOLUME, IDS_COMMAND_DETAIL_VOLUME}, - - {L"DUMP", NULL, NULL, NULL, IDS_NONE, IDS_NONE}, - {L"DUMP", L"DISK", NULL, DumpDisk, IDS_NONE, IDS_NONE}, - {L"DUMP", L"PARTITION", NULL, DumpPartition, IDS_NONE, IDS_NONE}, - {L"EXIT", NULL, NULL, NULL, IDS_HELP_EXIT, IDS_COMMAND_EXIT}, - - {L"EXPAND", NULL, NULL, expand_main, IDS_HELP_EXPAND, IDS_COMMAND_EXPAND}, - {L"EXTEND", NULL, NULL, extend_main, IDS_HELP_EXTEND, IDS_COMMAND_EXTEND}, - {L"FILESYSTEMS", NULL, NULL, filesystems_main, IDS_HELP_FILESYSTEMS, IDS_COMMAND_FILESYSTEMS}, - {L"FORMAT", NULL, NULL, format_main, IDS_HELP_FORMAT, IDS_COMMAND_FORMAT}, - {L"GPT", NULL, NULL, gpt_main, IDS_HELP_GPT, IDS_COMMAND_GPT}, - {L"HELP", NULL, NULL, help_main, IDS_HELP_HELP, IDS_COMMAND_HELP}, - {L"IMPORT", NULL, NULL, import_main, IDS_HELP_IMPORT, IDS_COMMAND_IMPORT}, - {L"INACTIVE", NULL, NULL, inactive_main, IDS_HELP_INACTIVE, IDS_COMMAND_INACTIVE}, - - {L"LIST", NULL, NULL, NULL, IDS_HELP_LIST, IDS_NONE}, - {L"LIST", L"DISK", NULL, ListDisk, IDS_HELP_LIST_DISK, IDS_COMMAND_LIST_DISK}, - {L"LIST", L"PARTITION", NULL, ListPartition, IDS_HELP_LIST_PARTITION, IDS_COMMAND_LIST_PARTITION}, - {L"LIST", L"VOLUME", NULL, ListVolume, IDS_HELP_LIST_VOLUME, IDS_COMMAND_LIST_VOLUME}, - {L"LIST", L"VDISK", NULL, ListVirtualDisk, IDS_HELP_LIST_VDISK, IDS_COMMAND_LIST_VDISK}, - - {L"MERGE", NULL, NULL, merge_main, IDS_HELP_MERGE, IDS_COMMAND_MERGE}, - {L"OFFLINE", NULL, NULL, offline_main, IDS_HELP_OFFLINE, IDS_COMMAND_OFFLINE}, - {L"ONLINE", NULL, NULL, online_main, IDS_HELP_ONLINE, IDS_COMMAND_ONLINE}, - {L"RECOVER", NULL, NULL, recover_main, IDS_HELP_RECOVER, IDS_COMMAND_RECOVER}, - {L"REM", NULL, NULL, NULL, IDS_HELP_REM, IDS_COMMAND_REM}, - {L"REMOVE", NULL, NULL, remove_main, IDS_HELP_REMOVE, IDS_COMMAND_REMOVE}, - {L"REPAIR", NULL, NULL, repair_main, IDS_HELP_REPAIR, IDS_COMMAND_REPAIR}, - {L"RESCAN", NULL, NULL, rescan_main, IDS_HELP_RESCAN, IDS_COMMAND_RESCAN}, - {L"RETAIN", NULL, NULL, retain_main, IDS_HELP_RETAIN, IDS_COMMAND_RETAIN}, - {L"SAN", NULL, NULL, san_main, IDS_HELP_SAN, IDS_COMMAND_SAN}, - - {L"SELECT", NULL, NULL, NULL, IDS_HELP_SELECT, IDS_NONE}, - {L"SELECT", L"DISK", NULL, SelectDisk, IDS_HELP_SELECT_DISK, IDS_COMMAND_SELECT_DISK}, - {L"SELECT", L"PARTITION", NULL, SelectPartition, IDS_HELP_SELECT_PARTITION, IDS_COMMAND_SELECT_PARTITION}, - {L"SELECT", L"VOLUME", NULL, SelectVolume, IDS_HELP_SELECT_VOLUME, IDS_COMMAND_SELECT_VOLUME}, -// {L"SELECT", L"VDISK", NULL, SelectVirtualDisk, IDS_HELP_SELECT_VDISK, IDS_COMMAND_SELECT_VDISK}, - - {L"SETID", NULL, NULL, setid_main, IDS_HELP_SETID, IDS_COMMAND_SETID}, - {L"SHRINK", NULL, NULL, shrink_main, IDS_HELP_SHRINK, IDS_COMMAND_SHRINK}, - - {L"UNIQUEID", NULL, NULL, NULL, IDS_HELP_UNIQUEID, IDS_NONE}, - {L"UNIQUEID", L"DISK", NULL, UniqueIdDisk, IDS_HELP_UNIQUEID_DISK, IDS_COMMAND_UNIQUEID_DISK}, - - {NULL, NULL, NULL, NULL, IDS_NONE, IDS_NONE} + {L"ACTIVE", NULL, NULL, active_main, IDS_HELP_ACTIVE, MSG_COMMAND_ACTIVE}, + {L"ADD", NULL, NULL, add_main, IDS_HELP_ADD, MSG_COMMAND_ADD}, + {L"ASSIGN", NULL, NULL, assign_main, IDS_HELP_ASSIGN, MSG_COMMAND_ASSIGN}, + {L"ATTACH", NULL, NULL, attach_main, IDS_HELP_ATTACH, MSG_COMMAND_ATTACH}, + {L"ATTRIBUTES", NULL, NULL, attributes_main, IDS_HELP_ATTRIBUTES, MSG_COMMAND_ATTRIBUTES}, + {L"AUTOMOUNT", NULL, NULL, automount_main, IDS_HELP_AUTOMOUNT, MSG_COMMAND_AUTOMOUNT}, + {L"BREAK", NULL, NULL, break_main, IDS_HELP_BREAK, MSG_COMMAND_BREAK}, + {L"CLEAN", NULL, NULL, clean_main, IDS_HELP_CLEAN, MSG_COMMAND_CLEAN}, + {L"COMPACT", NULL, NULL, compact_main, IDS_HELP_COMPACT, MSG_COMMAND_COMPACT}, + {L"CONVERT", NULL, NULL, convert_main, IDS_HELP_CONVERT, MSG_COMMAND_CONVERT}, + + {L"CREATE", NULL, NULL, NULL, IDS_HELP_CREATE, MSG_NONE}, + {L"CREATE", L"PARTITION", NULL, NULL, IDS_HELP_CREATE_PARTITION, MSG_NONE}, +// {L"CREATE", L"PARTITION", L"EFI", CreateEfiPartition, IDS_HELP_CREATE_PARTITION_EFI, MSG_COMMAND_CREATE_PARTITION_EFI}, + {L"CREATE", L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, MSG_COMMAND_CREATE_PARTITION_EXTENDED}, + {L"CREATE", L"PARTITION", L"LOGICAL", CreateLogicalPartition, IDS_HELP_CREATE_PARTITION_LOGICAL, MSG_COMMAND_CREATE_PARTITION_LOGICAL}, +// {L"CREATE", L"PARTITION", L"MSR", CreateMsrPartition, IDS_HELP_CREATE_PARTITION_MSR, MSG_COMMAND_CREATE_PARTITION_MSR}, + {L"CREATE", L"PARTITION", L"PRIMARY", CreatePrimaryPartition, IDS_HELP_CREATE_PARTITION_PRIMARY, MSG_COMMAND_CREATE_PARTITION_PRIMARY}, + {L"CREATE", L"VOLUME", NULL, NULL, IDS_HELP_CREATE_VOLUME, MSG_NONE}, + {L"CREATE", L"VDISK", NULL, NULL, IDS_HELP_CREATE_VDISK, MSG_NONE}, + + {L"DELETE", NULL, NULL, NULL, IDS_HELP_DELETE, MSG_NONE}, + {L"DELETE", L"DISK", NULL, DeleteDisk, IDS_HELP_DELETE_DISK, MSG_COMMAND_DELETE_DISK}, + {L"DELETE", L"PARTITION", NULL, DeletePartition, IDS_HELP_DELETE_PARTITION, MSG_COMMAND_DELETE_PARTITION}, + {L"DELETE", L"VOLUME", NULL, DeleteVolume, IDS_HELP_DELETE_VOLUME, MSG_COMMAND_DELETE_VOLUME}, + + {L"DETACH", NULL, NULL, detach_main, IDS_HELP_DETACH, MSG_COMMAND_DETACH}, + + {L"DETAIL", NULL, NULL, NULL, IDS_HELP_DETAIL, MSG_NONE}, + {L"DETAIL", L"DISK", NULL, DetailDisk, IDS_HELP_DETAIL_DISK, MSG_COMMAND_DETAIL_DISK}, + {L"DETAIL", L"PARTITION", NULL, DetailPartition, IDS_HELP_DETAIL_PARTITION, MSG_COMMAND_DETAIL_PARTITION}, + {L"DETAIL", L"VOLUME", NULL, DetailVolume, IDS_HELP_DETAIL_VOLUME, MSG_COMMAND_DETAIL_VOLUME}, + + {L"DUMP", NULL, NULL, NULL, IDS_NONE, MSG_NONE}, + {L"DUMP", L"DISK", NULL, DumpDisk, IDS_NONE, MSG_NONE}, + {L"DUMP", L"PARTITION", NULL, DumpPartition, IDS_NONE, MSG_NONE}, + {L"EXIT", NULL, NULL, NULL, IDS_HELP_EXIT, MSG_COMMAND_EXIT}, + + {L"EXPAND", NULL, NULL, expand_main, IDS_HELP_EXPAND, MSG_COMMAND_EXPAND}, + {L"EXTEND", NULL, NULL, extend_main, IDS_HELP_EXTEND, MSG_COMMAND_EXTEND}, + {L"FILESYSTEMS", NULL, NULL, filesystems_main, IDS_HELP_FILESYSTEMS, MSG_COMMAND_FILESYSTEMS}, + {L"FORMAT", NULL, NULL, format_main, IDS_HELP_FORMAT, MSG_COMMAND_FORMAT}, + {L"GPT", NULL, NULL, gpt_main, IDS_HELP_GPT, MSG_COMMAND_GPT}, + {L"HELP", NULL, NULL, help_main, IDS_HELP_HELP, MSG_COMMAND_HELP}, + {L"IMPORT", NULL, NULL, import_main, IDS_HELP_IMPORT, MSG_COMMAND_IMPORT}, + {L"INACTIVE", NULL, NULL, inactive_main, IDS_HELP_INACTIVE, MSG_COMMAND_INACTIVE}, + + {L"LIST", NULL, NULL, NULL, IDS_HELP_LIST, MSG_NONE}, + {L"LIST", L"DISK", NULL, ListDisk, IDS_HELP_LIST_DISK, MSG_COMMAND_LIST_DISK}, + {L"LIST", L"PARTITION", NULL, ListPartition, IDS_HELP_LIST_PARTITION, MSG_COMMAND_LIST_PARTITION}, + {L"LIST", L"VOLUME", NULL, ListVolume, IDS_HELP_LIST_VOLUME, MSG_COMMAND_LIST_VOLUME}, + {L"LIST", L"VDISK", NULL, ListVirtualDisk, IDS_HELP_LIST_VDISK, MSG_COMMAND_LIST_VDISK}, + + {L"MERGE", NULL, NULL, merge_main, IDS_HELP_MERGE, MSG_COMMAND_MERGE}, + {L"OFFLINE", NULL, NULL, offline_main, IDS_HELP_OFFLINE, MSG_COMMAND_OFFLINE}, + {L"ONLINE", NULL, NULL, online_main, IDS_HELP_ONLINE, MSG_COMMAND_ONLINE}, + {L"RECOVER", NULL, NULL, recover_main, IDS_HELP_RECOVER, MSG_COMMAND_RECOVER}, + {L"REM", NULL, NULL, NULL, IDS_HELP_REM, MSG_COMMAND_REM}, + {L"REMOVE", NULL, NULL, remove_main, IDS_HELP_REMOVE, MSG_COMMAND_REMOVE}, + {L"REPAIR", NULL, NULL, repair_main, IDS_HELP_REPAIR, MSG_COMMAND_REPAIR}, + {L"RESCAN", NULL, NULL, rescan_main, IDS_HELP_RESCAN, MSG_COMMAND_RESCAN}, + {L"RETAIN", NULL, NULL, retain_main, IDS_HELP_RETAIN, MSG_COMMAND_RETAIN}, + {L"SAN", NULL, NULL, san_main, IDS_HELP_SAN, MSG_COMMAND_SAN}, + + {L"SELECT", NULL, NULL, NULL, IDS_HELP_SELECT, MSG_NONE}, + {L"SELECT", L"DISK", NULL, SelectDisk, IDS_HELP_SELECT_DISK, MSG_COMMAND_SELECT_DISK}, + {L"SELECT", L"PARTITION", NULL, SelectPartition, IDS_HELP_SELECT_PARTITION, MSG_COMMAND_SELECT_PARTITION}, + {L"SELECT", L"VOLUME", NULL, SelectVolume, IDS_HELP_SELECT_VOLUME, MSG_COMMAND_SELECT_VOLUME}, +// {L"SELECT", L"VDISK", NULL, SelectVirtualDisk, IDS_HELP_SELECT_VDISK, MSG_COMMAND_SELECT_VDISK}, + + {L"SETID", NULL, NULL, setid_main, IDS_HELP_SETID, MSG_COMMAND_SETID}, + {L"SHRINK", NULL, NULL, shrink_main, IDS_HELP_SHRINK, MSG_COMMAND_SHRINK}, + + {L"UNIQUEID", NULL, NULL, NULL, IDS_HELP_UNIQUEID, MSG_NONE}, + {L"UNIQUEID", L"DISK", NULL, UniqueIdDisk, IDS_HELP_UNIQUEID_DISK, MSG_COMMAND_UNIQUEID_DISK}, + + {NULL, NULL, NULL, NULL, IDS_NONE, MSG_NONE} }; diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 4eeadf4066a..1554d37cee8 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -37,6 +37,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END STRINGTABLE @@ -49,10 +51,10 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partition ### Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" - IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %-3lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" @@ -176,248 +178,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 69de3471d20..f392db0f256 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -37,6 +37,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Ukryta : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Aktywna : %s\n" IDS_DETAIL_PARTITION_OFFSET "Przesunięcie w bajtach: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END STRINGTABLE @@ -49,8 +51,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Dysk ### Stan Rozmiar Wolne Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partycja Typ Rozmiar Przesunięcie\n" + IDS_LIST_DISK_FORMAT "%c Dysk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partycja ### Typ Rozmiar Przesunięcie\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- ------------\n" IDS_LIST_PARTITION_FORMAT "%c Partycja %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n" @@ -176,248 +178,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Wyświetla lub ustawia identyfikator tabeli partycji GUID (GPT)\n lub sygnaturę głównego rekordu rozruchowego (MBR).\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 0edee6239c9..b39f2027624 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disco ## Estado Tamanho Livre Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- --------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partição Tipo Tamanho deslocamento\n" + IDS_LIST_DISK_FORMAT "%c Disco %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partição ### Tipo Tamanho deslocamento\n" IDS_LIST_PARTITION_LINE " ------------- ------- --------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partição %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Mostra ou define o identificador da tabela de partição GUID (GPT)\n ou assinatura do master boot recorder (MBR) de um disco.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 7f69919ca93..337dc506afb 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disc ### Stare Dimensiune Liber Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partiție Tip Dim. Depl.\n" + IDS_LIST_DISK_FORMAT "%c Disc %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partiție ### Tip Dim. Depl.\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partiție %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Afișează sau instituie identificatorul tabelei GUID a partiției\n (GPT) sau semnătura de inițializare (MBR) a discului.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 3ecfe9122bf..320aaa12620 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Диск ### Состояние Размер Свободно Дин GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Разметка Тип Размер Отступ\n" + IDS_LIST_DISK_FORMAT "%c Диск %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Разметка ### Тип Размер Отступ\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Отображение или установка кода таблицы разделов GUID (GPT) или\n подписи основной загрузочной записи (MBR) диска.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 49e7ea9ff34..d03ea2b3522 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -41,6 +41,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -48,8 +50,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partition ### Type Size Offset\n" IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" @@ -180,248 +182,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Shfaq ose vendos tabelen e particionit GUID - (GPT) identifikues\n ose master boot record (MBR) firmen e një disku.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index bb106bccd82..61099db6c2e 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Durum Boyut Boş Dev Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Bölüm Tür Boyut Ofset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Bölüm ### Tür Boyut Ofset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Bir diskin GUID bölüm tablosu (GPT) tanımlayıcısını ya da üst ön yükleme kaydı (MBR) imini görüntüler ya da ayarlar.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 1a23e12d8cd..ab86d06dc8e 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -46,6 +46,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -53,8 +55,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " 磁盘 ### 状态大小可用活动 Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " 分区类型大小偏移量\n" + IDS_LIST_DISK_FORMAT "%c 磁盘 %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " 分区 ### 类型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" @@ -185,248 +187,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "显示或设置 GUID 分区表（GPT）的标识符\n 或主引导记录（MBR）磁盘的签名。\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 6f931d2e0dd..fbdbf64992e 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -40,6 +40,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -47,8 +49,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " 磁碟 ### 狀態大小可用 Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " 分區類型大小偏移量\n" + IDS_LIST_DISK_FORMAT "%c 磁碟 %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " 分區 ### 類型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" @@ -179,248 +181,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "顯示或設定 GUID 分區表 (GPT) 的標識符\n 或主開機記錄 (MBR) 磁碟的簽名。\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index b46651b670b..b530f6581df 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -78,3 +78,26 @@ RoundingDivide( { return (Dividend + Divisor / 2) / Divisor; } + + +VOID +PrintMessageString( + _In_ DWORD dwMessage) +{ + PWSTR pBuffer; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, //hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + NULL); + if (pBuffer) + { + ConPuts(StdOut, pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } +} diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 313e9b6eee5..51a3946af55 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -9,6 +9,7 @@ #pragma once #define IDS_NONE -1 +#define MSG_NONE 0 #define IDS_APP_HEADER 0 #define IDS_APP_USAGE 1 @@ -38,6 +39,9 @@ #define IDS_DETAIL_PARTITION_ACTIVE 1133 #define IDS_DETAIL_PARTITION_OFFSET 1134 +#define IDS_DETAIL_NO_DISKS 1135 +#define IDS_DETAIL_NO_VOLUME 1136 + #define IDS_HELP_FORMAT_STRING 1200 #define IDS_LIST_DISK_HEAD 3300 @@ -148,60 +152,6 @@ #define IDS_HELP_UNIQUEID 117 #define IDS_HELP_UNIQUEID_DISK 118 - -#define IDS_COMMAND_ACTIVE 1000 -#define IDS_COMMAND_ADD 1001 -#define IDS_COMMAND_ASSIGN 1002 -#define IDS_COMMAND_ATTACH 1003 -#define IDS_COMMAND_ATTRIBUTES 1004 -#define IDS_COMMAND_AUTOMOUNT 1005 -#define IDS_COMMAND_BREAK 1006 -#define IDS_COMMAND_CLEAN 1007 -#define IDS_COMMAND_COMPACT 1008 -#define IDS_COMMAND_CONVERT 1009 -#define IDS_COMMAND_CREATE_PARTITION_EFI 1010 -#define IDS_COMMAND_CREATE_PARTITION_EXTENDED 1011 -#define IDS_COMMAND_CREATE_PARTITION_LOGICAL 1012 -#define IDS_COMMAND_CREATE_PARTITION_MSR 1013 -#define IDS_COMMAND_CREATE_PARTITION_PRIMARY 1014 -#define IDS_COMMAND_DELETE_DISK 1015 -#define IDS_COMMAND_DELETE_PARTITION 1016 -#define IDS_COMMAND_DELETE_VOLUME 1017 -#define IDS_COMMAND_DETACH 1018 -#define IDS_COMMAND_DETAIL_DISK 1019 -#define IDS_COMMAND_DETAIL_PARTITION 1020 -#define IDS_COMMAND_DETAIL_VOLUME 1021 -#define IDS_COMMAND_EXIT 1022 -#define IDS_COMMAND_EXPAND 1023 -#define IDS_COMMAND_EXTEND 1024 -#define IDS_COMMAND_FILESYSTEMS 1025 -#define IDS_COMMAND_FORMAT 1026 -#define IDS_COMMAND_GPT 1027 -#define IDS_COMMAND_HELP 1028 -#define IDS_COMMAND_IMPORT 1029 -#define IDS_COMMAND_INACTIVE 1030 -#define IDS_COMMAND_LIST_DISK 1031 -#define IDS_COMMAND_LIST_PARTITION 1032 -#define IDS_COMMAND_LIST_VOLUME 1033 -#define IDS_COMMAND_LIST_VDISK 1034 -#define IDS_COMMAND_MERGE 1035 -#define IDS_COMMAND_ONLINE 1036 -#define IDS_COMMAND_OFFLINE 1037 -#define IDS_COMMAND_RECOVER 1038 -#define IDS_COMMAND_REM 1039 -#define IDS_COMMAND_REMOVE 1040 -#define IDS_COMMAND_REPAIR 1041 -#define IDS_COMMAND_RESCAN 1042 -#define IDS_COMMAND_RETAIN 1043 -#define IDS_COMMAND_SAN 1044 -#define IDS_COMMAND_SELECT_DISK 1045 -#define IDS_COMMAND_SELECT_PARTITION 1046 -#define IDS_COMMAND_SELECT_VOLUME 1047 -#define IDS_COMMAND_SELECT_VDISK 1048 -#define IDS_COMMAND_SETID 1049 -#define IDS_COMMAND_SHRINK 1050 -#define IDS_COMMAND_UNIQUEID_DISK 1051 - #define IDS_ERROR_MSG_NO_SCRIPT 2000 #define IDS_ERROR_MSG_BAD_ARG 2001 #define IDS_ERROR_INVALID_ARGS 2002

1 0

[reactos] 01/01: [USETUP] Fix several typos in Russian (ru-RU) translation
by Stanislav Motylkov 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=488643583da3b408e44a6… commit 488643583da3b408e44a67fff84750024ad14422 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun May 29 23:46:19 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun May 29 23:46:19 2022 +0300 [USETUP] Fix several typos in Russian (ru-RU) translation CORE-18203 --- base/setup/usetup/lang/ru-RU.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 19690daeb4c..9b6b1c9b7c1 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -140,7 +140,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 8, 19, - "\x07 \215\240\246\254\250\342\245 L \244\253\357 \257\340\256\341\254\256\342\340\240 \253\250\346\245\255\247\250\256\255\255\256\243\256 \341\256\243\253\240\350\245\255\250\357 ReactOS", + "\x07 \215\240\246\254\250\342\245 L \244\253\357 \257\340\256\341\254\256\342\340\240 \253\250\346\245\255\247\250\256\255\255\256\243\256 \341\256\243\253\240\350\245\255\250\357 ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -363,7 +363,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = { 8, 18, - "\205\341\253\250 \257\256 \252\240\252\256\254-\253\250\241\256 \257\340\250\347\250\255\240\254 \242\353 \255\245 \257\256\253\343\347\250\253\250 \252\256\257\250\356 \216\342\252\340\353\342\256\243\256", + "\205\341\253\250 \257\256 \252\240\252\250\254-\253\250\241\256 \257\340\250\347\250\255\240\254 \242\353 \255\245 \257\256\253\343\347\250\253\250 \252\256\257\250\356 \216\342\252\340\353\342\256\243\256", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -405,7 +405,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = { 8, 26, - "\217\220\210\203\216\204\215\216\221\222\210 \204\213\237 \212\216\215\212\220\205\222\215\233\225 \226\205\213\205\211", + "\217\220\210\203\216\204\215\216\221\222\210 \204\213\237 \212\216\215\212\220\205\222\215\233\225 \226\205\213\205\211.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022