[ros-diffs] [hbelusca] 65466: [TASKMGR] Improve formatting memory size usage in the status bar of Task Manager. Patch by Ismael Ferreras Morezuelas (swyter). CORE-8810 #resolve #comment Committed in r65466, th...

Author: hbelusca
Date: Sun Nov 23 18:36:25 2014
New Revision: 65466

URL: http://svn.reactos.org/svn/reactos?rev=65466&view=rev
Log:
[TASKMGR]
Improve formatting memory size usage in the status bar of Task Manager.
Patch by Ismael Ferreras Morezuelas (swyter).
CORE-8810 #resolve #comment Committed in r65466, thanks d:^D

Modified:
    trunk/reactos/base/applications/taskmgr/CMakeLists.txt
    trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc
    trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc
    trunk/reactos/base/applications/taskmgr/lang/da-DK.rc
    trunk/reactos/base/applications/taskmgr/lang/de-DE.rc
    trunk/reactos/base/applications/taskmgr/lang/el-GR.rc
    trunk/reactos/base/applications/taskmgr/lang/en-US.rc
    trunk/reactos/base/applications/taskmgr/lang/es-ES.rc
    trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc
    trunk/reactos/base/applications/taskmgr/lang/he-IL.rc
    trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc
    trunk/reactos/base/applications/taskmgr/lang/id-ID.rc
    trunk/reactos/base/applications/taskmgr/lang/it-IT.rc
    trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc
    trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc
    trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc
    trunk/reactos/base/applications/taskmgr/lang/no-NO.rc
    trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc
    trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc
    trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc
    trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc
    trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc
    trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc
    trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc
    trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc
    trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc
    trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc
    trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc
    trunk/reactos/base/applications/taskmgr/perfpage.c

Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt	[iso-8859-1] Sun Nov 23
18:36:25 2014
@@ -23,6 +23,6 @@
 
 add_executable(taskmgr ${SOURCE} taskmgr.rc)
 set_module_type(taskmgr win32gui UNICODE)
-add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
+add_importlibs(taskmgr advapi32 user32 gdi32 shell32 shlwapi comctl32 msvcrt kernel32
ntdll)
 add_pch(taskmgr precomp.h SOURCE)
 add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Невъзможно намаляване на
първенство"
     IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ: Промяната на
първенството на това действие може да\nпричини
нежелани последствия, включително неустойчивост
на системата. Сигурен ли сте, \nче искате да
смените старшинството?"
     IDS_MSG_TRAYICONCPUUSAGE "Заетост на ЦПУ: %d%%"
-    IDS_STATUS_MEMUSAGE "Заета памет: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Заета памет: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Заетост на ЦПУ: %3d%%"
     IDS_STATUS_PROCESSES "Действия: %d"
     IDS_NOT_RESPONDING "Не отговаря"

Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Není možné změnit prioritu"
     IDS_MSG_WARNINGCHANGEPRIORITY "Upozornění: Změna priority procesu
může\nzpůsobit nestabilitu systému a jiné nepředvídatelné problémy. Jste si
jisti\nse změnou priority procesu?"
     IDS_MSG_TRAYICONCPUUSAGE "Využití CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Využití paměti: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Využití paměti: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Využití CPU: %3d%%"
     IDS_STATUS_PROCESSES "Procesy: %d"
     IDS_NOT_RESPONDING "Neodpovídá"

Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
-    IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
     IDS_NOT_RESPONDING "Not Responding"

Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Kann die Priorität nicht ändern"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses
Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität,
führen.\nSind Sie sicher, dass Sie sie ändern möchten?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%"
-    IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%"
     IDS_STATUS_PROCESSES "Prozesse: %d"
     IDS_NOT_RESPONDING "Keine Rückmeldung"

Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
-    IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
     IDS_NOT_RESPONDING "Not Responding"

Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -431,7 +431,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
-    IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
     IDS_NOT_RESPONDING "Not Responding"

Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "No se pudo cambiar la prioridad"
     IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: El cambio de prioridad en ciertos
procesos podría provocar la inestabilidad del sistema.\n¿Seguro que desea cambiar la
prioridad?"
     IDS_MSG_TRAYICONCPUUSAGE "Promedio CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Uso de memoria: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Uso de memoria: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%"
     IDS_STATUS_PROCESSES "Procesos: %d"
     IDS_NOT_RESPONDING "No responde"

Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Impossible de changer la priorité"
     IDS_MSG_WARNINGCHANGEPRIORITY "ATTENTION : Changer la priorité du processus
peut causer des\neffets indésirables comme l'instabilité du système.\nÊtes-vous
sûr de vouloir changer la priorité ?"
     IDS_MSG_TRAYICONCPUUSAGE "UC utilisée : %d%%"
