Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [SERVICES][SETUPLIB][UMANDLG][USETUP] Add missing \n to DPRINT() calls (#5983)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=780c2a0375cfc3e328f05… commit 780c2a0375cfc3e328f059cb7ea2a2e2d52a6626 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 16 23:22:12 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 22:22:12 2023 +0000 [SERVICES][SETUPLIB][UMANDLG][USETUP] Add missing \n to DPRINT() calls (#5983) And promote 1 DPRINT() to DPRINT1. --- base/applications/utilman/umandlg/process.c | 4 ++-- base/setup/lib/install.c | 2 +- base/setup/lib/setuplib.c | 4 ++-- base/setup/lib/utils/partlist.c | 2 +- base/setup/usetup/usetup.c | 10 +++++----- base/system/services/database.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/utilman/umandlg/process.c b/base/applications/utilman/umandlg/process.c index 33ceeac0b31..c1ff0c191e6 100644 --- a/base/applications/utilman/umandlg/process.c +++ b/base/applications/utilman/umandlg/process.c @@ -84,7 +84,7 @@ BOOL IsProcessRunning(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(SYNCHRONIZE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)", GetLastError()); + DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)\n", GetLastError()); return FALSE; } @@ -211,7 +211,7 @@ BOOL CloseProcess(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)", GetLastError()); + DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)\n", GetLastError()); return FALSE; } diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index a9a489bf8ce..46a36d2fa08 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -655,7 +655,7 @@ PrepareCopyInfFile( if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); pSetupData->LastErrorNumber = ERROR_CREATE_DIR; if (pSetupData->ErrorRoutine) pSetupData->ErrorRoutine(pSetupData, PathBuffer); diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 1ee70e6216a..40e8c13b36f 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -833,7 +833,7 @@ InitializeSetup( &pSetupData->SourceRootDir); if (!NT_SUCCESS(Status)) { - DPRINT1("GetSourcePaths() failed (Status 0x%08lx)", Status); + DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); return ERROR_NO_SOURCE_DRIVE; } /* @@ -850,7 +850,7 @@ InitializeSetup( Error = LoadSetupInf(pSetupData); if (Error != ERROR_SUCCESS) { - DPRINT1("LoadSetupInf() failed (Error 0x%lx)", Error); + DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error); return Error; } DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath); diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5f1044335ed..49c15e9ffe2 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1882,7 +1882,7 @@ CreatePartitionList(VOID) &ReturnSize); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx", Status); + DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx\n", Status); RtlFreeHeap(ProcessHeap, 0, List); return NULL; } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 47d24464977..9c25a1e6fbd 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2847,7 +2847,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) DiskEntry->DiskNumber, PartEntry->PartitionNumber); - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoFormat() failed: Status 0x%08lx\n", Status); MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); /* Reset the filesystem list */ @@ -2950,7 +2950,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (!NT_SUCCESS(Status)) { - DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoChkdsk() failed: Status 0x%08lx\n", Status); RtlStringCbPrintfA(Buffer, sizeof(Buffer), @@ -3060,7 +3060,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3164,7 +3164,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3825,7 +3825,7 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir) DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + DPRINT1("InstallMbrBootCodeToDisk() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); return FALSE; } diff --git a/base/system/services/database.c b/base/system/services/database.c index 8dbf148d43a..3ec18104158 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -2273,7 +2273,7 @@ ScmAutoStartServices(VOID) } else { - DPRINT1("WARNING: Could not open the associated Safe Boot key"); + DPRINT1("WARNING: Could not open the associated Safe Boot key\n"); CurrentService->ServiceVisited = FALSE; } }

1 year, 1 month

[reactos] 01/01: [CMD] Use correct console input mode in ConInString()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98353cdb376fa507b9201… commit 98353cdb376fa507b9201982ed956092149de363 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 16 21:48:51 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 21:58:54 2023 +0100 [CMD] Use correct console input mode in ConInString() ENABLE_PROCESSED_INPUT is necessary to correctly deal with CR-LF and display it only when necessary. Fixes cmd:batch winetests. Addendum to commit db219e45c --- base/shell/cmd/console.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c index ba718fbc076..de35fa7f373 100644 --- a/base/shell/cmd/console.c +++ b/base/shell/cmd/console.c @@ -96,7 +96,7 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) hFile = GetStdHandle(STD_INPUT_HANDLE); GetConsoleMode(hFile, &dwOldMode); - SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + SetConsoleMode(hFile, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); @@ -106,10 +106,9 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) #endif for (p = lpInput; *p; p++) { - if (*p == _T('\r')) // Terminate at the next carriage-return. + if (*p == _T('\r')) // Terminate at the carriage-return. { *p = _T('\0'); - ConOutChar(_T('\n')); // Output newline as well. break; } }

1 year, 1 month

[reactos] 01/01: [WIN32KNT_APITEST] 2 minor code improvements and a first fix (#5980)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5c3bb5bcedf31b99adbf… commit a5c3bb5bcedf31b99adbfefcbf6ce60c6f8d241a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 16 21:57:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 21:57:10 2023 +0100 [WIN32KNT_APITEST] 2 minor code improvements and a first fix (#5980) - Update .rc filename; addendum to 7ad21a4 (r70458). - Move one '#include "resource.h"' around to where it is needed. Addendum to e1b2e7a (r29284) then ec5e0ea (r48103). - Adjust all '#include <win32nt.h>' --- modules/rostests/apitests/win32nt/CMakeLists.txt | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c | 2 +- .../apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c | 2 +- .../rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c | 2 +- .../rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c | 3 ++- modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c | 2 +- .../apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c | 2 +- modules/rostests/apitests/win32nt/w32knapi.h | 1 - modules/rostests/apitests/win32nt/{w32knapi.rc => win32knt.rc} | 0 64 files changed, 63 insertions(+), 63 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 9968d8a0c9d..cab6970201e 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -76,7 +76,7 @@ list(APPEND PCH_SKIP_SOURCE add_executable(win32knt_apitest ${SOURCE} ${PCH_SKIP_SOURCE} - w32knapi.rc) + win32knt.rc) target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools) set_module_type(win32knt_apitest win32cui) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c index 4e0f5c8ec4f..5ba2958cec1 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDdCreateDirectDrawObject) { diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c index 78d1af7a325..43cb7b92deb 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDdDeleteDirectDrawObject) { diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 3b380dabbe0..16ffc45ec07 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" #include <ddrawi.h> diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c index 8ff437e81f2..c8099055eed 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiArcInternal) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c index 95f838f315c..e46dadf0f37 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiBitBlt) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c index c5f27cc68ed..379207e79f8 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCombineRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c index fd0bd1601a7..fee272af496 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_NtGdiCreateBitmap_Params(void) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c index 34035295d07..5546f63c9d2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCreateCompatibleBitmap) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c index 9edb8e96201..013e6bbba39 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCreateCompatibleDC) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c index 07fcad20a45..94453326e43 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* HBITMAP diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c index a464f829d27..6332deedb38 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDeleteObjectApp) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c index 9893cbe4875..1cd434c088f 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" HPALETTE CreateTestPalette() diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c index a77d0c88fab..c8ec86b9db4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiEngCreatePalette) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c index 0393dbfbbb5..1dcadf6f7fa 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiEnumFontOpen) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c index 6dd1a22a86e..df6fe63aed0 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiExcludeClipRect) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c index 847c1377cef..996a45546b4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiExtSelectClipRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c index 3a75f9f0b9f..a7c139e5463 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* BOOL diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c index 729a7a49b5e..7fe302dc209 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" NTSTATUS (NTAPI diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c index e7d0f3e8edf..0a2cae7c8a1 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetBitmapBits) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c index f8069d60170..928af110fb2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* taken from gdi32, bitmap.c */ UINT diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c index 107a00b8148..b06426f9c36 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetFontResourceInfoInternalW) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c index 05c501ea752..09628aad653 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetRandomRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c index df14a9f3f46..72d2f66661e 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetStockObject) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c index cbe66134ab7..3d55be7bbc9 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiIntersectClipRect) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c index ef28a23c8f2..d6e2ce9f721 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiOffsetClipRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c index 82b99fd0cff..a834a6ec4ec 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" static diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c index 1eafc20b6a2..a36957304cb 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" static HBRUSH hbrush; static HBITMAP hbitmap; diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c index 0e39eb4d8bc..3799289de4c 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSaveDC) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c index ec5acdec3a3..3e1fdeabb78 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_SelectDIBSection(void) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c index 08451977cbb..d2db64e6e07 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectBrush) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c index 08e04b28a89..1ebc6b63782 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectFont) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c index 67e6d66d7eb..3f0a0c32282 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectPen) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c index 8b6fa267436..96477898192 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSetBitmapBits) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c index ff8e3e9dac9..dde7a5c18dd 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void ReadBits(HDC hDC, PDWORD OutBits) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c index 33b4dfd4427..6f0e520baa4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c @@ -5,7 +5,7 @@ * COPYRIGHT: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiTransformPoints) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c index 7fd68813611..fe43b81103c 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndRoutine_DeregisterShellHookWindow(HWND hWnd) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c index c16bebe1649..aed4af88190 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c index 1d98af434da..aa345d1d599 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndOptRoutine_SetProgmanWindow(void) /* 0x4a */ diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c index 93f321c5f74..0b35a6bb284 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndParamRoutine_SetWindowContextHelpId(HWND hWnd) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c index 9868434f018..55b37ea7cb3 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserCallHwndParamLock) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c index 1d269080bcd..da7905d1642 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_NoParamRoutine_CreateMenu(void) /* 0 */ diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c index 1fce205bdaf..5b3c405e606 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c index 5dccf655d6b..52281ee79b6 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserCountClipboardFormats) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c index 45d9ea6fe3e..4b680725206 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c @@ -4,7 +4,7 @@ * PURPOSE: Test for NtUserCreateWindowEx */ -#include <win32nt.h> +#include "../win32nt.h" static inline diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c index 317234320f6..c600c248cbd 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" ULONG gMonitorCount = 0; HDC ghdcMonitor = 0; diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c index 5a954489145..cd084fff16f 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c index 2356344e88d..9dae79fa969 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserFindExistingCursorIcon) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c index 8e5e4cab544..c65ab07b974 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2022 Thomas Faber (thomas.faber(a)reactos.org) */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetAsyncKeyState) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c index 65002ced27a..3023d35c1c1 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetClassInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c index a5a2129987c..d89685782da 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c @@ -5,7 +5,8 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" +#include "../resource.h" START_TEST(NtUserGetIconInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index 00e378dcddf..af8af7c44b4 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" #include <pseh/pseh2.h> typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c index 772d00b7355..d5e2712a023 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" #include <pseh/pseh2.h> #define MAX_COUNT 8 diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c index d9587462dc5..fb81c2370d6 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetTitleBarInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c index 9ff9e7d82f4..eadf710ac6d 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c @@ -6,7 +6,7 @@ * Copyright 2021 Hermes Belusca-Maito */ -#include <win32nt.h> +#include "../win32nt.h" #define NTOS_MODE_USER #include <ndk/exfuncs.h> diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c index fda02281348..5d84fa39336 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserRedrawWindow) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c index 4d9534563d0..a2daa8bbf80 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserScrollDC) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c index 8c00d39f3b7..687709982a1 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" FORCEINLINE PALETTEENTRY diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c index dd1067a5157..aad40f49698 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserSetTimer) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 491a67d0c92..9ecef4907b4 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" #include <winreg.h> diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c index 1263f19ac4c..2506783d885 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserToUnicodeEx) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c index 274be855dc4..7ff974de766 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/w32knapi.h b/modules/rostests/apitests/win32nt/w32knapi.h index 57f00a63fa7..a2bfab000c0 100644 --- a/modules/rostests/apitests/win32nt/w32knapi.h +++ b/modules/rostests/apitests/win32nt/w32knapi.h @@ -27,7 +27,6 @@ #include <ntgdihdl.h> #include "../apitest.h" -#include "resource.h" typedef struct { diff --git a/modules/rostests/apitests/win32nt/w32knapi.rc b/modules/rostests/apitests/win32nt/win32knt.rc similarity index 100% rename from modules/rostests/apitests/win32nt/w32knapi.rc rename to modules/rostests/apitests/win32nt/win32knt.rc

1 year, 1 month

[reactos] 02/02: [NTDLL_APITEST] Write some tests for NtSetDefaultLocale

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d8ce79080499741713c8… commit 1d8ce79080499741713c8d63b894331fd1bb09d9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 12 11:39:04 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Nov 16 21:09:08 2023 +0100 [NTDLL_APITEST] Write some tests for NtSetDefaultLocale --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/NtSetDefaultLocale.c | 43 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 46 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index acc24d45a3e..f48d4e53dec 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -47,6 +47,7 @@ list(APPEND SOURCE NtQueryVolumeInformationFile.c NtReadFile.c NtSaveKey.c + NtSetDefaultLocale.c NtSetInformationFile.c NtSetInformationProcess.c NtSetInformationThread.c diff --git a/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c b/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c new file mode 100644 index 00000000000..ad50dac80fa --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c @@ -0,0 +1,43 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtSetDefaultLocale API + * COPYRIGHT: Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +START_TEST(NtSetDefaultLocale) +{ + NTSTATUS Status; + + Status = NtSetDefaultLocale(TRUE, 0xffffffff); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0xfffffffe); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x7fffffff); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x7ffffffe); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x80000000); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x80000001); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x10000); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 1); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + Status = NtSetDefaultLocale(TRUE, 0x0C); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + Status = NtSetDefaultLocale(TRUE, 0x1000); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 641a756f261..6d22f349692 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -43,6 +43,7 @@ extern void func_NtQueryValueKey(void); extern void func_NtQueryVolumeInformationFile(void); extern void func_NtReadFile(void); extern void func_NtSaveKey(void); +extern void func_NtSetDefaultLocale(void); extern void func_NtSetInformationFile(void); extern void func_NtSetInformationProcess(void); extern void func_NtSetInformationThread(void); @@ -142,6 +143,7 @@ const struct test winetest_testlist[] = { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, { "NtReadFile", func_NtReadFile }, { "NtSaveKey", func_NtSaveKey}, + { "NtSetDefaultLocale", func_NtSetDefaultLocale }, { "NtSetInformationFile", func_NtSetInformationFile }, { "NtSetInformationProcess", func_NtSetInformationProcess }, { "NtSetInformationThread", func_NtSetInformationThread },

1 year, 1 month

[reactos] 01/02: [NTOS:EX] Bail out on an invalid locale or language ID

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6438b856055f80f456bed… commit 6438b856055f80f456bede220a19534196da4393 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 12 11:10:27 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Nov 16 21:09:05 2023 +0100 [NTOS:EX] Bail out on an invalid locale or language ID NtSetDefaultLocale and ExpSetCurrentUserUILanguage do not probe the given locale or language ID, and as a result of that these functions would happily take any given argument. This is problematic because overwriting NLS data (specifically the Default registry key value as its gets set by the NtSetDefaultLocale syscall itself) with garbage stuff, rendering the system completely unbootable. In addition to that, these functions do not check the captured language/locale ID against pre-determined locales or languages pre-installed in the system. This basically means an ID of 1, for example, is still valid because it is not bogus albeit there is no such a locale of an ID of 1. That value would get passed to the Default value key and that renders the system unbootable as well. CORE-18100 --- ntoskrnl/ex/locale.c | 337 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 290 insertions(+), 47 deletions(-) diff --git a/ntoskrnl/ex/locale.c b/ntoskrnl/ex/locale.c index b8abb886031..445a304991a 100644 --- a/ntoskrnl/ex/locale.c +++ b/ntoskrnl/ex/locale.c @@ -24,8 +24,231 @@ LANGID PsInstallUILanguageId = LANGIDFROMLCID(0x00000409); LCID PsDefaultThreadLocaleId = 0x00000409; LANGID PsDefaultUILanguageId = LANGIDFROMLCID(0x00000409); +/* DEFINES *******************************************************************/ + +#define BOGUS_LOCALE_ID 0xFFFF0000 + /* PRIVATE FUNCTIONS *********************************************************/ +/** + * @brief + * Validates the registry data of a NLS locale. + * + * @param[in] LocaleData + * A pointer to partial information that contains + * the NLS locale data. + * + * @return + * Returns TRUE if the following conditions are met, + * otherwise FALSE is returned. + */ +static +__inline +BOOLEAN +ExpValidateNlsLocaleData( + _In_ PKEY_VALUE_PARTIAL_INFORMATION LocaleData) +{ + PWCHAR Data; + + /* Is this a null-terminated string type? */ + if (LocaleData->Type != REG_SZ) + { + return FALSE; + } + + /* Does it have a consistent length? */ + if (LocaleData->DataLength < sizeof(WCHAR)) + { + return FALSE; + } + + /* Is the locale set and null-terminated? */ + Data = (PWSTR)LocaleData->Data; + if (Data[0] != L'1' || Data[1] != UNICODE_NULL) + { + return FALSE; + } + + /* All of the conditions above are met */ + return TRUE; +} + +/** + * @brief + * Validates a NLS locale. Whether a locale is valid + * or not depends on the following conditions: + * + * - The locale must exist in the Locale key, otherwise + * in the Alternate Sorts key; + * + * - The locale must exist in the Language Groups key, and + * the queried value must be readable; + * + * - The locale registry data must be of REG_SIZE type, + * has a consistent length and the locale belongs to + * a supported language group that is set. + * + * @param[in] LocaleId + * A locale identifier that corresponds to a specific + * locale to be validated. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * validated the locale and it is valid. STATUS_OBJECT_NAME_NOT_FOUND + * is returned if the following locale does not exist on the system. + * A failure NTSTATUS code is returned otherwise. + */ +static +NTSTATUS +ExpValidateNlsLocaleId( + _In_ LCID LocaleId) +{ + NTSTATUS Status; + HANDLE NlsLocaleKey = NULL, AltSortKey = NULL, LangGroupKey = NULL; + OBJECT_ATTRIBUTES NlsLocalKeyAttrs, AltSortKeyAttrs, LangGroupKeyAttrs; + PKEY_VALUE_PARTIAL_INFORMATION BufferKey; + WCHAR ValueBuffer[20], LocaleIdBuffer[20]; + ULONG ReturnedLength; + UNICODE_STRING LocaleIdString; + static UNICODE_STRING NlsLocaleKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"); + static UNICODE_STRING AltSortKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale\\Alternate Sorts"); + static UNICODE_STRING LangGroupPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language Groups"); + + /* Initialize the registry path attributes */ + InitializeObjectAttributes(&NlsLocalKeyAttrs, + &NlsLocaleKeyPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + InitializeObjectAttributes(&AltSortKeyAttrs, + &AltSortKeyPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + InitializeObjectAttributes(&LangGroupKeyAttrs, + &LangGroupPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Copy the locale ID into a buffer */ + swprintf(LocaleIdBuffer, + L"%08lx", + (ULONG)LocaleId); + + /* And build the LCID string */ + RtlInitUnicodeString(&LocaleIdString, LocaleIdBuffer); + + /* Open the NLS locale key */ + Status = ZwOpenKey(&NlsLocaleKey, + KEY_QUERY_VALUE, + &NlsLocalKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", NlsLocaleKeyPath, Status); + return Status; + } + + /* Open the NLS alternate sort locales key */ + Status = ZwOpenKey(&AltSortKey, + KEY_QUERY_VALUE, + &AltSortKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", AltSortKeyPath, Status); + goto Quit; + } + + /* Open the NLS language groups key */ + Status = ZwOpenKey(&LangGroupKey, + KEY_QUERY_VALUE, + &LangGroupKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", LangGroupPath, Status); + goto Quit; + } + + /* Check if the captured locale ID exists in the list of other locales */ + BufferKey = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + Status = ZwQueryValueKey(NlsLocaleKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + /* We failed, retry by looking at the alternate sorts locales */ + Status = ZwQueryValueKey(AltSortKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query value from Alternate Sorts key (Status 0x%lx)\n", Status); + goto Quit; + } + } + + /* Ensure the queried locale is of the right key type with a sane length */ + if (BufferKey->Type != REG_SZ || + BufferKey->DataLength < sizeof(WCHAR)) + { + DPRINT1("The queried locale is of bad value type or length (Type %lu, DataLength %lu)\n", + BufferKey->Type, BufferKey->DataLength); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quit; + } + + /* We got what we need, now query the locale from the language groups */ + RtlInitUnicodeString(&LocaleIdString, (PWSTR)BufferKey->Data); + Status = ZwQueryValueKey(LangGroupKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query value from Language Groups key (Status 0x%lx)\n", Status); + goto Quit; + } + + /* + * We have queried the locale with its data. However we are not finished here yet, + * because the locale data could be malformed or the locale itself was not set + * so ensure all of these conditions are met. + */ + if (!ExpValidateNlsLocaleData(BufferKey)) + { + DPRINT1("The locale data is not valid!\n"); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + +Quit: + if (LangGroupKey != NULL) + { + ZwClose(LangGroupKey); + } + + if (AltSortKey != NULL) + { + ZwClose(AltSortKey); + } + + if (NlsLocaleKey != NULL) + { + ZwClose(NlsLocaleKey); + } + + return Status; +} + NTSTATUS NTAPI ExpGetCurrentUserUILanguage(IN PCWSTR MuiName, @@ -114,6 +337,12 @@ ExpSetCurrentUserUILanguage(IN PCWSTR MuiName, NTSTATUS Status; PAGED_CODE(); + /* Check that the passed language ID is not bogus */ + if (LanguageId & BOGUS_LOCALE_ID) + { + return STATUS_INVALID_PARAMETER; + } + /* Setup the key name */ RtlInitUnicodeString(&ValueName, MuiName); @@ -128,26 +357,31 @@ ExpSetCurrentUserUILanguage(IN PCWSTR MuiName, UserHandle, NULL); - /* Open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + /* Validate the language ID */ + Status = ExpValidateNlsLocaleId(MAKELCID(LanguageId, SORT_DEFAULT)); if (NT_SUCCESS(Status)) { - /* Setup the value name */ - ValueLength = swprintf(ValueBuffer, - L"%04lX", - (ULONG)LanguageId); - - /* Set the length for the call and set the value */ - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - /* Close the handle for this key */ - ZwClose(KeyHandle); + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Setup the value name */ + ValueLength = swprintf(ValueBuffer, + L"%04lX", + (ULONG)LanguageId); + + /* Set the length for the call and set the value */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + + /* Close the handle for this key */ + ZwClose(KeyHandle); + } } /* Close the user key and return status */ @@ -207,15 +441,21 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, UNICODE_STRING KeyName; UNICODE_STRING ValueName; UNICODE_STRING LocaleString; - HANDLE KeyHandle; + HANDLE KeyHandle = NULL; ULONG ValueLength; WCHAR ValueBuffer[20]; - HANDLE UserKey; + HANDLE UserKey = NULL; NTSTATUS Status; UCHAR KeyValueBuffer[256]; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; PAGED_CODE(); + /* Check that the passed locale ID is not bogus */ + if (DefaultLocaleId & BOGUS_LOCALE_ID) + { + return STATUS_INVALID_PARAMETER; + } + /* Check if we have a profile */ if (UserProfile) { @@ -234,7 +474,6 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\Nls\\Language"); RtlInitUnicodeString(&ValueName, L"Default"); - UserKey = NULL; } /* Initialize the object attributes */ @@ -251,7 +490,6 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - KeyHandle = NULL; goto Cleanup; } @@ -293,36 +531,41 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, } else { - /* Otherwise, open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + /* We have a locale, validate it */ + Status = ExpValidateNlsLocaleId(DefaultLocaleId); if (NT_SUCCESS(Status)) { - /* Check if we had a profile */ - if (UserProfile) - { - /* Fill in the buffer */ - ValueLength = swprintf(ValueBuffer, - L"%08lx", - (ULONG)DefaultLocaleId); - } - else + /* Open the key now */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) { - /* Fill in the buffer */ - ValueLength = swprintf(ValueBuffer, - L"%04lx", - (ULONG)DefaultLocaleId & 0xFFFF); - } + /* Check if we had a profile */ + if (UserProfile) + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%08lx", + (ULONG)DefaultLocaleId); + } + else + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%04lx", + (ULONG)DefaultLocaleId & 0xFFFF); + } - /* Set the length for the registry call */ - ValueLength = (ValueLength + 1) * sizeof(WCHAR); + /* Set the length for the registry call */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); - /* Now write the actual value */ - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); + /* Now write the actual value */ + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + } } }

1 year, 1 month

[reactos] 02/02: [CMD] Fix missing/misplaced newlines at end of displayed errors and prompts.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db219e45c0d7c720585d4… commit db219e45c0d7c720585d44355f8b23a7f5e11f31 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 15 22:00:59 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 17:06:40 2023 +0100 [CMD] Fix missing/misplaced newlines at end of displayed errors and prompts. ConInString() should display a newline when it encounters the terminating carriage-return pressed by the user for ending string output. + Remove the extra \n hacks in FilePromptYN[A]. Improve outputted strings from DATE and TIME commands. + Rename some STRING_***_ERROR defines. CORE-18489 --- base/shell/cmd/console.c | 3 ++- base/shell/cmd/console.h | 1 - base/shell/cmd/date.c | 7 ++++--- base/shell/cmd/lang/cs-CZ.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/de-DE.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/el-GR.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/en-US.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/es-ES.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/fr-FR.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/hu-HU.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/id-ID.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/it-IT.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/ja-JP.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/no-NO.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/pl-PL.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/pt-BR.rc | 42 +++++++++++++++++++++--------------------- base/shell/cmd/lang/pt-PT.rc | 42 +++++++++++++++++++++--------------------- base/shell/cmd/lang/ro-RO.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/ru-RU.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/sk-SK.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/sq-AL.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/sv-SE.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/tr-TR.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/uk-UA.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/zh-CN.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/zh-TW.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/misc.c | 4 +--- base/shell/cmd/ren.c | 2 +- base/shell/cmd/resource.h | 10 +++++----- base/shell/cmd/start.c | 2 +- base/shell/cmd/time.c | 8 ++++---- base/shell/cmd/type.c | 2 +- base/shell/cmd/window.c | 2 +- 33 files changed, 450 insertions(+), 451 deletions(-) diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c index a3d6b6c984d..ba718fbc076 100644 --- a/base/shell/cmd/console.c +++ b/base/shell/cmd/console.c @@ -106,9 +106,10 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) #endif for (p = lpInput; *p; p++) { - if (*p == _T('\x0d')) + if (*p == _T('\r')) // Terminate at the next carriage-return. { *p = _T('\0'); + ConOutChar(_T('\n')); // Output newline as well. break; } } diff --git a/base/shell/cmd/console.h b/base/shell/cmd/console.h index 9ea070dfe6c..4bca3e3a126 100644 --- a/base/shell/cmd/console.h +++ b/base/shell/cmd/console.h @@ -14,7 +14,6 @@ extern CON_PAGER StdOutPager; // extern BOOL bIgnoreEcho; // extern BOOL bExit; -VOID ConInDummy (VOID); VOID ConInDisable (VOID); VOID ConInEnable (VOID); VOID ConInFlush (VOID); diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index 5f509b28f5b..c562638fc87 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -44,7 +44,7 @@ static WORD awMonths[2][13] = static VOID -PrintDateString (VOID) +PromptDateString(VOID) { switch (nDateFormat) { @@ -203,8 +203,9 @@ INT cmd_date(LPTSTR param) nDateString = i; } + // TODO: Should prepend a "Current date is: " prompt, as done with TIME. if (nDateString == -1) - ConOutPrintf(_T("%s"), GetDateString()); + ConOutPrintf(_T("%s\n"), GetDateString()); if (!bPrompt) { @@ -216,7 +217,7 @@ INT cmd_date(LPTSTR param) { if (nDateString == -1) { - PrintDateString(); + PromptDateString(); ConInString(szDate, ARRAYSIZE(szDate)); TRACE("\'%s\'\n", debugstr_aw(szDate)); diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 2005df0a6c5..301cb262409 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nEnter new date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEnter new date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEnter new date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Enter new date (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Enter new date (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Enter new date (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Displays or sets the date.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -249,7 +249,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -403,7 +403,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Enter new time: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -481,23 +481,23 @@ title new title\n" STRING_CMD_ERROR3 "Nelze přesměrovat do souboru %s\n" STRING_CMD_ERROR4 "Spouští se %s...\n" STRING_CMD_ERROR5 "Spouští se cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Chyba stejných barev! (Pozadí a popředí nemohou mít stejnou barvu)" - STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy" + STRING_COLOR_ERROR1 "Chyba stejných barev! (Pozadí a popředí nemohou mít stejnou barvu)\n" + STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy\n" STRING_CONSOLE_ERROR "Neznámá chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Nelze otevřít zdroj - %s!\n" STRING_COPY_ERROR2 "Chyba: Zdroj a cíl jsou shodné!\n" STRING_COPY_ERROR3 "Chyba při zápisu do cíle!\n" STRING_COPY_ERROR4 "Chyba: Není naimplementováno!\n" - STRING_DATE_ERROR "Neplatné datum." + STRING_DATE_ERROR "Neplatné datum.\n" STRING_DEL_ERROR5 "Soubor %s bude vymazán! " STRING_DEL_ERROR6 "Určitě provést (A/N)? " STRING_DEL_ERROR7 "Mazání: %s\n" STRING_ERROR_ERROR1 "Neznámá chyba! Kód: 0x%lx\n" STRING_ERROR_ERROR2 "Chyba syntaxe" - STRING_FOR_ERROR1 "'in' chybí v příkazu 'for'." - STRING_FOR_ERROR2 "nebyly nalezeny závorky." - STRING_FOR_ERROR3 "chybí 'do'." - STRING_FOR_ERROR4 "žádný příkaz po 'do'." + STRING_FOR_ERROR1 "'in' chybí v příkazu 'for'.\n" + STRING_FOR_ERROR2 "nebyly nalezeny závorky.\n" + STRING_FOR_ERROR3 "chybí 'do'.\n" + STRING_FOR_ERROR4 "žádný příkaz po 'do'.\n" STRING_FREE_ERROR1 "Neplatná jednotka" STRING_FREE_ERROR2 "bez popisku" STRING_GOTO_ERROR1 "Pro GOTO nebyl zadán popisek\n" @@ -506,10 +506,10 @@ title new title\n" STRING_MD_ERROR2 "Cesta do nového adresáře neexistuje.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" - STRING_REN_ERROR1 "MoveFile() selhalo. Chyba: %lu\n" - STRING_TIME_ERROR1 "Neplatný čas." - STRING_TYPE_ERROR1 "Neplatný parametr '/%s'\n" - STRING_WINDOW_ERROR1 "Okno nenalezeno" + STRING_REN_ERROR "MoveFile() selhalo. Chyba: %lu\n" + STRING_TIME_ERROR "Neplatný čas.\n" + STRING_TYPE_ERROR "Neplatný parametr '/%s'\n" + STRING_WINDOW_ERROR "Okno nenalezeno\n" STRING_ERROR_PARAMETERF_ERROR "Formát parametru je nesprávný - %c\n" STRING_ERROR_INVALID_SWITCH "Neplatný přepínač - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Příliš mnoho parametrů - %s\n" @@ -538,9 +538,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Verze %d.%d.%d] %s" STRING_COPY_FILE " %d souborů(s) zkopírováno\n" STRING_DELETE_WIPE "vymazáno" - STRING_FOR_ERROR "neplatná specifikace proměnné." - STRING_SCREEN_COL "neplatná hodnota pro col" - STRING_SCREEN_ROW "neplatná hodnota pro row" + STRING_FOR_ERROR "neplatná specifikace proměnné.\n" + STRING_SCREEN_COL "neplatná hodnota pro col\n" + STRING_SCREEN_ROW "neplatná hodnota pro row\n" STRING_TIMER_TIME "Časovač %d je %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolický odkaz vytvořen pro %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link vytvořen pro %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index ea323f28c7a..b6a1b9c0d9a 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -105,9 +105,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nGeben Sie das neue Datum ein (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nGeben Sie das neue Datum ein (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Geben Sie das neue Datum ein (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Geben Sie das neue Datum ein (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Geben Sie das neue Datum ein (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Ändert das eingestellte Datum oder zeigt es an.\n\n\ DATE [/T][Datum]\n\n\ /T nur Datum anzeigen\n\n\ @@ -243,7 +243,7 @@ Variable1==Variable2\n\ EXIST Dateiname Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\ DEFINED Variable Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\ wurde." - STRING_LOCALE_HELP1 "Aktuelle Zeit: " + STRING_TIME_NOW "Aktuelle Zeit: " STRING_MKDIR_HELP "Erzeugt ein Verzeichnis.\n\n\ MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad" STRING_MKLINK_HELP "Erzeugt eine Dateisystemverknüpfung.\n\n\ @@ -477,23 +477,23 @@ Titel neuer Titel" STRING_CMD_ERROR3 "%s kann nicht in die Datei umgeleitet werden\n" STRING_CMD_ERROR4 "Ausführend %s...\n" STRING_CMD_ERROR5 "Ausführend cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!" - STRING_COLOR_ERROR2 "Fehler in der Farbangabe" + STRING_COLOR_ERROR1 "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!\n" + STRING_COLOR_ERROR2 "Fehler in der Farbangabe\n" STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1 "Fehler: Quelle kann nicht geöffnet werden - %s!\n" STRING_COPY_ERROR2 "Fehler: Kann nicht über sich selbst kopiert werden.\n" STRING_COPY_ERROR3 "Fehler: Schreibziel!\n" STRING_COPY_ERROR4 "Fehler: Noch nicht implementiert!\n" - STRING_DATE_ERROR "Ungültiges Datum." + STRING_DATE_ERROR "Ungültiges Datum.\n" STRING_DEL_ERROR5 "Die Datei %s wird gelöscht! " STRING_DEL_ERROR6 "Sind Sie sicher (J/N)? " STRING_DEL_ERROR7 "Löschen: %s\n" STRING_ERROR_ERROR1 "Unbekannter Fehler! Fehlernummer: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax-Fehler" - STRING_FOR_ERROR1 "'in' fehlt für ein Statement." - STRING_FOR_ERROR2 "Klammern nicht gefunden." - STRING_FOR_ERROR3 "'do' fehlt." - STRING_FOR_ERROR4 "kein Befehl nach 'do'." + STRING_FOR_ERROR1 "'in' fehlt für ein Statement.\n" + STRING_FOR_ERROR2 "Klammern nicht gefunden.\n" + STRING_FOR_ERROR3 "'do' fehlt.\n" + STRING_FOR_ERROR4 "kein Befehl nach 'do'.\n" STRING_FREE_ERROR1 "Ungültiges Laufwerk" STRING_FREE_ERROR2 "keine Bezeichnung" STRING_GOTO_ERROR1 "Keine Sprungmarke für GOTO gesetzt\n" @@ -502,10 +502,10 @@ Titel neuer Titel" STRING_MD_ERROR2 "Der Pfad zum neuen Ordner existiert nicht.\n"//FIXME STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[FEHLER]\n" - STRING_REN_ERROR1 "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" - STRING_TIME_ERROR1 "Ungültige Zeit." - STRING_TYPE_ERROR1 "Ungültige Option '/%s'\n" - STRING_WINDOW_ERROR1 "Fenster nicht gefunden" + STRING_REN_ERROR "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" + STRING_TIME_ERROR "Ungültige Zeit.\n" + STRING_TYPE_ERROR "Ungültige Option '/%s'\n" + STRING_WINDOW_ERROR "Fenster nicht gefunden\n" STRING_ERROR_PARAMETERF_ERROR "Parameterformat ist nicht korrekt - %c\n" STRING_ERROR_INVALID_SWITCH "Ungültiger Parameter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Zu viele Parameter - %s\n" @@ -534,9 +534,9 @@ Titel neuer Titel" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d Datei(en) kopiert\n" STRING_DELETE_WIPE "sicher gelöscht" - STRING_FOR_ERROR "ungültige Variablenangabe." - STRING_SCREEN_COL "ungültige Spalten-Angabe" - STRING_SCREEN_ROW "ungültige Zeilen-Angabe" + STRING_FOR_ERROR "ungültige Variablenangabe.\n" + STRING_SCREEN_COL "ungültige Spalten-Angabe\n" + STRING_SCREEN_ROW "ungültige Zeilen-Angabe\n" STRING_TIMER_TIME "Timer %d ist %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolische Verknüpfung erstellt für %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hardlink erstellt für %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index a5fbf33c3fc..f5711d1452c 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nΕισάγετε νέα ημερομηνία (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nΕισάγετε νέα ημερομηνία (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nΕισάγετε νέα ημερομηνία (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Εισάγετε νέα ημερομηνία (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Εισάγετε νέα ημερομηνία (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Εισάγετε νέα ημερομηνία (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Εμφάνιση ή αλλαγή της ημερομηνίας.\n\n\ DATE [/T][ημερομηνία]\n\n\ /T εμφάνιση μόνο\n\n\ @@ -248,7 +248,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -402,7 +402,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Εισάγετε νέα ώρα: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -480,23 +480,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Εκτελείται το %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Άγνωστο σφάλμα: %d\n" STRING_COPY_ERROR1 "Σφάλμα: Δεν ήταν δυνατό το άνοιγμα της πηγής - %s!\n" STRING_COPY_ERROR2 "Σφάλμα: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Σφάλμα: writing destination!\n" STRING_COPY_ERROR4 "Σφάλμα: Not implemented yet!\n" - STRING_DATE_ERROR "Μη έγκυρη ημερομηνία." + STRING_DATE_ERROR "Μη έγκυρη ημερομηνία.\n" STRING_DEL_ERROR5 "Το αρχείο %s πρόκειται να διαγραφεί! " STRING_DEL_ERROR6 "Είστε σίγουροι (Y/N)? " STRING_DEL_ERROR7 "Γίνεται διαγραφή: %s\n" STRING_ERROR_ERROR1 "Άγνωστο σφάλμα! Κωδικός λάθους: 0x%lx\n" STRING_ERROR_ERROR2 "Σφάλμα σύνταξης" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' λείπει." - STRING_FOR_ERROR4 "καμία εντολή μετά το 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' λείπει.\n" + STRING_FOR_ERROR4 "καμία εντολή μετά το 'do'.\n" STRING_FREE_ERROR1 "Μη έγκυρος δίσκος" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -505,10 +505,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Σφάλμα]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Μη έγκυρη ώρα." - STRING_TYPE_ERROR1 "Μη έγκυρη επιλογή '/%s'\n" - STRING_WINDOW_ERROR1 "Το παράθυρο δε βρέθηκε" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Μη έγκυρη ώρα.\n" + STRING_TYPE_ERROR "Μη έγκυρη επιλογή '/%s'\n" + STRING_WINDOW_ERROR "Το παράθυρο δε βρέθηκε\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Πολλές παράμετροι - %s\n" @@ -537,9 +537,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "invalid value for col" - STRING_SCREEN_ROW "invalid value for row" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "invalid value for col\n" + STRING_SCREEN_ROW "invalid value for row\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index e530cda2db9..c48c8c6cdd0 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nEnter new date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEnter new date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEnter new date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Enter new date (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Enter new date (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Enter new date (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Displays or sets the date.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -244,7 +244,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -398,7 +398,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Enter new time: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -476,23 +476,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Unknown error: %d\n" STRING_COPY_ERROR1 "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Error: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Error writing destination!\n" STRING_COPY_ERROR4 "Error: Not implemented yet!\n" - STRING_DATE_ERROR "Invalid date." + STRING_DATE_ERROR "Invalid date.\n" STRING_DEL_ERROR5 "The file %s will be deleted! " STRING_DEL_ERROR6 "Are you sure (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' missing." - STRING_FOR_ERROR4 "no command after 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' missing.\n" + STRING_FOR_ERROR4 "no command after 'do'.\n" STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -501,10 +501,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Invalid time." - STRING_TYPE_ERROR1 "Invalid option '/%s'\n" - STRING_WINDOW_ERROR1 "Window not found" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Invalid time.\n" + STRING_TYPE_ERROR "Invalid option '/%s'\n" + STRING_WINDOW_ERROR "Window not found\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Too many parameters - %s\n" @@ -533,9 +533,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "invalid value for col" - STRING_SCREEN_ROW "invalid value for row" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "invalid value for col\n" + STRING_SCREEN_ROW "invalid value for row\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 8d10735703d..690cbdf270b 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -101,9 +101,9 @@ CTTY device\n\n\ CON normalmente es el dispositivo estándar de E/S predeterminado.\n\n\ Para devolver el control a la consola estándar, escriba: CTTY CON en el\n\ dispositivo auxiliar." - STRING_DATE_HELP1 "\nIntroduce la nueva fecha (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nIntroduce la nueva fecha (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nIntroduce la nueva fecha (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Introduce la nueva fecha (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Introduce la nueva fecha (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Introduce la nueva fecha (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Muestra o cambia la fecha.\n\n\ DATE [/T][date]\n\n\ /T Sólo la muestra\n\n\ @@ -247,7 +247,7 @@ comando Especifica el comando a ejecutar si se cumple la condición.\n string1==string2 Especifica una condición verdadera si las cadenas de texto coinciden.\n\ EXIST archivo Especifica una condición verdadera si existe el archivo especificado.\n\ DEFINED variable Especifica una condición verdadera si la variable está definida.\n" - STRING_LOCALE_HELP1 "La hora actual es" + STRING_TIME_NOW "La hora actual es: " STRING_MKDIR_HELP "Crea un directorio.\n\n\ MKDIR [unidad:]ruta\nMD [unidad:]ruta" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -484,23 +484,23 @@ title Nuevo título\n" STRING_CMD_ERROR3 "No se puede redirigir el archivo %s\n" STRING_CMD_ERROR4 "Ejecutando %s...\n" STRING_CMD_ERROR5 "Ejecutando cmdexit.bat...\n" - STRING_COLOR_ERROR1 "¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" - STRING_COLOR_ERROR2 "Error en la especificación del color" + STRING_COLOR_ERROR1 "¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)\n" + STRING_COLOR_ERROR2 "Error en la especificación del color\n" STRING_CONSOLE_ERROR "Error desconocido: %d\n" STRING_COPY_ERROR1 "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2 "Error: ¡No se puede copiar sobre si mismo!\n" STRING_COPY_ERROR3 "¡Error escribiendo destino!\n" STRING_COPY_ERROR4 "Error: ¡No implementado aún!\n" - STRING_DATE_ERROR "Fecha incorrecta." + STRING_DATE_ERROR "Fecha incorrecta.\n" STRING_DEL_ERROR5 "¡El archivo %s va a ser borrado!" STRING_DEL_ERROR6 "¿Estás seguro (S/N)? " STRING_DEL_ERROR7 "Borrando: %s\n" STRING_ERROR_ERROR1 "¡Error desconocido! Códige de error: 0x%lx\n" STRING_ERROR_ERROR2 "Error de sintaxsis" - STRING_FOR_ERROR1 "Falta 'in' para la declaración." - STRING_FOR_ERROR2 "No se encontraron las parénteris." - STRING_FOR_ERROR3 "Falta 'do'." - STRING_FOR_ERROR4 "No hay comando después de 'do'." + STRING_FOR_ERROR1 "Falta 'in' para la declaración.\n" + STRING_FOR_ERROR2 "No se encontraron las parénteris.\n" + STRING_FOR_ERROR3 "Falta 'do'.\n" + STRING_FOR_ERROR4 "No hay comando después de 'do'.\n" STRING_FREE_ERROR1 "Unidad errónea." STRING_FREE_ERROR2 "Sin etiqueta" STRING_GOTO_ERROR1 "No se especifico etiqueta para GOTO\n" @@ -509,10 +509,10 @@ title Nuevo título\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[Correcto]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() falló. Error: %lu\n" - STRING_TIME_ERROR1 "Hora incorrecta." - STRING_TYPE_ERROR1 "Opción incorrecta '/%s'\n" - STRING_WINDOW_ERROR1 "Ventana no encontrada" + STRING_REN_ERROR "MoveFile() falló. Error: %lu\n" + STRING_TIME_ERROR "Hora incorrecta.\n" + STRING_TYPE_ERROR "Opción incorrecta '/%s'\n" + STRING_WINDOW_ERROR "Ventana no encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato del parámetro incorrecto - %c\n" STRING_ERROR_INVALID_SWITCH "Parámetro incorrecto - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Demasiados parámetros - %s\n" @@ -541,9 +541,9 @@ title Nuevo título\n" STRING_VERSION_RUNVER "%s [Versión %d.%d.%d] %s" STRING_COPY_FILE " %d archivo(s) copiado(s)\n" STRING_DELETE_WIPE "Borrado" - STRING_FOR_ERROR "Se ha especificado una variable errónea." - STRING_SCREEN_COL "Valor de columna no válido" - STRING_SCREEN_ROW "Valor de fila no válido" + STRING_FOR_ERROR "Se ha especificado una variable errónea.\n" + STRING_SCREEN_COL "Valor de columna no válido\n" + STRING_SCREEN_ROW "Valor de fila no válido\n" STRING_TIMER_TIME "El temporizador %d es %s: " STRING_MKLINK_CREATED_SYMBOLIC "Enlace simbólico creado para %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Enlace duro creado para %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index a87e276a888..7968f9ba700 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -105,9 +105,9 @@ CTTY périph\n\n\ CON est habituellement le périphérique d'I/O standard par défaut.\n\n\ Pour restaurer le contrôle vers la console standard, entrez: CTTY CON sur\n\ le périphérique auxiliaire." - STRING_DATE_HELP1 "\nEntrer la nouvelle date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEntrer la nouvelle date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEntrer la nouvelle date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Entrer la nouvelle date (mm%cdd%cyyyy) : " + STRING_DATE_HELP2 "Entrer la nouvelle date (dd%cmm%cyyyy) : " + STRING_DATE_HELP3 "Entrer la nouvelle date (yyyy%cmm%cdd) : " STRING_DATE_HELP4 "Affiche ou règle la date.\n\n\ DATE [/T][date]\n\n\ /T affiche seulement\n\n\ @@ -258,7 +258,7 @@ commande Indique la commande à lancer si la condition est vérifiée.\ chaine1==chaine2 La condition sera vraie si les deux chaines sont identiques.\n\ EXIST nomfichier La condition sera vraie si le fichier spécifié existe.\n\ DEFINED variable La condition sera vraie si la variable indiquée est définie." - STRING_LOCALE_HELP1 "L'heure actuelle est " + STRING_TIME_NOW "L'heure actuelle est : " STRING_MKDIR_HELP "Crée un répertoire.\n\n\ MKDIR [lecteur:]chemin\nMD [lecteur:]chemin" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -492,23 +492,23 @@ titre titre de la fenêtre" STRING_CMD_ERROR3 "Ne peut rediriger vers le fichier %s\n" STRING_CMD_ERROR4 "Lance %s...\n" STRING_CMD_ERROR5 "Lance cmdexit.bat...\n" - STRING_COLOR_ERROR1 "L'arrière plan et l'avant plan ne peuvent être de la même couleur" - STRING_COLOR_ERROR2 "Erreur dans la spécification des couleurs" + STRING_COLOR_ERROR1 "L'arrière plan et l'avant plan ne peuvent être de la même couleur\n" + STRING_COLOR_ERROR2 "Erreur dans la spécification des couleurs\n" STRING_CONSOLE_ERROR "Erreur inconnue : %d\n" STRING_COPY_ERROR1 "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2 "Erreur : Ne peut copier le fichier sur lui-même !\n" STRING_COPY_ERROR3 "Erreur à l'écriture de la destination !\n" STRING_COPY_ERROR4 "Erreur : Non implémenté actuellement !\n" - STRING_DATE_ERROR "Date invalide." + STRING_DATE_ERROR "Date invalide.\n" STRING_DEL_ERROR5 "Le fichier %s va être effacé ! " STRING_DEL_ERROR6 "Etes vous sûr (O/N) ? " STRING_DEL_ERROR7 "Efface : %s\n" STRING_ERROR_ERROR1 "Erreur inconnue! Code d'erreur : 0x%lx\n" STRING_ERROR_ERROR2 "Erreur de syntaxe" - STRING_FOR_ERROR1 "'in' manquant." - STRING_FOR_ERROR2 "pas de parenthèse trouvée." - STRING_FOR_ERROR3 "'do' manquant." - STRING_FOR_ERROR4 "pas de commande après 'do'." + STRING_FOR_ERROR1 "'in' manquant.\n" + STRING_FOR_ERROR2 "pas de parenthèse trouvée.\n" + STRING_FOR_ERROR3 "'do' manquant.\n" + STRING_FOR_ERROR4 "pas de commande après 'do'.\n" STRING_FREE_ERROR1 "Lecteur invalide" STRING_FREE_ERROR2 "sans nom" STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO\n" @@ -517,10 +517,10 @@ titre titre de la fenêtre" STRING_MD_ERROR2 "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erreur]\n" - STRING_REN_ERROR1 "MoveFile() a échoué. Erreur : %lu\n" - STRING_TIME_ERROR1 "Heure invalide." - STRING_TYPE_ERROR1 "Option invalide '/%s'\n" - STRING_WINDOW_ERROR1 "Fenêtre introuvable" + STRING_REN_ERROR "MoveFile() a échoué. Erreur : %lu\n" + STRING_TIME_ERROR "Heure invalide.\n" + STRING_TYPE_ERROR "Option invalide '/%s'\n" + STRING_WINDOW_ERROR "Fenêtre introuvable\n" STRING_ERROR_PARAMETERF_ERROR "Format du paramètre incorrect - %c\n" STRING_ERROR_INVALID_SWITCH "Paramètre invalide - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Trop de paramètres - %s\n" @@ -549,9 +549,9 @@ titre titre de la fenêtre" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d fichier(s) copié(s)\n" STRING_DELETE_WIPE "effacé(s)" - STRING_FOR_ERROR "mauvaise variable spécifiée." - STRING_SCREEN_COL "valeur invalide pour col" - STRING_SCREEN_ROW "valeur invalide pour lig" + STRING_FOR_ERROR "mauvaise variable spécifiée.\n" + STRING_SCREEN_COL "valeur invalide pour col\n" + STRING_SCREEN_ROW "valeur invalide pour lig\n" STRING_TIMER_TIME "Le timer n°%d est %s : " STRING_MKLINK_CREATED_SYMBOLIC "Lien symbolique créé pour %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Lien réel créé pour %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 9e62549b518..2994170e092 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -97,9 +97,9 @@ CTTY device\n\n\ AUX, COMx (x=1..N), CON, LPTx (x=1..N), PRN, NUL.\n\ A CON általában az alapértelmezett standard I/O eszköz.\n\n\ A vezérlés visszavételéhez gépelje be a távoli terminálon ezt: CTTY CON" - STRING_DATE_HELP1 "\nÚj dátum (hh%cnn%céééé): " - STRING_DATE_HELP2 "\nÚj dátum (nn%chh%céééé): " - STRING_DATE_HELP3 "\nÚj dátum (éééé%chh%cnn): " + STRING_DATE_HELP1 "Új dátum (hh%cnn%céééé): " + STRING_DATE_HELP2 "Új dátum (nn%chh%céééé): " + STRING_DATE_HELP3 "Új dátum (éééé%chh%cnn): " STRING_DATE_HELP4 "Megjeleníti vagy beállítja a rendszerdátumot.\n\n\ DATE [/T][dátum]\n\n\ /T Csak megjeleníti\n\n\ @@ -239,7 +239,7 @@ parancs Ezt a parancsot hajtsa végre, ha igaz a feltétel.\n\ string1==string2 Igaz a feltétel, ha a megadott sztringek egyenlőek.\n\ EXIST fájlnév Igaz a feltétel, ha a megadott fájl létezik.\n\ DEFINED változó Igaz a feltétel, ha a megadott változó definiálva van.\n" - STRING_LOCALE_HELP1 "Az aktuális idő" + STRING_TIME_NOW "Az aktuális idő: " STRING_MKDIR_HELP "Létrehoz egy új mappát.\n\n\ MKDIR [meghajtó:]útvonal\nMD [meghajtó:]útvonal" STRING_MKLINK_HELP "Létrehoz egy fájlrendszer-hivatkozást.\n\n\ @@ -468,23 +468,23 @@ title új cím\n" STRING_CMD_ERROR3 "Nem lehet a(z) %s állományba átirányítani\n" STRING_CMD_ERROR4 "%s futtatása...\n" STRING_CMD_ERROR5 "cmdexit.bat futtatása...\n" - STRING_COLOR_ERROR1 "Ugyanaz a szín nem lehet! (Az elő- és háttérszín nem lehet ugyanolyan)" - STRING_COLOR_ERROR2 "Hibás szín megadás" + STRING_COLOR_ERROR1 "Ugyanaz a szín nem lehet! (Az elő- és háttérszín nem lehet ugyanolyan)\n" + STRING_COLOR_ERROR2 "Hibás szín megadás\n" STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1 "Hiba: a forrás nem nyitható meg - %s!\n" STRING_COPY_ERROR2 "Hiba: nem másolhatja önmagára az állományt!\n" STRING_COPY_ERROR3 "Hiba a cél írása közben!\n" STRING_COPY_ERROR4 "Hiba: ez még nem működik!\n" - STRING_DATE_ERROR "Érvénytelen dátum." + STRING_DATE_ERROR "Érvénytelen dátum.\n" STRING_DEL_ERROR5 "A(z) %s állomány törölve lesz! " STRING_DEL_ERROR6 "Biztos benne (I/N)? " STRING_DEL_ERROR7 "Törlés: %s\n" STRING_ERROR_ERROR1 "Ismeretlen hiba! Hiba kód: 0x%lx\n" STRING_ERROR_ERROR2 "Szintaxis hiba" - STRING_FOR_ERROR1 "az 'in' hiányzik a FOR parancsból." - STRING_FOR_ERROR2 "nincs zárójel megadva." - STRING_FOR_ERROR3 "a 'do' hiányzik." - STRING_FOR_ERROR4 "nincs parancs a 'do' után." + STRING_FOR_ERROR1 "az 'in' hiányzik a FOR parancsból.\n" + STRING_FOR_ERROR2 "nincs zárójel megadva.\n" + STRING_FOR_ERROR3 "a 'do' hiányzik.\n" + STRING_FOR_ERROR4 "nincs parancs a 'do' után.\n" STRING_FREE_ERROR1 "Érvénytelen meghajtó" STRING_FREE_ERROR2 "nincs címkézve" STRING_GOTO_ERROR1 "Nem lett címke megadva a GOTO után\n" @@ -493,10 +493,10 @@ title új cím\n" STRING_MD_ERROR2 "Az útvonal az új mappához nem létezik.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[HIBA]\n" - STRING_REN_ERROR1 "MoveFile() sikertelen. Hiba: %lu\n" - STRING_TIME_ERROR1 "Érvénytelen idő." - STRING_TYPE_ERROR1 "Érvénytelen opció '/%s'\n" - STRING_WINDOW_ERROR1 "Az ablak nem található" + STRING_REN_ERROR "MoveFile() sikertelen. Hiba: %lu\n" + STRING_TIME_ERROR "Érvénytelen idő.\n" + STRING_TYPE_ERROR "Érvénytelen opció '/%s'\n" + STRING_WINDOW_ERROR "Az ablak nem található\n" STRING_ERROR_PARAMETERF_ERROR "A paraméter megadás hibás - %c\n" STRING_ERROR_INVALID_SWITCH "Érvénytelen kapcsoló - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Túl sok paraméter - %s\n" @@ -525,9 +525,9 @@ title új cím\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d állomány másolva\n" STRING_DELETE_WIPE "biztonságosan törölve" - STRING_FOR_ERROR "Hibás változó megadás." - STRING_SCREEN_COL "Érvénytelen érték oszlopnak" - STRING_SCREEN_ROW "Érvénytelen érték sornak" + STRING_FOR_ERROR "Hibás változó megadás.\n" + STRING_SCREEN_COL "Érvénytelen érték oszlopnak\n" + STRING_SCREEN_ROW "Érvénytelen érték sornak\n" STRING_TIMER_TIME "Stopper %d állapota %s: " STRING_MKLINK_CREATED_SYMBOLIC "Szimbolikus link létrehozva ehhez: %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link létrehozva ehhez: %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 2d129e3fadd..6f40cb787ab 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -100,9 +100,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nMasukkan tanggal baru (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nMasukkan tanggal baru (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nMasukkan tanggal baru (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Masukkan tanggal baru (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Masukkan tanggal baru (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Masukkan tanggal baru (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Menampilkan atau menyetel tanggal.\n\n\ DATE [/T][date]\n\n\ /T hanya menampilkan\n\n\ @@ -245,7 +245,7 @@ string1==string2 Menetapkan kondisi benar jika string teks yang ditetapkan\n\ sama.\n\ EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" - STRING_LOCALE_HELP1 "Waktu saat ini" + STRING_TIME_NOW "Waktu saat ini: " STRING_MKDIR_HELP "Membuat direktori.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -399,7 +399,7 @@ meminta yang baru. Tekan ENTER untuk membiarkan jam tetap sama.\n" STRING_TIME_HELP2 "Masukkan jam baru: " STRING_TIMER_HELP1 "Berlalu %d mdetik\n" STRING_TIMER_HELP2 "Berlalu %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "mengijinkan penggunaan sepuluh stopwatch.\n\n\ + STRING_TIMER_HELP3 "Mengijinkan penggunaan sepuluh stopwatch.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON menyetel stopwatch ON\n\ OFF menyetel stopwatch OFF\n\ @@ -475,23 +475,23 @@ title judul baru\n" STRING_CMD_ERROR3 "Tidak bisa mengalihkan ke file %s\n" STRING_CMD_ERROR4 "Menjalankan %s...\n" STRING_CMD_ERROR5 "Menjalankan cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" - STRING_COLOR_ERROR2 "Kesalahan dalam spesifikasi warna" + STRING_COLOR_ERROR1 "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)\n" + STRING_COLOR_ERROR2 "Kesalahan dalam spesifikasi warna\n" STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1 "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2 "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" STRING_COPY_ERROR3 "Kesalahan menulis tujuan!\n" STRING_COPY_ERROR4 "Salah: Belum diimplementasikan!\n" - STRING_DATE_ERROR "Tanggal tidak benar." + STRING_DATE_ERROR "Tanggal tidak benar.\n" STRING_DEL_ERROR5 "File %s akan dihapus! " STRING_DEL_ERROR6 "Anda yakin (Y/N)? " STRING_DEL_ERROR7 "Menghapus: %s\n" STRING_ERROR_ERROR1 "Kesalahan tidak dikenal! Kode kesalahan: 0x%lx\n" STRING_ERROR_ERROR2 "Sintaks salah" - STRING_FOR_ERROR1 "'in' kurang dalam pernyataan for." - STRING_FOR_ERROR2 "tidak ada kurung ditemukan." - STRING_FOR_ERROR3 "'do' hilang." - STRING_FOR_ERROR4 "tidak ada perintah setelah 'do'." + STRING_FOR_ERROR1 "'in' kurang dalam pernyataan for.\n" + STRING_FOR_ERROR2 "tidak ada kurung ditemukan.\n" + STRING_FOR_ERROR3 "'do' hilang.\n" + STRING_FOR_ERROR4 "tidak ada perintah setelah 'do'.\n" STRING_FREE_ERROR1 "Drive tidak benar" STRING_FREE_ERROR2 "tak berlabel" STRING_GOTO_ERROR1 "Tidak ada label ditetapkan untuk GOTO\n" @@ -500,10 +500,10 @@ title judul baru\n" STRING_MD_ERROR2 "Path ke folder baru tidak ada.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Salah]\n" - STRING_REN_ERROR1 "MoveFile() gagal. Kesalahan: %lu\n" - STRING_TIME_ERROR1 "Jam tidak benar." - STRING_TYPE_ERROR1 "Opsi tidak benar '/%s'\n" - STRING_WINDOW_ERROR1 "Jendela tidak ditemukan" + STRING_REN_ERROR "MoveFile() gagal. Kesalahan: %lu\n" + STRING_TIME_ERROR "Jam tidak benar.\n" + STRING_TYPE_ERROR "Opsi tidak benar '/%s'\n" + STRING_WINDOW_ERROR "Jendela tidak ditemukan\n" STRING_ERROR_PARAMETERF_ERROR "Format parameter tidak benar - %c\n" STRING_ERROR_INVALID_SWITCH "Saklar tidak benar - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Terlalu banyak parameter - %s\n" @@ -532,9 +532,9 @@ title judul baru\n" STRING_VERSION_RUNVER "%s [Versi %d.%d.%d] %s" STRING_COPY_FILE " %d file di-copy\n" STRING_DELETE_WIPE "dihapus" - STRING_FOR_ERROR "spesifikasi variabel tidak baik." - STRING_SCREEN_COL "Nilai untuk kolom tidak benar" - STRING_SCREEN_ROW "Nilai untuk baris tidak benar" + STRING_FOR_ERROR "spesifikasi variabel tidak baik.\n" + STRING_SCREEN_COL "Nilai untuk kolom tidak benar\n" + STRING_SCREEN_ROW "Nilai untuk baris tidak benar\n" STRING_TIMER_TIME "Timer %d adalah %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index e39c246abe6..a87f920652f 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nScrivi la nuova data (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nScrivi la nuova data (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nnScrivi la nuova data (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Scrivi la nuova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Scrivi la nuova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Scrivi la nuova data (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Visualizza o imposta la nuova data.\n\n\ DATE [/T][data]\n\n\ /T Visualizzazione\n\n\ @@ -245,7 +245,7 @@ command E' il comando da eseguire se la condizione è verificata.\n\ string1==string2 E' verificata se sono uguali le due stringhe\n\ EXIST nomefile E' verificata se il file esiste.\n\ DEFINED variabile E' verificata se la variabile è definita.\n" - STRING_LOCALE_HELP1 "L'ora attuale è" + STRING_TIME_NOW "L'ora attuale è: " STRING_MKDIR_HELP "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" STRING_MKLINK_HELP "Crea un oggetto di collegamento nel filesystem.\n\n\ @@ -405,7 +405,7 @@ quella nuova. Premere INVIO per non modificarla.\n" STRING_TIME_HELP2 "Inserisci la nuova ora: " STRING_TIMER_HELP1 "Sono trascorsi %d millisecondi\n" STRING_TIMER_HELP2 "Sono trascorsi %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permette l'uso di dieci cronometri.\n\n\ + STRING_TIMER_HELP3 "Permette l'uso di dieci cronometri.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON attiva il cronometro\n\ OFF ferma il cronometro\n\ @@ -485,23 +485,23 @@ titolo il nuovo titolo\n" STRING_CMD_ERROR3 "Impossibile ridirigere nel file %s\n" STRING_CMD_ERROR4 "Esecuzione di %s...\n" STRING_CMD_ERROR5 "Esecuzione di cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Il colore di primo piano e sfondo non possono essere uguali" - STRING_COLOR_ERROR2 "Errore nella indicazione dei colori" + STRING_COLOR_ERROR1 "Il colore di primo piano e sfondo non possono essere uguali\n" + STRING_COLOR_ERROR2 "Errore nella indicazione dei colori\n" STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n" STRING_COPY_ERROR1 "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2 "Errore: Impossibile copiare un file su se stesso!\n" STRING_COPY_ERROR3 "Errore durante la scrittura della destinazione!\n" STRING_COPY_ERROR4 "Errore: Non ancora implementato!\n" - STRING_DATE_ERROR "Data non valida." + STRING_DATE_ERROR "Data non valida.\n" STRING_DEL_ERROR5 "Il file %s sarà cancellato! " STRING_DEL_ERROR6 "Sei sicuro (S/N)? " STRING_DEL_ERROR7 "Cancellazione di: %s\n" STRING_ERROR_ERROR1 "Errore sconosciuto! Codice errore: 0x%lx\n" STRING_ERROR_ERROR2 "Errore di sintassi" - STRING_FOR_ERROR1 "'in' mancante nella istruzione for." - STRING_FOR_ERROR2 "Parentesi mancanti." - STRING_FOR_ERROR3 "'do' mancante." - STRING_FOR_ERROR4 "nessuno comando dopo 'do'." + STRING_FOR_ERROR1 "'in' mancante nella istruzione for.\n" + STRING_FOR_ERROR2 "Parentesi mancanti.\n" + STRING_FOR_ERROR3 "'do' mancante.\n" + STRING_FOR_ERROR4 "nessuno comando dopo 'do'.\n" STRING_FREE_ERROR1 "Disco non valido" STRING_FREE_ERROR2 "non etichettato" STRING_GOTO_ERROR1 "Nessuna etichetta indicata per GOTO\n" @@ -510,10 +510,10 @@ titolo il nuovo titolo\n" STRING_MD_ERROR2 "Il percorso della nuova cartella non esiste.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Errore]\n" - STRING_REN_ERROR1 "MoveFile() fallita. Errore: %lu\n" - STRING_TIME_ERROR1 "Ora non valida." - STRING_TYPE_ERROR1 "Opzione '/%s' non valida\n" - STRING_WINDOW_ERROR1 "Finestra non trovata" + STRING_REN_ERROR "MoveFile() fallita. Errore: %lu\n" + STRING_TIME_ERROR "Ora non valida.\n" + STRING_TYPE_ERROR "Opzione '/%s' non valida\n" + STRING_WINDOW_ERROR "Finestra non trovata\n" STRING_ERROR_PARAMETERF_ERROR "Formato del parametro errato - %c\n" STRING_ERROR_INVALID_SWITCH "Selezione non valida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Troppi parametri - %s\n" @@ -542,9 +542,9 @@ titolo il nuovo titolo\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file copiati\n" STRING_DELETE_WIPE "resi illeggibili" - STRING_FOR_ERROR "variabile non valida." - STRING_SCREEN_COL "valore non valido per colonna" - STRING_SCREEN_ROW "valore non valido per riga" + STRING_FOR_ERROR "variabile non valida.\n" + STRING_SCREEN_COL "valore non valido per colonna\n" + STRING_SCREEN_ROW "valore non valido per riga\n" STRING_TIMER_TIME "Timer %d è %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbolico creato per %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link creato per %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index aa32b46c436..e6fc6fa6fe0 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -100,9 +100,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\n新しい日付を入力してください (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\n新しい日付を入力してください (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\n新しい日付を入力してください (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "新しい日付を入力してください (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "新しい日付を入力してください (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "新しい日付を入力してください (yyyy%cmm%cdd): " STRING_DATE_HELP4 "日付を表示または設定します。\n\n\ DATE [/T][日付]\n\n\ /T 日付の表示のみ行います。\n\n\ @@ -251,7 +251,7 @@ EXIST ファイル名指定したファイル名が存在するときに条件指定します。\n\ DEFINED 変数指定した変数が定義されているときに条件が真になるように\n\ 指定します。\n" - STRING_LOCALE_HELP1 "現在時刻は" + STRING_TIME_NOW "現在時刻は: " STRING_MKDIR_HELP "ディレクトリを作成します。\n\n\ MKDIR [ドライブ:]パス\n\ MD [ドライブ:]パス" @@ -483,23 +483,23 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_CMD_ERROR3 "ファイル %s へとリダイレクトできません。\n" STRING_CMD_ERROR4 "%s を実行しています...\n" STRING_CMD_ERROR5 "cmdexit.bat を実行しています...\n" - STRING_COLOR_ERROR1 "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)" - STRING_COLOR_ERROR2 "色の指定に問題があります。" + STRING_COLOR_ERROR1 "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)\n" + STRING_COLOR_ERROR2 "色の指定に問題があります。\n" STRING_CONSOLE_ERROR "不明なエラー: %d\n" STRING_COPY_ERROR1 "エラー: 元のファイル %s を開けません!\n" STRING_COPY_ERROR2 "エラー: コピー元とコピー先が一緒です!\n" STRING_COPY_ERROR3 "指定先への書き込みでエラーが発生しました!\n" STRING_COPY_ERROR4 "エラー: まだ実装されていません!\n" - STRING_DATE_ERROR "無効な日付です。" + STRING_DATE_ERROR "無効な日付です。\n" STRING_DEL_ERROR5 "ファイル %s は削除されます! " STRING_DEL_ERROR6 "よろしいですか (Y/N)? " STRING_DEL_ERROR7 "削除しています: %s\n" STRING_ERROR_ERROR1 "不明なエラーです! エラーコード: 0x%lx\n" STRING_ERROR_ERROR2 "構文エラー" - STRING_FOR_ERROR1 "命令文中に 'in' が不足しています。" - STRING_FOR_ERROR2 "括弧が見つかりません。" - STRING_FOR_ERROR3 "'do' が不足しています。" - STRING_FOR_ERROR4 "'do' の後にコマンドがありません。" + STRING_FOR_ERROR1 "命令文中に 'in' が不足しています。\n" + STRING_FOR_ERROR2 "括弧が見つかりません。\n" + STRING_FOR_ERROR3 "'do' が不足しています。\n" + STRING_FOR_ERROR4 "'do' の後にコマンドがありません。\n" STRING_FREE_ERROR1 "無効なドライブです。" STRING_FREE_ERROR2 "ラベルがありません。" STRING_GOTO_ERROR1 "GOTO にラベルが指定されていません。\n" @@ -508,10 +508,10 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_MD_ERROR2 "新しいフォルダへのパスが存在していません。\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[エラー]\n" - STRING_REN_ERROR1 "MoveFile() failed. エラー: %lu\n" - STRING_TIME_ERROR1 "無効な時刻です。" - STRING_TYPE_ERROR1 "'/%s' は無効なオプションです\n" - STRING_WINDOW_ERROR1 "ウィンドウが見つかりません。" + STRING_REN_ERROR "MoveFile() failed. エラー: %lu\n" + STRING_TIME_ERROR "無効な時刻です。\n" + STRING_TYPE_ERROR "'/%s' は無効なオプションです\n" + STRING_WINDOW_ERROR "ウィンドウが見つかりません。\n" STRING_ERROR_PARAMETERF_ERROR "パラメータの書式が間違っています。 - %c\n" STRING_ERROR_INVALID_SWITCH "無効なスイッチです。 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "パラメータが多すぎます。 - %s\n" @@ -540,9 +540,9 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 個のファイルがコピーされました\n" STRING_DELETE_WIPE "完全に消去されました。" - STRING_FOR_ERROR "無効な変数が指定されました。" - STRING_SCREEN_COL "行の値が無効です。" - STRING_SCREEN_ROW "列の値が無効です。" + STRING_FOR_ERROR "無効な変数が指定されました。\n" + STRING_SCREEN_COL "行の値が無効です。\n" + STRING_SCREEN_ROW "列の値が無効です。\n" STRING_TIMER_TIME "タイマー %d は %s です。: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 9f7183151c1..43513601503 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nSkriv inn ny dato (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nSkriv inn ny dato (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nSkriv inn ny dato (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Skriv inn ny dato (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Skriv inn ny dato (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Skriv inn ny dato (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Vis eller endre datoen.\n\n\ DATO [/T][dato]\n\n\ /T Vis bare\n\n\ @@ -243,7 +243,7 @@ streng1==streng2 Angir et oppfylt vilkår hvis tekststrengene er like\n\ EXIST filnavn Angir et oppfylt vilkår hvis spesifisert filnavn eksisterer.\n\ DEFINED variabel Angir et oppfylt vilkår hvis spesifisert variabel er\n\ definert.\n" - STRING_LOCALE_HELP1 "gjeldende tid er" + STRING_TIME_NOW "Gjeldende tid er: " STRING_MKDIR_HELP "Oppretter en mappe.\n\n\ MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -474,23 +474,23 @@ tittel ny tittel\n" STRING_CMD_ERROR3 "Kan ikke videreføre til fil %s\n" STRING_CMD_ERROR4 "Kjører %s...\n" STRING_CMD_ERROR5 "Kjører cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" - STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" + STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon\n" STRING_CONSOLE_ERROR "Ukjent feil: %d\n" STRING_COPY_ERROR1 "Feil: kan ikke åpne kilden - %s!\n" STRING_COPY_ERROR2 "Feil: kan ikke kopiere til seg selv!\n" STRING_COPY_ERROR3 "Feil ved skriving til destinasjon!\n" STRING_COPY_ERROR4 "Feil: Ikke implementert enda!\n" - STRING_DATE_ERROR "Ugyldig dato." + STRING_DATE_ERROR "Ugyldig dato.\n" STRING_DEL_ERROR5 "Filen %s vil bli slettet! " STRING_DEL_ERROR6 "Er du sikker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Ukjent feil! Feilkode: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaks feil" - STRING_FOR_ERROR1 "'in' tapt i FOR kommando." - STRING_FOR_ERROR2 "ingen brakett funnet." - STRING_FOR_ERROR3 "'gjøre' tapt." - STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'." + STRING_FOR_ERROR1 "'in' tapt i FOR kommando.\n" + STRING_FOR_ERROR2 "ingen brakett funnet.\n" + STRING_FOR_ERROR3 "'gjøre' tapt.\n" + STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'.\n" STRING_FREE_ERROR1 "Ugyldig driver" STRING_FREE_ERROR2 "utmerket" STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO\n" @@ -499,10 +499,10 @@ tittel ny tittel\n" STRING_MD_ERROR2 "Stien til den nye mappen eksisterer ikke.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Feil]\n" - STRING_REN_ERROR1 "MoveFile() mislykkes. Feil: %lu\n" - STRING_TIME_ERROR1 "Ugyldig tid." - STRING_TYPE_ERROR1 "Ugyldig alternativ '/%s'\n" - STRING_WINDOW_ERROR1 "Vinduet ble ikke funnet" + STRING_REN_ERROR "MoveFile() mislykkes. Feil: %lu\n" + STRING_TIME_ERROR "Ugyldig tid.\n" + STRING_TYPE_ERROR "Ugyldig alternativ '/%s'\n" + STRING_WINDOW_ERROR "Vinduet ble ikke funnet\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format ikke riktig - %c\n" STRING_ERROR_INVALID_SWITCH "Ugyldig bryter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "For mange parametere - %s\n" @@ -531,9 +531,9 @@ tittel ny tittel\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopiert\n" STRING_DELETE_WIPE "slettet" - STRING_FOR_ERROR "ugyldig variabel spesifikasjon." - STRING_SCREEN_COL "ugyldig verdi for kolonne" - STRING_SCREEN_ROW "ugyldig verdi for rad" + STRING_FOR_ERROR "ugyldig variabel spesifikasjon.\n" + STRING_SCREEN_COL "ugyldig verdi for kolonne\n" + STRING_SCREEN_ROW "ugyldig verdi for rad\n" STRING_TIMER_TIME "Stoppeklokke %d er %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 4bbb420d202..24ee8ecacf2 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -108,9 +108,9 @@ urządzenie CTTY\n\n\ CON przeważnie jest domyślnym urządzeniem standardowym I/O.\n\n\ Aby przywrócić kontrolę standardowej konsoli, wpisz: CTTY CON na urządzeniu\n\ pomocniczym." - STRING_DATE_HELP1 "\nPodaj nową datę (mm%cdd%crrrr): " - STRING_DATE_HELP2 "\nPodaj nową datę (dd%cmm%crrrr): " - STRING_DATE_HELP3 "\nPodaj nową datę (rrrr%cmm%cdd): " + STRING_DATE_HELP1 "Podaj nową datę (mm%cdd%crrrr): " + STRING_DATE_HELP2 "Podaj nową datę (dd%cmm%crrrr): " + STRING_DATE_HELP3 "Podaj nową datę (rrrr%cmm%cdd): " STRING_DATE_HELP4 "Wyświetla lub zmienia datę systemową.\n\n\ DATE [/T][data]\n\n\ /T tylko wyświetlenie\n\n\ @@ -251,7 +251,7 @@ komenda Komenda do wykonania, gdy warunek będzie spełniony.\n\ ciąg1==ciąg2 Zwraca PRAWDA, gdy oba ciągi znaków są identyczne\n\ EXIST plik Zwraca PRAWDA, jeśli podany plik istnieje.\n\ DEFINED zmienna Zwraca PRAWDA, jeśli podana zmienna została zdefiniowana\n" - STRING_LOCALE_HELP1 "Czas bieżący" + STRING_TIME_NOW "Czas bieżący: " STRING_MKDIR_HELP "Tworzy katalog.\n\n\ MKDIR [napęd:]ścieżka\nMD [napęd:]ścieżka" STRING_MKLINK_HELP "Tworzy dowiązanie obiektu w systemie plików.\n\n\ @@ -481,23 +481,23 @@ title nowy tytuł okna\n" STRING_CMD_ERROR3 "Nie można przekierować do pliku %s\n" STRING_CMD_ERROR4 "Wykonywanie %s...\n" STRING_CMD_ERROR5 "Wykonywanie cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Błąd! Kolor tła i tekstu nie może być taki sam" - STRING_COLOR_ERROR2 "Błąd w oznaczeniu kolorów." + STRING_COLOR_ERROR1 "Błąd! Kolor tła i tekstu nie może być taki sam\n" + STRING_COLOR_ERROR2 "Błąd w oznaczeniu kolorów.\n" STRING_CONSOLE_ERROR "Nieznany błąd: %d\n" STRING_COPY_ERROR1 "Błąd: Nie można otworzyć źródła - %s!\n" STRING_COPY_ERROR2 "Błąd: Nie można przekopiować pliku na niego samego!\n" STRING_COPY_ERROR3 "Błąd zapisu na miejscu docelowym!\n" STRING_COPY_ERROR4 "Błąd: Nie zaimplementowano!\n" - STRING_DATE_ERROR "Data nieprawidłowa." + STRING_DATE_ERROR "Data nieprawidłowa.\n" STRING_DEL_ERROR5 "Plik %s zostanie skasowany! " STRING_DEL_ERROR6 "Czy jesteś pewien (T/N)? " STRING_DEL_ERROR7 "Kasowanie: %s\n" STRING_ERROR_ERROR1 "Nieznany błąd! Kod błędu: 0x%lx\n" STRING_ERROR_ERROR2 "Błąd składni" - STRING_FOR_ERROR1 "Brak 'in' dla twierdzenia." - STRING_FOR_ERROR2 "Nawias nie został znaleziony." - STRING_FOR_ERROR3 "Brakuje 'do'." - STRING_FOR_ERROR4 "Brak komendy po 'do'." + STRING_FOR_ERROR1 "Brak 'in' dla twierdzenia.\n" + STRING_FOR_ERROR2 "Nawias nie został znaleziony.\n" + STRING_FOR_ERROR3 "Brakuje 'do'.\n" + STRING_FOR_ERROR4 "Brak komendy po 'do'.\n" STRING_FREE_ERROR1 "Nieprawidłowa litera napędu" STRING_FREE_ERROR2 "brak" STRING_GOTO_ERROR1 "Brak etykiety dla GOTO\n" @@ -506,10 +506,10 @@ title nowy tytuł okna\n" STRING_MD_ERROR2 "Ścieżka do nowego katalogu nie jest prawidłowa.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Błąd]\n" - STRING_REN_ERROR1 "MoveFile() nieudane. Błąd: %lu\n" - STRING_TIME_ERROR1 "Nieprawidłowy czas." - STRING_TYPE_ERROR1 "Nieprawidłowa opcja '/%s'\n" - STRING_WINDOW_ERROR1 "Okno nie zostało odnalezione" + STRING_REN_ERROR "MoveFile() nieudane. Błąd: %lu\n" + STRING_TIME_ERROR "Nieprawidłowy czas.\n" + STRING_TYPE_ERROR "Nieprawidłowa opcja '/%s'\n" + STRING_WINDOW_ERROR "Okno nie zostało odnalezione\n" STRING_ERROR_PARAMETERF_ERROR "Format parametrów nieprawidłowy - %c\n" STRING_ERROR_INVALID_SWITCH "Niewłaściwy argument - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Zbyt wiele parametrów - %s\n" @@ -538,9 +538,9 @@ title nowy tytuł okna\n" STRING_VERSION_RUNVER "%s [Wersja %d.%d.%d] %s" STRING_COPY_FILE " %d plik(ów) skopiowano\n" STRING_DELETE_WIPE "skasowano" - STRING_FOR_ERROR "złe określenie zmiennej." - STRING_SCREEN_COL "nieprawidłowy numer kolumny" - STRING_SCREEN_ROW "nieprawidłowy numer rzędu" + STRING_FOR_ERROR "złe określenie zmiennej.\n" + STRING_SCREEN_COL "nieprawidłowy numer kolumny\n" + STRING_SCREEN_ROW "nieprawidłowy numer rzędu\n" STRING_TIMER_TIME "Stoper %d czas - %s: " STRING_MKLINK_CREATED_SYMBOLIC "Dowiązanie symboliczne utworzone dla %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Dowiązanie twarde utworzone dla %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc index 4cc11ed42c9..cf2373aad90 100644 --- a/base/shell/cmd/lang/pt-BR.rc +++ b/base/shell/cmd/lang/pt-BR.rc @@ -107,9 +107,9 @@ Dispositivo CTTY\n\n\ CON geralmente é o dispositivo de E/S predefinido.\n\n\ Para atribuir o controle ao console predefinido, digite: CTTY CON no dispositivo\n\ auxiliar." - STRING_DATE_HELP1 "\nInsira uma nova data (mm%cdd%cyyyy):" - STRING_DATE_HELP2 "\nInsira uma nova data (dd%cmm%cyyyy):" - STRING_DATE_HELP3 "\nInsira uma nova data (aaaa%cmm%cdd):" + STRING_DATE_HELP1 "Insira uma nova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Insira uma nova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Insira uma nova data (aaaa%cmm%cdd): " STRING_DATE_HELP4 "Apresenta ou define a data.\n\n\ DATE [/T][data]\n\n\ /T Apresenta a data atual\n\n\ @@ -267,7 +267,7 @@ EXIST arquivo Especifica uma condição verdadeira se o nome do arquivo\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" - STRING_LOCALE_HELP1 "A hora atual é" + STRING_TIME_NOW "A hora atual é: " STRING_MKDIR_HELP "Cria um diretório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" STRING_MKLINK_HELP "Cria uma ligação simbólica.\n\n\ @@ -425,10 +425,10 @@ TIME [/ T] [hora]\n\n\ /T Apenas apresenta a hora\n\n\ Digite TIME sem parâmetros para apresentar a definição de hora atual e um prompt\n\ para digitar nova hora. Pressione ENTER para manter a mesma hora.\n" - STRING_TIME_HELP2 "Digite o novo horário:" + STRING_TIME_HELP2 "Digite o novo horário: " STRING_TIMER_HELP1 "Tempo Decorrido %d msegs\n" STRING_TIMER_HELP2 "Decorrido %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permite o uso de dez cronômetros.\n\n\ + STRING_TIMER_HELP3 "Permite o uso de dez cronômetros.\n\n\ TIMER [ON|OFF] [/S][/n][/Fn]\n\n\ ON inicia a contagem do cronômetro (LIGADO)\n\ OFF termina a contagem do cronômetro (DESLIGADO)\n\ @@ -504,23 +504,23 @@ título Novo título\n" STRING_CMD_ERROR3 "Não é possível redirecionar para o arquivo %s\n" STRING_CMD_ERROR4 "A executar %s ...\n" STRING_CMD_ERROR5 "A executar cmdexit.bat ...\n" - STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)" - STRING_COLOR_ERROR2 "Erro na especificação da cor" + STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)\n" + STRING_COLOR_ERROR2 "Erro na especificação da cor\n" STRING_CONSOLE_ERROR "Erro desconhecido: %d\n" STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n" STRING_COPY_ERROR2 "Erro: Não é possível copiar para si mesmo!\n" STRING_COPY_ERROR3 "Erro ao escrever destino!\n" STRING_COPY_ERROR4 "Erro: ainda não implementado!\n" - STRING_DATE_ERROR "Data inválida." + STRING_DATE_ERROR "Data inválida.\n" STRING_DEL_ERROR5 "O arquivo %s será eliminado!" STRING_DEL_ERROR6 "Tem a certeza? (S/N)" STRING_DEL_ERROR7 "Excluindo: %s\n" STRING_ERROR_ERROR1 "Erro desconhecido! Código do erro: 0x%lx\n" STRING_ERROR_ERROR2 "Erro de sintaxe" - STRING_FOR_ERROR1 "Falta 'em' na declaração." - STRING_FOR_ERROR2 "nenhum colchete encontrado." - STRING_FOR_ERROR3 "falta 'do'." - STRING_FOR_ERROR4 "nenhum comando depois de 'do'." + STRING_FOR_ERROR1 "Falta 'em' na declaração.\n" + STRING_FOR_ERROR2 "nenhum colchete encontrado.\n" + STRING_FOR_ERROR3 "falta 'do'.\n" + STRING_FOR_ERROR4 "nenhum comando depois de 'do'.\n" STRING_FREE_ERROR1 "Unidade inválida" STRING_FREE_ERROR2 "sem etiqueta" STRING_GOTO_ERROR1 "Nenhum rótulo especificado para GOTO\n" @@ -529,10 +529,10 @@ título Novo título\n" STRING_MD_ERROR2 "O caminho para a nova pasta não existe.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erro]\n" - STRING_REN_ERROR1 "MoveFile () falhou. Erro: %lu\n" - STRING_TIME_ERROR1 "Horário inválido." - STRING_TYPE_ERROR1 "Opção inválida '/%s'\n" - STRING_WINDOW_ERROR1 "Janela não encontrada" + STRING_REN_ERROR "MoveFile () falhou. Erro: %lu\n" + STRING_TIME_ERROR "Horário inválido.\n" + STRING_TYPE_ERROR "Opção inválida '/%s'\n" + STRING_WINDOW_ERROR "Janela não encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato de parâmetro incorreto - %c\n" STRING_ERROR_INVALID_SWITCH "Chave inválida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Muitos parâmetros - %s\n" @@ -561,10 +561,10 @@ título Novo título\n" STRING_VERSION_RUNVER "%s [Versão %d.%d.%d] %s" STRING_COPY_FILE "%d arquivo(s) copiado(s)\n" STRING_DELETE_WIPE "eliminado" - STRING_FOR_ERROR "especificação de variável incorreta." - STRING_SCREEN_COL "valor inválido para col" - STRING_SCREEN_ROW "valor inválido para linha" - STRING_TIMER_TIME "Timer %d é %s:" + STRING_FOR_ERROR "especificação de variável incorreta.\n" + STRING_SCREEN_COL "valor inválido para col\n" + STRING_SCREEN_ROW "valor inválido para linha\n" + STRING_TIMER_TIME "Timer %d é %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbólico criado para %s << === >> %s\n" STRING_MKLINK_CREATED_HARD "Hard link criado para %s << === >> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junção criada para %s << === >> %s\n" diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 9cbe01d818a..f67a8febcb6 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -100,9 +100,9 @@ Dispositivo CTTY\n\n\ CON geralmente é o dispositivo de E/S predefinido.\n\n\ Para atribuir o controle à consola predefinida, digite: CTTY CON no dispositivo\n\ auxiliar." - STRING_DATE_HELP1 "\nInsira uma nova data (mm%cdd%cyyyy):" - STRING_DATE_HELP2 "\nInsira uma nova data (dd%cmm%cyyyy):" - STRING_DATE_HELP3 "\nInsira uma nova data (aaaa%cmm%cdd):" + STRING_DATE_HELP1 "Insira uma nova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Insira uma nova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Insira uma nova data (aaaa%cmm%cdd): " STRING_DATE_HELP4 "Apresenta ou define a data.\n\n\ DATE [/T][data]\n\n\ /T Apresenta a data actual\n\n\ @@ -260,7 +260,7 @@ EXIST ficheiro Especifica uma condição verdadeira se o nome do ficheiro\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" - STRING_LOCALE_HELP1 "A hora actual é" + STRING_TIME_NOW "A hora actual é: " STRING_MKDIR_HELP "Cria um directório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" STRING_MKLINK_HELP "Cria uma ligação simbólica.\n\n\ @@ -418,10 +418,10 @@ TIME [/ T] [hora]\n\n\ /T Apenas apresenta a hora\n\n\ Digite TIME sem parâmetros para apresentar a definição de hora actual e um prompt\n\ para digitar nova hora. Pressione ENTER para manter a mesma hora.\n" - STRING_TIME_HELP2 "Digite o novo horário:" + STRING_TIME_HELP2 "Digite o novo horário: " STRING_TIMER_HELP1 "Tempo Decorrido %d msegs\n" STRING_TIMER_HELP2 "Decorrido %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permite o uso de dez cronômetros.\n\n\ + STRING_TIMER_HELP3 "Permite o uso de dez cronômetros.\n\n\ TIMER [ON|OFF] [/S][/n][/Fn]\n\n\ ON inicia a contagem do cronômetro (LIGADO)\n\ OFF termina a contagem do cronômetro (DESLIGADO)\n\ @@ -497,23 +497,23 @@ título Novo título\n" STRING_CMD_ERROR3 "Não é possível redirecionar para o ficheiro %s\n" STRING_CMD_ERROR4 "A executar %s ...\n" STRING_CMD_ERROR5 "A executar cmdexit.bat ...\n" - STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)" - STRING_COLOR_ERROR2 "Erro na especificação da cor" + STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)\n" + STRING_COLOR_ERROR2 "Erro na especificação da cor\n" STRING_CONSOLE_ERROR "Erro desconhecido: %d\n" STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n" STRING_COPY_ERROR2 "Erro: Não é possível copiar para si mesmo!\n" STRING_COPY_ERROR3 "Erro ao escrever destino!\n" STRING_COPY_ERROR4 "Erro: ainda não implementado!\n" - STRING_DATE_ERROR "Data inválida." + STRING_DATE_ERROR "Data inválida.\n" STRING_DEL_ERROR5 "O ficheiro %s será eliminado!" STRING_DEL_ERROR6 "Tem a certeza? (S/N)" STRING_DEL_ERROR7 "Excluindo: %s\n" STRING_ERROR_ERROR1 "Erro desconhecido! Código do erro: 0x%lx\n" STRING_ERROR_ERROR2 "Erro de sintaxe" - STRING_FOR_ERROR1 "Falta 'em' na declaração." - STRING_FOR_ERROR2 "nenhum colchete encontrado." - STRING_FOR_ERROR3 "falta 'do'." - STRING_FOR_ERROR4 "nenhum comando depois de 'do'." + STRING_FOR_ERROR1 "Falta 'em' na declaração.\n" + STRING_FOR_ERROR2 "nenhum colchete encontrado.\n" + STRING_FOR_ERROR3 "falta 'do'.\n" + STRING_FOR_ERROR4 "nenhum comando depois de 'do'.\n" STRING_FREE_ERROR1 "Unidade inválida" STRING_FREE_ERROR2 "sem etiqueta" STRING_GOTO_ERROR1 "Nenhum rótulo especificado para GOTO\n" @@ -522,10 +522,10 @@ título Novo título\n" STRING_MD_ERROR2 "O caminho para a nova pasta não existe.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erro]\n" - STRING_REN_ERROR1 "MoveFile () falhou. Erro: %lu\n" - STRING_TIME_ERROR1 "Horário inválido." - STRING_TYPE_ERROR1 "Opção inválida '/%s'\n" - STRING_WINDOW_ERROR1 "Janela não encontrada" + STRING_REN_ERROR "MoveFile () falhou. Erro: %lu\n" + STRING_TIME_ERROR "Horário inválido.\n" + STRING_TYPE_ERROR "Opção inválida '/%s'\n" + STRING_WINDOW_ERROR "Janela não encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato de parâmetro incorrecto - %c\n" STRING_ERROR_INVALID_SWITCH "Chave inválida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Muitos parâmetros - %s\n" @@ -554,10 +554,10 @@ título Novo título\n" STRING_VERSION_RUNVER "%s [Versão %d.%d.%d] %s" STRING_COPY_FILE "%d ficheiro(s) copiado(s)\n" STRING_DELETE_WIPE "eliminado" - STRING_FOR_ERROR "especificação de variável incorrecta." - STRING_SCREEN_COL "valor inválido para col" - STRING_SCREEN_ROW "valor inválido para linha" - STRING_TIMER_TIME "Timer %d é %s:" + STRING_FOR_ERROR "especificação de variável incorrecta.\n" + STRING_SCREEN_COL "valor inválido para col\n" + STRING_SCREEN_ROW "valor inválido para linha\n" + STRING_TIMER_TIME "Timer %d é %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbólico criado para %s << === >> %s\n" STRING_MKLINK_CREATED_HARD "Hard link criado para %s << === >> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junção criada para %s << === >> %s\n" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index e2b57adb494..4726739ff7b 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -119,9 +119,9 @@ CTTY dispozitiv\n\n\ CON este de obicei dispozitivul standard implicit de In/Ex.\n\n\ Pentru a restitui controlul la consola standard, tastați: CTTY CON la\n\ dispozitivul auxiliar." - STRING_DATE_HELP1 "\nIntroduceți o nouă dată (ll%czz%caaaa): " - STRING_DATE_HELP2 "\nIntroduceți o nouă dată (zz%cll%caaaa): " - STRING_DATE_HELP3 "\nIntroduceți o nouă dată (aaaa%cll%czz): " + STRING_DATE_HELP1 "Introduceți o nouă dată (ll%czz%caaaa): " + STRING_DATE_HELP2 "Introduceți o nouă dată (zz%cll%caaaa): " + STRING_DATE_HELP3 "Introduceți o nouă dată (aaaa%cll%czz): " STRING_DATE_HELP4 "Afișează sau stabilește data.\n\n\ DATE [/T][dată]\n\n\ /T doar afișează\n\n\ @@ -280,7 +280,7 @@ O etichetă va fi definită pe un rând întreg, începând cu două puncte (:). fișierului specificat.\n\ DEFINED variablă Determină o condiție satisfăcută dacă «variabilă»\n\ a fost anterior definită.\n" - STRING_LOCALE_HELP1 "Ora curentă este" + STRING_TIME_NOW "Ora curentă este: " STRING_MKDIR_HELP "Crează un director.\n\n\ MD [unitate:]cale\nMKDIR [unitate:]cale\n" STRING_MKLINK_HELP "Creată o legătură obiect al sistemului de fișiere.\n\n\ @@ -515,23 +515,23 @@ titlu Noul titlu.\n" STRING_CMD_ERROR3 "Redirecționarea către fișierul %s nu a fost posibilă\n" STRING_CMD_ERROR4 "«%s» în execuție...\n" STRING_CMD_ERROR5 "«cmdexit.bat» în execuție...\n" - STRING_COLOR_ERROR1 "Eroare de culoare identică! (Culorile nu trebuie să fie identice)" - STRING_COLOR_ERROR2 "Eroare la specificarea culorii" + STRING_COLOR_ERROR1 "Eroare de culoare identică! (Culorile nu trebuie să fie identice)\n" + STRING_COLOR_ERROR2 "Eroare la specificarea culorii\n" STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n" STRING_COPY_ERROR1 "Eroare: Fișierul - «%s» nu a putut fi deschis!\n" STRING_COPY_ERROR2 "Eroare: Nu poate fi copiat peste el însuși!\n" STRING_COPY_ERROR3 "Eroare de scriere în destinație!\n" STRING_COPY_ERROR4 "Eroare: Încă nu a fost implementat!\n" - STRING_DATE_ERROR "Dată nevalidă." + STRING_DATE_ERROR "Dată nevalidă.\n" STRING_DEL_ERROR5 "Fișierul «%s» va fi șters!\n" STRING_DEL_ERROR6 "Confirmați (Da|Nu)? " STRING_DEL_ERROR7 "Ștergere: %s\n" STRING_ERROR_ERROR1 "Eroare necunoscută! Codul de eroare: 0x%lx\n" STRING_ERROR_ERROR2 "Eroare de sintaxă" - STRING_FOR_ERROR1 "Lipsește «IN» din formularea lui «FOR»." - STRING_FOR_ERROR2 "Nu au fost găsite paranteze." - STRING_FOR_ERROR3 "Lipsește «DO»." - STRING_FOR_ERROR4 "Nici o comandă după «DO»." + STRING_FOR_ERROR1 "Lipsește «IN» din formularea lui «FOR».\n" + STRING_FOR_ERROR2 "Nu au fost găsite paranteze.\n" + STRING_FOR_ERROR3 "Lipsește «DO».\n" + STRING_FOR_ERROR4 "Nici o comandă după «DO».\n" STRING_FREE_ERROR1 "Unitate nevalidă" STRING_FREE_ERROR2 "neetichetat" STRING_GOTO_ERROR1 "Nu a fost specificată nici o etichetă pentru «GOTO»\n" @@ -540,10 +540,10 @@ titlu Noul titlu.\n" STRING_MD_ERROR2 "Calea către noul director nu există.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Eroare]\n" - STRING_REN_ERROR1 "A eșuat MoveFile(). Eroarea: %lu\n" - STRING_TIME_ERROR1 "Oră nevalidă." - STRING_TYPE_ERROR1 "Opțiune eronată «/%s»\n" - STRING_WINDOW_ERROR1 "Fereastra nu a fost găsită" + STRING_REN_ERROR "A eșuat MoveFile(). Eroarea: %lu\n" + STRING_TIME_ERROR "Oră nevalidă.\n" + STRING_TYPE_ERROR "Opțiune eronată «/%s»\n" + STRING_WINDOW_ERROR "Fereastra nu a fost găsită\n" STRING_ERROR_PARAMETERF_ERROR "Formatul argumentului nu este corect - %c\n" STRING_ERROR_INVALID_SWITCH "Argument eronat - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Prea multe argumente - %s\n" @@ -572,9 +572,9 @@ titlu Noul titlu.\n" STRING_VERSION_RUNVER "%s [Versiunea %d.%d.%d] %s" STRING_COPY_FILE " %d fișier(e) copiat(e)\n" STRING_DELETE_WIPE "șters" - STRING_FOR_ERROR "specificație de variabilă eronată." - STRING_SCREEN_COL "valoarea pentru «coloană» este nevalidă" - STRING_SCREEN_ROW "valoarea pentru «rând» este nevalidă" + STRING_FOR_ERROR "specificație de variabilă eronată.\n" + STRING_SCREEN_COL "valoarea pentru «coloană» este nevalidă\n" + STRING_SCREEN_ROW "valoarea pentru «rând» este nevalidă\n" STRING_TIMER_TIME "Cronometrul %d: %s: " STRING_MKLINK_CREATED_SYMBOLIC "A fost creată o legătură simbolică pentru %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "A fost creată o legătură permanentă pentru %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index a08ed2db272..0cea72229f8 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -107,9 +107,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nВведите новую дату (мм%cдд%cгггг): " - STRING_DATE_HELP2 "\nВведите новую дату (дд%cмм%cгггг): " - STRING_DATE_HELP3 "\nВведите новую дату (гггг%cмм%cдд): " + STRING_DATE_HELP1 "Введите новую дату (мм%cдд%cгггг): " + STRING_DATE_HELP2 "Введите новую дату (дд%cмм%cгггг): " + STRING_DATE_HELP3 "Введите новую дату (гггг%cмм%cдд): " STRING_DATE_HELP4 "Вывод или изменение даты.\n\n\ DATE [/T][дата]\n\n\ /T Не запрашивать ввод новой даты\n\n\ @@ -257,7 +257,7 @@ GOTO метка\n\n\ За этой командой может следовать ключевое слово ELSE,\n\ служащее для указания команды, которая должна\n\ выполняться в том случае, если условие ложно.\n" - STRING_LOCALE_HELP1 "Текущее время: " + STRING_TIME_NOW "Текущее время: " STRING_MKDIR_HELP "Создание каталога.\n\n\ MKDIR [диск:]путь\nMD [диск:]путь" STRING_MKLINK_HELP "Создание символической ссылки.\n\n\ @@ -493,23 +493,23 @@ RESTORE восстанавливает окно\n\ STRING_CMD_ERROR3 "Невозможно перенаправить в файл %s\n" STRING_CMD_ERROR4 "Запуск %s...\n" STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)" - STRING_COLOR_ERROR2 "Ошибка в указании цвета" + STRING_COLOR_ERROR1 "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)\n" + STRING_COLOR_ERROR2 "Ошибка в указании цвета\n" STRING_CONSOLE_ERROR "Неизвестная ошибка: %d\n" STRING_COPY_ERROR1 "Ошибка: Невозможно открыть источник - %s!\n" STRING_COPY_ERROR2 "Ошибка: Невозможно копировать в себя!\n" STRING_COPY_ERROR3 "Ошибка записи!\n" STRING_COPY_ERROR4 "Ошибка: В данный момент не реализовано!\n" - STRING_DATE_ERROR "Неправильная дата." + STRING_DATE_ERROR "Неправильная дата.\n" STRING_DEL_ERROR5 "Файл %s будет удален! " STRING_DEL_ERROR6 "Вы уверены (Y/N)? " STRING_DEL_ERROR7 "Удаление: %s\n" STRING_ERROR_ERROR1 "Неизвестная ошибка! Код ошибки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксическая ошибка" - STRING_FOR_ERROR1 "'in' отсутствует в команде for." - STRING_FOR_ERROR2 "скобок не обнаружено." - STRING_FOR_ERROR3 "'do' отсутствует." - STRING_FOR_ERROR4 "нет команды после 'do'." + STRING_FOR_ERROR1 "'in' отсутствует в команде for.\n" + STRING_FOR_ERROR2 "скобок не обнаружено.\n" + STRING_FOR_ERROR3 "'do' отсутствует.\n" + STRING_FOR_ERROR4 "нет команды после 'do'.\n" STRING_FREE_ERROR1 "Неверное имя диска" STRING_FREE_ERROR2 "не отмечено" STRING_GOTO_ERROR1 "Не определена метка для GOTO\n" @@ -518,10 +518,10 @@ RESTORE восстанавливает окно\n\ STRING_MD_ERROR2 "Путь к новому каталогу не существует.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Ошибка]\n" - STRING_REN_ERROR1 "Выполнение MoveFile() было неудачным. Ошибка: %lu\n" - STRING_TIME_ERROR1 "Неверное время." - STRING_TYPE_ERROR1 "Неверный параметр '/%s'\n" - STRING_WINDOW_ERROR1 "Окно не найдено" + STRING_REN_ERROR "Выполнение MoveFile() было неудачным. Ошибка: %lu\n" + STRING_TIME_ERROR "Неверное время.\n" + STRING_TYPE_ERROR "Неверный параметр '/%s'\n" + STRING_WINDOW_ERROR "Окно не найдено\n" STRING_ERROR_PARAMETERF_ERROR "Некорректный формат параметра - %c\n" STRING_ERROR_INVALID_SWITCH "Неверный параметр - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Слишком много параметров - %s\n" @@ -550,9 +550,9 @@ RESTORE восстанавливает окно\n\ STRING_VERSION_RUNVER "%s [Версия %d.%d.%d] %s" STRING_COPY_FILE " %d файл(ов) скопировано\n" STRING_DELETE_WIPE "очищено" - STRING_FOR_ERROR "неправильное задание переменной." - STRING_SCREEN_COL "неправильное значение для колонок" - STRING_SCREEN_ROW "неправильное значение для строк" + STRING_FOR_ERROR "неправильное задание переменной.\n" + STRING_SCREEN_COL "неправильное значение для колонок\n" + STRING_SCREEN_ROW "неправильное значение для строк\n" STRING_TIMER_TIME "Таймер %d на %s: " STRING_MKLINK_CREATED_SYMBOLIC "Символьная ссылка создана для %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Жесткая ссылка создана для %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 75955a903db..12a60f88e71 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -104,9 +104,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nZadajte nový dátum (mm%cdd%crrrr): " - STRING_DATE_HELP2 "\nZadajte nový dátum (dd%cmm%crrrr): " - STRING_DATE_HELP3 "\nZadajte nový dátum (rrrr%cmm%cdd): " + STRING_DATE_HELP1 "Zadajte nový dátum (mm%cdd%crrrr): " + STRING_DATE_HELP2 "Zadajte nový dátum (dd%cmm%crrrr): " + STRING_DATE_HELP3 "Zadajte nový dátum (rrrr%cmm%cdd): " STRING_DATE_HELP4 "Zobrazí alebo nastaví dátum.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -250,7 +250,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Aktuálny čas je" + STRING_TIME_NOW "Aktuálny čas je: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -404,7 +404,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Zadajte nový čas: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -482,23 +482,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Neznáma chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Chyba: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Error writing destination!\n" STRING_COPY_ERROR4 "Chyba: Zatiaľ neimplementované!\n" - STRING_DATE_ERROR "Neplatný dátum." + STRING_DATE_ERROR "Neplatný dátum.\n" STRING_DEL_ERROR5 "The file %s will be deleted! " STRING_DEL_ERROR6 "Ste si istý (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Neznáma chyba! Kód chyby: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' missing." - STRING_FOR_ERROR4 "no command after 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' missing.\n" + STRING_FOR_ERROR4 "no command after 'do'.\n" STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -507,10 +507,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Neplatný čas." - STRING_TYPE_ERROR1 "Invalid option '/%s'\n" - STRING_WINDOW_ERROR1 "Okno sa nenašlo" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Neplatný čas.\n" + STRING_TYPE_ERROR "Invalid option '/%s'\n" + STRING_WINDOW_ERROR "Okno sa nenašlo\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Neplatný prepínač - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Príliš veľa parametrov - %s\n" @@ -539,9 +539,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d súbor(ov) skopírovaný(ch)\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "neplatná hodnota pre stĺpec" - STRING_SCREEN_ROW "neplatná hodnota pre riadok" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "neplatná hodnota pre stĺpec\n" + STRING_SCREEN_ROW "neplatná hodnota pre riadok\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 65a852dac54..25b9fcef88e 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -102,9 +102,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nShkruani datën e re (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nShkruani datën e re (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nShkruani datën e re (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Shkruani datën e re (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Shkruani datën e re (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Shkruani datën e re (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Shfaq ose ndrysho datën.\n\n\ DATE [/T][datë]\n\n\ /T vetëm shfaq\n\n\ @@ -248,7 +248,7 @@ string1==string2 Përcakton një kusht të vërtetë nëse vargjet e specifikua EXIST filename Përcakton një kusht të vërtetë, nëse ekziston dokumenti i specifikuar.\n\ DEFINED variable Përcakton një kusht të vërtetë nëse variabli është specifikuar\n\ dhe karakterizuar.\n" - STRING_LOCALE_HELP1 "Koha e tanishme është" + STRING_TIME_NOW "Koha e tanishme është: " STRING_MKDIR_HELP "Krijon një skedë.\n\n\ MKDIR [drive:]rrugë\nMD [drive:]rrugë" STRING_MKLINK_HELP "Krijon një lidhje objekti në dokumentat e sistemit.\n\n\ @@ -402,7 +402,7 @@ për një të re. Kliko ENTER të mbash të njëjtë orë.\n" STRING_TIME_HELP2 "Shkruaj orën e re: " STRING_TIMER_HELP1 "Kaluar %d milisekonda\n" STRING_TIMER_HELP2 "Kaluar %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "të lejojë përdorimin e dhjetë kronometrave.\n\n\ + STRING_TIMER_HELP3 "Të lejojë përdorimin e dhjetë kronometrave.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON Nis kronometrin\n\ OFF Ndalo kronometrin\n\ @@ -480,23 +480,23 @@ title titull i ri\n" STRING_CMD_ERROR3 "Nuk mund të përcjellim në dokument %s\n" STRING_CMD_ERROR4 "Fillo %s...\n" STRING_CMD_ERROR5 "Fillo cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Error i njëta ngjyra! (Historiku dhe prioritetit nuk mund të jetë ngjyrë të njëjtë)" - STRING_COLOR_ERROR2 "Gabim në specifikim ngjyra" + STRING_COLOR_ERROR1 "Error i njëta ngjyra! (Historiku dhe prioritetit nuk mund të jetë ngjyrë të njëjtë)\n" + STRING_COLOR_ERROR2 "Gabim në specifikim ngjyra\n" STRING_CONSOLE_ERROR "Error i paditur: %d\n" STRING_COPY_ERROR1 "Error: Nuk mund të hapni burim - %s!\n" STRING_COPY_ERROR2 "Error: Nuk mund të kopjoni mbi veten!\n" STRING_COPY_ERROR3 "Gabim gjatë shkrimit në destinacion!\n" STRING_COPY_ERROR4 "Error: Akoma nuk është implementuar!\n" - STRING_DATE_ERROR "Date Invalid." + STRING_DATE_ERROR "Date Invalid.\n" STRING_DEL_ERROR5 "Dokumenti %s do të fshihet! " STRING_DEL_ERROR6 "Jeni të sigurtë (P/J)? " STRING_DEL_ERROR7 "Fshini: %s\n" STRING_ERROR_ERROR1 "Error i paditur! Kodi error: 0x%lx\n" STRING_ERROR_ERROR2 "Error sintaksi" - STRING_FOR_ERROR1 "'Në' humbur për në deklaratë." - STRING_FOR_ERROR2 "Nuk gjenden kllapat." - STRING_FOR_ERROR3 "'bëj' i humbur." - STRING_FOR_ERROR4 "asnjë komandë pas 'do'." + STRING_FOR_ERROR1 "'Në' humbur për në deklaratë.\n" + STRING_FOR_ERROR2 "Nuk gjenden kllapat.\n" + STRING_FOR_ERROR3 "'bëj' i humbur.\n" + STRING_FOR_ERROR4 "asnjë komandë pas 'do'.\n" STRING_FREE_ERROR1 "Drive Invalid" STRING_FREE_ERROR2 "E paetiketuar" STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar për GOTO\n" @@ -505,10 +505,10 @@ title titull i ri\n" STRING_MD_ERROR2 "Rruga për tek skeda e re nuk ekziston.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() dështoj. Error: %lu\n" - STRING_TIME_ERROR1 "Ora invalide." - STRING_TYPE_ERROR1 "Opsion invalid '/%s'\n" - STRING_WINDOW_ERROR1 "Dritaria nuk i gjend" + STRING_REN_ERROR "MoveFile() dështoj. Error: %lu\n" + STRING_TIME_ERROR "Ora invalide.\n" + STRING_TYPE_ERROR "Opsion invalid '/%s'\n" + STRING_WINDOW_ERROR "Dritaria nuk i gjend\n" STRING_ERROR_PARAMETERF_ERROR "Parametrat e formanit nuk jane te sakta - %c\n" STRING_ERROR_INVALID_SWITCH "Qeles invalid - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Shumë parametra - %s\n" @@ -537,9 +537,9 @@ title titull i ri\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "spastruar" - STRING_FOR_ERROR "specifikimi i varibleve i keq." - STRING_SCREEN_COL "vlere invalide për col" - STRING_SCREEN_ROW "vlere invalide për row" + STRING_FOR_ERROR "specifikimi i varibleve i keq.\n" + STRING_SCREEN_COL "vlere invalide për col\n" + STRING_SCREEN_ROW "vlere invalide për row\n" STRING_TIMER_TIME "kohëmatës %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link i krijuar simbolik për %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Krijus linku i forte për %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 91653be0023..6a64655894f 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nSkriv in nytt datum (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nSkriv in nytt datum (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nSkriv in nytt datum (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Skriv in nytt datum (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Skriv in nytt datum (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Skriv in nytt datum (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Visa eller ändra datumet.\n\n\ DATE [/T][datum]\n\n\ /T Endast visa\n\n\ @@ -243,7 +243,7 @@ sträng1==sträng2 Anger ett uppfyllt villkor om textsträngarna är lika\n\ EXIST filnamn Anger ett uppfyllt villkor om angivet filnamn existerar.\n\ DEFINED variabel Anger ett uppfyllt villkor om angiven variabel är\n\ definerad.\n" - STRING_LOCALE_HELP1 "aktuell tid är" + STRING_TIME_NOW "Aktuell tid är: " STRING_MKDIR_HELP "Skapar en mapp.\n\n\ MKDIR [enhet:]mapp\nMD [enhet:]mapp" STRING_MKLINK_HELP "Skapar en filesystemslänk.\n\n\ @@ -474,23 +474,23 @@ tittel ny tittel\n" STRING_CMD_ERROR3 "Kan inte videreføre till fil %s\n" STRING_CMD_ERROR4 "Kör %s...\n" STRING_CMD_ERROR5 "Kör cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Samma färg fel! (Bakgrunn och forgrunn kan inte ha samme farge)" - STRING_COLOR_ERROR2 "Fel i färgspecifikation" + STRING_COLOR_ERROR1 "Samma färg fel! (Bakgrunn och forgrunn kan inte ha samme farge)\n" + STRING_COLOR_ERROR2 "Fel i färgspecifikation\n" STRING_CONSOLE_ERROR "Okänt fel: %d\n" STRING_COPY_ERROR1 "Fel: kan inte öppna källan - %s!\n" STRING_COPY_ERROR2 "Fel: kan inte kopiera till sig själv!\n" STRING_COPY_ERROR3 "Fel vid skriving till destinationen!\n" STRING_COPY_ERROR4 "Fel: Inte implementert!\n" - STRING_DATE_ERROR "Ogiltuft datum." + STRING_DATE_ERROR "Ogiltuft datum.\n" STRING_DEL_ERROR5 "Filen %s vill bli slettet! " STRING_DEL_ERROR6 "Är du säker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Okänt fel! Felkod: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaxfel" - STRING_FOR_ERROR1 "'in' tapt i FOR kommando." - STRING_FOR_ERROR2 "ingen brakett funnet." - STRING_FOR_ERROR3 "'do' tapt." - STRING_FOR_ERROR4 "inget kommando etter 'gjøre'." + STRING_FOR_ERROR1 "'in' tapt i FOR kommando.\n" + STRING_FOR_ERROR2 "ingen brakett funnet.\n" + STRING_FOR_ERROR3 "'do' tapt.\n" + STRING_FOR_ERROR4 "inget kommando etter 'gjøre'.\n" STRING_FREE_ERROR1 "Ogiltig drivrutin" STRING_FREE_ERROR2 "utmärkt" STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO\n" @@ -499,10 +499,10 @@ tittel ny tittel\n" STRING_MD_ERROR2 "Stien till den nye mappen exsisterar inte.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Fel]\n" - STRING_REN_ERROR1 "MoveFile() mislyckades. Fel: %lu\n" - STRING_TIME_ERROR1 "Ogiltig tid." - STRING_TYPE_ERROR1 "Ogiltigt alternativ '/%s'\n" - STRING_WINDOW_ERROR1 "Fönstret hittades inte" + STRING_REN_ERROR "MoveFile() mislyckades. Fel: %lu\n" + STRING_TIME_ERROR "Ogiltig tid.\n" + STRING_TYPE_ERROR "Ogiltigt alternativ '/%s'\n" + STRING_WINDOW_ERROR "Fönstret hittades inte\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format inte riktig - %c\n" STRING_ERROR_INVALID_SWITCH "Ogiltig växel - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "For mange parametere - %s\n" @@ -531,9 +531,9 @@ tittel ny tittel\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopierades\n" STRING_DELETE_WIPE "slettet" - STRING_FOR_ERROR "ogiltig variabelspecifikastion." - STRING_SCREEN_COL "ogiltigt värde för kolumn" - STRING_SCREEN_ROW "ogiltigr värde för rad" + STRING_FOR_ERROR "ogiltig variabelspecifikastion.\n" + STRING_SCREEN_COL "ogiltigt värde för kolumn\n" + STRING_SCREEN_ROW "ogiltigr värde för rad\n" STRING_TIMER_TIME "Stoppeklokke %d är %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 0cbc3a72e2f..77e9663e2d3 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -102,9 +102,9 @@ CTTY [cihaz]\n\n\ AUX, COMx (x=1..N), CON, LPTx (x=1..N), PRN, NUL.\n\ CON genellikle varsayılan standart G/Ç cihazıdır..\n\n\ Kontrolü standart konsola geri döndürmek için, yardımcı cihazda CTTY CON yazın." - STRING_DATE_HELP1 "\nYeni tarihi giriniz (ay%cgün%cyıl): " - STRING_DATE_HELP2 "\nYeni tarihi giriniz (gün%cay%cyıl): " - STRING_DATE_HELP3 "\nYeni tarihi giriniz (yıl%cay%cgün): " + STRING_DATE_HELP1 "Yeni tarihi giriniz (ay%cgün%cyıl): " + STRING_DATE_HELP2 "Yeni tarihi giriniz (gün%cay%cyıl): " + STRING_DATE_HELP3 "Yeni tarihi giriniz (yıl%cay%cgün): " STRING_DATE_HELP4 "Tarihi görüntüler veya ayarlar.\n\n\ DATE [/T][tarih]\n\n\ /T sadece tarihi gösterir\n\n\ @@ -244,7 +244,7 @@ command Koşul karşılanırsa yürütülecek komutu belirtir.\n\ dizi1==dizi2 Belirtilen metin dizeleri eşleşirse doğru bir koşul belirtir\n\ EXIST dosya_adi Belirtilen dosya adı mevcutsa doğru bir koşul belirtir.\n\ DEFINED variable Belirtilen değişken tanımlanmışsa doğru bir koşul belirtir\n" - STRING_LOCALE_HELP1 "Şimdiki zaman: " + STRING_TIME_NOW "Şimdiki zaman: " STRING_MKDIR_HELP "Bir dizin oluşturur.\n\n\ MKDIR [sürücü:]yol\nMD [sürücü:]yol" STRING_MKLINK_HELP "Bir dosya sistemi bağlantı nesnesi oluşturur.\n\n\ @@ -469,23 +469,23 @@ başlık pencere için yeni başlık\n" STRING_CMD_ERROR3 "%s dosyasına yönlendirilemedi\n" STRING_CMD_ERROR4 "%s çalışıtırılıyor...\n" STRING_CMD_ERROR5 "cmdexit.bat çalıştırılıyor...\n" - STRING_COLOR_ERROR1 "Aynı renk hatası! (Arka plan ve ön plan aynı renk olamaz)" - STRING_COLOR_ERROR2 "Renk özelliklerinde hata" + STRING_COLOR_ERROR1 "Aynı renk hatası! (Arka plan ve ön plan aynı renk olamaz)\n" + STRING_COLOR_ERROR2 "Renk özelliklerinde hata\n" STRING_CONSOLE_ERROR "Bilinmeyen Hata: %d\n" STRING_COPY_ERROR1 "Hata: Kaynak açılamadı - %s!\n" STRING_COPY_ERROR2 "Hata: Kendi üzerine kopyalanamaz!\n" STRING_COPY_ERROR3 "Hata: Hedefe yazılırken hata oluştu!\n" STRING_COPY_ERROR4 "Hata: Henüz eklenmedi/geliştirilmedi!\n" - STRING_DATE_ERROR "Geçersiz tarih." + STRING_DATE_ERROR "Geçersiz tarih.\n" STRING_DEL_ERROR5 "%s dosyası silinecek! " STRING_DEL_ERROR6 "Emin misiniz (E/H)? " STRING_DEL_ERROR7 "Siliniyor: %s\n" STRING_ERROR_ERROR1 "Bilinmeyen hata! Hata kodu: 0x%lx\n" STRING_ERROR_ERROR2 "Sözdizimi hatası" - STRING_FOR_ERROR1 "'for' döngüsü içerisinde 'in' ifadesi eksik." - STRING_FOR_ERROR2 "parantez bulunamadı." - STRING_FOR_ERROR3 "'do' eksik." - STRING_FOR_ERROR4 "'do' ifadesinin ardından herhangi bir komut girilmedi." + STRING_FOR_ERROR1 "'for' döngüsü içerisinde 'in' ifadesi eksik.\n" + STRING_FOR_ERROR2 "parantez bulunamadı.\n" + STRING_FOR_ERROR3 "'do' eksik.\n" + STRING_FOR_ERROR4 "'do' ifadesinin ardından herhangi bir komut girilmedi.\n" STRING_FREE_ERROR1 "Geçersiz sürücü" STRING_FREE_ERROR2 "etiketsiz" STRING_GOTO_ERROR1 "GOTO için bir etiket bulunamadı.\n" @@ -494,10 +494,10 @@ başlık pencere için yeni başlık\n" STRING_MD_ERROR2 "Yeni dizinin yolu mevcut değil.\n" STRING_MOVE_ERROR1 "[TAMAM]\n" STRING_MOVE_ERROR2 "[Hata]\n" - STRING_REN_ERROR1 "MoveFile() hatayla sonuçlandı. Hata: %lu\n" - STRING_TIME_ERROR1 "Yanlış tarih." - STRING_TYPE_ERROR1 "Yanlış ayar '/%s'\n" - STRING_WINDOW_ERROR1 "Pencere bulunamadı" + STRING_REN_ERROR "MoveFile() hatayla sonuçlandı. Hata: %lu\n" + STRING_TIME_ERROR "Yanlış tarih.\n" + STRING_TYPE_ERROR "Yanlış ayar '/%s'\n" + STRING_WINDOW_ERROR "Pencere bulunamadı\n" STRING_ERROR_PARAMETERF_ERROR "Parametre biçimi hatalı - %c\n" STRING_ERROR_INVALID_SWITCH "Geçersiz anahtar - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Çok fazla parametre girildi - %s\n" @@ -526,9 +526,9 @@ başlık pencere için yeni başlık\n" STRING_VERSION_RUNVER "%s [Sürüm %d.%d.%d] %s" STRING_COPY_FILE " %d adet dosya(lar) kopyalandı\n" STRING_DELETE_WIPE "temizlendi" - STRING_FOR_ERROR "hatalı değişken belirtimi." - STRING_SCREEN_COL "sütun için geçersiz değer" - STRING_SCREEN_ROW "satır için geçersiz değer" + STRING_FOR_ERROR "hatalı değişken belirtimi.\n" + STRING_SCREEN_COL "sütun için geçersiz değer\n" + STRING_SCREEN_ROW "satır için geçersiz değer\n" STRING_TIMER_TIME "Sayaç %d, %s'dır: " STRING_MKLINK_CREATED_SYMBOLIC "%s <<===>> %s için sembolik bağlantı oluşturuldu.\n" STRING_MKLINK_CREATED_HARD "%s <<===>> %s için sabit bağlantı oluşturuldu.\n" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index ece8cafbed2..c903a9615df 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -106,9 +106,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nВведiть нову дату (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nВведiть нову дату (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nВведiть нову дату (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Введiть нову дату (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Введiть нову дату (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Введiть нову дату (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Вiдображення чи змiна дати.\n\n\ DATE [/T][дата]\n\n\ /T лише вiдображення\n\n\ @@ -255,7 +255,7 @@ ERRORLEVEL число Ця умова є iстинною, якщо код, що EXIST iм'я_файлу Умова є iстинною, якщо файл з вказаним iменем iснує.\n\ DEFINED змiнна Ця умова є iстинною, якщо вказана змiнна\n\ задана.\n" - STRING_LOCALE_HELP1 "Поточний час: " + STRING_TIME_NOW "Поточний час: " STRING_MKDIR_HELP "Створення каталогу.\n\n\ MKDIR [диск:]шлях\nMD [диск:]шлях" STRING_MKLINK_HELP "Створення об'єкту-посилання файлової системи.\n\n\ @@ -408,7 +408,7 @@ TIME без параметрiв виводить поточний час та з STRING_TIME_HELP2 "Введiть новий час: " STRING_TIMER_HELP1 "Минуло %d мсек\n" STRING_TIMER_HELP2 "Минуло %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "дозволяє використати десять секундомiрiв.\n\n\ + STRING_TIMER_HELP3 "Дозволяє використати десять секундомiрiв.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON ввiмкнути секундомiр (ON)\n\ OFF вимкнути секундомiр (OFF)\n\ @@ -486,23 +486,23 @@ title новий заголовок\n" STRING_CMD_ERROR3 "Не можу перенаправити в файл %s\n" STRING_CMD_ERROR4 "Запуск %s...\n" STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)" - STRING_COLOR_ERROR2 "Помилка при вказаннi кольору" + STRING_COLOR_ERROR1 "Помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)\n" + STRING_COLOR_ERROR2 "Помилка при вказаннi кольору\n" STRING_CONSOLE_ERROR "Невiдома помилка: %d\n" STRING_COPY_ERROR1 "Помилка: Неможливо вiдкрити джерело - %s!\n" STRING_COPY_ERROR2 "Помилка: Неможливо копiювати в себе!\n" STRING_COPY_ERROR3 "Помилка запису призначення!\n" STRING_COPY_ERROR4 "Помилка: Ще не реалiзовано!\n" - STRING_DATE_ERROR "Невiрна дата." + STRING_DATE_ERROR "Невiрна дата.\n" STRING_DEL_ERROR5 "Файл %s буде видалений! " STRING_DEL_ERROR6 "Ви впевненi (Y/N)? " STRING_DEL_ERROR7 "Видалення: %s\n" STRING_ERROR_ERROR1 "Невiдома помилка! Код помилки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксична помилка" - STRING_FOR_ERROR1 "'in' вiдсутнє в команді for." - STRING_FOR_ERROR2 "дужок не знайдено." - STRING_FOR_ERROR3 "'do' вiдсутнє." - STRING_FOR_ERROR4 "немає команди пiсля 'do'." + STRING_FOR_ERROR1 "'in' вiдсутнє в команді for.\n" + STRING_FOR_ERROR2 "дужок не знайдено.\n" + STRING_FOR_ERROR3 "'do' вiдсутнє.\n" + STRING_FOR_ERROR4 "немає команди пiсля 'do'.\n" STRING_FREE_ERROR1 "Невiрний диск" STRING_FREE_ERROR2 "не вiдмiчено" STRING_GOTO_ERROR1 "Не визначена мiтка для GOTO\n" @@ -511,10 +511,10 @@ title новий заголовок\n" STRING_MD_ERROR2 "Шлях до нового каталогу не iснує.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Помилка]\n" - STRING_REN_ERROR1 "Невдачне виконання MoveFile(). Помилка: %lu\n" - STRING_TIME_ERROR1 "Невiрний час." - STRING_TYPE_ERROR1 "Невiрний параметр '/%s'\n" - STRING_WINDOW_ERROR1 "Вiкно не знайдено" + STRING_REN_ERROR "Невдачне виконання MoveFile(). Помилка: %lu\n" + STRING_TIME_ERROR "Невiрний час.\n" + STRING_TYPE_ERROR "Невiрний параметр '/%s'\n" + STRING_WINDOW_ERROR "Вiкно не знайдено\n" STRING_ERROR_PARAMETERF_ERROR "Неправильний формат параметра - %c\n" STRING_ERROR_INVALID_SWITCH "Невірна опцiя - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Забагато параметрiв - %s\n" @@ -543,9 +543,9 @@ title новий заголовок\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d файл(iв) скопiйовано\n" STRING_DELETE_WIPE "витерто" - STRING_FOR_ERROR "невiрна специфiкацiя змiнної." - STRING_SCREEN_COL "неправильне значення col" - STRING_SCREEN_ROW "неправильне значення row" + STRING_FOR_ERROR "невiрна специфiкацiя змiнної.\n" + STRING_SCREEN_COL "неправильне значення col\n" + STRING_SCREEN_ROW "неправильне значення row\n" STRING_TIMER_TIME "Таймер %d - %s: " STRING_MKLINK_CREATED_SYMBOLIC "Створено символiчне посилання для %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Створено жорстке посилання для %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 0d002218656..c3a6572b9f8 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON 一般是默认的标准 I/O 设备名。\n\n\ 想要把控制权交还给默认终端，在外置设备上输入：CTTY CON\n\ device." - STRING_DATE_HELP1 "\n输入新的日期 (mm%cdd%cyyyy)：" - STRING_DATE_HELP2 "\n输入新的日期 (dd%cmm%cyyyy)：" - STRING_DATE_HELP3 "\n输入新的日期 (yyyy%cmm%cdd)：" + STRING_DATE_HELP1 "输入新的日期 (mm%cdd%cyyyy)： " + STRING_DATE_HELP2 "输入新的日期 (dd%cmm%cyyyy)： " + STRING_DATE_HELP3 "输入新的日期 (yyyy%cmm%cdd)： " STRING_DATE_HELP4 "显示或者设置日期。\n\n\ DATE [/T][日期]\n\n\ /T 仅显示\n\n\ @@ -237,7 +237,7 @@ ERRORLEVEL 数字当上一个程序返回一个大于或等于指定数字字符串1==字符串2 当所指定的字符串相匹配时为真。\n\ EXIST 文件名当指定的文件名存在时为真。\n\ DEFINED 变量当指定的变量已被定义时为真。\n" - STRING_LOCALE_HELP1 "当前时间是" + STRING_TIME_NOW "当前时间是： " STRING_MKDIR_HELP "创建一个目录。\n\n\ MKDIR [驱动器:]路径\nMD [驱动器:]路径" STRING_MKLINK_HELP "创建一个文件系统链接对象。\n\n\ @@ -376,7 +376,7 @@ TITLE [字符串]\n\n\ TIME [/T][时间]\n\n\ /T 仅显示\n\n\ 执行不带参数的 TIME 将会显示当前时间设置并且提示设置新的时间。按下 ENTER 键来保持原有设置。\n" - STRING_TIME_HELP2 "输入新的时间：" + STRING_TIME_HELP2 "输入新的时间： " STRING_TIMER_HELP1 "已过去 %d 毫秒\n" STRING_TIMER_HELP2 "已过去 %02d%c%02d%c%02d%c%02d\n" STRING_TIMER_HELP3 "允许使用最多十个停表。\n\n\ @@ -449,23 +449,23 @@ RESTORE 恢复窗口\n\ STRING_CMD_ERROR3 "无法重定向到文件 %s\n" STRING_CMD_ERROR4 "正在运行 %s...\n" STRING_CMD_ERROR5 "正在运行 cmdexit.bat...\n" - STRING_COLOR_ERROR1 "同样颜色错误！ (背景和前景不能同色)" - STRING_COLOR_ERROR2 "颜色指定错误" + STRING_COLOR_ERROR1 "同样颜色错误！ (背景和前景不能同色)\n" + STRING_COLOR_ERROR2 "颜色指定错误\n" STRING_CONSOLE_ERROR "未知错误：%d\n" STRING_COPY_ERROR1 "错误：无法打开源文件 - %s！\n" STRING_COPY_ERROR2 "错误：无法复制到自身！\n" STRING_COPY_ERROR3 "写入目标文件时出错！\n" STRING_COPY_ERROR4 "错误：尚未实现！\n" - STRING_DATE_ERROR "无效日期。" + STRING_DATE_ERROR "无效日期。\n" STRING_DEL_ERROR5 "文件 %s 将会被删除！" STRING_DEL_ERROR6 "您确定吗（Y/N）？ " STRING_DEL_ERROR7 "正在删除：%s\n" STRING_ERROR_ERROR1 "未知错误！错误码：0x%lx\n" STRING_ERROR_ERROR2 "语法错误" - STRING_FOR_ERROR1 "语句中缺少“in”。" - STRING_FOR_ERROR2 "没有发现括号。" - STRING_FOR_ERROR3 "缺少“do”。" - STRING_FOR_ERROR4 "“do”后没有命令。" + STRING_FOR_ERROR1 "语句中缺少“in”。\n" + STRING_FOR_ERROR2 "没有发现括号。\n" + STRING_FOR_ERROR3 "缺少“do”。\n" + STRING_FOR_ERROR4 "“do”后没有命令。\n" STRING_FREE_ERROR1 "无效驱动器" STRING_FREE_ERROR2 "未标记" STRING_GOTO_ERROR1 "没有为 GOTO 指定标签\n" @@ -474,10 +474,10 @@ RESTORE 恢复窗口\n\ STRING_MD_ERROR2 "到新文件夹的路径不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[错误]\n" - STRING_REN_ERROR1 "MoveFile() 失败。错误码：%lu\n" - STRING_TIME_ERROR1 "无效时间。" - STRING_TYPE_ERROR1 "无效选项“/%s”\n" - STRING_WINDOW_ERROR1 "未找到窗口" + STRING_REN_ERROR "MoveFile() 失败。错误码：%lu\n" + STRING_TIME_ERROR "无效时间。\n" + STRING_TYPE_ERROR "无效选项“/%s”\n" + STRING_WINDOW_ERROR "未找到窗口\n" STRING_ERROR_PARAMETERF_ERROR "参数格式不正确 - %c\n" STRING_ERROR_INVALID_SWITCH "无效开关 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "参数过多 - %s\n" @@ -506,9 +506,9 @@ RESTORE 恢复窗口\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 个文件已复制\n" STRING_DELETE_WIPE "已擦除" - STRING_FOR_ERROR "无效的变量指定。" - STRING_SCREEN_COL "无效的列值" - STRING_SCREEN_ROW "无效的行值" + STRING_FOR_ERROR "无效的变量指定。\n" + STRING_SCREEN_COL "无效的列值\n" + STRING_SCREEN_ROW "无效的行值\n" STRING_TIMER_TIME "计时器 %d 是 %s：" STRING_MKLINK_CREATED_SYMBOLIC "已为 %s <<===>> %s 创建符号链接\n" STRING_MKLINK_CREATED_HARD "已为 %s <<===>> %s 创建硬链接\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index bc32ae71020..913295e16c8 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\n輸入新的日期 (mm%cdd%cyyyy)：" - STRING_DATE_HELP2 "\n輸入新的日期 (dd%cmm%cyyyy)：" - STRING_DATE_HELP3 "\n輸入新的日期 (yyyy%cmm%cdd)：" + STRING_DATE_HELP1 "輸入新的日期 (mm%cdd%cyyyy)： " + STRING_DATE_HELP2 "輸入新的日期 (dd%cmm%cyyyy)： " + STRING_DATE_HELP3 "輸入新的日期 (yyyy%cmm%cdd)： " STRING_DATE_HELP4 "顯示或者設定日期。\n\n\ DATE [/T][日期]\n\n\ /T 僅顯示\n\n\ @@ -237,7 +237,7 @@ ERRORLEVEL 數字當上一個程式返回一個大於或等於指定數字字元串1==字元串2 當所指定的字元串相匹配時為 TRUE。\n\ EXIST 檔案名稱當指定的檔案名稱存在時為 TRUE。\n\ DEFINED 變數當指定的變數已被定義時為 TRUE。\n" - STRING_LOCALE_HELP1 "目前的時間是" + STRING_TIME_NOW "目前的時間是： " STRING_MKDIR_HELP "建立一個目錄。\n\n\ MKDIR [磁碟機:]路徑\nMD [磁碟機:]路徑" STRING_MKLINK_HELP "建立一個檔案系統連結物件。\n\n\ @@ -377,7 +377,7 @@ TITLE [字串]\n\n\ TIME [/T][時間]\n\n\ /T 僅顯示\n\n\ 執行不帶參數的 TIME 將會顯示目前的時間設定並且提示設定新的時間。按下 ENTER 鍵來保持原有設定。\n" - STRING_TIME_HELP2 "輸入新的時間：" + STRING_TIME_HELP2 "輸入新的時間： " STRING_TIMER_HELP1 "已過去 %d 毫秒\n" STRING_TIMER_HELP2 "已過去 %02d%c%02d%c%02d%c%02d\n" STRING_TIMER_HELP3 "允許使用最多十個計時器。\n\n\ @@ -453,23 +453,23 @@ RESTORE 恢復視窗\n\ STRING_CMD_ERROR3 "無法重定向到檔案 %s\n" STRING_CMD_ERROR4 "正在運行 %s...\n" STRING_CMD_ERROR5 "正在運行 cmdexit.bat...\n" - STRING_COLOR_ERROR1 "同樣顏色錯誤！ (背景和前景不能同色)" - STRING_COLOR_ERROR2 "顏色指定錯誤" + STRING_COLOR_ERROR1 "同樣顏色錯誤！ (背景和前景不能同色)\n" + STRING_COLOR_ERROR2 "顏色指定錯誤\n" STRING_CONSOLE_ERROR "未知錯誤：%d\n" STRING_COPY_ERROR1 "錯誤：無法開啟來源 - %s！\n" STRING_COPY_ERROR2 "錯誤：無法複製到自身！\n" STRING_COPY_ERROR3 "寫入目的時出錯！\n" STRING_COPY_ERROR4 "錯誤：尚未實現！\n" - STRING_DATE_ERROR "無效的日期。" + STRING_DATE_ERROR "無效的日期。\n" STRING_DEL_ERROR5 "檔案 %s 將會被刪除！" STRING_DEL_ERROR6 "您確定嗎 (Y/N)？ " STRING_DEL_ERROR7 "正在刪除：%s\n" STRING_ERROR_ERROR1 "未知錯誤！錯誤碼：0x%lx\n" STRING_ERROR_ERROR2 "語法錯誤" - STRING_FOR_ERROR1 "語句中缺少 'in'。" - STRING_FOR_ERROR2 "沒有發現括號。" - STRING_FOR_ERROR3 "缺少 'do'。" - STRING_FOR_ERROR4 "'do' 後沒有命令。" + STRING_FOR_ERROR1 "語句中缺少 'in'。\n" + STRING_FOR_ERROR2 "沒有發現括號。\n" + STRING_FOR_ERROR3 "缺少 'do'。\n" + STRING_FOR_ERROR4 "'do' 後沒有命令。\n" STRING_FREE_ERROR1 "無效的磁碟機" STRING_FREE_ERROR2 "未標記" STRING_GOTO_ERROR1 "沒有為 GOTO 指定標籤\n" @@ -478,10 +478,10 @@ RESTORE 恢復視窗\n\ STRING_MD_ERROR2 "新資料夾的路徑不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[錯誤]\n" - STRING_REN_ERROR1 "MoveFile() 失敗。錯誤碼：%lu\n" - STRING_TIME_ERROR1 "無效的時間。" - STRING_TYPE_ERROR1 "無效的選項 '/%s'\n" - STRING_WINDOW_ERROR1 "找不到視窗" + STRING_REN_ERROR "MoveFile() 失敗。錯誤碼：%lu\n" + STRING_TIME_ERROR "無效的時間。\n" + STRING_TYPE_ERROR "無效的選項 '/%s'\n" + STRING_WINDOW_ERROR "找不到視窗\n" STRING_ERROR_PARAMETERF_ERROR "參數格式不正確 - %c\n" STRING_ERROR_INVALID_SWITCH "無效的開關 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "太多參數 - %s\n" @@ -510,9 +510,9 @@ RESTORE 恢復視窗\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 個檔案已複製\n" STRING_DELETE_WIPE "已擦除" - STRING_FOR_ERROR "無效的變數指定。" - STRING_SCREEN_COL "無效的行值" - STRING_SCREEN_ROW "無效的列值" + STRING_FOR_ERROR "無效的變數指定。\n" + STRING_SCREEN_COL "無效的行值\n" + STRING_SCREEN_ROW "無效的列值\n" STRING_TIMER_TIME "計時器 %d 是 %s：" STRING_MKLINK_CREATED_SYMBOLIC "已為 %s <<===>> %s 建立符號連結\n" STRING_MKLINK_CREATED_HARD "已為 %s <<===>> %s 建立硬連結\n" diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index 97b252e50ed..13403f9f2d0 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -570,7 +570,6 @@ INT FilePromptYN (UINT resID) /* preliminary fix */ ConInString(szIn, 10); - ConOutChar(_T('\n')); _tcsupr (szIn); for (p = szIn; _istspace (*p); p++) @@ -634,13 +633,12 @@ INT FilePromptYNA (UINT resID) /* preliminary fix */ ConInString(szIn, 10); - ConOutChar(_T('\n')); _tcsupr (szIn); for (p = szIn; _istspace (*p); p++) ; - LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg)); + LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg)); if (_tcsncmp(p, &szMsg[0], 1) == 0) return PROMPT_YES; diff --git a/base/shell/cmd/ren.c b/base/shell/cmd/ren.c index 7a19e4ad379..76864274c11 100644 --- a/base/shell/cmd/ren.c +++ b/base/shell/cmd/ren.c @@ -314,7 +314,7 @@ INT cmd_rename (LPTSTR param) else { if (!(dwFlags & REN_ERROR)) - ConErrResPrintf(STRING_REN_ERROR1, GetLastError()); + ConErrResPrintf(STRING_REN_ERROR, GetLastError()); } } } diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h index 7836cfb96b8..8024eeb2ad1 100644 --- a/base/shell/cmd/resource.h +++ b/base/shell/cmd/resource.h @@ -53,10 +53,10 @@ #define STRING_MOVE_ERROR1 342 #define STRING_MOVE_ERROR2 343 #define STRING_SET_ENV_ERROR 345 -#define STRING_REN_ERROR1 346 -#define STRING_TIME_ERROR1 348 -#define STRING_TYPE_ERROR1 349 -#define STRING_WINDOW_ERROR1 350 +#define STRING_REN_ERROR 346 +#define STRING_TIME_ERROR 348 +#define STRING_TYPE_ERROR 349 +#define STRING_WINDOW_ERROR 350 #define STRING_REPLACE_ERROR1 351 #define STRING_REPLACE_ERROR2 352 #define STRING_REPLACE_ERROR3 353 @@ -134,7 +134,7 @@ #define STRING_GOTO_HELP1 659 -#define STRING_LOCALE_HELP1 666 +#define STRING_TIME_NOW 666 #define STRING_MKDIR_HELP 667 diff --git a/base/shell/cmd/start.c b/base/shell/cmd/start.c index aec8aa8c853..34bef7dbf84 100644 --- a/base/shell/cmd/start.c +++ b/base/shell/cmd/start.c @@ -164,7 +164,7 @@ INT cmd_start (LPTSTR Rest) } else { - ConErrResPrintf(STRING_TYPE_ERROR1, option); + ConErrResPrintf(STRING_TYPE_ERROR, option); return 0; } } diff --git a/base/shell/cmd/time.c b/base/shell/cmd/time.c index c53abbf11bf..f8fa5d6a282 100644 --- a/base/shell/cmd/time.c +++ b/base/shell/cmd/time.c @@ -157,7 +157,7 @@ INT cmd_time(LPTSTR param) SYSTEMTIME st; GetLocalTime(&st); FormatTime(szTime, &st); - ConOutPuts(szTime); + ConOutPrintf(_T("%s\n"), szTime); freep(arg); return 0; } @@ -168,8 +168,8 @@ INT cmd_time(LPTSTR param) if (nTimeString == -1) { - ConOutResPrintf(STRING_LOCALE_HELP1); - ConOutPrintf(_T(": %s\n"), GetTimeString()); + ConOutResPuts(STRING_TIME_NOW); + ConOutPrintf(_T("%s\n"), GetTimeString()); } while (TRUE) @@ -202,7 +202,7 @@ INT cmd_time(LPTSTR param) nTimeString = -1; } - ConErrResPuts(STRING_TIME_ERROR1); + ConErrResPuts(STRING_TIME_ERROR); nErrorLevel = 1; } diff --git a/base/shell/cmd/type.c b/base/shell/cmd/type.c index 450f2e49240..6d061824f05 100644 --- a/base/shell/cmd/type.c +++ b/base/shell/cmd/type.c @@ -267,7 +267,7 @@ INT cmd_type(LPTSTR param) } // error_invalid_switch(argv[i] + 1); - ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); + ConErrResPrintf(STRING_TYPE_ERROR, argv[i] + 1); nErrorLevel = 1; goto Quit; } diff --git a/base/shell/cmd/window.c b/base/shell/cmd/window.c index 45a7d758471..324a5cf84c1 100644 --- a/base/shell/cmd/window.c +++ b/base/shell/cmd/window.c @@ -213,7 +213,7 @@ INT CommandActivate (LPTSTR param) { if (arg != NULL) freep(arg); - ConErrResPuts(STRING_WINDOW_ERROR1); + ConErrResPuts(STRING_WINDOW_ERROR); return 1; } if (arg != NULL)

1 year, 1 month

[reactos] 01/02: [RTL] Minor formatting, remove redundant 'return'.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cef9f5c4a6997601bf74a… commit cef9f5c4a6997601bf74a65e20b07242585e039f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 15 21:12:05 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 17:06:40 2023 +0100 [RTL] Minor formatting, remove redundant 'return'. --- dll/ntdll/rtl/libsupp.c | 1 - ntoskrnl/rtl/libsupp.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index 7053bf401d7..18bac9a7b25 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -338,7 +338,6 @@ RtlpGetStackLimits( { *LowLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit; *HighLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackBase; - return; } BOOLEAN diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 1a6ac697a7c..462bea20fa0 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -513,13 +513,13 @@ RtlpGetStackLimits( OUT PULONG_PTR HighLimit) { PKTHREAD CurrentThread = KeGetCurrentThread(); + *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; #ifdef _M_IX86 - * HighLimit = (ULONG_PTR)CurrentThread->InitialStack - + *HighLimit = (ULONG_PTR)CurrentThread->InitialStack - sizeof(FX_SAVE_AREA); #else *HighLimit = (ULONG_PTR)CurrentThread->InitialStack; #endif - *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; } /* RTL Atom Tables ************************************************************/

1 year, 1 month

[reactos] 01/01: [INF] Update Romanian (ro-RO) translation (#5969)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6b5ec22c4f5f29d83c5… commit 6a6b5ec22c4f5f29d83c55db33085e65202f4489 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Thu Nov 16 14:34:43 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 13:34:43 2023 +0100 [INF] Update Romanian (ro-RO) translation (#5969) --- media/inf/legcydrv.inf | 2 +- media/inf/wdmaudio.inf | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media/inf/legcydrv.inf b/media/inf/legcydrv.inf index 76cf3d27a24..b02bb3670ec 100644 --- a/media/inf/legcydrv.inf +++ b/media/inf/legcydrv.inf @@ -41,7 +41,7 @@ LegacyDriverClassName = "Controladores incompatibles con PnP" LegacyDriverClassName = "Sterowniki niezgodne z Plug and Play" [Strings.0418] -LegacyDriverClassName = "Modúle pilot de cuplare statică (non-PnP)" +LegacyDriverClassName = "Drivere de dispozitiv ce nu sunt Plug and Play" [Strings.0419] LegacyDriverClassName = "Драйверы устройств не Plug and Play" diff --git a/media/inf/wdmaudio.inf b/media/inf/wdmaudio.inf index 91e9f844923..50f177423e2 100644 --- a/media/inf/wdmaudio.inf +++ b/media/inf/wdmaudio.inf @@ -225,13 +225,13 @@ kmixer.SvcDesc = "Dispozitiv de mixaj audio Wave al ReactOS" WDM_SYSAUDIO.DeviceDesc = "Dispozitiv audio de sistem al ReactOS" WDM_SYSAUDIO.FriendlyName = "Dispozitiv audio de sistem al ReactOS" sysaudio.SvcDesc = "Dispozitiv audio de sistem al ReactOS" -WDM_DRMKAUD.DeviceDesc = "Modúle-pilot audio certificate ale ReactOS" -WDM_DRMKAUD.FriendlyName = "Modúle-pilot audio certificate ale ReactOS" -drmkaud.SvcDesc = "Modúle-pilot audio certificate ale ReactOS" -WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "Modúle-pilot audio WDM ale ReactOS" -WDM_WDMAUD.DeviceDesc = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" -WDM_WDMAUD.FriendlyName = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" -wdmaud.SvcDesc = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" +WDM_DRMKAUD.DeviceDesc = "Drivere audio certificate ale ReactOS" +WDM_DRMKAUD.FriendlyName = "Drivere audio certificate ale ReactOS" +drmkaud.SvcDesc = "Drivere audio certificate ale ReactOS" +WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "Drivere audio WDM ale ReactOS" +WDM_WDMAUD.DeviceDesc = "Driver pentru WINMM-WDM-Audio ReactOS" +WDM_WDMAUD.FriendlyName = "Driver pentru WINMM-WDM-Audio ReactOS" +wdmaud.SvcDesc = "Driver pentru WINMM-WDM-Audio ReactOS" [Strings.041f] WDM_KMIXER.DeviceDesc = "ReactOS Dalga Ses Karıştırıcısı"

1 year, 2 months

[reactos] 01/01: [TASKKILL] Update Romanian (ro-RO) translation (#5954)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f61f3b0b001386682e7ef… commit f61f3b0b001386682e7ef5f7de71c1a553b3e550 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Thu Nov 16 14:33:55 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 13:33:55 2023 +0100 [TASKKILL] Update Romanian (ro-RO) translation (#5954) --- base/applications/cmdutils/taskkill/lang/ro-RO.rc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/base/applications/cmdutils/taskkill/lang/ro-RO.rc b/base/applications/cmdutils/taskkill/lang/ro-RO.rc index 649dfc47ed2..445601f02d0 100644 --- a/base/applications/cmdutils/taskkill/lang/ro-RO.rc +++ b/base/applications/cmdutils/taskkill/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Taskkill Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -18,6 +24,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n" STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n" STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n" - STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" - STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" + STRING_PARAM_TOO_MUCH, "Eroare: Sintaxă nevalidă. Opțiunea '%1' nu este permisă mai mult de '%2!d!' dată(dăți).\n" + STRING_INVALID_SYNTAX, "Eroare: Sintaxă nevalidă.\n" }

1 year, 2 months

[reactos] 01/01: [MSPAINT] s/AirBrushWidth/AirBrushRadius/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157739a658ad4c31acb51… commit 157739a658ad4c31acb51d65d8040cfe894dc1b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 16 15:45:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 16 15:45:06 2023 +0900 [MSPAINT] s/AirBrushWidth/AirBrushRadius/ Fix logical error. CORE-19094 --- base/applications/mspaint/mouse.cpp | 2 +- base/applications/mspaint/toolsettings.cpp | 4 ++-- base/applications/mspaint/toolsmodel.cpp | 14 +++++++------- base/applications/mspaint/toolsmodel.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index ad709d9c3db..d650259f6cb 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -654,7 +654,7 @@ struct AirBrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); + Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushRadius()); } void OnSpecialTweak(BOOL bMinus) override diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index e8bd61f1b7e..d1a501728a2 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -219,7 +219,7 @@ VOID CToolSettingsWindow::drawAirBrush(HDC hdc, LPCRECT prc) RECT& rc = rects[i]; INT x = (rc.left + rc.right) / 2; INT y = (rc.top + rc.bottom) / 2; - BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushWidth()); + BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushRadius()); if (bHigh) { ::FillRect(hdc, &rc, ::GetSysColorBrush(COLOR_HIGHLIGHT)); @@ -438,7 +438,7 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_AIRBRUSH: iItem = getAirBrushRects(rects, &rect1, &pt); if (iItem != -1) - toolsModel.SetAirBrushWidth(s_AirRadius[iItem]); + toolsModel.SetAirBrushRadius(s_AirRadius[iItem]); break; case TOOL_LINE: case TOOL_BEZIER: diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 884b92d7d6c..42ee980c2b3 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -18,7 +18,7 @@ ToolsModel::ToolsModel() m_shapeStyle = 0; m_brushStyle = BrushStyleRound; m_oldActiveTool = m_activeTool = TOOL_PEN; - m_airBrushWidth = 5; + m_airBrushRadius = 5; m_rubberRadius = 4; m_transpBg = FALSE; m_zoom = 1000; @@ -99,8 +99,8 @@ void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner) { - INT thickness = GetAirBrushWidth(); - SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); + INT thickness = GetAirBrushRadius(); + SetAirBrushRadius(bThinner ? max(1, thickness - 1) : (thickness + 1)); } void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner) @@ -180,14 +180,14 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) NotifyToolChanged(); } -int ToolsModel::GetAirBrushWidth() const +INT ToolsModel::GetAirBrushRadius() const { - return m_airBrushWidth; + return m_airBrushRadius; } -void ToolsModel::SetAirBrushWidth(int nAirBrushWidth) +void ToolsModel::SetAirBrushRadius(INT nAirBrushRadius) { - m_airBrushWidth = nAirBrushWidth; + m_airBrushRadius = nAirBrushRadius; NotifyToolSettingsChanged(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 9af67a501c7..a5737010d9b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -80,7 +80,7 @@ private: BrushStyle m_brushStyle; TOOLTYPE m_activeTool; TOOLTYPE m_oldActiveTool; - int m_airBrushWidth; + INT m_airBrushRadius; int m_rubberRadius; BOOL m_transpBg; int m_zoom; @@ -116,8 +116,8 @@ public: TOOLTYPE GetOldActiveTool() const; void SetActiveTool(TOOLTYPE nActiveTool); - int GetAirBrushWidth() const; - void SetAirBrushWidth(int nAirBrushWidth); + INT GetAirBrushRadius() const; + void SetAirBrushRadius(INT nAirBrushRadius); void MakeAirBrushThickerOrThinner(BOOL bThinner); int GetRubberRadius() const;

1 year, 2 months

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