Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Use IS_INTRESOURCE in CCopyToMenu/CMoveToMenu::InvokeCommand
by Katayama Hirofumi MZ 22 Oct '23

22 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc70af4c134ba31778b46… commit bc70af4c134ba31778b46686da8fc1c70f0f6d51 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 23 07:55:24 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 23 07:55:24 2023 +0900 [SHELL32] Use IS_INTRESOURCE in CCopyToMenu/CMoveToMenu::InvokeCommand CORE-18426 --- dll/win32/shell32/CCopyToMenu.cpp | 2 +- dll/win32/shell32/CDefView.cpp | 3 +++ dll/win32/shell32/CMoveToMenu.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index a692d7fed53..d3da9d1f5a8 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -319,7 +319,7 @@ CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; TRACE("CCopyToMenu::InvokeCommand(%p)\n", lpici); - if (HIWORD(lpici->lpVerb) == 0) + if (IS_INTRESOURCE(lpici->lpVerb)) { if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdCopyTo) { diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9f12fd09549..876748cd13e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1522,6 +1522,9 @@ HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCom cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.hwnd = m_hWnd; + if (uCommand==FCIDM_SHVIEW_COPYTO) cmi.lpVerb = "copyto"; + if (uCommand==FCIDM_SHVIEW_MOVETO) cmi.lpVerb = "moveto"; + if (GetKeyState(VK_SHIFT) & 0x8000) cmi.fMask |= CMIC_MASK_SHIFT_DOWN; diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 5087f5ec37d..a2d35f1ade1 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -323,7 +323,7 @@ CMoveToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; TRACE("CMoveToMenu::InvokeCommand(%p)\n", lpici); - if (HIWORD(lpici->lpVerb) == 0) + if (IS_INTRESOURCE(lpici->lpVerb)) { if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdMoveTo) {

1 0

[reactos] 01/01: [COMCTL32] Invalidate LVIS_CUT selected items too (#4218)
by Jesús Sanz del Rey 21 Oct '23

21 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855008d97b2c7e1a1b72a… commit 855008d97b2c7e1a1b72ad268b68d83c739ebc6d Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Sat Oct 21 18:51:54 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 21 18:51:54 2023 +0200 [COMCTL32] Invalidate LVIS_CUT selected items too (#4218) This fixes icons that should be drawn transparently not showing as such until window gets repainted. For example, hidden shell folders that are not drawn transparently until the filebrowser window is resized... CORE-16722 --- dll/win32/comctl32/listview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 9d6609ffd71..5bd7e287a8b 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2276,7 +2276,11 @@ static void LISTVIEW_InvalidateSelectedItems(const LISTVIEW_INFO *infoPtr) iterator_frameditems(&i, infoPtr, &infoPtr->rcList); while(iterator_next(&i)) { +#ifdef __REACTOS__ + if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED | LVIS_CUT)) +#else if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED)) +#endif LISTVIEW_InvalidateItem(infoPtr, i.nItem); } iterator_destroy(&i);

1 0

[reactos] 01/01: [HDAUDBUS][KS][WDMAUD] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5792)
by Serge Gautherie 20 Oct '23

20 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c03b2ed9bebdc9b68539f… commit c03b2ed9bebdc9b68539f863f8f6ea853989e961 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 20 18:09:03 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 18:09:03 2023 +0200 [HDAUDBUS][KS][WDMAUD] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5792) And promote/fix 2 DPRINTs as well. --- drivers/ksfilter/ks/filterfactory.c | 3 +-- drivers/ksfilter/ks/misc.c | 12 ++---------- drivers/wdm/audio/hdaudbus/fdo.cpp | 5 ++--- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 13 +++++-------- drivers/wdm/audio/legacy/wdmaud/sup.c | 18 +++--------------- 5 files changed, 13 insertions(+), 38 deletions(-) diff --git a/drivers/ksfilter/ks/filterfactory.c b/drivers/ksfilter/ks/filterfactory.c index aed00b05d92..be907d8df9c 100644 --- a/drivers/ksfilter/ks/filterfactory.c +++ b/drivers/ksfilter/ks/filterfactory.c @@ -247,7 +247,7 @@ IKsFilterFactory_fnInitialize( This->FilterFactory.FilterDescriptor = AllocateItem(NonPagedPool, sizeof(KSFILTER_DESCRIPTOR)); if (!This->FilterFactory.FilterDescriptor) { - DPRINT("out of memory"); + DPRINT1("Out of memory\n"); return STATUS_INSUFFICIENT_RESOURCES; } RtlMoveMemory((PVOID)This->FilterFactory.FilterDescriptor, (PVOID)Descriptor, sizeof(KSFILTER_DESCRIPTOR)); @@ -751,4 +751,3 @@ KsFilterFactoryUpdateCacheData( /* done */ return Status; } - diff --git a/drivers/ksfilter/ks/misc.c b/drivers/ksfilter/ks/misc.c index 5174f850cf0..e2656442d3e 100644 --- a/drivers/ksfilter/ks/misc.c +++ b/drivers/ksfilter/ks/misc.c @@ -22,7 +22,6 @@ CompleteRequest( ASSERT(Irp->IoStatus.Status != STATUS_PENDING); - IoCompleteRequest(Irp, PriorityBoost); } @@ -31,19 +30,14 @@ AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_KS); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_KS); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_KS); } NTSTATUS @@ -172,5 +166,3 @@ KsGetParent( /* return object type */ return (PVOID)BasicHeader->Parent.KsDevice; } - - diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 7088ee933c3..59eaf7d48ec 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -5,6 +5,7 @@ * PURPOSE: HDA Driver Entry * PROGRAMMER: Johannes Anderwald */ + #include "hdaudbus.h" BOOLEAN @@ -217,7 +218,7 @@ HDA_InitCodec( Entry = (PHDA_CODEC_ENTRY)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_ENTRY)); if (!Entry) { - DPRINT1("hda: failed to allocate memory"); + DPRINT1("hda: failed to allocate memory\n"); return STATUS_UNSUCCESSFUL; } @@ -812,5 +813,3 @@ HDA_FDOQueryBusRelations( /* done */ return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 88e82c6b7ed..5522d18033f 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -5,6 +5,7 @@ * PURPOSE: HDA Driver Entry * PROGRAMMER: Johannes Anderwald */ + #include "hdaudbus.h" DRIVER_DISPATCH HDA_Pnp; @@ -19,19 +20,14 @@ AllocateItem( _In_ POOL_TYPE PoolType, _In_ SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_HDA); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_HDA); } VOID FreeItem( __drv_freesMem(Mem) PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_HDA); } NTSTATUS @@ -305,6 +301,7 @@ HDA_Unload( extern "C" { + NTSTATUS NTAPI DriverEntry( @@ -320,4 +317,4 @@ DriverEntry( return STATUS_SUCCESS; } -} +} // extern "C" diff --git a/drivers/wdm/audio/legacy/wdmaud/sup.c b/drivers/wdm/audio/legacy/wdmaud/sup.c index 91334c09bb3..496eabf56e2 100644 --- a/drivers/wdm/audio/legacy/wdmaud/sup.c +++ b/drivers/wdm/audio/legacy/wdmaud/sup.c @@ -21,23 +21,16 @@ AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_WDMAUD); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_WDMAUD); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_WDMAUD); } - - ULONG GetSysAudioDeviceCount( IN PDEVICE_OBJECT DeviceObject) @@ -62,7 +55,6 @@ GetSysAudioDeviceCount( return Count; } - NTSTATUS SetIrpIoStatus( IN PIRP Irp, @@ -72,8 +64,8 @@ SetIrpIoStatus( Irp->IoStatus.Information = Length; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } ULONG @@ -186,7 +178,6 @@ ReadKeyValue( return PartialInformation; } - NTSTATUS CompareProductName( IN HANDLE hSubKey, @@ -248,8 +239,6 @@ CompareProductName( return STATUS_SUCCESS; } - - NTSTATUS FindProductName( IN LPWSTR PnpName, @@ -431,5 +420,4 @@ OpenDevice( } return Status; - }

1 0

[reactos] 01/01: [BOOTDATA] vfatfs.sys is packaged for xbox only (#5805)
by Serge Gautherie 20 Oct '23

20 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fed9475cc51f3b5fc40b… commit 1fed9475cc51f3b5fc40bd52bced98c89614dae4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 20 13:19:41 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:19:41 2023 +0200 [BOOTDATA] vfatfs.sys is packaged for xbox only (#5805) Addendum to 14c3936 (0.4.15-dev-5090). CORE-16373 --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index ed359f99bbe..1c084276ce4 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -124,7 +124,6 @@ pci.sys = 1,,,,,,x,4,,,,1,4 scsiport.sys = 1,,,,,,,4,,,,1,4 storport.sys = 1,,,,,,,4,,,,1,4 fastfat.sys = 1,,,,,,x,4,,,,1,4 -vfatfs.sys = 1,,,,,,,4,,,,1,4 btrfs.sys = 1,,,,,,x,4,,,,1,4 ramdisk.sys = 1,,,,,,x,4,,,,1,4 pciide.sys = 1,,,,,,,4,,,,1,4 @@ -282,6 +281,7 @@ halaacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 [Files.xbox] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 +vfatfs.sys = 1,,,,,,,4,,,,1,4 [Files.pc98_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2

1 0

[reactos] 01/01: [TASKMGR] Get rid of cplusplus extern c (#5808)
by Joachim Henze 20 Oct '23

20 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd1d19b3fbf6731eb533… commit ddd1d19b3fbf6731eb5339d5834f7f519caeae39 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Oct 20 13:03:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:03:59 2023 +0200 [TASKMGR] Get rid of cplusplus extern c (#5808) The others in graphctrl.h and graph.h are being handled in the yet-uncommitted PR #5343. --- base/applications/taskmgr/perfdata.h | 15 +++------------ base/applications/taskmgr/perfpage.h | 10 +--------- base/applications/taskmgr/taskmgr.h | 23 +---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 3da4a0fef2b..0a06c4d5cf2 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,17 +1,13 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Counters. + * PURPOSE: Performance Counters * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + (double)((x).LowPart)) typedef struct _PERFDATA @@ -43,9 +39,9 @@ typedef struct _PERFDATA typedef struct _CMD_LINE_CACHE { - DWORD idx; + DWORD idx; LPWSTR str; - ULONG len; + ULONG len; struct _CMD_LINE_CACHE* pnext; } CMD_LINE_CACHE, *PCMD_LINE_CACHE; @@ -99,8 +95,3 @@ ULONG PerfDataGetPhysicalMemorySystemCacheK(void); ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); - - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index e581bd39c3e..fcf270eece3 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,16 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Page. + * PURPOSE: Performance Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - extern HWND hPerformancePage; /* Performance Property Page */ INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -18,7 +14,3 @@ void RefreshPerformancePage(void); void PerformancePage_OnViewShowKernelTimes(void); void PerformancePage_OnViewCPUHistoryOneGraphAll(void); void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index e65ef30221f..fe387718c40 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,29 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Main Header. + * PURPOSE: Main Header * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef _MSC_VER -/*MF -typedef struct _IO_COUNTERS { - ULONGLONG ReadOperationCount; - ULONGLONG WriteOperationCount; - ULONGLONG OtherOperationCount; - ULONGLONG ReadTransferCount; - ULONGLONG WriteTransferCount; - ULONGLONG OtherTransferCount; -} IO_COUNTERS, *PIO_COUNTERS; -*/ -#endif /* _MSC_VER */ - #include "resource.h" #define RUN_APPS_PAGE @@ -100,7 +83,3 @@ void TaskManager_OnTabWndSelChange(void); VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread); - -#ifdef __cplusplus -} -#endif

1 0

[reactos] 01/01: [SHELL32] Enable Apply button when shortcut show mode is changed (#5807)
by Whindmar Saksit 20 Oct '23

20 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ded91e310a570323182df… commit ded91e310a570323182df18325af29b62b2d0810 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Oct 20 13:02:14 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:02:14 2023 +0200 [SHELL32] Enable Apply button when shortcut show mode is changed (#5807) Basically this happens when the combobox selection changes. --- dll/win32/shell32/CShellLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index d8951860328..bdd1b617082 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2886,7 +2886,7 @@ void CShellLink::OnCommand(HWND hwndDlg, int id, HWND hwndCtl, UINT codeNotify) return; } } - if (codeNotify == EN_CHANGE) + if (codeNotify == EN_CHANGE || codeNotify == CBN_SELCHANGE) { if (!m_bInInit) PropSheet_Changed(GetParent(hwndDlg), hwndDlg);

1 0

[reactos] 01/01: [TASKMGR] *.rc Deduplicate dynamic menu strings (#5772)
by Joachim Henze 19 Oct '23

19 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63eaf2bd529f5bf94cde6… commit 63eaf2bd529f5bf94cde65afc26944e98b47850b Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Oct 19 12:19:20 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 19 10:19:20 2023 +0000 [TASKMGR] *.rc Deduplicate dynamic menu strings (#5772) Some of the Menu-controls are just dummies in the RC, because those controls are dynamically replaced at runtime based on which tab/propsheet is active in taskmgr. They are replaced by the IDS_MENU_* strings then. Deduplicating them has many advantages: 1.) It shrinks binary size: master taskmgr.exe RosBEWin2.2.2 GCC8.4.0dbg 708.608 -> 696.832 bytes 2.) Translators don't get lured into translating dead stuff, assuming they translated the menu properly, while in fact they did not. This is *real*. Happened even to me multiple times already, although I am actually aware of the design. 3.) Some of them were offsync already between the dummy and the real thing. 4.) It reduces diff between en-US and other rc's. * Aside of that improve alignment in some languages rcs in the "Shutdown"-menu-section, * and improve a translation in de-DE, sq-AL, and zh-CN. * [TASKMGR] id-ID.rc 2 accelerators in the same string is definitely wrong * [TASKMGR] *.rc, make sure that warning is in all 30 langs, especially in en-US.rc * [TASKMGR] for several translations add FIXME-comments regarding accelerator collisions --- base/applications/taskmgr/lang/bg-BG.rc | 52 +++++++++--------- base/applications/taskmgr/lang/cs-CZ.rc | 50 ++++++++--------- base/applications/taskmgr/lang/da-DK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/de-DE.rc | 40 +++++++------- base/applications/taskmgr/lang/el-GR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/en-US.rc | 54 ++++++++++--------- base/applications/taskmgr/lang/es-ES.rc | 96 ++++++++++++++++----------------- base/applications/taskmgr/lang/et-EE.rc | 54 ++++++++++--------- base/applications/taskmgr/lang/fr-FR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/he-IL.rc | 52 +++++++++--------- base/applications/taskmgr/lang/hu-HU.rc | 72 ++++++++++++------------- base/applications/taskmgr/lang/id-ID.rc | 36 ++++++------- base/applications/taskmgr/lang/it-IT.rc | 52 +++++++++--------- base/applications/taskmgr/lang/ja-JP.rc | 52 +++++++++--------- base/applications/taskmgr/lang/ko-KR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/nl-NL.rc | 56 +++++++++---------- base/applications/taskmgr/lang/no-NO.rc | 78 +++++++++++++-------------- base/applications/taskmgr/lang/pl-PL.rc | 52 +++++++++--------- base/applications/taskmgr/lang/pt-BR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/pt-PT.rc | 60 ++++++++++----------- base/applications/taskmgr/lang/ro-RO.rc | 48 ++++++++--------- base/applications/taskmgr/lang/ru-RU.rc | 50 ++++++++--------- base/applications/taskmgr/lang/sk-SK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/sq-AL.rc | 56 +++++++++---------- base/applications/taskmgr/lang/sv-SE.rc | 56 +++++++++---------- base/applications/taskmgr/lang/tr-TR.rc | 50 ++++++++--------- base/applications/taskmgr/lang/uk-UA.rc | 52 +++++++++--------- base/applications/taskmgr/lang/zh-CN.rc | 54 +++++++++---------- base/applications/taskmgr/lang/zh-HK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/zh-TW.rc | 52 +++++++++--------- 30 files changed, 823 insertions(+), 815 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 69bbd1ab122..b41a49d2b2a 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Винаги отгоре", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "С&маляване при употреба", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Скриване при смаляване", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Показване на 16-битово задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "Из&глед" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Задържане", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Големи значета", ID_VIEW_LARGE - MENUITEM "&Малки значета", ID_VIEW_SMALL - MENUITEM "&Подробен", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Избор на стълбове...", ID_VIEW_SELECTCOLUMNS - POPUP "Дневник на &ЦПУ" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Една графика за всички ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "По графика за &всеки ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Показване на времената на ядрото", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Прозорци" + POPUP "" BEGIN MENUITEM "Водоравно настелване", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Отвесно настелване", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Помо&щ" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Нова задача (Изпълнение...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Превключване на", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Изваждане &отпред ", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Възстановяване", ID_RESTORE MENUITEM "&Затваряне", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Прекратяването на действието", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "&Прекратяването на дърво от действия", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Задачен управител" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Прекратяване на задача", IDC_ENDTASK, 7, 189, 95, 14, WS_DISABLED PUSHBUTTON "Пре&включване на...", IDC_SWITCHTO, 102, 189, 75, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Показване на действията на всички потребители", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 190, 10 diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 280d0e6aa3a..63f2119ee40 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizovat při použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skrýt při minimalizaci", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Zobrazit 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Zobrazit" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Zastavit", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Velké ikony", ID_VIEW_LARGE - MENUITEM "&Malé ikony", ID_VIEW_SMALL - MENUITEM "&Detaily", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vybrat sloupce...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historie CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Jeden graf, všechny procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&Jeden graf, jeden procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Zobrazit časy jádra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Okna" + POPUP "" BEGIN MENUITEM "Vyrovnat &horizontálně", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Vyrovnat &vertikálně", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Vy&pnout" BEGIN - MENUITEM "Režim &spánku", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernace", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Vypnout", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restartovat", ID_SHUTDOWN_REBOOT - MENUITEM "&Odhlásit uživatele %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Režim &spánku", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernace", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Vypnout", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restartovat", ID_SHUTDOWN_REBOOT + MENUITEM "&Odhlásit uživatele %s", ID_SHUTDOWN_LOGOFF MENUITEM "&Přepnout uživatele\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Zamknout počítač\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "O&dpojit se", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Vy&jmout počítač", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Zamknout počítač\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "O&dpojit se", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Vy&jmout počítač", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Nápověda" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nová úloha (Spustit...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Přepnout do", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Přenést do popředí", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Obnovit", ID_RESTORE MENUITEM "&Uzavřít", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ukončit proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Ukončit &strom procesu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Správce úloh" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Ukončit úlohu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Přepnout", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Zobrazit procesy všech uživatelů", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10 diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 7af08f234b9..ae1f26bf3f5 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Altid Øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimere Ved Brug", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skjul Når Minimeret", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Vis 16-bit Opgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vis" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Pauset", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "St&ore Ikoner", ID_VIEW_LARGE - MENUITEM "S&må Ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vælg Kolonner...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historie" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&En Graf, Alle CPUer", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "En Graf &Pr CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Vis Kernel Tider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vinduer" + POPUP "" BEGIN MENUITEM "Tile &Horisontalt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Verticalt", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjælp" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny Opgave (Kør...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Skift Til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Gendan", ID_RESTORE MENUITEM "&Luk", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Afslut Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Afslut Process &Træ", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Opgavestyring" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Afslut Opgave", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Skift Til", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Vis Processor fra alle brugere", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 519d3097edb..f914ee914aa 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Nach Programmstart minimieren", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ausblenden, wenn minimiert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&16-Bit-Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ansicht" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "Ang&ehalten", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Große Symbole", ID_VIEW_LARGE - MENUITEM "K&leine Symbole", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Spalten auswählen...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU-Verlauf" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Alle CPUs in einem Diagramm", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&Ein Diagramm pro CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "K&ernel-Zeiten anzeigen", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fenster" + POPUP "" BEGIN MENUITEM "&Untereinander", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Neuer Task (Ausführen...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Wechseln zu", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Wiederherstellen", ID_RESTORE MENUITEM "S&chließen", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Prozess beenden", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Pr&ozessstruktur beenden", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Task-Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Task beenden", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Wechseln zu", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Prozesse aller &Benutzer anzeigen", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10 @@ -285,7 +285,7 @@ BEGIN LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 CONTROL "&Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "&PID (Prozess-ID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 + CONTROL "&CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 CONTROL "&Delta Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 @@ -326,7 +326,7 @@ BEGIN ID_OPTIONS_ALWAYSONTOP "Task-Manager bleibt im Vordergrund, wenn nicht minimiert." ID_OPTIONS_MINIMIZEONUSE "Task-Manager wird minimiert, wenn ein SwitchTo-Vorgang durchgeführt wird." ID_OPTIONS_HIDEWHENMINIMIZED "Blendet den Task-Manager aus, wenn er minimiert ist." - ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung, unabhängig von der Geschwindigkeitseinstellung." + ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung." ID_VIEW_LARGE "Zeigt Tasks als große Symbole an." ID_VIEW_SMALL "Zeigt Tasks als kleine Symbole an." ID_VIEW_DETAILS "Zeigt Informationen über jeden Task an." @@ -385,7 +385,7 @@ BEGIN IDS_TAB_PID "PID" IDS_TAB_USERNAME "Benutzername" IDS_TAB_SESSIONID "Sitzungskennung" - IDS_TAB_CPU "CPU %" + IDS_TAB_CPU "CPU" IDS_TAB_CPUTIME "CPU-Zeit" IDS_TAB_MEMUSAGE "Speicherlast" IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast" diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 0d9068e83f4..8b0a0db89d4 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Πάντα Μπροστά", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Σμίκρυνση κατά τη Χρήση", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Απόκρυψη όταν είναι σε Σμίκρυνση", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Εμφάνιση 16-bit διεργασιών", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Εμφάνιση" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Σε Διακοπή", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Με&γάλα Εικονίδια", ID_VIEW_LARGE - MENUITEM "Μι&κρά Εικονίδια", ID_VIEW_SMALL - MENUITEM "&Λεπτομέρειες", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Επιλογή Στηλών...", ID_VIEW_SELECTCOLUMNS - POPUP "&Ιστορικό Επεξεργαστή" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Εμφάνιση Χρόνων Επεξεργαστή", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Παράθυρα" + POPUP "" BEGIN MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Βοήθεια" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&New Task (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restore", ID_RESTORE MENUITEM "&Close", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index 8f7e588b6e2..6c12067e84f 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Always On Top", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimize On Use", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Hide When Minimized", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Show 16-bit tasks", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&View" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Paused", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Lar&ge Icons", ID_VIEW_LARGE - MENUITEM "S&mall Icons", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Select Columns...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU History" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Show Kernel Times", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Windows" + POPUP "" BEGIN MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&New Task (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restore", ID_RESTORE MENUITEM "&Close", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -143,6 +143,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -150,14 +152,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -168,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 35cce6c9f33..233085d876e 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Siempre &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar al abrir", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar al estar minimizado", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Mo&strar tareas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ver" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Pausar", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Iconos &grandes", ID_VIEW_LARGE - MENUITEM "Iconos &pequeños", ID_VIEW_SMALL - MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleccionar columnas...", ID_VIEW_SELECTCOLUMNS - POPUP "Historial de &CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un gráfico de todas las CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un gráfico &por cada CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END MENUITEM "&Mostrar cronología del kernel", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Ventanas" + POPUP "" BEGIN MENUITEM "Mosaico &horizontal", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Mosaico &vertical", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Apaga&r" BEGIN - MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Apagar", ID_SHUTDOWN_POWEROFF - MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT - MENUITEM "&Cerrar sesión de %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Apagar", ID_SHUTDOWN_POWEROFF + MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT + MENUITEM "&Cerrar sesión de %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision + MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED //FIXME: accelerator collision MENUITEM "&Bloquear equipo\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Desconectar", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Expulsar equipo", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Desconectar", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Expulsar equipo", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ay&uda" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nueva tarea (Ejecutar...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Cambiar a", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Traer al frente", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Cerrar", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Terminar proceso", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Finalizar el ár&bol de procesos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Administrador de tareas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Finalizar tarea", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Cambiar a", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar procesos de todos los usuarios", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 160, 10 @@ -275,37 +275,37 @@ BEGIN CONTROL "CPU 31", IDC_CPU31, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 175, 119, 41, 10 END -IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199 // 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar columnas" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 // 84 - PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 // 138 - LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 // 181 - CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 // 56 - CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 // 88 + DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 + LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 + CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 + CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 CONTROL "Uso de &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 - CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 // 48 + CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 CONTROL "Uso de &memoria", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 // 82 - CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 // 82 - CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 // 53 - CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 // 62 - CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 // 49 + CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 + CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 + CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 + CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 + CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 90, 10 - CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 // 50 - CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 // 51 - CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 // 107, 60 - CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 // 107, 60 - CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 // 107, 53 - CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 - CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 - CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 // 107 - CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 // 107 - CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 - CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 - CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 + CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 + CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 + CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 + CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 + CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 + CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 + CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 + CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 + CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 + CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 + CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 + CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 CONTROL "Otros de E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 60, 10 CONTROL "Otros bytes de E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 75, 10 CONTROL "&Línea de comandos", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 75, 10 diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 5f2af96aedd..0d0a6d3c89c 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -19,7 +19,7 @@ BEGIN MENUITEM "&Alati pealmiseks", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimeeri kasutamisel", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Minmeerimisel &peida", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Näita 16-bitiseid tegumeid", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vaade" BEGIN @@ -32,18 +32,18 @@ BEGIN MENUITEM "&Peatatud", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "S&uured ikoonid", ID_VIEW_LARGE - MENUITEM "Vä&ikesed ikoonid", ID_VIEW_SMALL - MENUITEM "&Detailid", ID_VIEW_DETAILS, CHECKED - MENUITEM "Va&li veerud...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Ajalugu" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Üks diagramm kõigile protsessoritele", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Üks diagramm protsessori kohta", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kuva tuumaajad", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Aknad" + POPUP "" BEGIN MENUITEM "Paani &horisontaalselt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Paani &vertikaalselt", ID_WINDOWS_TILEVERTICALLY @@ -54,15 +54,15 @@ BEGIN END POPUP "S&ulgemine" BEGIN - MENUITEM "&Puhkerežiim", ID_SHUTDOWN_STANDBY - MENUITEM "&Talveuni", ID_SHUTDOWN_HIBERNATE - MENUITEM "Lül&ita välja", ID_SHUTDOWN_POWEROFF - MENUITEM "T&aaskäivita", ID_SHUTDOWN_REBOOT - MENUITEM "&Logi välja %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Vaheta kasutajat\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Lu&kusta arvuti\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "Katkesta &ühendus", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eemalda arvuti", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Puhkerežiim", ID_SHUTDOWN_STANDBY + MENUITEM "&Talveuni", ID_SHUTDOWN_HIBERNATE + MENUITEM "Lül&ita välja", ID_SHUTDOWN_POWEROFF + MENUITEM "T&aaskäivita", ID_SHUTDOWN_REBOOT + MENUITEM "&Logi välja %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Vaheta kasutajat\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Lu&kusta arvuti\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "Katkesta &ühendus", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eemalda arvuti", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "S&pikker" BEGIN @@ -84,7 +84,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Uus tegum (käivita...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -96,7 +96,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Aktiveeri", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Too kõige ette", ID_WINDOWS_BRINGTOFRONT @@ -114,7 +114,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Taasta", ID_RESTORE MENUITEM "&Sule", ID_FILE_EXIT @@ -125,7 +125,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Lõpeta protsess", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Lõpeta protsessi&puu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -149,6 +149,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -156,14 +158,14 @@ CAPTION "Tegumihaldur" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Lõpeta tegum", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Aktiveeri", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -174,7 +176,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Näita protsesse kõigilt kasutajatelt", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index d86362f1fec..409ec1e6856 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Toujours visible", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Réduire à l'exécution", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Masquer l'icône réduite", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Afficher les &tâches 16-bits", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Affichage" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&En pause", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Grandes icônes", ID_VIEW_LARGE - MENUITEM "&Petites icônes", ID_VIEW_SMALL - MENUITEM "&Détails", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Sélectionner les colonnes...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historique du processeur" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un graphique pour tous les UC", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un graphique &par UC", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fenêtres" + POPUP "" BEGIN MENUITEM "Mosaïque &horizontale", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Mosaïque &verticale", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "É&teindre" BEGIN - MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY - MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE - MENUITEM "É&teindre", ID_SHUTDOWN_POWEROFF - MENUITEM "&Redémarrer", ID_SHUTDOWN_REBOOT - MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Déconnecter", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Libér&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY + MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE + MENUITEM "É&teindre", ID_SHUTDOWN_POWEROFF + MENUITEM "&Redémarrer", ID_SHUTDOWN_REBOOT + MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Déconnecter", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Libér&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aide" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nouvelle tâche (Exécuter...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Basculer vers", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurer", ID_RESTORE MENUITEM "&Fermer", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Terminer le processus", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "T&erminer l'arborescence du processus", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Gestionnaire des tâches" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "F&in de tâche", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Basculer vers", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Aff&icher les processus de tous les utilisateurs", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10 diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 49dc0ff2ec1..c6ae88bee4e 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "תמיד &עליון", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&מזער בעת שימוש", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&הסתר בעת שימוש", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "הצג משימות של 16 &סיביות", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "ת&צוגה" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&מושהה", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "סמלים ג&דולים", ID_VIEW_LARGE - MENUITEM "סמלים ק&טנים", ID_VIEW_SMALL - MENUITEM "מ&אפיינים", ID_VIEW_DETAILS, CHECKED - MENUITEM "ב&חירת עמודות...", ID_VIEW_SELECTCOLUMNS - POPUP "&היסטורית מעבד" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&עמודה אחת עבור כל המעבדים", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "עמ&ודה אחת לכל מעבד", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "הראה זמני &ליבה", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&חלונות" + POPUP "" BEGIN MENUITEM "חלונות מוערמים", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "חלונות זה לצד זה", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&כיבוי" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&עזרה" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "משימה &חדשה", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&עבור אל", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&שחזר", ID_RESTORE MENUITEM "&סגור", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&סיים תהליך", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "סיים &עץ תהליכים", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "מנהל המשימות" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&סיים משימה", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&עבור אל", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&הראה תהליכים מכל המשתמשים", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 126, 10 diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 0f240685e7b..0c811e384b7 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -15,12 +15,12 @@ BEGIN MENUITEM "&Mindig látható", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Indításkor kis méret", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Elrejtés kis méretnél", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&16 bites feladatok megjelenítése", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Nézet" BEGIN - MENUITEM "&Frissítés most", ID_VIEW_REFRESH - POPUP "&Frissítés gyakorisága" + MENUITEM "&Frissítés most", ID_VIEW_REFRESH //FIXME: accelerator collision + POPUP "&Frissítés gyakorisága" //FIXME: accelerator collision BEGIN MENUITEM "&Gyakran", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Normál", ID_VIEW_UPDATESPEED_NORMAL, CHECKED @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Felfüggesztve", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Nagy ikonok", ID_VIEW_LARGE - MENUITEM "&Kis ikonok", ID_VIEW_SMALL - MENUITEM "Rés&zletek", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Oszlopok kiválasztása...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU használat" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Minden CPU &egy grafikonon", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Külön grafikon &minden CPU-hoz", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kernel idő megjelenítése", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Ablak" + POPUP "" BEGIN MENUITEM "&Vízszintes rendezés", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Függőleges rendezés", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Leállítás" BEGIN - MENUITEM "Készen&léti állapot", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernálás", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Kikapcsolás", ID_SHUTDOWN_POWEROFF - MENUITEM "&Újraindítás", ID_SHUTDOWN_REBOOT - MENUITEM "Ki&jelentkezés - %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Felhasználóváltás\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Készen&léti állapot", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernálás", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Kikapcsolás", ID_SHUTDOWN_POWEROFF + MENUITEM "&Újraindítás", ID_SHUTDOWN_REBOOT + MENUITEM "Ki&jelentkezés - %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Felhasználóváltás\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "Számítógép &zárolása\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Szétkapcsolódás", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Dokkolóról leválasztás", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Szétkapcsolódás", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Dokkolóról leválasztás", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Súgó" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Új feladat (Futtatás...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Váltás", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Előtérbe helyezés", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Visszaállít", ID_RESTORE MENUITEM "&Bezárás", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Folyamat befejezése", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Folyamat&struktúra leállítása", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Feladatkezelő" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Fela&dat befejezése", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Váltás", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Minden felhasználó folya&matait jelenítse meg", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10 @@ -283,32 +283,32 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 129, 178, 50, 14 PUSHBUTTON "Mégse", IDCANCEL, 183, 178, 50, 14 LTEXT "Válassza ki azokat az oszlopokat amelyeket szeretne látni a feladatkezelőben.", IDC_STATIC, 7, 7, 226, 17 - CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 + CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision + CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 //FIXME: accelerator collision CONTROL "&CPU használat", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10 CONTROL "CPU idő", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 CONTROL "&Memóriahasználat", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 - CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 + CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 //FIXME: accelerator collision CONTROL "Memóriahasználat &csúcsértéke", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 110, 10 - CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 + CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 //FIXME: accelerator collision CONTROL "&USER objektumok", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 72, 10 CONTROL "I/O olvasások", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10 CONTROL "I/O olvasott bájtok", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10 CONTROL "&Munkamenet-azonosító", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10 CONTROL "&Felhasználónév", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 71, 10 CONTROL "Lap&hibaszám változása", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 110, 10 - CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10 - CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10 + CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10 //FIXME: accelerator collision + CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10 //FIXME: accelerator collision CONTROL "&Nem lapozható készlet", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 110, 10 - CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10 - CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 + CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10 //FIXME: accelerator collision + CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 //FIXME: accelerator collision CONTROL "&Szálak száma", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 CONTROL "GDI Objektumok", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 85, 10 CONTROL "I/O írások", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 49, 10 CONTROL "I/O írott bájtok", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 65, 10 CONTROL "Egyéb I/O műveletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 85, 10 CONTROL "Egyéb I/O műveletek bájtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 - CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 + CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 //FIXME: accelerator collision END /* String Tables */ diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index d9c8a1eda13..388742c4f2d 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Sel&alu di atas", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "Per&kecil Saat Digunakan", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Se&mbunyikan Saat Diperkecil", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Tampilkan tugas 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Tampilan" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Jeda", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Ikon &Besar", ID_VIEW_LARGE - MENUITEM "Ikon K&ecil", ID_VIEW_SMALL - MENUITEM "&Rinci", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Pilih Kolom...", ID_VIEW_SELECTCOLUMNS - POPUP "Riwayat &CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Satu Grafik Semua CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Satu Grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Tampilkan Waktu Kernel", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Jendela" + POPUP "" BEGIN MENUITEM "Ubin secara &Horisontal", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Ubin secara &Vertikal", ID_WINDOWS_TILEVERTICALLY @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Tugas Baru (Jalankan...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "B&erpindah Ke", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bawa ke Depan", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Kembalikan", ID_RESTORE MENUITEM "&Tutup", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Akhiri Proses", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "A&khiri Pohon Proses", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Manajer Tugas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Akhiri Tugas", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Berpindah ke", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Tunjukkan proses dari semua pengguna", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 138, 10 @@ -302,7 +302,7 @@ BEGIN CONTROL "N&on-paged Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 61, 95, 10 CONTROL "P&rioritas Dasar", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 72, 95, 10 CONTROL "&Jumlah Tuas", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 83, 95, 10 - CONTROL "&Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10 + CONTROL "Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10 CONTROL "Obyek GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 105, 95, 10 CONTROL "I/O Tulis", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 116, 95, 10 CONTROL "I/O Byte Tulis", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 127, 95, 10 diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index 57d40137744..b8623d046b4 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Sempre in primo piano", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Riduci a icona in esecuzione", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Nascondi se ridotto a icona", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Mostra operazioni a 16 bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Visualizza" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Icone &Grandi", ID_VIEW_LARGE - MENUITEM "Icone &Piccole", ID_VIEW_SMALL - MENUITEM "&Dettagli", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleziona colonne...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un grafico, Tutte le CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un grafico &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostra Kernel Times", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Finestre" + POPUP "" BEGIN MENUITEM "Affianca &Orizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Affianca &Verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aiuto" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nuova operazione (Esegui...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Passa a", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ripristina", ID_RESTORE MENUITEM "&Chiudi", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Termina processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Termina processo e &Albero", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Termina processo", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Passa a", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostra i processi di tutti gli utenti", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 117, 10 diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index d545e88c677..6b8eb9ad8d0 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "常に手前に表示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "未使用時に最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時に隠す(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16 ビットタスクの表示(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "表示(&V)" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "一時停止(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大きいアイコン(&G)", ID_VIEW_LARGE - MENUITEM "小さいアイコン(&M)", ID_VIEW_SMALL - MENUITEM "詳細(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "列の選択(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU の履歴(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "すべての CPU で 1 グラフ(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "CPU ごとに 1 グラフ(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "カーネル時間を表示する(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "ウィンドウ(&W)" + POPUP "" BEGIN MENUITEM "上下に並べて表示(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "左右に並べて表示(&V)", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ヘルプ(&H)" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新しいタスクの実行(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切り替え(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "手前に表示(&B)", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "元のサイズに戻す(&R)", ID_RESTORE MENUITEM "閉じる(&C)", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "プロセスの終了(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "プロセスツリーの終了(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "タスクマネージャ" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "タスクの終了(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切り替え(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "全ユーザーのプロセスを表示する(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index d2dd50f36a1..42dd47883d4 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "항상 위(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "사용중일때 최소화(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "최소화일때 숨기기(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16비트 작업 표시(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "보기(&V)" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "일시 정지(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "큰 아이콘(&G)", ID_VIEW_LARGE - MENUITEM "작은 아이콘(&M)", ID_VIEW_SMALL - MENUITEM "자세히(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "열 선택(&S)", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 히스토리(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "그래프 하나, 모든 CPU(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "CPU 하나 당 그래프 하나(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "커널 시간 보이기(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "윈도우(&S)" + POPUP "" BEGIN MENUITEM "가로 바둑판식 창 배열(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "세로 바둑판식 창 배열(&V)", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "도움말(&H)" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "새 작업 (실행...)(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "전환(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "맨 앞으로 가져오기(&B)", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "복원(&R)", ID_RESTORE MENUITEM "닫기(&C)", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "프로세스 종료(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "프로세스 트리 종료(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "작업 관리자" MENU IDR_TASKMANAGER FONT 9, "굴림" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "굴림" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "작업 끝내기(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "전환(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "굴림" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "모든 유저의 프로세스 보이기(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10 diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 19838770442..f5b939d798e 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -11,9 +11,9 @@ BEGIN POPUP "&Opties" BEGIN MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP, CHECKED - MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED + MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED //FIXME: accelerator collision &b with IDS_MENU_16BITTASK MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16-&bits taken weergeven", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "B&eeld" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Onderbroken", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Grote pictogrammen", ID_VIEW_LARGE - MENUITEM "&Kleine pictogrammen", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Kolommen selecteren...", ID_VIEW_SELECTCOLUMNS - POPUP "&Geschiedenis van CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Eén grafiek, alle CPU's", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Eén grafiek &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kerneltijden weergeven", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vensters" + POPUP "" BEGIN MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Afsl&uiten" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF - MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT - MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF - MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF + MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT + MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF + MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nieuwe taak (Uitvoeren...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Activeren", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Vorig formaat", ID_RESTORE MENUITEM "&Sluiten", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Pro&ces beëindigen", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Process&tructuur beëindigen", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Taakbeheer" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Taa&k beëindigen", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Activeren", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Processen van &alle gebruikers weergeven", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 151, 10 @@ -406,7 +406,7 @@ BEGIN IDS_TAB_IOOTHERBYTES "I/O: overige bytes" IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..." - IDS_MENU_16BITTASK "16-&bits taken weergeven" + IDS_MENU_16BITTASK "16-&bits taken weergeven" //FIXME: accelerator collision &b with ID_OPTIONS_MINIMIZEONUSE IDS_MENU_WINDOWS "&Vensters" IDS_MENU_LARGEICONS "&Grote pictogrammen" IDS_MENU_SMALLICONS "&Kleine pictogrammen" diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 31b01b6d973..45f9d9d8b9a 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -13,12 +13,12 @@ BEGIN MENUITEM "&Alltid øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimer ved bruk", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skjul når Minimert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Vis 16-bites oppgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vis" BEGIN - MENUITEM "&Oppdater nå", ID_VIEW_REFRESH - POPUP "&Oppdateringshastighet" + MENUITEM "&Oppdater nå", ID_VIEW_REFRESH //FIXME: accelerator collision + POPUP "&Oppdateringshastighet" //FIXME: accelerator collision BEGIN MENUITEM "&Høy", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL, CHECKED @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Midlertidig stanset", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "St&ore Ikoner", ID_VIEW_LARGE - MENUITEM "S&må Ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Velg tospaltet...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historie" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&En graf, per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "EN graf &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Vis Kjernetider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vindu" + POPUP "" BEGIN MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjelp" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny oppgave (Kjør...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Få tilbake", ID_RESTORE MENUITEM "&Avslutt", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Avslutt Prosess", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Avslutt Prosess&tre", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Oppgavebehandling" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Avslutt oppgave", IDC_ENDTASK, 60, 189, 65, 14, WS_DISABLED PUSHBUTTON "&Bytt til", IDC_SWITCHTO, 129, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Vis prosesser fra alle brukere", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 @@ -281,22 +281,22 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 84, 178, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 138, 178, 50, 14 LTEXT "Velg kolonnene som skal vises på prosesssiden i Oppgavebehandling.", IDC_STATIC, 7, 7, 181, 17 - CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10 - CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 - CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10 - CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 + CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision + CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10 //FIXME: accelerator collision + CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 //FIXME: accelerator collision + CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10 //FIXME: accelerator collision + CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 //FIXME: accelerator collision + CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 //FIXME: accelerator collision CONTROL "Ma&ks minne bruk", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 - CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10 - CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 + CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10 //FIXME: accelerator collision + CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 //FIXME: accelerator collision CONTROL "I/O Lest", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 CONTROL "I/O skrevet", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "&Økt ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 - CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 + CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 //FIXME: accelerator collision + CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 //FIXME: accelerator collision CONTROL "&Virtuelt minne størrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 86, 10 - CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 + CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 //FIXME: accelerator collision CONTROL "I&ngen-side innsats", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 72, 10 CONTROL "Basisp&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 CONTROL "&Handle regne", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index ae4b327ea71..7b3b49eb5ad 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -20,7 +20,7 @@ BEGIN MENUITEM "Za&wsze na wierzchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizuj podczas użytkowania", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ukryj, gdy zminimalizowane", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Pokazuj 16-&bitowe zadania", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Widok" BEGIN @@ -33,18 +33,18 @@ BEGIN MENUITEM "&Wstrzymana", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "D&uże ikony", ID_VIEW_LARGE - MENUITEM "&Małe ikony", ID_VIEW_SMALL - MENUITEM "&Szczegóły", ID_VIEW_DETAILS, CHECKED - MENUITEM "Wybierz &kolumny...", ID_VIEW_SELECTCOLUMNS - POPUP "H&istoria użycia procesora CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Jeden &wykres dla wszystkich procesorów CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Jeden w&ykres dla każdego procesora CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Pokaż &czas jądra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "O&kna" + POPUP "" BEGIN MENUITEM "&Sąsiadująco w poziomie", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Sąsi&adująco w pionie", ID_WINDOWS_TILEVERTICALLY @@ -55,15 +55,15 @@ BEGIN END POPUP "&Zamknij" BEGIN - MENUITEM "Przejdź w &stan gotowości", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernuj", ID_SHUTDOWN_HIBERNATE - MENUITEM "Wyłą&cz", ID_SHUTDOWN_POWEROFF - MENUITEM "&Uruchom ponownie", ID_SHUTDOWN_REBOOT - MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Przełącz użytkownika\tLogo Win+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Zablokuj komputer\tLogo Win+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Rozłącz", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME ? + MENUITEM "Przejdź w &stan gotowości", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernuj", ID_SHUTDOWN_HIBERNATE + MENUITEM "Wyłą&cz", ID_SHUTDOWN_POWEROFF + MENUITEM "&Uruchom ponownie", ID_SHUTDOWN_REBOOT + MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision + MENUITEM "&Przełącz użytkownika\tLogo Win+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Zablokuj komputer\tLogo Win+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Rozłącz", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME: accelerator collision END POPUP "Pomo&c" BEGIN @@ -85,7 +85,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nowe zadanie (Uruchom...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -97,7 +97,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "P&rzełącz na", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Przesuń na wierzch", ID_WINDOWS_BRINGTOFRONT @@ -115,7 +115,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Przywróć", ID_RESTORE MENUITEM "&Zamknij", ID_FILE_EXIT @@ -126,7 +126,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Zakończ proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Zamknij &drzewo procesów", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -159,14 +159,14 @@ CAPTION "Menedżer zadań" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Zakończ zadanie", IDC_ENDTASK, 39, 189, 65, 14, WS_DISABLED PUSHBUTTON "P&rzełącz na", IDC_SWITCHTO, 107, 189, 65, 14, WS_DISABLED @@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Po&każ procesy wszystkich użytkowników", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10 diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index ca351367f6a..ec47a6598c3 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar durante o uso", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Exibir tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "E&xibir" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Íco&nes grandes", ID_VIEW_LARGE - MENUITEM "Ícones &pequenos", ID_VIEW_SMALL - MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Selecionar colunas...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historico do CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Janelas" + POPUP "" BEGIN MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Executar nova tarefa...", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Fechar", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Gerenciador de tarefas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Finalizar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar processos de todos os usuários", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 3ffd856374e..3cf81bfce57 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar durante utilização", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Mostrar tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ver" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Íco&nes grandes", ID_VIEW_LARGE - MENUITEM "Ícones &pequenos", ID_VIEW_SMALL - MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleccionar colunas...", ID_VIEW_SELECTCOLUMNS - POPUP "&Histórico do CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Janelas" + POPUP "" BEGIN MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Desligar" BEGIN - MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF - MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT - MENUITEM "&Terminar sessão %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Mudar de utilizador\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Bloquear\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision + MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT + MENUITEM "&Terminar sessão %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Mudar de utilizador\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Bloquear\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED //FIXME: accelerator collision + MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Executar nova tarefa...", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Fechar", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -136,10 +136,10 @@ BEGIN MENUITEM "Abai&xo do normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL MENUITEM "&Baixa", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision MENUITEM SEPARATOR MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision END END @@ -154,14 +154,14 @@ CAPTION "Gestor de tarefas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Terminar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar processos de todos os utilizadores", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 @@ -285,7 +285,7 @@ BEGIN LTEXT "Seleccione as colunas que aparecerão na página de processos do 'Gestor de tarefas.", IDC_STATIC, 7, 7, 181, 17 CONTROL "Nome da ima&gem", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 66, 10 CONTROL "&Identificação do processo (PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 113, 10 - CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 + CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 //FIXME: accelerator collision CONTROL "&Tempo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 61, 10 CONTROL "U&so de memória", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 CONTROL "Inter&valo de uso de memória", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 @@ -295,7 +295,7 @@ BEGIN CONTROL "Leituras de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 61, 10 CONTROL "Bytes de leitura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 86, 10 CONTROL "Ide&ntificação de sessão", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 90, 10 - CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 + CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 //FIXME: accelerator collision CONTROL "Intervalo de fal&has de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 28, 110, 10 CONTROL "Tamanho da &memória virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 39, 110, 10 CONTROL "&Reserva de memória paginável", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 50, 110, 10 diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 84573a284c9..3c6c747f93f 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -18,7 +18,7 @@ BEGIN MENUITEM "Mereu &deasupra", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizează la comutare", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ascunde la minimizare", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Afișează activități pe 16 &biți", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Afișare" BEGIN @@ -31,18 +31,18 @@ BEGIN MENUITEM "St&agnantă", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "D&ale", ID_VIEW_LARGE - MENUITEM "&Pictograme", ID_VIEW_SMALL - MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED - MENUITEM "Selectare &coloane…", ID_VIEW_SELECTCOLUMNS - POPUP "Ist&oric procesor" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Grafic general &comun", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Grafice indi&viduale", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Afișea&ză timpi nucleu", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "Fe&restre" + POPUP "" BEGIN MENUITEM "Aranjări &orizontale", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Aranjări &verticale", ID_WINDOWS_TILEVERTICALLY @@ -53,15 +53,15 @@ BEGIN END POPUP "Î&nchidere calculator" BEGIN - MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY - MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE - MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF - MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT - MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF + MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY + MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE + MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF + MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT + MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF MENUITEM "&Comută utilizator\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "&Blochează calculatorul\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&utor" BEGIN @@ -83,7 +83,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Activitate nouă (E&xecutare…)", ID_FILE_NEW MENUITEM SEPARATOR @@ -95,7 +95,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Comută la", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Ad&uce în prim-plan", ID_WINDOWS_BRINGTOFRONT @@ -113,7 +113,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restabilește", ID_RESTORE MENUITEM "Î&nchide", ID_FILE_EXIT @@ -124,7 +124,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Opr&ește procesul", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Oprește &arborele de procese", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -157,14 +157,14 @@ CAPTION "Gestionar de activități" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Închid&e", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Comută la", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -175,7 +175,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Afișea&ză procesele tuturor utilizatorilor", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 150, 10 diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 989dec8a6c1..777e4747259 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Пове&рх остальных окон", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Сворачивать после обращения", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "С&крывать свернутое", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Отображать 16-разрядные задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Вид" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Приостановить", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Крупные значки", ID_VIEW_LARGE - MENUITEM "&Мелкие значки", ID_VIEW_SMALL - MENUITEM "&Таблица", ID_VIEW_DETAILS, CHECKED - MENUITEM "В&ыбрать столбцы...", ID_VIEW_SELECTCOLUMNS - POPUP "&Загрузка ЦП" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Один график на все ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&По графику на каждый ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Вывод времени ядра", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Окна" + POPUP "" BEGIN MENUITEM "С&верху вниз", ID_WINDOWS_TILEVERTICALLY MENUITEM "С&лева направо", ID_WINDOWS_TILEHORIZONTALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Завер&шение работы" BEGIN - MENUITEM "Переход в &ждущий режим", ID_SHUTDOWN_STANDBY - MENUITEM "Переход в &спящий режим", ID_SHUTDOWN_HIBERNATE - MENUITEM "В&ыключение", ID_SHUTDOWN_POWEROFF - MENUITEM "&Перезагрузка", ID_SHUTDOWN_REBOOT - MENUITEM "&Завершение сеанса %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Переход в &ждущий режим", ID_SHUTDOWN_STANDBY + MENUITEM "Переход в &спящий режим", ID_SHUTDOWN_HIBERNATE + MENUITEM "В&ыключение", ID_SHUTDOWN_POWEROFF + MENUITEM "&Перезагрузка", ID_SHUTDOWN_REBOOT + MENUITEM "&Завершение сеанса %s", ID_SHUTDOWN_LOGOFF MENUITEM "С&мена пользователя\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Заб&локировать компьютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Отключить", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "С&нять компьютер с док-станции", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Заб&локировать компьютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Отключить", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "С&нять компьютер с док-станции", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Справка" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Новая задача (Выполнить...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Переключиться", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&На передний план", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Востановить", ID_RESTORE MENUITEM "&Закрыть", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Завершить процесс", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Завершить &дерево процессов", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Диспетчер задач" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Завершить &задачу", IDC_ENDTASK, 12, 189, 73, 14, WS_DISABLED PUSHBUTTON "&Переключиться", IDC_SWITCHTO, 89, 189, 73, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Отображать процессы всех пользователей", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 158, 10 diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 67afcebfda8..5f5e88bd5bb 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizovať pri použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skryť pri minimalizovaní", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Zobraziť 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Zobraziť" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Pozastavené", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Veľké ikony", ID_VIEW_LARGE - MENUITEM "&Malé ikony", ID_VIEW_SMALL - MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vybrať stĺpce...", ID_VIEW_SELECTCOLUMNS - POPUP "&História procesora" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Jeden graf pre všetky procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Jeden graf pre &každý procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Zobraziť časy jadra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Okna" + POPUP "" BEGIN MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Vedľa seba", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Pomocník" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nová úloha (Spustiť...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "P&repnúť", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Presunúť d&opredu", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Obnoviť", ID_RESTORE MENUITEM "&Zavrieť", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ukončiť proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Ukončiť stro&m procesu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Správca úloh systému" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Ukončiť úlo&hu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Prepnúť", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Zobraziť procesy všetkých používateľov", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 144, 10 diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index a22ff20f7ba..9823efa67c4 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -16,7 +16,7 @@ BEGIN MENUITEM "Perhere lart", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizo ne perdorim", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Fshehe gjate minimizimit", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Shfaq 16-bit detyre", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vezhgo" BEGIN @@ -29,18 +29,18 @@ BEGIN MENUITEM "&Pushim", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Ikona te medha", ID_VIEW_LARGE - MENUITEM "Ikona te vogla", ID_VIEW_SMALL - MENUITEM "&Detaje", ID_VIEW_DETAILS, CHECKED - MENUITEM "Perzgjedh kolone...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Histori" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Nje grafik, Te gjith CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Nje grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Shfaq oren e Kernelit", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "Dritare" + POPUP "" BEGIN MENUITEM "Shfaq &Horizontalisht", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Shfaq &Vertikalisht", ID_WINDOWS_TILEVERTICALLY @@ -51,15 +51,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ndihme" BEGIN @@ -81,7 +81,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Detyre e re (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -93,7 +93,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Ndrysho ne", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Sjelle para", ID_WINDOWS_BRINGTOFRONT @@ -111,7 +111,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restauro", ID_RESTORE MENUITEM "Mbyll", ID_FILE_EXIT @@ -122,7 +122,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Mbyll procesin", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Mbyll procesin &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -146,6 +146,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -153,14 +155,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Mbyll", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "Kalo tek", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -171,7 +173,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Shfaq proceset nga te gjith perdoruesit", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 @@ -430,7 +432,7 @@ BEGIN IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit" IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te\nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?" IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%" - IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" + IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%" IDS_STATUS_PROCESSES "Proceset: %d" IDS_NOT_RESPONDING "Nuk pergjigjet" diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index aefb89ba2e4..4541fdd7875 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -4,18 +4,18 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDR_TASKMANAGER MENU BEGIN - POPUP "&Arkiv" + POPUP "&Arkiv" //FIXME: accelerator collision &A BEGIN MENUITEM "&Ny Aktivitet (Kör...)", ID_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avsluta Aktivitetshanteraren", ID_FILE_EXIT END - POPUP "&Alternativ" + POPUP "&Alternativ" //FIXME: accelerator collision &A BEGIN MENUITEM "&Alltid överst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimera vid användning", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Göm minimerad", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Visa 16-bitarsaktiviteter", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Visa" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Fryst", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Stora ikoner", ID_VIEW_LARGE - MENUITEM "S&må ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Välj kolumner...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historik" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "En visare för &alla processorer", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&En visare per processor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Visa kernel-tider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fönster" + POPUP "" BEGIN MENUITEM "Ordna &horizontellt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Ordna &vertikalt", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjälp" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny aktivitet (Kör...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Växla till", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&För till förgrunden", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Återställ", ID_RESTORE MENUITEM "&Stäng", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Avsluta process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Avsluta process&träd", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Aktivitetshanteraren" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Avsluta aktiviteten", IDC_ENDTASK, 34, 189, 83, 14, WS_DISABLED PUSHBUTTON "&Växla till", IDC_SWITCHTO, 120, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Visa processer från alla användare", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 156, 10 diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index d55c1118996..e8335de8a0e 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Her Zaman Üstte", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Kullanımda Simge Durumuna Küçült", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Simge Durumuna Küçültüldüğünde Gizle", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16 &Bitlik Görevleri Göster", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Görünüm" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "D&uraklatılmış", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Büyük Simgeler", ID_VIEW_LARGE - MENUITEM "&Küçük Simgeler", ID_VIEW_SMALL - MENUITEM "&Ayrıntılar", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Sütunları Seç...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Geçmişi" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Tek Grafik, Tüm CPU'lar", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&CPU Başına Bir Grafik", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Ç&ekirdek Sürelerini Göster", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Pencereler" + POPUP "" BEGIN MENUITEM "&Yatay Olarak Döşe", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Dikey Olarak Döşe", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Bilgisayarı Kapat" BEGIN - MENUITEM "&Uykuya Geçir", ID_SHUTDOWN_STANDBY - MENUITEM "&Hazırda Beklet", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF - MENUITEM "&Yeniden Başlat", ID_SHUTDOWN_REBOOT - MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF + MENUITEM "&Uykuya Geçir", ID_SHUTDOWN_STANDBY + MENUITEM "&Hazırda Beklet", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF + MENUITEM "&Yeniden Başlat", ID_SHUTDOWN_REBOOT + MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF MENUITEM "Ku&llanıcı Değiştir\tROS+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "&Bilgisayarı Kilitle\tROS+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "B&ağlantıyı Kes", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "B&ilgisayarı Çıkar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "B&ağlantıyı Kes", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "B&ilgisayarı Çıkar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Yardım" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Yeni Görev (Çalıştır...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Geç", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Öne Getir", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Eski Durumuna Getir", ID_RESTORE MENUITEM "&Kapat", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&İşlemi Sonlandır", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "İ&şlem Ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -145,6 +145,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -152,14 +154,14 @@ CAPTION "Görev Yöneticisi" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "G&örevi Sonlandır", IDC_ENDTASK, 60, 189, 68, 14, WS_DISABLED PUSHBUTTON "&Geç", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Tüm Kullanıcıların İşlemlerini Göster", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 340e631ce8f..57d5620a65e 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Поверх інших вікон", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Згортати після звернення", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "При&ховувати згорнуте", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Відображати 16-розрядні завдання", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Вигляд" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Призупинити", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Великі значки", ID_VIEW_LARGE - MENUITEM "&Дрібні значки", ID_VIEW_SMALL - MENUITEM "Д&етально", ID_VIEW_DETAILS, CHECKED - MENUITEM "В&ибрати стовпці...", ID_VIEW_SELECTCOLUMNS - POPUP "&Хронологія ЦП" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Один графік для всіх ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Окремий &графік для кожного ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Вивід часу ядра", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "В&ікна" + POPUP "" BEGIN MENUITEM "З&ліва направо", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Згори до&низу", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "&Завершення роботи" BEGIN - MENUITEM "Перехід до режиму &очікування", ID_SHUTDOWN_STANDBY - MENUITEM "Перехід до &сну", ID_SHUTDOWN_HIBERNATE - MENUITEM "Ви&мкнення", ID_SHUTDOWN_POWEROFF - MENUITEM "&Перезавантаження", ID_SHUTDOWN_REBOOT - MENUITEM "&Завершення сеансу %s", ID_SHUTDOWN_LOGOFF - MENUITEM "Змінити &користувача\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "За&блокувати комп'ютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Від'єднатися", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Зняти комп'ютер з &док-станції", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Перехід до режиму &очікування", ID_SHUTDOWN_STANDBY + MENUITEM "Перехід до &сну", ID_SHUTDOWN_HIBERNATE + MENUITEM "Ви&мкнення", ID_SHUTDOWN_POWEROFF + MENUITEM "&Перезавантаження", ID_SHUTDOWN_REBOOT + MENUITEM "&Завершення сеансу %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Змінити &користувача\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "За&блокувати комп'ютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Від'єднатися", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Зняти комп'ютер з &док-станції", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Довідка" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Нове завдання (Виконати...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "П&ереключитися", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "На передні&й план", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Відновити", ID_RESTORE MENUITEM "&Закрити", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Завершити процес", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Завершити &дерево процесів", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Диспетчер завдань" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Зн&яти завдання", IDC_ENDTASK, 55, 189, 60, 14, WS_DISABLED PUSHBUTTON "П&ереключитися", IDC_SWITCHTO, 118, 189, 60, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Відображати процеси всіх користувачів", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 147, 10 diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 5be7e478ead..6038833ee17 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -20,7 +20,7 @@ BEGIN MENUITEM "总在最前(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用时自动最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化时隐藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "显示 16 位任务(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "查看(&V)" BEGIN @@ -33,18 +33,18 @@ BEGIN MENUITEM "暂停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大图标(&G)", ID_VIEW_LARGE - MENUITEM "小图标(&M)", ID_VIEW_SMALL - MENUITEM "详细信息(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "选择列(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 记录(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 一张图表(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每个 CPU 一张图表(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "显示内核时间(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "窗口(&W)" + POPUP "" BEGIN MENUITEM "横向平铺(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "纵向平铺(&V)", ID_WINDOWS_TILEVERTICALLY @@ -55,15 +55,15 @@ BEGIN END POPUP "关机(&U)" BEGIN - MENUITEM "待机(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "关闭电源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新启动(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "退出用户(&L) %s", ID_SHUTDOWN_LOGOFF - MENUITEM "切换用户(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "锁定计算机(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "断开连接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "弹出计算机(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待机(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "关闭电源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新启动(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "退出用户(&L) %s", ID_SHUTDOWN_LOGOFF + MENUITEM "切换用户(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "锁定计算机(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "断开连接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "弹出计算机(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "帮助(&H)" BEGIN @@ -85,7 +85,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新建任务(运行...)(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -97,7 +97,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切换至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -115,7 +115,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "还原(&R)", ID_RESTORE MENUITEM "关闭(&C)", ID_FILE_EXIT @@ -126,7 +126,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "结束进程(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "结束进程树(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -159,14 +159,14 @@ CAPTION "任务管理器" MENU IDR_TASKMANAGER FONT 9, "宋体" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "结束任务(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切换至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "显示所有用户的进程(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 @@ -430,7 +430,7 @@ BEGIN IDS_MSG_UNABLEDEBUGPROCESS "无法调试进程" IDS_MSG_WARNINGDEBUG "警告：调试该进程可能会导致数据丢失。\n你确定想要附加调试器？" IDS_MSG_TASKMGRWARNING "任务管理器警告" - IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n 在被终止前，这一进程将不会获得机会保存其状态或数据。\n 您确定想终止该进程吗？" + IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n在被终止前，这一进程将不会获得机会保存其状态或数据。\n您确定想终止该进程吗？" IDS_MSG_UNABLETERMINATEPRO "无法终止进程" IDS_MSG_CLOSESYSTEMPROCESS "这是一个至关重要的系统进程。任务管理器不会结束这一进程。" IDS_MSG_UNABLECHANGEPRIORITY "无法更改优先级" diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index 65a336bc9f0..f12447626ae 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "檢視(&V)" BEGIN @@ -34,18 +34,18 @@ BEGIN MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大圖示(&G)", ID_VIEW_LARGE - MENUITEM "小圖示(&M)", ID_VIEW_SMALL - MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 記錄(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "窗口(&W)" + POPUP "" BEGIN MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY @@ -56,15 +56,15 @@ BEGIN END POPUP "關閉(&U)" BEGIN - MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF - MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF + MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "説明(&H)" BEGIN @@ -86,7 +86,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新工作（執行...）(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -98,7 +98,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -116,7 +116,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "還原(&R)", ID_RESTORE MENUITEM "關閉(&C)", ID_FILE_EXIT @@ -127,7 +127,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -160,14 +160,14 @@ CAPTION "工作管理員" MENU IDR_TASKMANAGER FONT 9, "新細明體" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index dad1b8ae772..eeaa0b72f36 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "檢視(&V)" BEGIN @@ -34,18 +34,18 @@ BEGIN MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大圖示(&G)", ID_VIEW_LARGE - MENUITEM "小圖示(&M)", ID_VIEW_SMALL - MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 記錄(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "視窗(&W)" + POPUP "" BEGIN MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY @@ -56,15 +56,15 @@ BEGIN END POPUP "關閉(&U)" BEGIN - MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF - MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF + MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "說明(&H)" BEGIN @@ -86,7 +86,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "執行新工作(&N)...", ID_FILE_NEW MENUITEM SEPARATOR @@ -98,7 +98,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -116,7 +116,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "還原(&R)", ID_RESTORE MENUITEM "關閉(&C)", ID_FILE_EXIT @@ -127,7 +127,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -160,14 +160,14 @@ CAPTION "工作管理員" MENU IDR_TASKMANAGER FONT 9, "新細明體" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10

1 0

[reactos] 03/03: [DESK] Add the current screensaver in the list if it isn't already present (#5766)
by Hermès Bélusca-Maïto 18 Oct '23

18 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=171941ad185893f848bf9… commit 171941ad185893f848bf915e869d5d3622695489 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 16 20:52:31 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:46:15 2023 +0200 [DESK] Add the current screensaver in the list if it isn't already present (#5766) - Introduce AddScreenSaver[Item] helpers for adding screensavers in the list (either given by file path or by item structure). - Rename "AddScreenSavers" to "EnumScreenSavers", and "ScreenSaverItem" type to "SCREEN_SAVER_ITEM". - Ensure the stored "SCRNSAVE.EXE" value is NULL-terminated. - Add the current screensaver, specified by the "SCRNSAVE.EXE" registry value, in the list if it isn't already present; otherwise select it in the list. - Make the filename comparison case-insensitive. --- dll/cpl/desk/screensaver.c | 339 ++++++++++++++++++++++----------------------- 1 file changed, 166 insertions(+), 173 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 549422e5492..b99b35b5827 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -16,15 +16,15 @@ static const TCHAR szPreviewWndClass[] = TEXT("SSDemoParent"); typedef struct { - BOOL bIsScreenSaver; /* Is this background a wallpaper */ + BOOL bIsScreenSaver; /* Is this a valid screensaver */ TCHAR szFilename[MAX_PATH]; TCHAR szDisplayName[256]; -} ScreenSaverItem; +} SCREEN_SAVER_ITEM; typedef struct _DATA { - ScreenSaverItem ScreenSaverItems[MAX_SCREENSAVERS]; + SCREEN_SAVER_ITEM ScreenSaverItems[MAX_SCREENSAVERS]; PROCESS_INFORMATION PrevWindowPi; int Selection; WNDPROC OldPreviewProc; @@ -411,136 +411,149 @@ CheckRegScreenSaverIsSecure(HWND hwndDlg) } -static VOID -SearchScreenSavers(HWND hwndScreenSavers, - LPCTSTR pszSearchPath, - PDATA pData) +static BOOL +AddScreenSaverItem( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ SCREEN_SAVER_ITEM* ScreenSaverItem) { - WIN32_FIND_DATA fd; - TCHAR szSearchPath[MAX_PATH]; - HANDLE hFind; - ScreenSaverItem *ScreenSaverItem; - HANDLE hModule; - UINT i, ScreenSaverCount; - HRESULT hr; + UINT i; - ScreenSaverCount = pData->ScreenSaverCount; + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + return FALSE; - hr = StringCbCopy(szSearchPath, sizeof(szSearchPath), pszSearchPath); - if (FAILED(hr)) - return; - hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\*.scr")); - if (FAILED(hr)) - return; + i = SendMessage(hwndScreenSavers, + CB_ADDSTRING, + 0, + (LPARAM)ScreenSaverItem->szDisplayName); + if ((i == CB_ERR) || (i == CB_ERRSPACE)) + return FALSE; - hFind = FindFirstFile(szSearchPath, &fd); + SendMessage(hwndScreenSavers, + CB_SETITEMDATA, + i, + (LPARAM)pData->ScreenSaverCount); - if (hFind == INVALID_HANDLE_VALUE) - return; + pData->ScreenSaverCount++; + return TRUE; +} + +static BOOL +AddScreenSaver( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ LPCTSTR pszFilePath, + _In_ LPCTSTR pszFileName) +{ + SCREEN_SAVER_ITEM* ScreenSaverItem; + HANDLE hModule; + HRESULT hr; + + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + return FALSE; - while (ScreenSaverCount < MAX_SCREENSAVERS) + ScreenSaverItem = pData->ScreenSaverItems + pData->ScreenSaverCount; + + ScreenSaverItem->bIsScreenSaver = TRUE; + + hModule = LoadLibraryEx(pszFilePath, + NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hModule) { - /* Don't add any hidden screensavers */ - if ((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + if (LoadString(hModule, + 1, + ScreenSaverItem->szDisplayName, + _countof(ScreenSaverItem->szDisplayName)) == 0) { - TCHAR filename[MAX_PATH]; - - hr = StringCbCopy(filename, sizeof(filename), pszSearchPath); + /* If the string does not exist, copy the file name */ + hr = StringCbCopy(ScreenSaverItem->szDisplayName, + sizeof(ScreenSaverItem->szDisplayName), + pszFileName); if (FAILED(hr)) { - FindClose(hFind); - return; - } - hr = StringCbCat(filename, sizeof(filename), _T("\\")); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } - hr = StringCbCat(filename, sizeof(filename), fd.cFileName); - if (FAILED(hr)) - { - FindClose(hFind); - return; + FreeLibrary(hModule); + return FALSE; } + /* Remove the .scr extension */ + ScreenSaverItem->szDisplayName[_tcslen(pszFileName)-4] = _T('\0'); + } + FreeLibrary(hModule); + } + else + { + hr = StringCbCopy(ScreenSaverItem->szDisplayName, + sizeof(ScreenSaverItem->szDisplayName), + _T("Unknown")); + if (FAILED(hr)) + return FALSE; + } - ScreenSaverItem = pData->ScreenSaverItems + ScreenSaverCount; + hr = StringCbCopy(ScreenSaverItem->szFilename, + sizeof(ScreenSaverItem->szFilename), + pszFilePath); + if (FAILED(hr)) + return FALSE; - ScreenSaverItem->bIsScreenSaver = TRUE; + return AddScreenSaverItem(hwndScreenSavers, pData, ScreenSaverItem); +} - hModule = LoadLibraryEx(filename, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - if (hModule) - { - if (0 == LoadString(hModule, - 1, - ScreenSaverItem->szDisplayName, - sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR))) - { - // If the string does not exists, copy the name of the file - hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), fd.cFileName); - if (FAILED(hr)) - { - FreeLibrary(hModule); - FindClose(hFind); - return; - } - ScreenSaverItem->szDisplayName[_tcslen(fd.cFileName)-4] = '\0'; - } - FreeLibrary(hModule); - } - else - { - hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), _T("Unknown")); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } - } +static VOID +SearchScreenSavers( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ LPCTSTR pszSearchPath) +{ + HRESULT hr; + WIN32_FIND_DATA fd; + HANDLE hFind; + TCHAR szFilePath[MAX_PATH]; - hr = StringCbCopy(ScreenSaverItem->szFilename, sizeof(ScreenSaverItem->szFilename), filename); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } + hr = StringCbPrintf(szFilePath, sizeof(szFilePath), + TEXT("%s\\*.scr"), pszSearchPath); + if (FAILED(hr)) + return; - i = SendMessage(hwndScreenSavers, - CB_ADDSTRING, - 0, - (LPARAM)ScreenSaverItem->szDisplayName); + hFind = FindFirstFile(szFilePath, &fd); + if (hFind == INVALID_HANDLE_VALUE) + return; - SendMessage(hwndScreenSavers, - CB_SETITEMDATA, - i, - (LPARAM)ScreenSaverCount); + do + { + /* Don't add any hidden screensavers */ + if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; - ScreenSaverCount++; - } + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + break; - if (!FindNextFile(hFind, &fd)) + hr = StringCbPrintf(szFilePath, sizeof(szFilePath), + TEXT("%s\\%s"), pszSearchPath, fd.cFileName); + if (FAILED(hr)) break; - } - FindClose(hFind); + if (!AddScreenSaver(hwndScreenSavers, pData, szFilePath, fd.cFileName)) + break; - pData->ScreenSaverCount = ScreenSaverCount; -} + } while (FindNextFile(hFind, &fd)); + FindClose(hFind); +} static VOID -AddScreenSavers(HWND hwndDlg, PDATA pData) +EnumScreenSavers( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData) { - HWND hwndScreenSavers = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); + SCREEN_SAVER_ITEM* ScreenSaverItem; + PTCHAR pBackSlash; TCHAR szSearchPath[MAX_PATH]; TCHAR szLocalPath[MAX_PATH]; - INT i; - ScreenSaverItem *ScreenSaverItem = NULL; - LPTSTR lpBackSlash; - /* Add the "None" item */ + /* Initialize the number of list items */ + pData->ScreenSaverCount = 0; + + /* Add the "(None)" item */ ScreenSaverItem = pData->ScreenSaverItems; ScreenSaverItem->bIsScreenSaver = FALSE; @@ -548,39 +561,28 @@ AddScreenSavers(HWND hwndDlg, PDATA pData) LoadString(hApplet, IDS_NONE, ScreenSaverItem->szDisplayName, - sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR)); + _countof(ScreenSaverItem->szDisplayName)); - i = SendMessage(hwndScreenSavers, - CB_ADDSTRING, - 0, - (LPARAM)ScreenSaverItem->szDisplayName); - - SendMessage(hwndScreenSavers, - CB_SETITEMDATA, - i, - (LPARAM)0); + AddScreenSaverItem(hwndScreenSavers, pData, ScreenSaverItem); - // Initialize number of items into the list - pData->ScreenSaverCount = 1; - - // Add all the screensavers where the applet is stored. - GetModuleFileName(hApplet, szLocalPath, MAX_PATH); - lpBackSlash = _tcsrchr(szLocalPath, _T('\\')); - if (lpBackSlash != NULL) + /* Add all the screensavers where the applet is stored */ + GetModuleFileName(hApplet, szLocalPath, _countof(szLocalPath)); + pBackSlash = _tcsrchr(szLocalPath, _T('\\')); + if (pBackSlash != NULL) { - *lpBackSlash = '\0'; - SearchScreenSavers(hwndScreenSavers, szLocalPath, pData); + *pBackSlash = _T('\0'); + SearchScreenSavers(hwndScreenSavers, pData, szLocalPath); } - // Add all the screensavers in the C:\ReactOS\System32 directory. - GetSystemDirectory(szSearchPath, MAX_PATH); - if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); + /* Add all the screensavers in the C:\ReactOS\System32 directory */ + GetSystemDirectory(szSearchPath, _countof(szSearchPath)); + if (pBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) + SearchScreenSavers(hwndScreenSavers, pData, szSearchPath); - // Add all the screensavers in the C:\ReactOS directory. - GetWindowsDirectory(szSearchPath, MAX_PATH); - if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); + /* Add all the screensavers in the C:\ReactOS directory */ + GetWindowsDirectory(szSearchPath, _countof(szSearchPath)); + if (pBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) + SearchScreenSavers(hwndScreenSavers, pData, szSearchPath); } @@ -606,7 +608,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) /* Set the screensaver */ if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver) { - SIZE_T Length = _tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR); + SIZE_T Length = (_tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) + 1) * sizeof(TCHAR); RegSetValueEx(regKey, _T("SCRNSAVE.EXE"), 0, @@ -658,9 +660,9 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) static BOOL OnInitDialog(HWND hwndDlg, PDATA pData) { - LPTSTR lpCurSs; HWND hwndSSCombo = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); - INT Num; + LPTSTR pSsValue; + INT iCurSs; WNDCLASS wc = {0}; pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); @@ -712,76 +714,67 @@ OnInitDialog(HWND hwndDlg, PDATA pData) IDC_SCREENS_TIME, UDM_SETRANGE, 0, - MAKELONG - ((short) 240, (short) 1)); + MAKELONG(240, 1)); - AddScreenSavers(hwndDlg, - pData); + EnumScreenSavers(hwndSSCombo, pData); CheckRegScreenSaverIsSecure(hwndDlg); /* Set the current screensaver in the combo box */ - lpCurSs = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE")); - if (lpCurSs) + iCurSs = 0; // Default to "(None)" + pSsValue = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE")); + if (pSsValue) { BOOL bFound = FALSE; INT i; - for (i = 0; i < MAX_SCREENSAVERS; i++) + /* Find whether the current screensaver is in the list */ + for (i = 0; i < pData->ScreenSaverCount; i++) { - if (!_tcscmp(lpCurSs, pData->ScreenSaverItems[i].szFilename)) + if (!_tcsicmp(pSsValue, pData->ScreenSaverItems[i].szFilename)) { bFound = TRUE; break; } } - if (bFound) + if (!bFound) { - Num = SendMessage(hwndSSCombo, - CB_FINDSTRINGEXACT, - -1, - (LPARAM)pData->ScreenSaverItems[i].szDisplayName); - if (Num != CB_ERR) - SendMessage(hwndSSCombo, - CB_SETCURSEL, - Num, - 0); + /* The current screensaver is not in the list: add it */ + // i = pData->ScreenSaverCount; + bFound = AddScreenSaver(hwndSSCombo, pData, pSsValue, _T("SCRNSAVE.EXE")); + if (bFound) + i = pData->ScreenSaverCount - 1; } - else + + HeapFree(GetProcessHeap(), 0, pSsValue); + + if (bFound) { - SendMessage(hwndSSCombo, - CB_SETCURSEL, - 0, - 0); + /* The current screensaver should be in the list: select it */ + iCurSs = SendMessage(hwndSSCombo, + CB_FINDSTRINGEXACT, + -1, + (LPARAM)pData->ScreenSaverItems[i].szDisplayName); + if (iCurSs == CB_ERR) + iCurSs = 0; // Default to "(None)" } - - HeapFree(GetProcessHeap(), 0, lpCurSs); - } - else - { - /* Set screensaver to (none) */ - SendMessage(hwndSSCombo, - CB_SETCURSEL, - 0, - 0); } + SendMessage(hwndSSCombo, CB_SETCURSEL, iCurSs, 0); /* Set the current timeout */ - lpCurSs = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut")); - if (lpCurSs) + pSsValue = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut")); + if (pSsValue) { - UINT Time = _ttoi(lpCurSs); + UINT Time = _ttoi(pSsValue) / 60; - Time /= 60; + HeapFree(GetProcessHeap(), 0, pSsValue); SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, UDM_SETPOS32, 0, Time); - - HeapFree(GetProcessHeap(), 0, lpCurSs); } SelectionChanged(hwndDlg, pData);

1 0

[reactos] 02/03: [DESK] Reimplement InstallScreenSaverW to behave similarly to Windows' one (#5766)
by Hermès Bélusca-Maïto 18 Oct '23

18 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3a25bcf8bdebb4fde966… commit b3a25bcf8bdebb4fde966449032777857a08dcd1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 5 22:42:17 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:45:39 2023 +0200 [DESK] Reimplement InstallScreenSaverW to behave similarly to Windows' one (#5766) CORE-6812 ; see also commit ff0951356 (r66688) This function "just" changes the per-user SCRNSAVE.EXE registry value to point to the new specified file, changes the SPI values and opens the desk.cpl "Screensaver" property tab for letting the user change the new selected screensaver properties. In particular, it does *NOT* copy the specified file to System32 or anything else (and doesn't verify that it is a valid PE executable). Our previous implementation did none of that, and was also relying on some private setupapi functions. We now behave closer to Windows' desk.cpl. Additionally: - ReactOS-specific feature (compile-time define) disabled by default: Verify that the specified file actually exists, before changing the screensaver. - Use NDEBUG, disabling DPRINT by default; - Improve InstallScreenSaver[A,W] spec entries; - Remove NUM_APPLETS define and use _countof() instead. --- dll/cpl/desk/desk.c | 129 ++++++++++++++++++++++++++++++++++--------------- dll/cpl/desk/desk.spec | 5 +- 2 files changed, 94 insertions(+), 40 deletions(-) diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 0bbfc7a4a0e..ce780332d91 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -13,9 +13,17 @@ #include <cplext.h> #include <winnls.h> +#define NDEBUG #include <debug.h> -#define NUM_APPLETS (1) + +/* Enable this for InstallScreenSaverW() to determine a possible full path + * to the specified screensaver file, verify its existence and use it. + * (NOTE: This is not Windows desk.cpl-compatible.) */ +// #define CHECK_SCR_FULL_PATH + + +VOID WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); @@ -26,11 +34,11 @@ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp); -HINSTANCE hApplet = 0; -HWND hCPLWindow; +HINSTANCE hApplet = NULL; +HWND hCPLWindow = NULL; /* Applets */ -APPLET Applets[NUM_APPLETS] = +APPLET Applets[] = { { IDC_DESK_ICON, @@ -211,8 +219,8 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) g_GlobalData.bmMonHeight = bitmap.bmHeight; } - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); + ZeroMemory(&psh, sizeof(psh)); + psh.dwSize = sizeof(psh); psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE | PSH_USEICONID; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; @@ -226,7 +234,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) /* Allow shell extensions to replace the background page */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Desk"), MAX_DESK_PAGES - psh.nPages); - for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++) + for (i = 0; i < _countof(PropPages); i++) { if (pwszSelectedTab && wcsicmp(pwszSelectedTab, PropPages[i].Name) == 0) psh.nStartPage = i; @@ -276,10 +284,10 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return TRUE; case CPL_GETCOUNT: - return NUM_APPLETS; + return _countof(Applets); case CPL_INQUIRE: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -294,14 +302,14 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) break; case CPL_DBLCLK: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); else return TRUE; break; case CPL_STARTWPARMSW: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; } @@ -317,45 +325,90 @@ InstallScreenSaverW( IN LPCWSTR pszFile, IN UINT nCmdShow) { - WCHAR pszSystemDir[MAX_PATH]; - WCHAR pszDrive[3]; - WCHAR pszPath[MAX_PATH]; - WCHAR pszFilename[MAX_PATH]; - WCHAR pszExt[MAX_PATH]; - LPWSTR pszOutName; - UINT uCompressionType=FILE_COMPRESSION_NONE; - DWORD dwSourceSize; - DWORD dwTargetSize; - DWORD rc; + LRESULT rc; + HKEY regKey; + INT Timeout; +#ifdef CHECK_SCR_FULL_PATH + HANDLE hFile; + WIN32_FIND_DATAW fdFile; +#endif + DWORD dwLen; + WCHAR szFullPath[MAX_PATH]; if (!pszFile) { - DPRINT("InstallScreenSaver() null file\n"); + DPRINT1("InstallScreenSaver() null file\n"); SetLastError(ERROR_INVALID_PARAMETER); return; } DPRINT("InstallScreenSaver() Installing screensaver %ls\n", pszFile); - rc = SetupGetFileCompressionInfoW(pszFile, &pszOutName, &dwSourceSize, &dwTargetSize, &uCompressionType); - if (ERROR_SUCCESS != rc) +#ifdef CHECK_SCR_FULL_PATH + /* Retrieve the actual path to the file and verify whether it exists */ + dwLen = GetFullPathNameW(pszFile, _countof(szFullPath), szFullPath, NULL); + if (dwLen == 0 || dwLen > _countof(szFullPath)) { - DPRINT("InstallScreenSaver() SetupGetFileCompressionInfo failed with error 0x%lx\n", rc); - SetLastError(rc); + DPRINT1("InstallScreenSaver() File %ls not accessible\n", pszFile); return; } - if (!GetSystemDirectoryW((LPWSTR)pszSystemDir, sizeof(pszSystemDir)/sizeof(WCHAR))) + hFile = FindFirstFile(szFullPath, &fdFile); + if (hFile == INVALID_HANDLE_VALUE) { - MyFree(pszOutName); - DPRINT("InstallScreenSaver() GetSystemDirectory failed with error 0x%lx\n", GetLastError()); + DPRINT1("InstallScreenSaver() File %ls not found\n", pszFile); return; } - _wsplitpath(pszOutName, pszDrive, pszPath, pszFilename, pszExt); - MyFree(pszOutName); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), L"\\"); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszFilename); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszExt); - rc = SetupDecompressOrCopyFileW(pszFile, pszSystemDir, &uCompressionType); - DPRINT("InstallScreenSaver() Copying to %ls, compression type %d return 0x%lx\n", pszFile, uCompressionType, rc); + FindClose(hFile); + /* Use the full file path from now on */ + pszFile = szFullPath; +#endif + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Control Panel\\Desktop", + 0, + KEY_SET_VALUE, + &regKey); + if (rc == ERROR_SUCCESS) + { + /* Set the screensaver */ + SIZE_T Length = (wcslen(pszFile) + 1) * sizeof(WCHAR); + rc = RegSetValueExW(regKey, + L"SCRNSAVE.EXE", + 0, + REG_SZ, + (PBYTE)pszFile, + (DWORD)Length); + RegCloseKey(regKey); + } + if (rc != ERROR_SUCCESS) + { + DPRINT1("InstallScreenSaver() Could not change the current screensaver\n"); + return; + } + + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_UPDATEINIFILE); + + /* If no screensaver timeout is present, default to 10 minutes (600 seconds) */ + Timeout = 0; + if (!SystemParametersInfoW(SPI_GETSCREENSAVETIMEOUT, 0, &Timeout, 0) || (Timeout <= 0)) + SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, 600, 0, SPIF_UPDATEINIFILE); + + /* Retrieve the name of this current instance of desk.cpl */ + dwLen = GetModuleFileNameW(hApplet, szFullPath, _countof(szFullPath)); + if ((dwLen == 0) || (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + /* We failed, copy the default value */ + StringCchCopyW(szFullPath, _countof(szFullPath), L"desk.cpl"); + } + + /* Build the desk.cpl command-line to start the ScreenSaver page. + * Equivalent to: "desk.cpl,ScreenSaver,@ScreenSaver" */ + rc = StringCchCatW(szFullPath, _countof(szFullPath), L",,1"); + if (FAILED(rc)) + return; + + /* Open the ScreenSaver page in this desk.cpl instance */ + DPRINT("InstallScreenSaver() Starting '%ls'\n", szFullPath); + Control_RunDLLW(hWindow, hInstance, szFullPath, nCmdShow); } void @@ -371,7 +424,7 @@ InstallScreenSaverA( if (!pszFile) { - DPRINT("InstallScreenSaver() null file\n"); + DPRINT1("InstallScreenSaver() null file\n"); SetLastError(ERROR_INVALID_PARAMETER); return; } @@ -393,7 +446,7 @@ InstallScreenSaverA( } if (!lpwString) { - DPRINT("InstallScreenSaver() not enough memory to convert string to unicode\n"); + DPRINT1("InstallScreenSaver() not enough memory to convert string to unicode\n"); return; } diff --git a/dll/cpl/desk/desk.spec b/dll/cpl/desk/desk.spec index ab028545161..b108c44825f 100644 --- a/dll/cpl/desk/desk.spec +++ b/dll/cpl/desk/desk.spec @@ -1,6 +1,7 @@ @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall DisplayClassInstaller(long ptr ptr) @ stdcall DisplaySaveSettings(ptr ptr) -@ stdcall InstallScreenSaverW(long long ptr long) -@ stdcall InstallScreenSaverA(long long ptr long) +@ stdcall InstallScreenSaver(ptr ptr str long) InstallScreenSaverA +@ stdcall InstallScreenSaverA(ptr ptr str long) +@ stdcall InstallScreenSaverW(ptr ptr wstr long) @ stdcall MonitorClassInstaller(long ptr ptr)

1 0

[reactos] 01/03: [DESK] Cleanup some functions.
by Hermès Bélusca-Maïto 18 Oct '23

18 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd1e5d53a5d8ec138db56… commit fd1e5d53a5d8ec138db56b534bfb16fbb3104665 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 16 21:11:09 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:30:10 2023 +0200 [DESK] Cleanup some functions. --- dll/cpl/desk/screensaver.c | 177 +++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 93 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 5c310f8d692..549422e5492 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -57,9 +57,7 @@ GetCurrentScreenSaverValue(LPTSTR lpValue) &BufSize); if (Ret == ERROR_SUCCESS) { - lpBuf = HeapAlloc(GetProcessHeap(), - 0, - BufSize); + lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize); if (lpBuf) { Ret = RegQueryValueEx(hKey, @@ -173,10 +171,14 @@ ShowScreenSaverPreview(IN LPDRAWITEMSTRUCT draw, IN PDATA pData) } +/* + * /p:<hwnd> Run preview, hwnd is handle of calling window + */ static VOID SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) { HWND hPreview = pData->ScreenSaverPreviewParent; + HRESULT hr; STARTUPINFO si; TCHAR szCmdline[2048]; @@ -190,32 +192,34 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) } ShowWindow(pData->ScreenSaverPreviewParent, SW_HIDE); - if (pData->Selection > 0) + if (pData->Selection < 1) + return; + + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /p %Iu"), + pData->ScreenSaverItems[pData->Selection].szFilename, + (ULONG_PTR)hPreview); + if (FAILED(hr)) + return; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); + + ShowWindow(pData->ScreenSaverPreviewParent, SW_SHOW); + + if (!CreateProcess(NULL, + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pData->PrevWindowPi)) { - _stprintf(szCmdline, - _T("%s /p %Iu"), - pData->ScreenSaverItems[pData->Selection].szFilename, - (ULONG_PTR)hPreview); - - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); - - ShowWindow(pData->ScreenSaverPreviewParent, SW_SHOW); - - if (!CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pData->PrevWindowPi)) - { - pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; - } + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } } @@ -260,38 +264,40 @@ WaitForSettingsDialog(HWND hwndDlg, } +/* + * /c:<hwnd> Run configuration, hwnd is handle of calling window + */ static VOID -ScreensaverConfig(HWND hwndDlg, PDATA pData) +ScreenSaverConfig(HWND hwndDlg, PDATA pData) { - /* - * /c:<hwnd> Run configuration, hwnd is handle of calling window - */ - - TCHAR szCmdline[2048]; + HRESULT hr; STARTUPINFO si; PROCESS_INFORMATION pi; + TCHAR szCmdline[2048]; if (pData->Selection < 1) return; - _stprintf(szCmdline, - _T("%s /c:%Iu"), - pData->ScreenSaverItems[pData->Selection].szFilename, - (ULONG_PTR)hwndDlg); + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /c:%Iu"), + pData->ScreenSaverItems[pData->Selection].szFilename, + (ULONG_PTR)hwndDlg); + if (FAILED(hr)) + return; ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); if (CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pi)) + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pi)) { /* Kill off the previous preview process */ if (pData->PrevWindowPi.hProcess) @@ -310,17 +316,16 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData) } } - +/* + * /s Run normal + */ static VOID -ScreensaverPreview(HWND hwndDlg, PDATA pData) +ScreenSaverPreview(HWND hwndDlg, PDATA pData) { - /* - /s Run normal - */ - - TCHAR szCmdline[2048]; + HRESULT hr; STARTUPINFO si; PROCESS_INFORMATION pi; + TCHAR szCmdline[2048]; if (pData->Selection < 1) return; @@ -334,23 +339,25 @@ ScreensaverPreview(HWND hwndDlg, PDATA pData) pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } - _stprintf(szCmdline, - _T("%s /s"), - pData->ScreenSaverItems[pData->Selection].szFilename); + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /s"), + pData->ScreenSaverItems[pData->Selection].szFilename); + if (FAILED(hr)) + return; ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); if (CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pi)) + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pi)) { WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); @@ -638,9 +645,8 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) &bRet, FALSE); if (Time == 0) - Time = 60; - else - Time *= 60; + Time = 1; + Time *= 60; // Convert to seconds SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); @@ -657,9 +663,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) INT Num; WNDCLASS wc = {0}; - pData = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(DATA)); + pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); if (!pData) { EndDialog(hwndDlg, -1); @@ -700,9 +704,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) pData->ScreenSaverPreviewParent = hChild; } - SetWindowLongPtr(hwndDlg, - DWLP_USER, - (LONG_PTR)pData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); pData->Selection = -1; @@ -754,9 +756,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) 0); } - HeapFree(GetProcessHeap(), - 0, - lpCurSs); + HeapFree(GetProcessHeap(), 0, lpCurSs); } else { @@ -781,14 +781,10 @@ OnInitDialog(HWND hwndDlg, PDATA pData) 0, Time); - HeapFree(GetProcessHeap(), - 0, - lpCurSs); - + HeapFree(GetProcessHeap(), 0, lpCurSs); } - SelectionChanged(hwndDlg, - pData); + SelectionChanged(hwndDlg, pData); return TRUE; } @@ -829,16 +825,13 @@ ScreenSaverPageProc(HWND hwndDlg, CloseHandle(pData->PrevWindowPi.hProcess); CloseHandle(pData->PrevWindowPi.hThread); } - HeapFree(GetProcessHeap(), - 0, - pData); + HeapFree(GetProcessHeap(), 0, pData); break; } case WM_ENDSESSION: { - SetScreenSaverPreviewBox(hwndDlg, - pData); + SetScreenSaverPreviewBox(hwndDlg, pData); break; } @@ -888,7 +881,7 @@ ScreenSaverPageProc(HWND hwndDlg, { if (command == BN_CLICKED) { - ScreensaverPreview(hwndDlg, pData); + ScreenSaverPreview(hwndDlg, pData); SetScreenSaverPreviewBox(hwndDlg, pData); } break; @@ -897,16 +890,14 @@ ScreenSaverPageProc(HWND hwndDlg, case IDC_SCREENS_SETTINGS: // Screensaver Settings { if (command == BN_CLICKED) - ScreensaverConfig(hwndDlg, pData); + ScreenSaverConfig(hwndDlg, pData); break; } case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure { if (command == BN_CLICKED) - { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } break; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs