Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d7ebc20481a587bd19e8… commit 6d7ebc20481a587bd19e8a8049317113071b0817 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 14 17:12:16 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 14 17:12:16 2020 +0200 [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps By taking alternative code-paths in WdmAud and bypassing Sysaudio. This relies on the patch 0.4.15-dev-765-g b8e936a57b4770e133772cf2dd66f30671a1524b It fixes the following bugs/regressions: -CORE-13202 Unhandled exception from wdmaud.drv when recording sound in Scratch 1.4 leads to app-crash -CORE-13488 A deadlock in "DiabloII" character selection screen and "The Lion King II" -CORE-8726/CORE-9986/CORE-16564 AC97 driver is now working in the same session where driver was installed, no reboot-orgies needed anymore -CORE-9981 almost 100% fixed, DosBox + Commander Keen6 properly plays music instead of garbled output, same improvement for ScummVM 2.0 with Monkey Island 2 The playback is not yet *entirely* perfect, still a few hiccups now and then, but by orders of magnitude better than before. --- dll/win32/wdmaud.drv/wdmaud.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/wdmaud.drv/wdmaud.c b/dll/win32/wdmaud.drv/wdmaud.c index dfd8ea0361e..45308b3aff2 100644 --- a/dll/win32/wdmaud.drv/wdmaud.c +++ b/dll/win32/wdmaud.drv/wdmaud.c @@ -18,6 +18,7 @@ #include <debug.h> #include <mmebuddy_debug.h> +#define USE_MMIXER_LIB #ifndef USE_MMIXER_LIB #define FUNC_NAME(x) x##ByLegacy #else

4 years, 3 months

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78edea816477ac7d088a8… commit 78edea816477ac7d088a86ec1743d7a649c0c025 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 14 13:25:45 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 14 13:25:45 2020 +0900 [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164) - Add tests for "My Documents" and "Control Panel". - Add some comments for usability. CORE-16939 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 63 ++++++++++++---------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 770c71c365f..1ec15fa02c2 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -13,8 +13,6 @@ #include <debug.h> #include <stdio.h> -//#define ShellExecCmdLine ShellExecCmdLine - #ifndef SECL_NO_UI #define SECL_NO_UI 0x2 #define SECL_LOG_USAGE 0x8 @@ -23,7 +21,7 @@ #define SECL_RUNAS 0x40 #endif -#ifdef ShellExecCmdLine +#define ShellExecCmdLine proxy_ShellExecCmdLine #define shell32_hInstance GetModuleHandle(NULL) #define IDS_FILE_NOT_FOUND (-1) @@ -38,6 +36,7 @@ static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source) lstrcpyW(*target, source); } +// NOTE: You have to sync the following code to dll/win32/shell32/shlexec.cpp. static LPCWSTR SplitParams(LPCWSTR psz, LPWSTR pszArg0, size_t cchArg0) { @@ -236,10 +235,11 @@ HRESULT WINAPI ShellExecCmdLine( return HRESULT_FROM_WIN32(dwError); } -#else - typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); - SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; -#endif + +#undef ShellExecCmdLine + +typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); +SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; typedef struct TEST_ENTRY { @@ -396,6 +396,12 @@ static const TEST_ENTRY s_entries[] = { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." }, + // My Documents + { __LINE__, S_OK, TRUE, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + // Control Panel + { __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, }; static void DoEntry(const TEST_ENTRY *pEntry) @@ -410,13 +416,16 @@ static void DoEntry(const TEST_ENTRY *pEntry) _SEH2_TRY { -#ifdef ShellExecCmdLine - hr = ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#else - hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#endif + if (IsReactOS()) + { + hr = proxy_ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } + else + { + hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -454,22 +463,22 @@ START_TEST(ShellExecCmdLine) { using namespace std; -#ifndef ShellExecCmdLine - // CHECKME - if (!IsWindowsVistaOrGreater()) + if (!IsReactOS()) { - skip("ShellExecCmdLine is not available on this platform\n"); - return; - } + if (!IsWindowsVistaOrGreater()) + { + skip("ShellExecCmdLine is not available on this platform\n"); + return; + } - HMODULE hShell32 = GetModuleHandleA("shell32"); - g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); - if (!g_pShellExecCmdLine) - { - skip("ShellExecCmdLine is not found\n"); - return; + HMODULE hShell32 = GetModuleHandleA("shell32"); + g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); + if (!g_pShellExecCmdLine) + { + skip("ShellExecCmdLine is not found\n"); + return; + } } -#endif // s_testfile1 FILE *fp = fopen(s_testfile1, "wb");

4 years, 3 months

[reactos] 01/01: [SHELL32] Fix boot to shell, addendum to commit 14599b0a.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3731984199872416fa2a… commit a3731984199872416fa2a53fd7b3867fede3135d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 14 05:39:48 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 14 05:54:13 2020 +0200 [SHELL32] Fix boot to shell, addendum to commit 14599b0a. shell32.ShellMessageBoxW redirects to shlwapi.ShellMessageBoxWrapW. However the latter one (shlwapi) is exported by ordinal only. Trying to use in shell32.spec file the following syntax: 182 varargs ShellMessageBoxW() shlwapi.ShellMessageBoxWrapW will therefore fail at runtime, because Windows/ReactOS will fail to snap shlwapi.ShellMessageBoxWrapW. Using instead an export by orginal: 182 varargs ShellMessageBoxW() shlwapi.#388 actually fails as well, but at link time, by both MSVC' LINK and GNU's dlltool. This generates a .def file containing the line: ShellMessageBoxW=shlwapi.#388 @182 It is not clear why it fails, because according to: https://docs.microsoft.com/en-us/cpp/build/reference/exports?view=vs-2019 and https://devblogs.microsoft.com/oldnewthing/20121116-00/?p=6073 this should be possible. However one encounters the same errors as those described at: https://groups.google.com/forum/#!topic/microsoft.public.vc.language/AVnx-E… and https://www.xspdf.com/questions/22333.shtml ... So instead we use another trick, that appears to be already in use in the shell32.spec. Since the shlwapi functions are imported because we link to it, this means that ShellMessageBoxWrapW() is already available through this import. So we can specify it in the .spec file as is, without a full name prefixed with "shlwapi." . Therefore the associated shell32.ShellMessageBoxW function will instead link to the small ShellMessageBoxWrapW() import stub that is generated automatically. --- dll/win32/shell32/shell32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 110ac17c69c..f5270cc103f 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,7 +178,7 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) shlwapi.ShellMessageBoxWrapW +182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long)

4 years, 3 months

[reactos] 01/01: [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a04831677eaaf62a7d7a9… commit a04831677eaaf62a7d7a99583f6f5e788687d9d2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 13 23:42:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:42:09 2020 +0200 [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152) CORE-12004 --- base/shell/progman/dialog.c | 4 ++-- sdk/lib/crt/misc/dbgrpt.cpp | 2 +- win32ss/user/user32/windows/cursoricon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/progman/dialog.c b/base/shell/progman/dialog.c index 3aebd71356f..452b1bc4c7b 100644 --- a/base/shell/progman/dialog.c +++ b/base/shell/progman/dialog.c @@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName); SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32); - pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, @@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, filename); DestroyIconList(pIconContext->hDlgCtrl); - pIconContext->hLibrary = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(filename, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index 9259ff8edab..a349687d475 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -113,7 +113,7 @@ HMODULE _CrtGetUser32() { if (_CrtUser32Handle == NULL) { - HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, 0 /* NT6+: LOAD_LIBRARY_SEARCH_SYSTEM32 */); if (mod == NULL) mod = (HMODULE)INVALID_HANDLE_VALUE; diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index ad0ac4d6d05..e64e0374a17 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -1866,7 +1866,7 @@ CURSORICON_CopyImage( ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); /* Get the module handle or load the module */ - hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(ustrModule.Buffer, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { DWORD err = GetLastError();

4 years, 3 months

[reactos] 01/01: [TRANSLATION][SHELL32] Localization of "System Folder" in My Computer types (#3168)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aad9bb8e8addfa3d0fdc5… commit aad9bb8e8addfa3d0fdc5a85606172690b58c425 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:16:19 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:16:19 2020 +0200 [TRANSLATION][SHELL32] Localization of "System Folder" in My Computer types (#3168) Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> Co-authored-by: JoseSanchezz <67137372+JoseSanchezz(a)users.noreply.github.com> --- dll/win32/shell32/folders/CRegFolder.cpp | 3 +-- dll/win32/shell32/lang/bg-BG.rc | 2 ++ dll/win32/shell32/lang/ca-ES.rc | 2 ++ dll/win32/shell32/lang/cs-CZ.rc | 2 ++ dll/win32/shell32/lang/da-DK.rc | 2 ++ dll/win32/shell32/lang/de-DE.rc | 2 ++ dll/win32/shell32/lang/el-GR.rc | 2 ++ dll/win32/shell32/lang/en-GB.rc | 2 ++ dll/win32/shell32/lang/en-US.rc | 2 ++ dll/win32/shell32/lang/es-ES.rc | 2 ++ dll/win32/shell32/lang/et-EE.rc | 2 ++ dll/win32/shell32/lang/fi-FI.rc | 2 ++ dll/win32/shell32/lang/fr-FR.rc | 2 ++ dll/win32/shell32/lang/he-IL.rc | 2 ++ dll/win32/shell32/lang/hi-IN.rc | 2 ++ dll/win32/shell32/lang/hu-HU.rc | 2 ++ dll/win32/shell32/lang/id-ID.rc | 2 ++ dll/win32/shell32/lang/it-IT.rc | 2 ++ dll/win32/shell32/lang/ja-JP.rc | 2 ++ dll/win32/shell32/lang/ko-KR.rc | 2 ++ dll/win32/shell32/lang/nl-NL.rc | 2 ++ dll/win32/shell32/lang/no-NO.rc | 2 ++ dll/win32/shell32/lang/pl-PL.rc | 2 ++ dll/win32/shell32/lang/pt-BR.rc | 2 ++ dll/win32/shell32/lang/pt-PT.rc | 2 ++ dll/win32/shell32/lang/ro-RO.rc | 2 ++ dll/win32/shell32/lang/ru-RU.rc | 2 ++ dll/win32/shell32/lang/sk-SK.rc | 2 ++ dll/win32/shell32/lang/sl-SI.rc | 2 ++ dll/win32/shell32/lang/sq-AL.rc | 2 ++ dll/win32/shell32/lang/sv-SE.rc | 2 ++ dll/win32/shell32/lang/tr-TR.rc | 2 ++ dll/win32/shell32/lang/uk-UA.rc | 2 ++ dll/win32/shell32/lang/zh-CN.rc | 2 ++ dll/win32/shell32/lang/zh-TW.rc | 2 ++ dll/win32/shell32/shresdef.h | 2 ++ 36 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 6dc12770212..ce7292f3964 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -771,8 +771,7 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL RegCloseKey(hKey); return S_OK; case 2: /* type */ - //return SHSetStrRet(&psd->str, resource_id); /* FIXME: translate */ - return SHSetStrRet(&psd->str, "System Folder"); + return SHSetStrRet(&psd->str, IDS_SYSTEMFOLDER); } return E_FAIL; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index c8cf53f7ab8..f256ece6cae 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1007,4 +1007,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index d7b4f1d9108..ff4656cd30c 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index fdb3815d20f..490b68aa090 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index cd8482376fd..0f86d9a3c26 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index d0a9621f396..6e94e825518 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -1007,4 +1007,6 @@ BEGIN IDS_MOVETOTITLE "Wählen Sie den Ort, in den '%s' verschoben werden soll. Klicken Sie anschließend auf Verschieben." IDS_MOVEITEMS "Elemente verschieben" IDS_MOVEBUTTON "Verschieben" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 608a39b4e47..ba7f4182855 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 105de0326dc..63424343e74 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index a363b8007ba..ef2dcf0590e 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d7587de7a88..41adf26c018 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1015,4 +1015,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 9533ddd67a0..4b308e77c23 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1013,4 +1013,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 714c08ac926..30071a27944 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 2cad6e6b751..acf02ca4a6b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Sélectionnez l'emplacement où vous souhaitez déplacer '%s', puis appuyez sur le bouton Déplacer." IDS_MOVEITEMS "Déplacer les éléments" IDS_MOVEBUTTON "Déplacer" + + IDS_SYSTEMFOLDER "Dossier système" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index a04365c04f7..b27f62e4bdc 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 54b4dfc3dfb..d3cac589e6e 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1001,4 +1001,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 8f887b03807..7c47db6fe45 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -1005,4 +1005,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 5dc7a1d0370..d48846edb55 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -1002,4 +1002,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 6bf694cb9cb..8572685eda1 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index c72797b6285..d1c420ecf1a 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -1003,4 +1003,6 @@ BEGIN IDS_MOVETOTITLE "'%s' の移動先を選択して「移動」ボタンをクリックして下さい。" IDS_MOVEITEMS "項目の移動先" IDS_MOVEBUTTON "移動" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 407d8675d61..0c0fd22d783 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index b4c70b2ba0a..0871a744914 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index d19c455cfa8..1b159361977 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 1d44e866ae8..2d6e65dce66 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1012,4 +1012,6 @@ BEGIN IDS_MOVETOTITLE "Zaznacz miejsce, w które chcesz przenieść '%s', a następnie kliknij przycisk Przenieś." IDS_MOVEITEMS "Przenoszenie elementów" IDS_MOVEBUTTON "Przenieś" + + IDS_SYSTEMFOLDER "Folder systemowy" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 4a8e3831407..f9d40a365da 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 779b5d22d43..82ca880f830 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 86e775f7670..bad12b2d015 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index e9da9dcfc0e..0b73dc46b94 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1013,4 +1013,6 @@ BEGIN IDS_MOVETOTITLE "Выберите расположение, куда вы хотите переместить '%s', затем нажмите кнопку 'Переместить'." IDS_MOVEITEMS "Перемещение элементов" IDS_MOVEBUTTON "Переместить" + + IDS_SYSTEMFOLDER "Системная папка" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 4b2263553ff..b7c2c68873e 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index f25073b1adf..25bb2407df3 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index dc503934a27..f555196609d 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1010,4 +1010,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e7a4927acc8..89ece721224 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 01a9d772838..8ba5645ac0f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1008,4 +1008,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 60e1d6c06df..b8c7c952a33 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -1006,4 +1006,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7fce0c7b035..b93b3a389ab 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1016,4 +1016,6 @@ BEGIN IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index a39f2ccc4ce..dbe437c0ea9 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1016,4 +1016,6 @@ BEGIN IDS_MOVETOTITLE "選取想要移動 '%s' 的位置，然後按一下 [移動] 按鈕。" IDS_MOVEITEMS "移動項目" IDS_MOVEBUTTON "移動" + + IDS_SYSTEMFOLDER "System Folder" END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 391b8330b2b..821d4d05a85 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -306,6 +306,8 @@ #define IDS_MOVEITEMS 30538 #define IDS_MOVEBUTTON 30539 +#define IDS_SYSTEMFOLDER 30540 + /* Dialogs */ /* Run dialog */

4 years, 3 months

[reactos] 01/01: [TRANSLATION][SCREENSAVERS][SYSSETUP] Add Portuguese (PT) translation (#3156)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b52189873db71e4fb784f… commit b52189873db71e4fb784fbb75349fe1c86922853 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Sep 13 22:14:05 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:14:05 2020 +0200 [TRANSLATION][SCREENSAVERS][SYSSETUP] Add Portuguese (PT) translation (#3156) --- .../applications/screensavers/3dtext/lang/pt-BR.rc | 2 +- .../3dtext/lang/{pt-BR.rc => pt-PT.rc} | 6 ++--- base/applications/screensavers/3dtext/rsrc.rc | 3 +++ base/applications/screensavers/logon/lang/pt-BR.rc | 2 +- base/applications/screensavers/logon/lang/pt-PT.rc | 9 +++++++ base/applications/screensavers/logon/logon.rc | 3 +++ dll/win32/syssetup/lang/pt-PT.rc | 30 +++++++++++----------- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/base/applications/screensavers/3dtext/lang/pt-BR.rc b/base/applications/screensavers/3dtext/lang/pt-BR.rc index 521dbcb94f5..e83ccd9294a 100644 --- a/base/applications/screensavers/3dtext/lang/pt-BR.rc +++ b/base/applications/screensavers/3dtext/lang/pt-BR.rc @@ -1,5 +1,5 @@ /* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/base/applications/screensavers/3dtext/lang/pt-BR.rc b/base/applications/screensavers/3dtext/lang/pt-PT.rc similarity index 68% copy from base/applications/screensavers/3dtext/lang/pt-BR.rc copy to base/applications/screensavers/3dtext/lang/pt-PT.rc index 521dbcb94f5..c1e71287703 100644 --- a/base/applications/screensavers/3dtext/lang/pt-BR.rc +++ b/base/applications/screensavers/3dtext/lang/pt-PT.rc @@ -1,15 +1,15 @@ -/* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ +/* Translation to Portuguese (PT) by zecarlos1957(a)hotmail.com 10-09-2020 */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opções do Protetor de Tela" +CAPTION "Opções de Protecção de Ecrã" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Personalizar Text", IDC_STATIC, 18, 17, 65, 8 + LTEXT "Personalizar Texto", IDC_STATIC, 18, 17, 65, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/rsrc.rc b/base/applications/screensavers/3dtext/rsrc.rc index 4e0f6c9a179..16d6659518b 100644 --- a/base/applications/screensavers/3dtext/rsrc.rc +++ b/base/applications/screensavers/3dtext/rsrc.rc @@ -70,6 +70,9 @@ IDI_ICON ICON DISCARDABLE "res/icon_3dtext.ico" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/screensavers/logon/lang/pt-BR.rc b/base/applications/screensavers/logon/lang/pt-BR.rc index cac144837be..eca2f843ffd 100644 --- a/base/applications/screensavers/logon/lang/pt-BR.rc +++ b/base/applications/screensavers/logon/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE BEGIN diff --git a/base/applications/screensavers/logon/lang/pt-PT.rc b/base/applications/screensavers/logon/lang/pt-PT.rc new file mode 100644 index 00000000000..1520b91659f --- /dev/null +++ b/base/applications/screensavers/logon/lang/pt-PT.rc @@ -0,0 +1,9 @@ +/* Translation to Portuguese (PT) by zecarlos1957(a)hotmail.com 10-09-2020*/ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DESCRIPTION "Protecção de ecrã Início" + IDS_TEXT "Esta protecção de ecrã não é configuravel." +END diff --git a/base/applications/screensavers/logon/logon.rc b/base/applications/screensavers/logon/logon.rc index 5881fd93698..cf7cc24e57e 100644 --- a/base/applications/screensavers/logon/logon.rc +++ b/base/applications/screensavers/logon/logon.rc @@ -77,6 +77,9 @@ IDB_SERVER BITMAP "res/1.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index de3be1e4467..cd9a7862216 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo ao assistente de instalação do ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Este assistente ajuda-o a instalar o ReactOS no seu computador. Precisamos reunir algumas informações para instalar o ReactOS devidamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Este assistente ajuda-o a instalar o ReactOS no seu computador. Precisamos reunir algumas informações para instalar o ReactOS correctamente.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END @@ -23,16 +23,16 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Instalação do ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Por favor escolha uma opção de produto:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "&Opções de produto:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Informação de produto", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Descrição:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -99,7 +99,7 @@ END IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 @@ -228,8 +228,8 @@ END STRINGTABLE BEGIN IDS_DETECTIONDISABLED "Detecção desabilitada" - IDS_LOOKFORWHEEL "A detectar o volante do rato" - IDS_ASSUMEPRESENT "Assume volante está presente" + IDS_LOOKFORWHEEL "A detectar o roda do rato" + IDS_ASSUMEPRESENT "Assume roda está presente" END STRINGTABLE @@ -242,11 +242,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_PRODUCTTITLE "Opções de produto" + IDS_PRODUCTSUBTITLE "Pode escolher uma opção de produto que afecta o comportamento do sistema." + IDS_PRODUCTSERVERNAME "Servidor ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Estação de trabalho ReactOS" + IDS_PRODUCTSERVERINFO "O sistema será reconhecido como um servidor. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" são independentes de ""Meus documentos""." + IDS_PRODUCTWORKSTATIONINFO "O sistema será reconhecido como uma estação de trabalho. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" estão em ""Meus documentos""." IDS_DEFAULT "(Default)" END

4 years, 3 months

[reactos] 01/01: [RAPPS][CONSRV] French translation update (#3160)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f07ace6aa245c10df7ba4… commit f07ace6aa245c10df7ba47cba01c3055f5e9d3a6 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:12:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:12:52 2020 +0200 [RAPPS][CONSRV] French translation update (#3160) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/rapps/lang/fr-FR.rc | 30 +++++++++++----------- .../user/winsrv/consrv/frontends/gui/lang/fr-FR.rc | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 996ffa5c212..e1f13a39b90 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -141,7 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nCommande de désinstallation : " IDS_INFO_MODIFYPATH "\nModifier le chemin d'accès : " IDS_INFO_INSTALLDATE "\nDate d'installation : " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNom du paquet : " END STRINGTABLE @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Applications Manager" + IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Chercher…" IDS_INSTALL "Installer" @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Sélectionnées pour installation" IDS_MISMATCH_CERT_INFO "Certificat inconnu:\nSujet: %s\nEmetteur: %s\nVoulez-vous continuer ?" IDS_UNABLE_PATH "Format de chemin invalide." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "détails" + IDS_APP_DISPLAY_LIST "liste" + IDS_APP_DISPLAY_TILE "tuile" END STRINGTABLE @@ -230,8 +230,8 @@ END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" - IDS_LICENSE_FREEWARE "Freeware" + IDS_LICENSE_OPENSOURCE "Libre" + IDS_LICENSE_FREEWARE "Gratuit" IDS_LICENSE_TRIAL "Version d'essai / Démo" END @@ -254,12 +254,12 @@ END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Usage : " + IDS_CMD_NEED_PACKAGE_NAME "Erreur : L'option %1 nécessite un ou plusieurs noms de paquets.\n" + IDS_CMD_NEED_FILE_NAME "Erreur : L'option %1 nécessite un nom de fichier.\n" + IDS_CMD_NEED_PARAMS "Erreur : L'option %1 nécessite un ou plusieurs paramètres.\n" + IDS_CMD_INVALID_OPTION "Erreur : L'option de ligne de commande spécifiée est inconnue ou invalide.\n" + IDS_CMD_FIND_RESULT_FOR "Résultats pour %1 :\n" + IDS_CMD_PACKAGE_NOT_FOUND "Impossible de trouver le paquet %1.\n" + IDS_CMD_PACKAGE_INFO "Information sur le paquet %1 :\n" END diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc index 2c8955fc4ea..23ab69ecc9e 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc @@ -20,7 +20,7 @@ BEGIN IDS_SCROLLUP "Défiler en haut" IDS_SCROLLDOWN "Défiler en bas" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "Console ReactOS" END STRINGTABLE

4 years, 3 months

[reactos] 01/01: [SHELL32] Improve Format dialog debug log (trivial) (#3176)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d4b853b8a0df3401da87… commit 6d4b853b8a0df3401da871ee2618f39e356328da Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:05:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:05:04 2020 +0200 [SHELL32] Improve Format dialog debug log (trivial) (#3176) - Logging of name for unknown filesystem. - Fix some trace content as not only HDD could be affected. --- dll/win32/shell32/dialogs/drive.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 60243d44a02..126dc0da211 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -212,7 +212,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("FAT16 is not supported on hdd larger than 4G current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("FAT16 is not supported on drive larger than 4G current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -234,7 +234,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("FAT32 is not supported on hdd larger than 32G current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("FAT32 is not supported on drive larger than 32G current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -256,7 +256,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("NTFS is not supported on hdd larger than 2TB current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("NTFS is not supported on drive larger than 2TB current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -289,7 +289,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("EXT2 is not supported on hdd larger than 32T current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("EXT2 is not supported on drive larger than 32T current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -310,7 +310,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { - TRACE("BtrFS is not supported on hdd larger than 16E current %lu\n", TotalNumberOfBytes.QuadPart); + TRACE("BtrFS is not supported on drive larger than 16E current %lu\n", TotalNumberOfBytes.QuadPart); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); return; } @@ -329,7 +329,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) } else { - FIXME("unknown fs\n"); + FIXME("Unknown filesystem: %ls\n", wszBuf); SendDlgItemMessageW(hwndDlg, 28680, CB_RESETCONTENT, iSelIndex, 0); return; } @@ -444,7 +444,7 @@ FormatExCB( case FSNOTSUPPORTED: case CLUSTERSIZETOOSMALL: bSuccess = FALSE; - FIXME("\n"); + FIXME("Unsupported command in FormatExCB\n"); break; default: @@ -476,13 +476,13 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) iSelIndex = SendMessageW(hDlgCtrl, CB_GETCURSEL, 0, 0); if (iSelIndex == CB_ERR) { - FIXME("\n"); + ERR("Unable to get file system selection\n"); return; } Length = SendMessageW(hDlgCtrl, CB_GETLBTEXTLEN, iSelIndex, 0); if ((int)Length == CB_ERR || Length + 1 > _countof(szFileSys)) { - FIXME("\n"); + ERR("Unable to get file system selection\n"); return; } @@ -495,7 +495,7 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) Length = SendMessageW(hDlgCtrl, WM_GETTEXTLENGTH, 0, 0); if (Length + 1 > _countof(szLabel)) { - FIXME("\n"); + ERR("Unable to get volume label\n"); return; } SendMessageW(hDlgCtrl, WM_GETTEXT, _countof(szLabel), (LPARAM)szLabel);

4 years, 3 months

[reactos] 01/01: [FORMAT] Fix of output text overlap in console when finished (#3177)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=860a985f26a41140ca063… commit 860a985f26a41140ca063e9493dbd953ede06ec9 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:02:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:02:09 2020 +0200 [FORMAT] Fix of output text overlap in console when finished (#3177) At the end of the format operation, text in console got overwritten and leftovers from previous line remained displayed. --- base/system/format/format.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/system/format/format.c b/base/system/format/format.c index 6685200e479..0d7e642c598 100644 --- a/base/system/format/format.c +++ b/base/system/format/format.c @@ -562,6 +562,7 @@ int wmain(int argc, WCHAR *argv[]) FormatEx(RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback); if (Error) return -1; + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, STRING_FMT_COMPLETE); //

4 years, 3 months

[reactos] 01/01: [FORMAT] French translation fix (#3178)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51023e3a2e5b15d0b76e1… commit 51023e3a2e5b15d0b76e1a39169f38ea65831783 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 13 23:01:07 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:01:07 2020 +0200 [FORMAT] French translation fix (#3178) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/system/format/lang/fr-FR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/format/lang/fr-FR.rc b/base/system/format/lang/fr-FR.rc index a077d4d346d..74447b46072 100644 --- a/base/system/format/lang/fr-FR.rc +++ b/base/system/format/lang/fr-FR.rc @@ -13,11 +13,11 @@ BEGIN sont fortement recommandées pour une utilisation courante\n\ NTFS peut utiliser 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT peut utiliser 8192, 16K, 32K, 64K, 128K, 256K.\n\ - La compression NTFS n'est pas possible au de là de 4096.\n\ + La compression NTFS n'est pas possible au delà de 4096.\n\ -C Les fichiers sur le nouveau disque seront compressés automatiquement.\n\n" STRING_COMPLETE "%lu pourcent effectués.\r" - STRING_FORMAT_FAIL "FormatEx ne peut se finir avec succés.\n\n" - STRING_NO_SUPPORT "Fontion Non Supportée" + STRING_FORMAT_FAIL "FormatEx ne peut se finir avec succès.\n\n" + STRING_NO_SUPPORT "Opération non supportée" STRING_FMIFS_FAIL "Impossible de trouver les points d'entrée FMIFS.\n\n" STRING_UNKNOW_ARG "Argument inconnu : %s\n" STRING_DRIVE_PARM "Le disque à formater n'est pas indiqué.\n\n" @@ -38,6 +38,6 @@ PERDUES !\nContinuer avec le formatage (O/N) ? " STRING_VOL_COMPRESS "Le disque ne supporte pas la compression.\n" STRING_ENTER_LABEL "Nom du disque (11 caractères, Entrée si aucun) ? " STRING_NO_LABEL "Impossible de donner un nom au disque" - STRING_FREE_SPACE "\nEspace disque total : %I64d octet.\n Espace disque disponible : %I64d octet.\n" + STRING_FREE_SPACE "\nEspace disque total : %I64d octet(s).\nEspace disque disponible : %I64d octet(s).\n" STRING_SERIAL_NUMBER "\nNuméro de série du disque: %04X-%04X\n" END

4 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020