-    IDS_STATUS_MEMUSAGE "Fichier d'échange utilisé : %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Fichier d'échange utilisé : %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "UC utilisée : %3d%%"
     IDS_STATUS_PROCESSES "Processus : %d"
     IDS_NOT_RESPONDING "Ne répond pas"

Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
-    IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
     IDS_NOT_RESPONDING "Not Responding"

Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Nem lehetséges a prioritás
megváltoztatása"
     IDS_MSG_WARNINGCHANGEPRIORITY "FIGYELEM: A prioritás
megváltoztatása\nkellemetlenségeket, akár rendszer instabilitást is
okozhat.\nBiztosan megakarod változtatni a prioritást?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU használat: %d%%"
-    IDS_STATUS_MEMUSAGE "Mem használat: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Mem használat: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU használat: %3d%%"
     IDS_STATUS_PROCESSES "Folyamatok: %d"
     IDS_NOT_RESPONDING "Nem válaszol"

Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "Pemakaian CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Pemakaian Mem: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Pemakaian Mem: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Pemakaian CPU: %3d%%"
     IDS_STATUS_PROCESSES "Proses: %d"
     IDS_NOT_RESPONDING "Tidak Merespon"

Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Impossibile cambiare la Priorità "
     IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di priorità 
può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del
sistema.\nSei sicuro di voler procedere?"
     IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Uso Mem: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%"
     IDS_STATUS_PROCESSES "Processi: %d"
     IDS_NOT_RESPONDING "Non risponde"

Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "優先度を変更できません"
     IDS_MSG_WARNINGCHANGEPRIORITY "警告: このプロセスの優先度クラスを変更すると、システムが不安定に\nなるなど、予期しない結果になることがあります。\n優先度クラスを変更しますか?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU 使用率: %d%%"
-    IDS_STATUS_MEMUSAGE "メモリ使用量: %dKB / %dKB"
+    IDS_STATUS_MEMUSAGE "メモリ使用量: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU 使用率: %3d%%"
     IDS_STATUS_PROCESSES "プロセス: %d"
     IDS_NOT_RESPONDING "応答なし"

Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "ìš°ì„  순위를 바꿀 수 없음"
     IDS_MSG_WARNINGCHANGEPRIORITY "ê²½ê³ : 이 프로세스의 ìš°ì„  순위
클래스를 변경하면 시스템 ë¶ˆì•ˆì •ì„ 포함하여\n예기치 않은 결과를 ì´ˆëž˜í•  수도
있습니다.\nìš°ì„  순위 클래스를 ë³€ê²½í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU 사용: %d%%"
-    IDS_STATUS_MEMUSAGE "메모리 사용: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "메모리 사용: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU 사용: %3d%%"
     IDS_STATUS_PROCESSES "프로세스: %d"
     IDS_NOT_RESPONDING "응답 없음"

Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Kan de prioriteit niet wijzigen"
     IDS_MSG_WARNINGCHANGEPRIORITY "Waarschuwing: het wijzigen van de
prioriteitsklasse van dit proces\nkan ongewenste resultaten hebben, zoals een instabiel
systeem. Weet u\nzeker dat u de prioriteitsklasse wilt wijzigen?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU-gebruik: %d%%"
-    IDS_STATUS_MEMUSAGE "Geheugengebruik: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Geheugengebruik: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU-gebruik: %3d%%"
     IDS_STATUS_PROCESSES "Processen: %d"
     IDS_NOT_RESPONDING "Reageert niet"

Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Ikke i stand til endre prioritet"
     IDS_MSG_WARNINGCHANGEPRIORITY "ADVARSEL: Endring av prioritet klasse av denne
prosess kan\nforutsake uønsket resultat inkluderer systemet kan bli ustabilt. Er
du\nsikker på at du vil endre prioritet klassen?"
     IDS_MSG_TRAYICONCPUUSAGE "Prosessorbruk: %d%%"
-    IDS_STATUS_MEMUSAGE "Tildelt minne: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Tildelt minne: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Prosessorbruk: %3d%%"
     IDS_STATUS_PROCESSES "Prosesser: %d"
     IDS_NOT_RESPONDING "Ingen reaksjon"

Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -441,7 +441,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Nie można zmienić priorytetu"
     IDS_MSG_WARNINGCHANGEPRIORITY "UWAGA: Zmiana priorytetu tego procesu może
przynieść\nniepożądane skutki, w tym również niestabilność systemu.\nCzy na pewno chcesz zmieni
priorytet?"
     IDS_MSG_TRAYICONCPUUSAGE "Użycie procesora: %d%%"
-    IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Użycie procesora: %3d%%"
     IDS_STATUS_PROCESSES "Procesy: %d"
     IDS_NOT_RESPONDING "Nie odpowiada"

Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Não é possível alterar a prioridade"
     IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteração da classe de prioridade do
processo\npode causar efeitos indesejáveis, inclusive a instabilidade do sistema.
Tem\ncerteza de que deseja alterar a classe de prioridade?"
     IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Uso de Memória: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Uso de Memória: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%"
     IDS_STATUS_PROCESSES "Processo: %d"
     IDS_NOT_RESPONDING "Não respondendo"

Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -439,7 +439,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Nu se poate schimba prioritatea"
     IDS_MSG_WARNINGCHANGEPRIORITY "Schimbarea priorității poate duce la efecte
colaterale\nprecum instabilitatea sistemului.\nSigur doriți schimbarea priorității
procesului?"
     IDS_MSG_TRAYICONCPUUSAGE "Utilizare procesor: %d%%"
-    IDS_STATUS_MEMUSAGE "Utilizare memorie: %dko/%dko"
+    IDS_STATUS_MEMUSAGE "Utilizare memorie: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Utilizare procesor: %3d%%"
     IDS_STATUS_PROCESSES "Procese: %d"
     IDS_NOT_RESPONDING "EXECUȚIE ANORMALĂ"

Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Не удалось изменить
приоритет"
     IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ: Изменение
приоритета этого процесса может привести к
нежелательным результатам, в том числе к
нестабильной работе системы.\nВы действительно хотите изменить класс приоритета?"
     IDS_MSG_TRAYICONCPUUSAGE "Загрузка ЦП: %d%%"
-    IDS_STATUS_MEMUSAGE "Выделение памяти: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Выделение памяти: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Загрузка ЦП: %3d%%"
     IDS_STATUS_PROCESSES "Процессов: %d"
     IDS_NOT_RESPONDING "Не отвечает"

Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Priorita sa nedá zmeniť."
     IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu môže
mať\nnežiadúce dôsledky vrátane nestability systému.\nNaozaj chcete zmeniť triedu
priority procesu?"
     IDS_MSG_TRAYICONCPUUSAGE "Využitie procesora: %d%%"
-    IDS_STATUS_MEMUSAGE "Využitá pamäť: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Využitá pamäť: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Využitie procesora: %3d%%"
     IDS_STATUS_PROCESSES "Procesy: %d"
     IDS_NOT_RESPONDING "Neodpovedá"

Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit"
     IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te
ketij procesi mund te \nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni
i sigurt\nper ndryshimin e klases se prioriteteve?"
     IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Perdorimi i  Mem: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Perdorimi i  Mem: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%"
     IDS_STATUS_PROCESSES "Proceset: %d"
     IDS_NOT_RESPONDING "Nuk pergjigjet"

Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -435,7 +435,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Kunde inte ändra prioritet"
     IDS_MSG_WARNINGCHANGEPRIORITY "VARNING: Ändring av prioritetsklassen hos den
här processen kan\norsaka oönskade effekter och påverka systemets stabilitet. Är
du\nsäker på att du vill ändra prioritetsklassen?"
     IDS_MSG_TRAYICONCPUUSAGE "Processoranvändning: %d%%"
-    IDS_STATUS_MEMUSAGE "Minnesanv: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Minnesanv: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Processoranv: %3d%%"
     IDS_STATUS_PROCESSES "Processer: %d"
     IDS_NOT_RESPONDING "Svarar inte"

Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Önceliğin Değiştirilememesi"
     IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu işlemin öncelik sınıfının
değiştirilmesi, dizge\nkararsızlığını içeren istenmeyen sonuçlara neden olabilir.
Öncelik \nsınıfını değiştirmek istediğinizden emin misiniz?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU Kullanımı: %%%d"
-    IDS_STATUS_MEMUSAGE "Bellek Kullanımı: %d KB / %d KB"
+    IDS_STATUS_MEMUSAGE "Bellek Kullanımı: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU Kullanımı: %%%3d"
     IDS_STATUS_PROCESSES "İşlem: %d"
     IDS_NOT_RESPONDING "Yanıt Vermiyor"

Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -433,7 +433,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Неможливо змінити
пріоритет"
     IDS_MSG_WARNINGCHANGEPRIORITY "УВАГА! Зміна класу
пріоритету цього процесу може призвести до
\nнебажаних наслідків, включаючи нестабільну роботу
\nсистеми.  Ви дійсно бажаєте змінити пріоритет
класу?"
     IDS_MSG_TRAYICONCPUUSAGE "Використання ЦП: %d%%"
-    IDS_STATUS_MEMUSAGE "Пам'ять: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "Пам'ять: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "Використання ЦП: %3d%%"
     IDS_STATUS_PROCESSES "Процесів: %d"
     IDS_NOT_RESPONDING "Не відповідає"

Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -439,7 +439,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this
process may\ncause undesired results including system instability. Are you\nsure you want
to change the priority class?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情况: %d%%"
-    IDS_STATUS_MEMUSAGE "内存使用情况: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "内存使用情况: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU 使用情况: %3d%%"
     IDS_STATUS_PROCESSES "處理程序: %d"
     IDS_NOT_RESPONDING "没有回应"

Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -441,7 +441,7 @@
     IDS_MSG_UNABLECHANGEPRIORITY "ç„¡æ³•æ›´æ”¹å„ªå…ˆé †åº"
     IDS_MSG_WARNINGCHANGEPRIORITY "警告: æ›´æ”¹æ­¤ç¨‹åºçš„å„ªå…ˆé †åºå¯èƒ½å°Žè‡´ç³»çµ±ä¸ç©©å®šã€‚\nä½ æ˜¯å¦ç¢ºå®šè¦æ›´æ”¹å„ªå…ˆé †åºï¼Ÿ"
     IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情況: %d%%"
-    IDS_STATUS_MEMUSAGE "記憶體使用情況: %dK / %dK"
+    IDS_STATUS_MEMUSAGE "記憶體使用情況: %s / %s (%d%%)"
     IDS_STATUS_CPUUSAGE "CPU 使用情況: %3d%%"
     IDS_STATUS_PROCESSES "處理程序: %d"
     IDS_NOT_RESPONDING "沒有回應"

Modified: trunk/reactos/base/applications/taskmgr/perfpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfpage.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/perfpage.c	[iso-8859-1] Sun Nov 23 18:36:25
2014
@@ -21,6 +21,7 @@
  */
 
 #include "precomp.h"
+#include <shlwapi.h>
 
 TGraphCtrl PerformancePageCpuUsageHistoryGraph;
 TGraphCtrl PerformancePageMemUsageHistoryGraph;
@@ -311,20 +312,20 @@
 
 DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
 {
-    ULONG  CommitChargeTotal;
-    ULONG  CommitChargeLimit;
-    ULONG  CommitChargePeak;
+    ULONGLONG  CommitChargeTotal;
+    ULONGLONG  CommitChargeLimit;
+    ULONGLONG  CommitChargePeak;
 
     ULONG  CpuUsage;
     ULONG  CpuKernelUsage;
 
-    ULONG  KernelMemoryTotal;
-    ULONG  KernelMemoryPaged;
-    ULONG  KernelMemoryNonPaged;
-
-    ULONG  PhysicalMemoryTotal;
-    ULONG  PhysicalMemoryAvailable;
-    ULONG  PhysicalMemorySystemCache;
+    ULONGLONG  KernelMemoryTotal;
+    ULONGLONG  KernelMemoryPaged;
+    ULONGLONG  KernelMemoryNonPaged;
+
+    ULONGLONG  PhysicalMemoryTotal;
+    ULONGLONG  PhysicalMemoryAvailable;
+    ULONGLONG  PhysicalMemorySystemCache;
 
     ULONG  TotalHandles;
     ULONG  TotalThreads;
@@ -342,6 +343,9 @@
         int nBarsUsed1;
         int nBarsUsed2;
 
+        WCHAR szChargeTotalFormat[256];
+        WCHAR szChargeLimitFormat[256];
+
         /*  Wait for an the event or application close */
         if (GetMessage(&msg, NULL, 0, 0) <= 0)
             return 0;
@@ -353,14 +357,25 @@
              */
             CommitChargeTotal = PerfDataGetCommitChargeTotalK();
             CommitChargeLimit = PerfDataGetCommitChargeLimitK();
-            CommitChargePeak = PerfDataGetCommitChargePeakK();
+            CommitChargePeak  = PerfDataGetCommitChargePeakK();
             _ultow(CommitChargeTotal, Text, 10);
             SetWindowTextW(hPerformancePageCommitChargeTotalEdit, Text);
             _ultow(CommitChargeLimit, Text, 10);
             SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text);
             _ultow(CommitChargePeak, Text, 10);
             SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text);
-            wsprintfW(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit);
+
+            StrFormatByteSizeW(CommitChargeTotal * 1024,
+                               szChargeTotalFormat,
+                               sizeof(szChargeTotalFormat));
+
+            StrFormatByteSizeW(CommitChargeLimit * 1024,
+                               szChargeLimitFormat,
+                               sizeof(szChargeLimitFormat));
+
+            wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat,
+                      (UINT)((CommitChargeTotal * 100) / CommitChargeLimit));
+
             SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text);
 
             /*