Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [MSTSC] Update Romanian (ro-RO) translation (#5959)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c56c9cd5fa2d1c1d96c1… commit 1c56c9cd5fa2d1c1d96c1743f8802cc715036f5f Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Nov 14 16:00:32 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 14 14:00:32 2023 +0000 [MSTSC] Update Romanian (ro-RO) translation (#5959) --- base/applications/mstsc/lang/ro-RO.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mstsc/lang/ro-RO.rc b/base/applications/mstsc/lang/ro-RO.rc index de0ac08490f..cda1b4b76d7 100644 --- a/base/applications/mstsc/lang/ro-RO.rc +++ b/base/applications/mstsc/lang/ro-RO.rc @@ -15,7 +15,7 @@ BEGIN GROUPBOX "Preferințe de conectare", IDC_STATIC, 7, 7, 228, 89 GROUPBOX "Gestiune conexiuni", IDC_STATIC, 7, 103, 228, 65 ICON "", IDC_LOGONICON, 15, 19, 20, 20 - LTEXT "Introduceți adresa unui servitor.", IDC_STATIC, 47, 24, 121, 8 + LTEXT "Introduceți adresa unui server.", IDC_STATIC, 47, 24, 121, 8 LTEXT "Server:", IDC_STATIC, 47, 41, 35, 8 LTEXT "Nume utilizator:", IDC_STATIC, 47, 58, 58, 8 COMBOBOX IDC_SERVERCOMBO, 101, 39, 119, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -24,7 +24,7 @@ BEGIN PUSHBUTTON "Sal&vează ca…", IDC_SAVEAS, 112, 139, 60, 14 PUSHBUTTON "&Deschidere…", IDC_OPEN, 177, 139, 50, 14 ICON "", IDC_CONNICON, 16, 114, 20, 20 - LTEXT "Puteți păstra preferințele curente de conectare sau puteți deschide preferințe existente.", IDC_STATIC, 50, 115, 172, 20 + LTEXT "Puteți salva setările curente de conectare sau puteți deschide o configurație existentă.", IDC_STATIC, 50, 115, 172, 20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -39,7 +39,7 @@ BEGIN CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO, 56, 102, 128, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_COLORIMAGE, "Static", SS_OWNERDRAW | SS_SUNKEN, 56, 121, 127, 10 - LTEXT "Notă: Această preferință poate fi sau nu compatibilă cu configurația calculatorului gazdă. Preferințele incompatibile vor fi ignorate.", IDC_STATIC, 56, 138, 155, 27 + LTEXT "Notă: Această preferință poate fi sau nu compatibilă cu setările calculatorului gazdă. Preferințele incompatibile vor fi ignorate.", IDC_STATIC, 56, 138, 155, 27 LTEXT "Mică", IDC_STATIC, 35, 42, 15, 8 LTEXT "Mare", IDC_STATIC, 189, 42, 17, 8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER

1 year, 2 months

[reactos] 01/01: [DESK] Update Romanian (ro-RO) translation (#5958)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ce9e3b669e4296ad66d3… commit 3ce9e3b669e4296ad66d35d997e769c1204e17d7 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Nov 14 15:59:17 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 14 13:59:17 2023 +0000 [DESK] Update Romanian (ro-RO) translation (#5958) --- dll/cpl/desk/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index bc5c33701a9..2425da1b74f 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -17,7 +17,7 @@ BEGIN LTEXT "O temă este un fundal plus un set de sunete, pictograme și alte elemente care vă ajută să vă personalizați calculatorul cu un singur clic.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Temă:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Salvare &ca…", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "Salvează &ca…", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 PUSHBUTTON "Șt&erge", IDC_THEMES_DELETE, 170, 70, 70, 14 CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE END @@ -46,7 +46,7 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Ani&mație de ecran inactiv", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Opțiuni", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP + PUSHBUTTON "&Setări", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "Pre&vizionare", IDC_SCREENS_TESTSC, 175, 102, 50, 15 LTEXT "În vigoare &după", IDC_WAITTEXT, 14, 125, 54, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 68, 123, 32, 13, ES_RIGHT | WS_GROUP @@ -82,7 +82,7 @@ END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Opțiuni avansate" +CAPTION "Setări avansate" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -255,7 +255,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Ecran" - IDS_CPLDESCRIPTION "Ajustarea opțiunilor de afișare și configurarea ecranului și a dispozitivelor video." + IDS_CPLDESCRIPTION "Ajustarea setărilor de afișare și configurarea ecranului și a dispozitivelor video." IDS_NONE "(nespecificată)" IDS_CENTER "Centrat" IDS_STRETCH "Extins"

1 year, 2 months

[reactos] 01/01: [TASKMGR] Harmonize and beautify the borders in performance tab (#5949)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b693eddd74f689c58f232… commit b693eddd74f689c58f232a8e92849f705444b0d3 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Tue Nov 14 14:57:17 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 14 13:57:17 2023 +0000 [TASKMGR] Harmonize and beautify the borders in performance tab (#5949) - When I started I actually just wanted to make the 2 red lines the same length. see PR-pic - Ultimately I was able to harmonize all ctrls sizes and position for all rc's. - This does also fix text truncation and overflows in several rc's. - Also this prevents the numbers (actual data) in some rc's to be cut off much earlier than in others, e.g. hu-HU.rc had IDC_KERNEL_MEMORY_PAGED width just 33 which is very small and will lead to quick truncation. Now all languages use width 45 for all data fields and width 57 for all text fields, which means if truncation would ever happen with very large numbers in the 64bit era, we will see that happen in all rc's at the same moment and not arbitrarily scattered over a century. It will happen later after this PR is applied. - After this PR the two red lines do have the same length. see PR-pic - After this PR the two green lines do have the same length. see PR-pic - After this PR the two yellow lines do have the same length. see PR-pic - After this PR the four brown lines do have the same length. see PR-pic - After this PR the five cyan lines do have the same length. see PR-pic --- base/applications/taskmgr/lang/bg-BG.rc | 54 +++++++++++------------ base/applications/taskmgr/lang/cs-CZ.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/da-DK.rc | 60 ++++++++++++------------- base/applications/taskmgr/lang/de-DE.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/el-GR.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/en-US.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/es-ES.rc | 78 ++++++++++++++++----------------- base/applications/taskmgr/lang/et-EE.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/fr-FR.rc | 62 +++++++++++++------------- base/applications/taskmgr/lang/he-IL.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/hu-HU.rc | 60 ++++++++++++------------- base/applications/taskmgr/lang/id-ID.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/it-IT.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/ja-JP.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/ko-KR.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/nl-NL.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/no-NO.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/pl-PL.rc | 76 ++++++++++++++++---------------- base/applications/taskmgr/lang/pt-BR.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/pt-PT.rc | 70 ++++++++++++++--------------- base/applications/taskmgr/lang/ro-RO.rc | 62 +++++++++++++------------- base/applications/taskmgr/lang/ru-RU.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/sk-SK.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/sq-AL.rc | 59 ++++++++++++------------- base/applications/taskmgr/lang/sv-SE.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/tr-TR.rc | 58 ++++++++++++------------ base/applications/taskmgr/lang/uk-UA.rc | 60 ++++++++++++------------- base/applications/taskmgr/lang/zh-CN.rc | 64 +++++++++++++-------------- base/applications/taskmgr/lang/zh-HK.rc | 56 +++++++++++------------ base/applications/taskmgr/lang/zh-TW.rc | 56 +++++++++++------------ 30 files changed, 890 insertions(+), 899 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index b41a49d2b2a..15b41d3f761 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Заетост на ЦПУ", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Заета памет", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Общо", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Заделена памет (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Действителна памет (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Памет на ядрото (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Общо", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Заделена памет (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Действителна памет (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Памет на ядрото (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT LTEXT "Описатели", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 - LTEXT "Нишки", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Действия", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Нишки", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Действия", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Общо", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8 - LTEXT "Ограничение", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER - LTEXT "Върхово", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Общо", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Ограничение", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Върхово", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Общо", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Налична", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 60, 8 - LTEXT "Системен склад", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 60, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Общо", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Налична", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Системен склад", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Общо", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Странирана", IDS_KERNEL_MEMORY_PAGED, 137, 184, 50, 8 - LTEXT "Нестранирана", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Общо", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Странирана", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Нестранирана", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Дневник на ЦПУ", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Дневник на паметта", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 63f2119ee40..4361e84a41e 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Využití CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Využití RAM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Celkem", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Využití paměti (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fyzická paměť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Paměť jádra (kB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 49, 8 - LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Celkem", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Využití paměti (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fyzická paměť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Paměť jádra (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Špička", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Špička", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkem", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Dostupná", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkem", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Dostupná", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkem", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 137, 184, 80, 8 - LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkem", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historie využití CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historie využití paměti", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index ae1f26bf3f5..7786e84a487 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -182,49 +182,49 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Forbrug", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Hukommelse Forbrug", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Ialt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Aftaget Forbrug (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fysisk Hukommelse (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel Hukommelse (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Håndtag", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Tråde", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Processor", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "MEM Forbrug", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Ialt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Aftaget Forbrug (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fysisk Hukommelse (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel Hukommelse (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Håndtag", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Tråde", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processor", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 35, 8 - LTEXT "Begrænsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER - LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 35, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Begrænsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ialt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Tilgængelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 - LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 45, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Ialt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Tilgængelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ialt", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8 - LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 45, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Ialt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Hukommelses Forbrug Historik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "MEM Hukommelses Forbrug Historik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT PUSHBUTTON "CPU Forbrug Visning", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "Hukommelses Forbrug Visning", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "CPU Forbrug Historik", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index f914ee914aa..7e847cc6d83 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Klemens Friedl */ +// COPYRIGHT: Klemens Friedl LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU-Last", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Speicher-Last", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 117, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 117, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 117, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel-Speicher (KB)", IDC_KERNEL_MEMORY_FRAME, 126, 166, 117, 39, 0, WS_EX_TRANSPARENT - LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Prozesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 71, 131, 48, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel-Speicher (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Prozesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 71, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 71, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8 - LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER - LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 71, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 71, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 71, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8 - LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8 - LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8 - LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8 - LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU-Lastverlauf", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Speicher-Lastverlauf", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 8b0a0db89d4..d09e503d52b 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Dj Apal */ +// COPYRIGHT: Dj Apal LANGUAGE LANG_GREEK, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Usage", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "MEM Usage", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Memory Usage History", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index 6c12067e84f..a9da3b690c1 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Usage", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "MEM Usage", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Memory Usage History", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 233085d876e..79f1f7aee2f 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: Carlos Garcia Gomez, Samuel Serapión, Ismael Ferreras Morezuelas (Swyter) */ +// COPYRIGHT: Carlos Garcia Gomez, Samuel Serapión, Ismael Ferreras Morezuelas (Swyter) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Memoria", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Sistema", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Carga de transacciones (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria física (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria del kernel (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 50, 8 - LTEXT "Subprocesos", IDS_TOTALS_THREAD_COUNT, 12, 140, 40, 8 - LTEXT "Procesos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Sistema", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Carga de transacciones (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria física (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria del kernel (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Subprocesos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Procesos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Límite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 30, 8, NOT WS_BORDER - LTEXT "Máximo", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Límite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Máximo", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 35, 8 - LTEXT "En caché", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 85, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "En caché", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 175, 27, 8 - LTEXT "Paginado", IDS_KERNEL_MEMORY_PAGED, 137, 184, 30, 8 - LTEXT "No paginado", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 40, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginado", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "No paginado", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historial de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historial de uso de memoria física", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT @@ -241,16 +241,16 @@ BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 120, 133, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 174, 133, 50, 14 LTEXT "El ajuste de afinidad de procesador controla las CPU en las que el proceso tendrá permiso para ejecutarse.", IDC_STATIC, 5, 5, 220, 16 - CONTROL "CPU 0", IDC_CPU0, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10 - CONTROL "CPU 1", IDC_CPU1, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10 - CONTROL "CPU 2", IDC_CPU2, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10 - CONTROL "CPU 3", IDC_CPU3, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 67, 37, 10 - CONTROL "CPU 4", IDC_CPU4, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 80, 37, 10 - CONTROL "CPU 5", IDC_CPU5, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 93, 37, 10 - CONTROL "CPU 6", IDC_CPU6, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 106, 37, 10 - CONTROL "CPU 7", IDC_CPU7, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 119, 37, 10 - CONTROL "CPU 8", IDC_CPU8, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 28, 37, 10 - CONTROL "CPU 9", IDC_CPU9, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 41, 37, 10 + CONTROL "CPU 0", IDC_CPU0, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10 + CONTROL "CPU 1", IDC_CPU1, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10 + CONTROL "CPU 2", IDC_CPU2, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10 + CONTROL "CPU 3", IDC_CPU3, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 67, 37, 10 + CONTROL "CPU 4", IDC_CPU4, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 80, 37, 10 + CONTROL "CPU 5", IDC_CPU5, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 93, 37, 10 + CONTROL "CPU 6", IDC_CPU6, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 106, 37, 10 + CONTROL "CPU 7", IDC_CPU7, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 119, 37, 10 + CONTROL "CPU 8", IDC_CPU8, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 28, 37, 10 + CONTROL "CPU 9", IDC_CPU9, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 41, 37, 10 CONTROL "CPU 10", IDC_CPU10, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 54, 41, 10 CONTROL "CPU 11", IDC_CPU11, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 67, 41, 10 CONTROL "CPU 12", IDC_CPU12, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 80, 41, 10 diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 0d0a6d3c89c..65b226461fd 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -189,45 +189,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU hõivatus", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Füüisline mälu", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Kokkuvõte", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Hõivatud mälu (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Füüsiline mälu (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Tuumamälu (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Sangu", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Lõimi", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Protsesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Kokkuvõte", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Hõivatud mälu (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Füüsiline mälu (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Tuumamälu (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Sangu", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Lõimi", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Protsesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Kokku", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limiit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Tipp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Kokku", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limiit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Tipp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Kokku", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Saadaval", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Vahemälus", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Kokku", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Saadaval", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Vahemälus", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Kokku", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Saalitud", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Saalimata", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Kokku", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Saalitud", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Saalimata", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU hõivatuse ajalugu", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Füüsilise mälu hõivatuse ajalugu", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 409ec1e6856..15d4ba4f6eb 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Benoit Plante (aka cmoibenlepro) */ +// COPYRIGHT: Benoit Plante (aka cmoibenlepro) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -183,47 +183,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Util. de l'UC", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Util. de la mémoire", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totaux", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Charge dédiée (Ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Mémoire physique (Ko)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Mémoire noyau (Ko)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 53, 8 - LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 53, 8 - LTEXT "Processus", IDS_TOTALS_PROCESS_COUNT, 12, 149, 53, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "UC utilisée", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Mémoire utilisée", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Totaux", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Charge dédiée (Ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Mémoire physique (Ko)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Mémoire noyau (Ko)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processus", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 53, 8 - LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 53, 8, NOT WS_BORDER - LTEXT "Pic", IDS_COMMIT_CHARGE_PEAK, 12, 193, 53, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Pic", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 48, 8 - LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 48, 8 - LTEXT "Cache système", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 48, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Cache système", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 48, 8 - LTEXT "Paginée", IDS_KERNEL_MEMORY_PAGED, 137, 184, 48, 8 - LTEXT "Non paginée", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 48, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginée", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Non paginée", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historique de l'utilisation de l'UC", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historique d'utilisation de la mémoire", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index c6ae88bee4e..7cd4206a16b 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: Baruch Rutman (peterooch), Shy Zedaka */ +// COPYRIGHT: Baruch Rutman (peterooch), Shy Zedaka LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "שימוש במעבד", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "שימוש בזיכרון", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "תהליכים", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "תהליכים", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "סה""כ", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "הגבלה", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER - LTEXT "שיא", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "סה""כ", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "הגבלה", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "שיא", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "סך הכל", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "זמין", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "מטמון המערכת", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "סך הכל", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "זמין", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "מטמון המערכת", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "סך הכל", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "מאגר בקובץ ההחלפה", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "מאגר שלא בקובץ ההחלפה", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "סך הכל", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 //FIXME: Shorten the string. "מאגר בקובץ ההחלפה" is too long. Do NOT shorten the numbers! + LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 //FIXME: Shorten the string. "מאגר שלא בקובץ ההחלפה" is too long. Do NOT shorten the numbers! + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "היסטורית שימוש בזיכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 0c811e384b7..03a8abb86eb 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Robert Horvath <talley(a)cubeclub.hu> */ +// COPYRIGHT: Robert Horvath <talley(a)cubeclub.hu> LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT @@ -184,46 +184,46 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU használat", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Memóriahasználat", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Összesítés", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Lefoglalt memória (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fizikai memória (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel memória (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Leírók", IDS_TOTALS_HANDLE_COUNT, 12, 131, 35, 8 - LTEXT "Szálak", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8 - LTEXT "Folyamatok száma", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Memória", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Összesítés", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Lefoglalt memória (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fizikai memória (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel memória (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Leírók", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Szálak", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Folyamatok", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Összesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8 - LTEXT "Korlát", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 35, 8, NOT WS_BORDER - LTEXT "Csúcsérték", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Összesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Korlát", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Csúcsérték", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Összesen", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8 - LTEXT "Elérhető", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 - LTEXT "Rendszer gyorsítótár", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 67, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Összesen", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Elérhető", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Rendszer gyorsítótár", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 205, 149, 28, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Összesen", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8 - LTEXT "Lapozóállományban", IDS_KERNEL_MEMORY_PAGED, 137, 184, 62, 8 - LTEXT "Nem lapozható", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Összesen", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Lapozható", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nem lapozható", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 200, 184, 33, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU használat", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Memória használat", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 388742c4f2d..d129a36abd8 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: Zaenal Mutaqin <ade999(a)gmail.com> and Mas Ahmad Muhammad <m.charly81(a)gmail.com> */ +// COPYRIGHT: Zaenal Mutaqin <ade999(a)gmail.com>, Mas Ahmad Muhammad <m.charly81(a)gmail.com> LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Pemakaian CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Pemakaian MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Total", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Biaya Komit (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memori Fisik (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memori Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Tuas", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Utas", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Proses", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Total", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Biaya Komit (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memori Fisik (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memori Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Tuas", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Utas", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Proses", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER - LTEXT "Puncak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Puncak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Tersedia", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Tembolok Sistem", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Tersedia", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Tembolok Sistem", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Riwayat Pemakaian CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Riwayat Pemakaian MEM", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index b8623d046b4..27cad122a69 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Uso MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totali", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Carico scritture (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria fisica (K)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 116, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria del Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 126, 166, 116, 39, 0, WS_EX_TRANSPARENT - LTEXT "Handle", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Thread", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Processi", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totali", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Carico scritture (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria fisica (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria del Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Handle", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Thread", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processi", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totale", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 21, 8, NOT WS_BORDER - LTEXT "Picco", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totale", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Picco", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totale", IDS_PHYSICAL_MEMORY_TOTAL, 132, 131, 27, 8 - LTEXT "Disponibile", IDS_PHYSICAL_MEMORY_AVAILABLE, 132, 140, 35, 8 - LTEXT "Cache sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 132, 149, 52, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totale", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponibile", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Cache sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totale", IDS_KERNEL_MEMORY_TOTAL, 132, 174, 27, 8 - LTEXT "Paginata", IDS_KERNEL_MEMORY_PAGED, 132, 184, 31, 8 - LTEXT "Non paginata", IDS_KERNEL_MEMORY_NONPAGED, 132, 193, 48, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totale", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginata", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Non paginata", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Storico uso CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Storico uso Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index 6b8eb9ad8d0..aa61aa60694 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -183,45 +183,45 @@ FONT 9, "MS UI Gothic" BEGIN GROUPBOX "CPU 使用率", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "メモリ使用量", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "合計", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "コミットチャージ (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "物理メモリ (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "カーネルメモリ (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "ハンドル", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "スレッド", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "プロセス", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "合計", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "コミットチャージ (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "物理メモリ (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "カーネルメモリ (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "ハンドル", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "スレッド", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "プロセス", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "合計", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "制限値", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "最大値", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "合計", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "制限値", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "最大値", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "合計", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "利用可能", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "システムキャッシュ", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "合計", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "利用可能", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "システムキャッシュ", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "合計", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "ページ", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "非ページ", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "合計", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "ページ", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "非ページ", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU 使用率の履歴", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "メモリ使用量の履歴", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 42dd47883d4..71850057b29 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Seungju Kim */ +// COPYRIGHT: Seungju Kim LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 9, "굴림" BEGIN GROUPBOX "CPU 사용", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "메모리 사용", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "합계", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "할당된 메모리 (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "물리적 메모리 (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "커널 메모리 (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "핸들", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "쓰레드", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "프로세스", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "합계", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "할당된 메모리 (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "물리적 메모리 (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "커널 메모리 (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "핸들", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "쓰레드", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "프로세스", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "합계", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "한계", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "최고", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "합계", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "한계", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "최고", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "합계", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "사용 가능", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "시스템 캐시", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "합계", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "사용 가능", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "시스템 캐시", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "합계", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "페이지됨", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "페이지 안됨", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "합계", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "페이지됨", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "페이지 안됨", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU 사용 기록", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "메모리 사용 기록", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index f5b939d798e..9c5f437a58f 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Wisselbestand", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totalen", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Geheugengebruik (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fysiek geheugen (kB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 126, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernelgeheugen (kB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 126, 39, 0, WS_EX_TRANSPARENT - LTEXT "Ingangen", IDS_TOTALS_HANDLE_COUNT, 12, 131, 37, 8 - LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 37, 8 - LTEXT "Processen", IDS_TOTALS_PROCESS_COUNT, 12, 149, 37, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totalen", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Geheugengebruik (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fysiek geheugen (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernelgeheugen (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Ingangen", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processen", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totaal", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 37, 8 - LTEXT "Limiet", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 37, 8, NOT WS_BORDER - LTEXT "Piek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 37, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totaal", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limiet", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Piek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totaal", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 46, 8 - LTEXT "Beschikbaar", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8 - LTEXT "Systeemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 205, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totaal", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Beschikbaar", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Systeemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 205, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 205, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totaal", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 85, 8 - LTEXT "In wisselbestand", IDS_KERNEL_MEMORY_PAGED, 137, 184, 85, 8 - LTEXT "Niet in wisselbestand", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 85, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 205, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totaal", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "In wisselbestand", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "N. wisselbestand", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 205, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 205, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Geschiedenis van CPU gebruik", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Geschiedenis van wisselbestandsgebruik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 45f9d9d8b9a..67730f81dc5 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -181,47 +181,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Prosessorbruk", IDC_CPU_USAGE_FRAME, 5, 5, 70, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Prosessorbruk", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Minnebruk", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Tildelt minne (kb)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fysisk minne (kb)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kjerne minne (kb)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Referanser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 50, 8 - LTEXT "Tråder", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Prosesser", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Tildelt minne (kb)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fysisk minne (kb)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kjerne minne (kb)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Referanser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Tråder", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Prosesser", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Begrensninger", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER - LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Begrensninger", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Tilgjengelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 40, 8 - LTEXT "Systembuffer", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 187, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Tilgjengelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Systembuffer", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 187, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 187, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Sidevekslet", IDS_KERNEL_MEMORY_PAGED, 137, 184, 54, 8 - LTEXT "Ikke sidevekslet", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 85, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 187, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Sidevekslet", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Ikke sidevekslet", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 187, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 187, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Logg for bruk av prosessor", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Logg for bruk av fysisk minne", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index 7b3b49eb5ad..96d5e6bff2c 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -1,9 +1,7 @@ -/* - * TRANSLATOR: xrogers <xxrogers(a)users.sourceforge.net> - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) - * Updated by Saibamen - Adam Stachowicz <saibamenppl(a)gmail.com> (August, 2014) - */ +// COPYRIGHT: xrogers <xxrogers(a)users.sourceforge.net> +// 2011 Caemyr +// 2014 Adam Stachowicz <saibamenppl(a)gmail.com> +// https://sourceforge.net/projects/reactospl LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -59,11 +57,11 @@ BEGIN 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 "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision &W 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 + MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME: accelerator collision &W END POPUP "Pomo&c" BEGIN @@ -188,50 +186,50 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Użycie procesora", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Użycie pliku stronicowania", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Sumy", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Pamięć zadeklarowana (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Pamięć fizyczna (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Pamięć jądra (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Dojścia", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Wątki", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Użycie CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Użycie MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Sumy", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Pamięć zadeklarowana (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Pamięć fizyczna (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Pamięć jądra (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Dojścia", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Wątki", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Razem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Szczyt", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Razem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Szczyt", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Razem", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Dostępne", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Bufor systemu", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Razem", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Dostępne", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Bufor systemu", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Razem", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Stronicowana", IDS_KERNEL_MEMORY_PAGED, 137, 184, 70, 8 - LTEXT "Niestronicowana", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Razem", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Stronicowana", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Niestronicowana", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historia użycia procesora CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Historia uzycia pliku stronicowania", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Historia uzycia pliku stronicowania MEM", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT PUSHBUTTON "Wyświetl użycie procesora", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "Wyświetl zużycie pamięci", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "Historia użycia procesora", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index ec47a6598c3..189c1e54bec 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 122, 122, 120, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 122, 166, 120, 39, 0, WS_EX_TRANSPARENT - LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8 - LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 36, 8 - LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 19, 8, NOT WS_BORDER - LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 126, 131, 27, 8 - LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 126, 140, 36, 8 - LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 126, 149, 57, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 126, 174, 27, 8 - LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 126, 184, 30, 8 - LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 126, 193, 45, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Histórico de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Histórico de uso de Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 3cf81bfce57..d2902236b57 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */ +// COPYRIGHT: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL @@ -52,12 +52,12 @@ BEGIN BEGIN MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision + MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision &D 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 "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED //FIXME: accelerator collision &D MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" @@ -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 //FIXME: accelerator collision + MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision &A MENUITEM SEPARATOR MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision + MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision &A END END @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 122, 122, 120, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 122, 166, 120, 39, 0, WS_EX_TRANSPARENT - LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8 - LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 36, 8 - LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 19, 8, NOT WS_BORDER - LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 126, 131, 27, 8 - LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 126, 140, 36, 8 - LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 126, 149, 57, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 126, 174, 27, 8 - LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 126, 184, 30, 8 - LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 126, 193, 45, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Histórico de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Histórico de uso de Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT @@ -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 //FIXME: accelerator collision + CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 //FIXME: accelerator collision &U 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 //FIXME: accelerator collision + CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 //FIXME: accelerator collision &U 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 3c6c747f93f..b5ab21b374e 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -1,7 +1,5 @@ -/* - * TRANSLATORS: Petru Dimitriu <petrimetri(a)gmail.com> - * Ștefan Fulea <stefan.fulea(a)mail.com> - */ +// COPYRIGHT: Petru Dimitriu <petrimetri(a)gmail.com> +// Ștefan Fulea <stefan.fulea(a)mail.com> LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -188,45 +186,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uz procesor", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Uz memorie", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 121, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memorie încărcată (ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 121, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memorie fizică (ko)", IDC_PHYSICAL_MEMORY_FRAME, 136, 122, 106, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memorie nucleu (ko)", IDC_KERNEL_MEMORY_FRAME, 136, 166, 106, 39, 0, WS_EX_TRANSPARENT - LTEXT "Id. de gestiune", IDS_TOTALS_HANDLE_COUNT, 12, 131, 125, 8 - LTEXT "Fire de execuție", IDS_TOTALS_THREAD_COUNT, 12, 140, 100, 8 - LTEXT "Procese", IDS_TOTALS_PROCESS_COUNT, 12, 149, 100, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 75, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memorie încărcată (ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memorie fizică (ko)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memorie nucleu (ko)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Id. de gestiune", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Fire de execuție", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Procese", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 75, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 75, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Actuală", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 100, 8 - LTEXT "Posibilă", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 100, 8, NOT WS_BORDER - LTEXT "Atinsă", IDS_COMMIT_CHARGE_PEAK, 12, 193, 100, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 75, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Actuală", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Posibilă", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Atinsă", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 75, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 75, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totală", IDS_PHYSICAL_MEMORY_TOTAL, 142, 131, 100, 8 - LTEXT "Disponbilă", IDS_PHYSICAL_MEMORY_AVAILABLE, 142, 140, 100, 8 - LTEXT "Tampon", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 142, 149, 100, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 190, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totală", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Disponbilă", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Tampon", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 190, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totală", IDS_KERNEL_MEMORY_TOTAL, 142, 174, 100, 8 - LTEXT "Paginată", IDS_KERNEL_MEMORY_PAGED, 142, 184, 100, 8 - LTEXT "Nepaginată", IDS_KERNEL_MEMORY_NONPAGED, 142, 193, 100, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 190, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totală", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Paginată", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nepaginată", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 190, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 190, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Istoricul încărcăturii de procesor", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Istoricul încărcăturii de memorie", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 777e4747259..400046cd393 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: Dmitry Chapyshev, 2007-06-10, Kudratov Olimjon <olim98(a)bk.ru> */ +// COPYRIGHT: Dmitry Chapyshev, 2007, Kudratov Olimjon <olim98(a)bk.ru> LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -184,46 +184,46 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Загрузка ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Файл подкачки", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Всего", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Выделение памяти (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Физическая память (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Память ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Память", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Всего", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Выделение памяти (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Физическая память (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Память ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT LTEXT "Дескрипторов", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 - LTEXT "Потоков", IDS_TOTALS_THREAD_COUNT, 12, 140, 30, 8 - LTEXT "Процессов", IDS_TOTALS_PROCESS_COUNT, 12, 149, 36, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Потоков", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Процессов", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Всего", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Предел", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER - LTEXT "Пик", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Всего", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Предел", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Пик", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Всего", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 33, 8 - LTEXT "Системный кэш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 184, 131, 49, 8, ES_RIGHT | ES_READONLY | + LTEXT "Всего", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Системный кэш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Всего", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Выгружаемая", IDS_KERNEL_MEMORY_PAGED, 137, 184, 50, 8 - LTEXT "Невыгружаемая", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 195, 174, 41, 8, ES_RIGHT | ES_READONLY | + LTEXT "Всего", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Выгружаемая", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Невыгружаемая", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 195, 184, 41, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 194, 41, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Хронология загрузки ЦП", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Хронология использования файла подкачки", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 5f5e88bd5bb..721160da292 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2007 Kario <kario(a)szm.sk> */ +// COPYRIGHT: 2007 Kario <kario(a)szm.sk> LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Procesor", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Stránkovanie", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Súčty", IDC_TOTALS_FRAME, 5, 122, 89, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Využitie pamäte (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 89, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fyzická pamäť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 99, 122, 143, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Pamäť jadra (kB)", IDC_KERNEL_MEMORY_FRAME, 99, 166, 143, 39, 0, WS_EX_TRANSPARENT - LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 40, 8 - LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 54, 131, 36, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Súčty", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Využitie pamäte (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fyzická pamäť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Pamäť jadra (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 54, 140, 36, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 54, 149, 36, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkovo", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Maximum", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 50, 174, 40, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkovo", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Maximum", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 50, 184, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 50, 193, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkovo", IDS_PHYSICAL_MEMORY_TOTAL, 104, 131, 27, 8 - LTEXT "K dispozícii", IDS_PHYSICAL_MEMORY_AVAILABLE, 104, 140, 40, 8 - LTEXT "Vyrovnáv. pamäť systému", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 104, 149, 90, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 196, 131, 40, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkovo", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "K dispozícii", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Vyrovnáv. pamäť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 196, 140, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 196, 149, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Celkovo", IDS_KERNEL_MEMORY_TOTAL, 104, 174, 27, 8 - LTEXT "Stránkovaná", IDS_KERNEL_MEMORY_PAGED, 104, 184, 52, 8 - LTEXT "Nestránkovaná", IDS_KERNEL_MEMORY_NONPAGED, 104, 193, 52, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 196, 174, 40, 8, ES_RIGHT | ES_READONLY | + LTEXT "Celkovo", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Stránkovaná", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Nestránkovaná", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 196, 184, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 196, 193, 40, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "História využitia procesora", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "História využitia stránkovacieho súboru", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index 9823efa67c4..fd8a285586f 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -1,5 +1,4 @@ -/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> -*/ +// COPYRIGHT: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -186,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Perdorimi i CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Perdorimi i MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Vendos Drejtimin (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria Fizike (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Memoria e Kernelit (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Trajton", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Temat", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "proceset", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Vendos Drejtimin (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria Fizike (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Memoria e Kernelit (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Trajton", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Temat", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "proceset", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totali", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limiti", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Shiko", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totali", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Limiti", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Shiko", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totali", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8 - LTEXT "Kafazi Sistemit", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totali", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Kafazi Sistemit", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 46, 8 - LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 137, 184, 46, 8 - LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 56, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historia e perdorimit CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historia e perdorimit Memories", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 4541fdd7875..50cf81c4a31 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: David Nordenberg */ +// COPYRIGHT: David Nordenberg LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Processoranv.", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Minnesanv.", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Upptaget minne (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fysiskt minne (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Kernel minne (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Referenser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 41, 8 - LTEXT "Trådar", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Processer", IDS_TOTALS_PROCESS_COUNT, 12, 149, 36, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Upptaget minne (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fysiskt minne (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Kernel minne (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Referenser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Trådar", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Processer", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Gräns", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 21, 8, NOT WS_BORDER - LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Gräns", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Tillgängligt", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8 - LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Tillgängligt", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 137, 175, 27, 8 - LTEXT "Fysiskt / virtuellt", IDS_KERNEL_MEMORY_PAGED, 137, 184, 56, 8 - LTEXT "Fysiskt", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 44, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Fysiskt / virtuellt", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Fysiskt", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 190, 184, 43, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Processorhistorik", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Minneshistorik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index e8335de8a0e..b108153265e 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2019 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> */ +// COPYRIGHT: 2013-2019 Erdem Ersoy LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Kullanımı", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Bellek Kullanımı", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Toplam", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Ayrılmış Bellek (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Fiziksel Bellek (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Çekirdek Belleği (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "İşleçler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 45, 8 - LTEXT "İş Parçacıkları", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8 - LTEXT "İşlemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "Toplam", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Ayrılmış Bellek (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Fiziksel Bellek (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Çekirdek Belleği (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "İşleçler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "İş Parçacıkları", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "İşlemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8 - LTEXT "Sınır", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER - LTEXT "En Yüksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Sınır", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "En Yüksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8 - LTEXT "Kullanılabilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 - LTEXT "Sistem Ön Belleği", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 51, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Kullanılabilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Sistem Ön Belleği", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8 - LTEXT "Sayfalanmış", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8 - LTEXT "Sayfalanmamış", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Sayfalanmış", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Sayfalanmamış", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU Kullanım Geçmişi", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Bellek Kullanım Geçmişi", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 57d5620a65e..7eaefe2f718 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -181,47 +181,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Викорис. ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 62, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Викорис. пам'яті", IDC_MEM_USAGE_FRAME, 5, 63, 62, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Усього", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Виділення пам'яті (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Фізична пам'ять (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "Пам'ять ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Дескрипторів", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8 - LTEXT "Потоків", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Процесів", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Пам'ять", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Усього", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Виділення пам'яті (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Фізична пам'ять (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "Пам'ять ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "Дескрипторів", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "Потоків", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "Процесів", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Усього", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Межа", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 18, 8, NOT WS_BORDER - LTEXT "Пік", IDS_COMMIT_CHARGE_PEAK, 12, 193, 18, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Усього", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "Межа", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "Пік", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Усього", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 32, 8 - LTEXT "Системний кеш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 53, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 188, 131, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "Усього", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "Системний кеш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 188, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 188, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Усього", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Вивантажувана", IDS_KERNEL_MEMORY_PAGED, 137, 184, 53, 8 - LTEXT "Невивантажувана", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 63, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 198, 174, 35, 8, ES_RIGHT | ES_READONLY | + LTEXT "Усього", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "Сторінка", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "Неповторний", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 198, 184, 35, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 200, 193, 33, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Хронологія використання ЦП", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Хронологія використання пам'яті", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 6038833ee17..f79d04301a0 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -1,9 +1,5 @@ -/* - * (Simplified Chinese resources) - * (简体中文资源) - * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> - * Improved by Wexpo Lyu <laosb(a)lasteam.net> - */ +// COPYRIGHT: 2008 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> +// Wexpo Lyu <laosb(a)lasteam.net> LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -190,45 +186,45 @@ FONT 9, "宋体" BEGIN GROUPBOX "CPU 使用情况显示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "页面文件使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "总数", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "提交开销(K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "物理内存(K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "核心内存(K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "句柄数", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "线程数", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "进程数", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "总数", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "提交开销(K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "物理内存(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "核心内存(K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "句柄数", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "线程数", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "进程数", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "总数", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER - LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "总数", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "总数", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "可用数", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "系统缓存", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "总数", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "可用数", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "系统缓存", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "总数", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "分页数", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8 - LTEXT "未分页", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "总数", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "分页数", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "未分页", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU 使用记录", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "内存使用记录", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index f12447626ae..79456a30c85 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -191,45 +191,45 @@ FONT 9, "新細明體" BEGIN GROUPBOX "CPU 使用情況顯示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "PF 使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER - LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8 - LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU 使用記錄", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "記憶體使用記錄", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index eeaa0b72f36..519312b4038 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -191,45 +191,45 @@ FONT 9, "新細明體" BEGIN GROUPBOX "CPU 使用情況顯示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "PF 使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | + GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT + LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8 + LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8 + LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER - LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8 + LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER + LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8 + LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8 + LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8 - LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | + LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8 + LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 + LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU 使用記錄", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "記憶體使用記錄", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT

1 year, 2 months

[reactos] 02/02: [CRT] dbgrpt.cpp: Fix buffer sizes in the *nprintf functions (#5678)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=161eb5d375fa6f5042625… commit 161eb5d375fa6f50426258d02921815cc23b2b47 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 13 22:37:36 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 14 12:24:00 2023 +0100 [CRT] dbgrpt.cpp: Fix buffer sizes in the *nprintf functions (#5678) Sizes are in number of chars; use _countof() instead of hardcoding them in the functions. --- sdk/lib/crt/misc/dbgrpt.cpp | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index 51c55af9b4c..a923f666d8a 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -133,7 +133,7 @@ HMODULE _CrtGetUser32() } } - return _CrtUser32Handle != INVALID_HANDLE_VALUE ? _CrtUser32Handle : NULL; + return (_CrtUser32Handle != INVALID_HANDLE_VALUE ? _CrtUser32Handle : NULL); } static tMessageBoxW _CrtGetMessageBox() @@ -149,7 +149,7 @@ static tMessageBoxW _CrtGetMessageBox() _InterlockedCompareExchangePointer((PVOID*)&_CrtMessageBoxW, (PVOID)proc, NULL); } - return _CrtMessageBoxW != INVALID_HANDLE_VALUE ? _CrtMessageBoxW : NULL; + return (_CrtMessageBoxW != INVALID_HANDLE_VALUE ? _CrtMessageBoxW : NULL); } @@ -158,7 +158,7 @@ static int _CrtDbgReportWindow(int reportType, const char_t *filename, int linen { typedef dbgrpt_char_traits<char_t> traits; - wchar_t szCompleteMessage[(DBGRPT_MAX_BUFFER_SIZE+1)*2] = {0}; + wchar_t szCompleteMessage[DBGRPT_MAX_BUFFER_SIZE] = {0}; wchar_t LineBuffer[20] = {0}; if (filename && !filename[0]) @@ -170,7 +170,8 @@ static int _CrtDbgReportWindow(int reportType, const char_t *filename, int linen if (linenumber) _itow(linenumber, LineBuffer, 10); - _snwprintf(szCompleteMessage, DBGRPT_MAX_BUFFER_SIZE * 2, + _snwprintf(szCompleteMessage, + _countof(szCompleteMessage) - 1, traits::szAssertionMessage, _CrtModeMessages[reportType], moduleName ? L"\nModule: " : L"", moduleName ? moduleName : traits::szEmptyString, @@ -185,7 +186,7 @@ static int _CrtDbgReportWindow(int reportType, const char_t *filename, int linen tMessageBoxW messageBox = _CrtGetMessageBox(); if (!messageBox) - return IsDebuggerPresent() ? IDRETRY : IDABORT; + return (IsDebuggerPresent() ? IDRETRY : IDABORT); // TODO: If we are not interacive, add MB_SERVICE_NOTIFICATION return messageBox(NULL, szCompleteMessage, L"ReactOS C++ Runtime Library", @@ -318,8 +319,8 @@ _VCrtDbgReportA( const char *format, va_list arglist) { - char szFormatted[DBGRPT_MAX_BUFFER_SIZE+1] = {0}; // The user provided message - char szCompleteMessage[(DBGRPT_MAX_BUFFER_SIZE+1)*2] = {0}; // The output for debug / file + char szFormatted[DBGRPT_MAX_BUFFER_SIZE] = {0}; // The user provided message + char szCompleteMessage[DBGRPT_MAX_BUFFER_SIZE] = {0}; // The output for debug / file // Check for recursive _CrtDbgReport calls, and validate reportType if (!_CrtEnterDbgReport(reportType, filename, linenumber)) @@ -327,12 +328,19 @@ _VCrtDbgReportA( if (filename) { - _snprintf(szCompleteMessage, DBGRPT_MAX_BUFFER_SIZE, "%s(%d) : ", filename, linenumber); + _snprintf(szCompleteMessage, + _countof(szCompleteMessage) - 1, + "%s(%d) : ", + filename, + linenumber); } if (format) { - int len = _vsnprintf(szFormatted, DBGRPT_MAX_BUFFER_SIZE - 2 - sizeof(DBGRPT_ASSERT_PREFIX_MESSAGE), format, arglist); + int len = _vsnprintf(szFormatted, + _countof(szFormatted) - 2 - _countof(DBGRPT_ASSERT_PREFIX_MESSAGE), + format, + arglist); if (len < 0) { strcpy(szFormatted, DBGRPT_STRING_TOO_LONG); @@ -373,8 +381,8 @@ _VCrtDbgReportW( const wchar_t *format, va_list arglist) { - wchar_t szFormatted[DBGRPT_MAX_BUFFER_SIZE+1] = {0}; // The user provided message - wchar_t szCompleteMessage[(DBGRPT_MAX_BUFFER_SIZE+1)*2] = {0}; // The output for debug / file + wchar_t szFormatted[DBGRPT_MAX_BUFFER_SIZE] = {0}; // The user provided message + wchar_t szCompleteMessage[DBGRPT_MAX_BUFFER_SIZE] = {0}; // The output for debug / file // Check for recursive _CrtDbgReportW calls, and validate reportType if (!_CrtEnterDbgReport(reportType, filename, linenumber)) @@ -382,12 +390,19 @@ _VCrtDbgReportW( if (filename) { - _snwprintf(szCompleteMessage, DBGRPT_MAX_BUFFER_SIZE, L"%s(%d) : ", filename, linenumber); + _snwprintf(szCompleteMessage, + _countof(szCompleteMessage) - 1, + L"%s(%d) : ", + filename, + linenumber); } if (format) { - int len = _vsnwprintf(szFormatted, DBGRPT_MAX_BUFFER_SIZE - 2 - sizeof(DBGRPT_ASSERT_PREFIX_MESSAGE), format, arglist); + int len = _vsnwprintf(szFormatted, + _countof(szFormatted) - 2 - _countof(DBGRPT_ASSERT_PREFIX_MESSAGE), + format, + arglist); if (len < 0) { wcscpy(szFormatted, _CRT_WIDE(DBGRPT_STRING_TOO_LONG));

1 year, 2 months

[reactos] 01/02: [CRT][MSVCRT] Implement _CrtDbgReport(W)V and redefine _CrtDbgReport(W) around those (#5678)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f49e213943a510044bd4b… commit f49e213943a510044bd4b8ff9c0a21a868a6195a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 10 19:08:07 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 14 12:23:51 2023 +0100 [CRT][MSVCRT] Implement _CrtDbgReport(W)V and redefine _CrtDbgReport(W) around those (#5678) Also add the internal _VCrtDbgReportA and _VCrtDbgReportW functions listed in https://learn.microsoft.com/en-us/cpp/c-runtime-library/internal-crt-global… CORE-11835, CORE-15517 --- dll/win32/msvcrt/msvcrt.spec | 4 +- sdk/include/crt/crtdbg.h | 4 ++ sdk/lib/atl/atltrace.h | 15 ++------ sdk/lib/crt/misc/dbgrpt.cpp | 89 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 89 insertions(+), 23 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 6a7b5372c51..0cd58fe0fd0 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -200,9 +200,9 @@ @ stub -version=0x600+ _CrtCheckMemory @ stub -version=0x600+ _CrtDbgBreak @ cdecl -version=0x600+ _CrtDbgReport(long str long str str) -@ stub -version=0x600+ _CrtDbgReportV +@ cdecl -version=0x600+ _CrtDbgReportV(long str long str str ptr) @ cdecl -version=0x600+ _CrtDbgReportW(long wstr long wstr wstr) -@ stub -version=0x600+ _CrtDbgReportWV +@ cdecl -version=0x600+ _CrtDbgReportWV(long wstr long wstr wstr ptr) @ stub -version=0x600+ _CrtDoForAllClientObjects @ stub -version=0x600+ _CrtDumpMemoryLeaks @ stub -version=0x600+ _CrtIsMemoryBlock diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index f9545698e89..13c16f66f50 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -81,6 +81,7 @@ extern "C" { size_t lTotalCount; } _CrtMemState; + // Debug reporting functions #ifdef _DEBUG @@ -88,6 +89,9 @@ extern "C" { int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...); int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...); + int __cdecl _CrtDbgReportV(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, va_list arglist); + int __cdecl _CrtDbgReportWV(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, va_list arglist); + #endif diff --git a/sdk/lib/atl/atltrace.h b/sdk/lib/atl/atltrace.h index 6230af9f1fc..fcd81faad6e 100644 --- a/sdk/lib/atl/atltrace.h +++ b/sdk/lib/atl/atltrace.h @@ -9,18 +9,11 @@ #include "atldef.h" -#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 +#ifdef _DEBUG #include <stdio.h> #include <crtdbg.h> -extern "C" -{ -// FIXME: Enabling _DEBUG at top level causes assertion failures... CORE-17505 -int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...); -int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...); -} - namespace ATL { @@ -267,10 +260,10 @@ AtlTrace(_In_z_ _Printf_format_string_ const X_CHAR *format, ...) } // namespace ATL -#endif // DBG +#endif // _DEBUG #ifndef ATLTRACE - #if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + #ifdef _DEBUG #define ATLTRACE(format, ...) ATL::AtlTraceEx(__FILE__, __LINE__, format, ##__VA_ARGS__) #else #define ATLTRACE(format, ...) ((void)0) @@ -279,7 +272,7 @@ AtlTrace(_In_z_ _Printf_format_string_ const X_CHAR *format, ...) #define ATLTRACE2 ATLTRACE -#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 +#ifdef _DEBUG #define ATLTRACENOTIMPL(funcname) do { \ ATLTRACE(atlTraceNotImpl, 0, #funcname " is not implemented.\n"); \ return E_NOTIMPL; \ diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index 131a918a2e2..51c55af9b4c 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -309,7 +309,14 @@ static int _CrtHandleDbgReport(int reportType, const char_t* szCompleteMessage, EXTERN_C -int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...) +int __cdecl +_VCrtDbgReportA( + int reportType, + const char *filename, + int linenumber, + const char *moduleName, + const char *format, + va_list arglist) { char szFormatted[DBGRPT_MAX_BUFFER_SIZE+1] = {0}; // The user provided message char szCompleteMessage[(DBGRPT_MAX_BUFFER_SIZE+1)*2] = {0}; // The output for debug / file @@ -325,11 +332,7 @@ int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, if (format) { - va_list arglist; - va_start(arglist, format); int len = _vsnprintf(szFormatted, DBGRPT_MAX_BUFFER_SIZE - 2 - sizeof(DBGRPT_ASSERT_PREFIX_MESSAGE), format, arglist); - va_end(arglist); - if (len < 0) { strcpy(szFormatted, DBGRPT_STRING_TOO_LONG); @@ -361,7 +364,14 @@ int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, } EXTERN_C -int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...) +int __cdecl +_VCrtDbgReportW( + int reportType, + const wchar_t *filename, + int linenumber, + const wchar_t *moduleName, + const wchar_t *format, + va_list arglist) { wchar_t szFormatted[DBGRPT_MAX_BUFFER_SIZE+1] = {0}; // The user provided message wchar_t szCompleteMessage[(DBGRPT_MAX_BUFFER_SIZE+1)*2] = {0}; // The output for debug / file @@ -377,11 +387,7 @@ int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumb if (format) { - va_list arglist; - va_start(arglist, format); int len = _vsnwprintf(szFormatted, DBGRPT_MAX_BUFFER_SIZE - 2 - sizeof(DBGRPT_ASSERT_PREFIX_MESSAGE), format, arglist); - va_end(arglist); - if (len < 0) { wcscpy(szFormatted, _CRT_WIDE(DBGRPT_STRING_TOO_LONG)); @@ -412,5 +418,68 @@ int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumb return nResult; } +EXTERN_C +int __cdecl +_CrtDbgReportV( + int reportType, + const char *filename, + int linenumber, + const char *moduleName, + const char *format, + va_list arglist) +{ + return _VCrtDbgReportA(reportType, filename, linenumber, moduleName, format, arglist); +} + +EXTERN_C +int __cdecl +_CrtDbgReportWV( + int reportType, + const wchar_t *filename, + int linenumber, + const wchar_t *moduleName, + const wchar_t *format, + va_list arglist) +{ + return _VCrtDbgReportW(reportType, filename, linenumber, moduleName, format, arglist); +} + +EXTERN_C +int __cdecl +_CrtDbgReport( + int reportType, + const char *filename, + int linenumber, + const char *moduleName, + const char *format, + ...) +{ + va_list arglist; + int result; + + va_start(arglist, format); + result = _VCrtDbgReportA(reportType, filename, linenumber, moduleName, format, arglist); + va_end(arglist); + return result; +} + +EXTERN_C +int __cdecl +_CrtDbgReportW( + int reportType, + const wchar_t *filename, + int linenumber, + const wchar_t *moduleName, + const wchar_t *format, + ...) +{ + va_list arglist; + int result; + + va_start(arglist, format); + result = _VCrtDbgReportW(reportType, filename, linenumber, moduleName, format, arglist); + va_end(arglist); + return result; +} //#endif // _DEBUG

1 year, 2 months

[reactos] 01/01: [WIN32KNT_APITEST] w32knapi.c: Update dll name (#5977)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7901a4c8fef4db23e4466… commit 7901a4c8fef4db23e4466a466ebf6ae1debc37ce Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Nov 14 12:14:39 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 14 12:14:39 2023 +0100 [WIN32KNT_APITEST] w32knapi.c: Update dll name (#5977) Addendum to commits 7ad21a4 (r70458) and bed6d00 (r76026). --- modules/rostests/apitests/win32nt/w32knapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/win32nt/w32knapi.c b/modules/rostests/apitests/win32nt/w32knapi.c index 037d88ee2f7..a4a854fe6f6 100644 --- a/modules/rostests/apitests/win32nt/w32knapi.c +++ b/modules/rostests/apitests/win32nt/w32knapi.c @@ -127,10 +127,10 @@ WinMain(HINSTANCE hInstance, InitOsVersion(); printf("g_OsIdx = %d\n", g_OsIdx); - g_hModule = LoadLibraryW(L"w32kdll.dll"); + g_hModule = LoadLibraryW(L"win32u.dll"); if (!g_hModule) { - printf("w32kdll.dll not found!\n"); + printf("win32u.dll not found!\n"); return -1; }

1 year, 2 months

[reactos] 01/01: [NTOS:EX][CSRSRV][WIN32K] Make a few #define more explicit/strict (#5907)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fb5957de14da885a1632… commit 3fb5957de14da885a16324fca028d9f0ea7fdf37 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 13 20:55:48 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 20:55:48 2023 +0100 [NTOS:EX][CSRSRV][WIN32K] Make a few #define more explicit/strict (#5907) - Add parentheses around macro parameters. - Add casts on return value for the Interlocked*UL ("Unsigned Long") macros. --- ntoskrnl/include/internal/ex.h | 16 ++++++++-------- subsystems/csr/csrsrv/srv.h | 8 ++++---- win32ss/pch.h | 9 +++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index f80cc7f8efd..50dde0cbfc8 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -79,9 +79,9 @@ VOID NTAPI ExpDebuggerWorker(IN PVOID Context); #define HANDLE_LOW_BITS (PAGE_SHIFT - 3) #define HANDLE_HIGH_BITS (PAGE_SHIFT - 2) #endif -#define HANDLE_TAG_BITS (2) -#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2*HANDLE_HIGH_BITS) -#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) +#define HANDLE_TAG_BITS 2 +#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2 * HANDLE_HIGH_BITS) +#define KERNEL_FLAG_BITS (sizeof(ULONG_PTR) * 8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) typedef union _EXHANDLE { @@ -160,9 +160,9 @@ typedef struct _HARDERROR_USER_PARAMETERS #define MAX_MID_INDEX (MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) -#define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&x->Ptr, (PVOID)y, (PVOID)z) -#define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)x, (PVOID)y, (PVOID)z) -#define ExpSetRundown(x, y) InterlockedExchangePointer(&x->Ptr, (PVOID)y) +#define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&(x)->Ptr, (PVOID)(y), (PVOID)(z)) +#define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)(x), (PVOID)(y), (PVOID)(z)) +#define ExpSetRundown(x, y) InterlockedExchangePointer(&(x)->Ptr, (PVOID)(y)) NTSTATUS NTAPI @@ -1541,10 +1541,10 @@ XIPInit( #ifdef _WIN64 #define InterlockedExchangeSizeT(Target, Value) \ - (SIZE_T)InterlockedExchange64((PLONG64)Target, (LONG64)Value) + (SIZE_T)InterlockedExchange64((PLONG64)(Target), (LONG64)(Value)) #else #define InterlockedExchangeSizeT(Target, Value) \ - (SIZE_T)InterlockedExchange((PLONG)Target, (LONG)Value) + (SIZE_T)InterlockedExchange((PLONG)(Target), (LONG)(Value)) #endif #define ExfInterlockedCompareExchange64UL(Destination, Exchange, Comperand) \ diff --git a/subsystems/csr/csrsrv/srv.h b/subsystems/csr/csrsrv/srv.h index d99c9633479..69ff83adbab 100644 --- a/subsystems/csr/csrsrv/srv.h +++ b/subsystems/csr/csrsrv/srv.h @@ -48,9 +48,9 @@ #define CSR_PORT_NAME L"ApiPort" #define UNICODE_PATH_SEP L"\\" -#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) -#define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) -#define InterlockedIncrementUL(Value) _InterlockedIncrement((PLONG)Value) -#define InterlockedDecrementUL(Value) _InterlockedDecrement((PLONG)Value) +#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)(n)) + (align) - 1, (align)) +#define ROUND_DOWN(n, align) (((ULONG)(n)) & ~((align) - 1l)) +#define InterlockedIncrementUL(Value) (ULONG)_InterlockedIncrement((PLONG)(Value)) +#define InterlockedDecrementUL(Value) (ULONG)_InterlockedDecrement((PLONG)(Value)) #endif /* _SRV_H */ diff --git a/win32ss/pch.h b/win32ss/pch.h index 31bf7246d8b..d72708658f0 100644 --- a/win32ss/pch.h +++ b/win32ss/pch.h @@ -1,5 +1,3 @@ -#ifndef __W32K_H -#define __W32K_H /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem @@ -8,6 +6,9 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ +#ifndef __W32K_H +#define __W32K_H + /* INCLUDES ******************************************************************/ #define _NO_COM @@ -103,8 +104,8 @@ extern "C" { #include <ft2build.h> #include FT_FREETYPE_H -#define InterlockedIncrementUL(Value) InterlockedIncrement((PLONG)Value) -#define InterlockedDecrementUL(Value) InterlockedDecrement((PLONG)Value) +#define InterlockedIncrementUL(Value) (ULONG)InterlockedIncrement((PLONG)(Value)) +#define InterlockedDecrementUL(Value) (ULONG)InterlockedDecrement((PLONG)(Value)) /* Internal Win32K header */ #include "win32kp.h"

1 year, 2 months

[reactos] 01/01: [NETSHELL] Display component icons in list (#5904)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e07dbf782c65fdedfeada… commit e07dbf782c65fdedfeada94f55814fcfbb6e34ce Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 13 20:51:52 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 13 20:51:52 2023 +0100 [NETSHELL] Display component icons in list (#5904) Display the class icons for the installed network components. Also fixes a bug where the selection change whacked the checkbox of the first item. Use 0x7fffffff to append the item at the end of the list, as optimization. --- dll/shellext/netshell/lanconnectui.cpp | 44 ++++++++++++++++++++++------------ dll/shellext/netshell/lanconnectui.h | 2 +- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index d0c5b0b2e28..70b72549171 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -26,15 +26,16 @@ CNetConnectionPropertyUi::~CNetConnectionPropertyUi() } VOID -AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked) +AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked, UINT Image) { LVITEMW lvItem; - ZeroMemory(&lvItem, sizeof(lvItem)); - lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; lvItem.pszText = szName; lvItem.lParam = (LPARAM)pItem; - lvItem.iItem = ListView_GetItemCount(hDlgCtrl); + lvItem.iImage = Image; + lvItem.iItem = 0x7fffffff; // Append at the end of the list. + lvItem.iSubItem = 0; lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); ListView_SetCheckState(hDlgCtrl, lvItem.iItem, bChecked); } @@ -73,7 +74,7 @@ CNetConnectionPropertyUi::GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent * } VOID -CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type) +CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type, PSP_CLASSIMAGELIST_DATA pCILD) { HRESULT hr; CComPtr<IEnumNetCfgComponent> pENetCfg; @@ -127,7 +128,10 @@ CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GU pItem->pNCfgComp = pNCfgComp.Detach(); pItem->NumPropDialogOpen = 0; - AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked); + INT image; + if (!pCILD->ImageList || !SetupDiGetClassImageIndex(pCILD, CompGuid, &image)) + image = I_IMAGENONE; + AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked, image); CoTaskMemFree(pDisplayName); } } @@ -143,7 +147,6 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) RECT rc; DWORD dwStyle; LPWSTR pDisplayName; - LVITEMW li; SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)m_pProperties->pszwDeviceName); if (m_pProperties->dwCharacter & NCCF_SHOW_ICON) @@ -193,15 +196,26 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) m_pNCfg = pNCfg; m_NCfgLock = pNCfgLock; - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); + SP_CLASSIMAGELIST_DATA spcid; + spcid.cbSize = sizeof(spcid); + if (SetupDiGetClassImageList(&spcid)) + { + HIMAGELIST hIL = ImageList_Duplicate(spcid.ImageList); + ListView_SetImageList(hDlgCtrl, hIL, LVSIL_SMALL); + } + else + { + spcid.ImageList = NULL; + } + + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT, &spcid); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE, &spcid); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL, &spcid); + + if (spcid.ImageList) + SetupDiDestroyClassImageList(&spcid); - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_STATE; - li.stateMask = (UINT)-1; - li.state = LVIS_FOCUSED|LVIS_SELECTED; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + ListView_SetItemState(hDlgCtrl, 0, -1, LVIS_FOCUSED | LVIS_SELECTED); } VOID diff --git a/dll/shellext/netshell/lanconnectui.h b/dll/shellext/netshell/lanconnectui.h index 0dd7fdc0384..964435b05fe 100644 --- a/dll/shellext/netshell/lanconnectui.h +++ b/dll/shellext/netshell/lanconnectui.h @@ -44,7 +44,7 @@ class CNetConnectionPropertyUi: private: BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); - VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); + VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type, PSP_CLASSIMAGELIST_DATA pCILD); VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); VOID ShowNetworkComponentProperties(HWND hwndDlg); BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID);

1 year, 2 months

[reactos] 01/01: [FREELDR] Implement NOSERIALMICE and FASTDETECT options (#5886)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d7153c8ba5babb42e336… commit 8d7153c8ba5babb42e336302c4995e81a311ae46 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun Nov 5 14:23:43 2023 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 13 19:49:41 2023 +0100 [FREELDR] Implement NOSERIALMICE and FASTDETECT options (#5886) Enable FASTDETECT by default, as done in NT 5+. This is because the serial mouse is recognized by the serial stack since NT 5.x. --- base/setup/lib/bootsup.c | 2 +- boot/bootdata/livecd.ini | 14 ++--- boot/bootdata/txtsetup.sif | 2 +- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 71 ++++++++++++++++++++++++-- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 15 ++++-- 5 files changed, 86 insertions(+), 18 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index c34950cc3e3..8c89220174e 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -73,7 +73,7 @@ CreateFreeLoaderReactOSEntries( /* ReactOS */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS"); BootEntry->FriendlyName = L"\"ReactOS\""; - Options->OsLoadOptions = NULL; // L""; + Options->OsLoadOptions = L"/FASTDETECT"; AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS")); /* ReactOS_Debug */ diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index 5e12037ff44..f36197c2e1d 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -18,34 +18,34 @@ LiveCD_LogFile="LiveCD (Log file)" [LiveCD] BootType=Windows2003 SystemPath=\reactos -Options=/MININT +Options=/FASTDETECT /MININT [LiveCD_Debug] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT [LiveCD_Macpi] BootType=Windows2003 SystemPath=\reactos -Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT [LiveCD_Aacpi] BootType=Windows2003 SystemPath=\reactos -Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT [LiveCD_VBoxDebug] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT +Options=/DEBUG /DEBUGPORT=VBOX /SOS /FASTDETECT /MININT [LiveCD_Screen] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT +Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT [LiveCD_LogFile] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT +Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index bb2e9d9d892..16ad79b9a8b 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -216,7 +216,7 @@ Cabinet=reactos.cab DefaultPath = \ReactOS SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN" -OsLoadOptions = "/NOGUIBOOT /NODEBUG" +OsLoadOptions = "/FASTDETECT /NOGUIBOOT /NODEBUG" [NLS] AnsiCodepage = c_1252.nls diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index c93bb23d945..639895ec25b 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -19,6 +19,8 @@ #include <freeldr.h> #include <cportlib/cportlib.h> +#include "../ntldr/ntldropts.h" + #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); @@ -710,6 +712,7 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, } } +static ULONG PcGetSerialPort(ULONG Index, PULONG Irq) { @@ -727,8 +730,60 @@ PcGetSerialPort(ULONG Index, PULONG Irq) return (ULONG) *(BasePtr + Index); } +/* + * Parse the serial mouse detection options. + * Format: /FASTDETECT + * or: /NOSERIALMICE=COM[0-9],[0-9],[0-9]... + * or: /NOSERIALMICE:COM[0-9]... + * If we have /FASTDETECT, then nothing can be detected. + */ +static +ULONG +GetSerialMouseDetectionBitmap( + _In_opt_ PCSTR Options) +{ + PCSTR Option, c; + ULONG OptionLength, PortBitmap, i; + + if (NtLdrGetOption(Options, "FASTDETECT")) + return (1 << MAX_COM_PORTS) - 1; + + Option = NtLdrGetOptionEx(Options, "NOSERIALMICE=", &OptionLength); + if (!Option) + Option = NtLdrGetOptionEx(Options, "NOSERIALMICE:", &OptionLength); + + if (!Option) + return 0; + + /* Invalid port list */ + if (OptionLength < (sizeof("NOSERIALMICE=COM9") - 1)) + return (1 << MAX_COM_PORTS) - 1; + + /* Move to the port list */ + Option += sizeof("NOSERIALMICE=COM") - 1; + OptionLength -= sizeof("NOSERIALMICE=COM") - 1; + + PortBitmap = 0; + c = Option; + for (i = 0; i < OptionLength; i += 2) + { + UCHAR PortNumber = *c - '0'; + + if (PortNumber > 0 && PortNumber <= 9) + PortBitmap |= 1 << (PortNumber - 1); + + c += 2; + } + + return PortBitmap; +} + VOID -DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetSerialPort, ULONG Count) +DetectSerialPorts( + _In_opt_ PCSTR Options, + _Inout_ PCONFIGURATION_COMPONENT_DATA BusKey, + _In_ GET_SERIAL_PORT MachGetSerialPort, + _In_ ULONG Count) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; @@ -740,9 +795,12 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetS PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG i; ULONG Size; + ULONG PortBitmap; TRACE("DetectSerialPorts()\n"); + PortBitmap = GetSerialMouseDetectionBitmap(Options); + for (i = 0; i < Count; i++) { Base = MachGetSerialPort(i, &Irq); @@ -813,7 +871,7 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetS Size, &ControllerKey); - if (!Rs232PortInUse(UlongToPtr(Base))) + if (!(PortBitmap & (1 << i)) && !Rs232PortInUse(UlongToPtr(Base))) { /* Detect serial mouse */ DetectSerialPointerPeripheral(ControllerKey, UlongToPtr(Base)); @@ -1561,7 +1619,10 @@ DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) static VOID -DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) +DetectIsaBios( + _In_opt_ PCSTR Options, + _Inout_ PCONFIGURATION_COMPONENT_DATA SystemKey, + _Out_ ULONG *BusNumber) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA BusKey; @@ -1600,7 +1661,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); - DetectSerialPorts(BusKey, PcGetSerialPort, MAX_COM_PORTS); + DetectSerialPorts(Options, BusKey, PcGetSerialPort, MAX_COM_PORTS); DetectParallelPorts(BusKey); DetectKeyboardController(BusKey); DetectPS2Mouse(BusKey); @@ -1647,7 +1708,7 @@ PcHwDetect( DetectPciBios(SystemKey, &BusNumber); DetectApmBios(SystemKey, &BusNumber); DetectPnpBios(SystemKey, &BusNumber); - DetectIsaBios(SystemKey, &BusNumber); // TODO: Detect first EISA or MCA, before ISA + DetectIsaBios(Options, SystemKey, &BusNumber); // TODO: Detect first EISA or MCA, before ISA DetectAcpiBios(SystemKey, &BusNumber); // TODO: Collect the ROM blocks from 0xC0000 to 0xF0000 and append their diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 4315e228598..97b38062d84 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -73,7 +73,11 @@ XboxGetSerialPort(ULONG Index, PULONG Irq) extern VOID -DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetSerialPort, ULONG Count); +DetectSerialPorts( + _In_opt_ PCSTR Options, + _Inout_ PCONFIGURATION_COMPONENT_DATA BusKey, + _In_ GET_SERIAL_PORT MachGetSerialPort, + _In_ ULONG Count); VOID XboxGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) @@ -201,7 +205,10 @@ DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) static VOID -DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) +DetectIsaBios( + _In_opt_ PCSTR Options, + _Inout_ PCONFIGURATION_COMPONENT_DATA SystemKey, + _Out_ ULONG *BusNumber) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA BusKey; @@ -240,7 +247,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); - DetectSerialPorts(BusKey, XboxGetSerialPort, MAX_XBOX_COM_PORTS); + DetectSerialPorts(Options, BusKey, XboxGetSerialPort, MAX_XBOX_COM_PORTS); DetectDisplayController(BusKey); /* FIXME: Detect more ISA devices */ @@ -279,7 +286,7 @@ XboxHwDetect( /* TODO: Build actual xbox's hardware configuration tree */ DetectPciBios(SystemKey, &BusNumber); - DetectIsaBios(SystemKey, &BusNumber); + DetectIsaBios(Options, SystemKey, &BusNumber); TRACE("DetectHardware() Done\n"); return SystemKey;

1 year, 2 months

[reactos] 01/01: [FREELDR:NTLDR] Pass boot-time detection options to HwDetect routines.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10e7643c808e99acc387b… commit 10e7643c808e99acc387b380df567784e567d243 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 15 17:04:53 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 13 19:19:40 2023 +0100 [FREELDR:NTLDR] Pass boot-time detection options to HwDetect routines. Will be used for supporting /NOSERIALMICE, /FASTDETECT (NT 5+) switches (see PR #5886), as well as the undocumented /PCIENUM option. --- boot/freeldr/freeldr/arch/arm/macharm.c | 5 +++-- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 3 ++- boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c | 3 ++- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 3 ++- boot/freeldr/freeldr/arch/uefi/uefihw.c | 3 ++- boot/freeldr/freeldr/include/arch/i386/machpc98.h | 6 +++++- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 5 ++++- boot/freeldr/freeldr/include/arch/pc/machpc.h | 6 +++++- boot/freeldr/freeldr/include/arch/uefi/machuefi.h | 3 ++- boot/freeldr/freeldr/include/machine.h | 9 ++++++--- boot/freeldr/freeldr/ntldr/winldr.c | 2 +- 11 files changed, 34 insertions(+), 14 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index 2179a59bd3a..e059ee07948 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -94,7 +94,8 @@ ArmPrepareForReactOS(VOID) } PCONFIGURATION_COMPONENT_DATA -ArmHwDetect(VOID) +ArmHwDetect( + _In_opt_ PCSTR Options) { ARM_CACHE_REGISTER CacheReg; @@ -137,7 +138,7 @@ BOOLEAN ArmInitializeBootDevices(VOID) { /* Emulate old behavior */ - if (ArmHwDetect() == NULL) + if (ArmHwDetect(NULL) == NULL) return FALSE; /* On ARM platforms, the loader is always in RAM */ diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 4bef802f667..c93bb23d945 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -1628,7 +1628,8 @@ PcGetFloppyCount(VOID) #endif PCONFIGURATION_COMPONENT_DATA -PcHwDetect(VOID) +PcHwDetect( + _In_opt_ PCSTR Options) { PCONFIGURATION_COMPONENT_DATA SystemKey; ULONG BusNumber = 0; diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c index a404237a6c0..98264eec03c 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c @@ -1180,7 +1180,8 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } PCONFIGURATION_COMPONENT_DATA -Pc98HwDetect(VOID) +Pc98HwDetect( + _In_opt_ PCSTR Options) { PCONFIGURATION_COMPONENT_DATA SystemKey; ULONG BusNumber = 0; diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 0574cd307a5..4315e228598 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -263,7 +263,8 @@ XboxGetFloppyCount(VOID) } PCONFIGURATION_COMPONENT_DATA -XboxHwDetect(VOID) +XboxHwDetect( + _In_opt_ PCSTR Options) { PCONFIGURATION_COMPONENT_DATA SystemKey; ULONG BusNumber = 0; diff --git a/boot/freeldr/freeldr/arch/uefi/uefihw.c b/boot/freeldr/freeldr/arch/uefi/uefihw.c index 8dcf9602274..f671446b474 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefihw.c +++ b/boot/freeldr/freeldr/arch/uefi/uefihw.c @@ -123,7 +123,8 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } PCONFIGURATION_COMPONENT_DATA -UefiHwDetect(VOID) +UefiHwDetect( + _In_opt_ PCSTR Options) { PCONFIGURATION_COMPONENT_DATA SystemKey; ULONG BusNumber = 0; diff --git a/boot/freeldr/freeldr/include/arch/i386/machpc98.h b/boot/freeldr/freeldr/include/arch/i386/machpc98.h index 07881b83319..23e268e9d98 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machpc98.h +++ b/boot/freeldr/freeldr/include/arch/i386/machpc98.h @@ -80,7 +80,11 @@ VOID Pc98VideoPrepareForReactOS(VOID); VOID Pc98PrepareForReactOS(VOID); TIMEINFO* Pc98GetTime(VOID); BOOLEAN Pc98InitializeBootDevices(VOID); -PCONFIGURATION_COMPONENT_DATA Pc98HwDetect(VOID); + +PCONFIGURATION_COMPONENT_DATA +Pc98HwDetect( + _In_opt_ PCSTR Options); + VOID Pc98HwIdle(VOID); /* pcmem.c */ diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 5b21d8515e9..4d3a4510263 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -58,7 +58,10 @@ ULONG XboxDiskGetCacheableBlockCount(UCHAR DriveNumber); TIMEINFO* XboxGetTime(VOID); -PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); +PCONFIGURATION_COMPONENT_DATA +XboxHwDetect( + _In_opt_ PCSTR Options); + VOID XboxHwIdle(VOID); VOID XboxSetLED(PCSTR Pattern); diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index 35bf0e904c8..2263d75778c 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -67,7 +67,11 @@ ULONG PcDiskGetCacheableBlockCount(UCHAR DriveNumber); TIMEINFO* PcGetTime(VOID); BOOLEAN PcInitializeBootDevices(VOID); -PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); + +PCONFIGURATION_COMPONENT_DATA +PcHwDetect( + _In_opt_ PCSTR Options); + VOID PcHwIdle(VOID); extern BIOS_MEMORY_MAP PcBiosMemoryMap[]; diff --git a/boot/freeldr/freeldr/include/arch/uefi/machuefi.h b/boot/freeldr/freeldr/include/arch/uefi/machuefi.h index ba878e30972..6df376b1494 100644 --- a/boot/freeldr/freeldr/include/arch/uefi/machuefi.h +++ b/boot/freeldr/freeldr/include/arch/uefi/machuefi.h @@ -106,7 +106,8 @@ BOOLEAN UefiInitializeBootDevices(VOID); PCONFIGURATION_COMPONENT_DATA -UefiHwDetect(VOID); +UefiHwDetect( + _In_opt_ PCSTR Options); VOID UefiPrepareForReactOS(VOID); diff --git a/boot/freeldr/freeldr/include/machine.h b/boot/freeldr/freeldr/include/machine.h index cfe40a2a0bc..7e6e5c249be 100644 --- a/boot/freeldr/freeldr/include/machine.h +++ b/boot/freeldr/freeldr/include/machine.h @@ -74,7 +74,7 @@ typedef struct tagMACHVTBL // NOTE: Not in the machine.c ... BOOLEAN (*InitializeBootDevices)(VOID); - PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID); + PCONFIGURATION_COMPONENT_DATA (*HwDetect)(_In_opt_ PCSTR Options); VOID (*HwIdle)(VOID); } MACHVTBL, *PMACHVTBL; @@ -133,8 +133,11 @@ VOID MachInit(const char *CmdLine); #define MachInitializeBootDevices() \ MachVtbl.InitializeBootDevices() -#define MachHwDetect() MachVtbl.HwDetect() -#define MachHwIdle() MachVtbl.HwIdle() +#define MachHwDetect(Options) \ + MachVtbl.HwDetect(Options) + +#define MachHwIdle() \ + MachVtbl.HwIdle() /* ARC FUNCTIONS **************************************************************/ diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 9f51a541721..9724b174c61 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -1173,7 +1173,7 @@ LoadAndBootWindowsCommon( /* Detect hardware */ UiUpdateProgressBar(20, "Detecting hardware..."); - LoaderBlock->ConfigurationRoot = MachHwDetect(); + LoaderBlock->ConfigurationRoot = MachHwDetect(BootOptions); /* Initialize the PE loader import-DLL callback, so that we can obtain * feedback (for example during SOS) on the PE images that get loaded. */

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs