Module: wine Branch: master Commit: ae62524d76881a9122e06a1cb4ab0cf991f75bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae62524d76881a9122e06a1cb4...
Author: Aurimas Fišeras aurimas@gmail.com Date: Thu Jun 25 22:43:11 2009 +0300
taskmgr: Make remaining strings translatable.
---
programs/taskmgr/En.rc | 14 ++++++++++++++ programs/taskmgr/Lt.rc | 14 ++++++++++++++ programs/taskmgr/applpage.c | 16 +++++++++------- programs/taskmgr/dbgchnl.c | 16 +++++++++++----- programs/taskmgr/perfdata.c | 3 ++- programs/taskmgr/procpage.c | 3 +-- programs/taskmgr/resource.h | 10 ++++++++++ programs/taskmgr/trayicon.c | 8 ++++++-- 8 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 425f44e..ce2bdf5 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -556,3 +556,17 @@ BEGIN IDS_AFFINITY_ERROR_TITLE "Invalid Option" IDS_AFFINITY_UNABLE2ACCESS "Unable to Access or Set Process Affinity" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "System Idle Process" + IDS_APPLICATION_NOT_RESPONDING "Not Responding" + IDS_APPLICATION_RUNNING "Running" + IDS_APPLICATION_TASK "Task" + IDS_APPLICATION_STATUS "Status" + IDS_DEBUG_CHANNEL "Debug Channels" + IDS_DEBUG_CHANNEL_FIXME "Fixme" + IDS_DEBUG_CHANNEL_ERR "Err" + IDS_DEBUG_CHANNEL_WARN "Warn" + IDS_DEBUG_CHANNEL_TRACE "Trace" +END diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 8d9603f..c58647a 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -547,4 +547,18 @@ BEGIN IDS_AFFINITY_UNABLE2ACCESS "Nepavyko prieiti prie ar nustatyti proceso atitikimo" END
+STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "Sistemos neveikos procesas" + IDS_APPLICATION_NOT_RESPONDING "Neatsako" + IDS_APPLICATION_RUNNING "Vykdoma" + IDS_APPLICATION_TASK "Užduotis" + IDS_APPLICATION_STATUS "Būsena" + IDS_DEBUG_CHANNEL "Derinimo kanalai" + IDS_DEBUG_CHANNEL_FIXME "Fixme (pataisyk)" + IDS_DEBUG_CHANNEL_ERR "Err (klaida)" + IDS_DEBUG_CHANNEL_WARN "Warn (įspėjimas)" + IDS_DEBUG_CHANNEL_TRACE "Trace (pėdsakas)" +END + #pragma code_page(default) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 8fb923d..b958887 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -417,9 +417,11 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) LV_DISPINFOW* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI;
- static const WCHAR wszNotResponding[] = {'N','o','t',' ','R','e','s','p','o','n','d','i','n','g',0}; - static const WCHAR wszRunning[] = {'R','u','n','n','i','n','g',0}; + WCHAR wszNotResponding[255]; + WCHAR wszRunning[255];
+ LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR));
idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; @@ -837,9 +839,11 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int cx, cy; LVCOLUMNW column;
- static const WCHAR wszTasks[] = {'T','a','s','k','s',0}; - static WCHAR wszTask[] = {'T','a','s','k',0}; - static WCHAR wszStatus[] = {'S','t','a','t','u','s',0}; + WCHAR wszTask[255]; + WCHAR wszStatus[255]; + + LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, sizeof(wszTask)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, sizeof(wszStatus)/sizeof(WCHAR));
switch (message) { case WM_INITDIALOG: @@ -858,8 +862,6 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hApplicationPageSwitchToButton = GetDlgItem(hDlg, IDC_SWITCHTO); hApplicationPageNewTaskButton = GetDlgItem(hDlg, IDC_NEWTASK);
- SetWindowTextW(hApplicationPageListCtrl, wszTasks); - /* Initialize the application page's controls */ column.mask = LVCF_TEXT|LVCF_WIDTH; column.pszText = wszTask; diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 382675f..77ddb6c 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -224,11 +224,17 @@ static void DebugChannels_OnCreate(HWND hwndDlg) HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST); LVCOLUMNW lvc;
- static WCHAR debug_channelW[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, - fixmeW[] = {'F','i','x','m','e',0}, - errW[] = {'E','r','r',0}, - warnW[] = {'W','a','r','n',0}, - traceW[] = {'T','r','a','c','e',0}; + WCHAR debug_channelW[255]; + WCHAR fixmeW[255]; + WCHAR errW[255]; + WCHAR warnW[255]; + WCHAR traceW[255]; + + LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, sizeof(debug_channelW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_FIXME, fixmeW, sizeof(fixmeW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_ERR, errW, sizeof(errW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_WARN, warnW, sizeof(warnW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_TRACE, traceW, sizeof(traceW)/sizeof(WCHAR));
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 5a24ba3..c96fdcf 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -253,7 +253,8 @@ void PerfDataRefresh(void) lstrcpyW(pPerfData[Idx].ImageName, pSPI->Name.Buffer); else { - static const WCHAR idleW[] = {'S','y','s','t','e','m',' ','I','d','l','e',' ','P','r','o','c','e','s','s',0}; + WCHAR idleW[255]; + LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, sizeof(idleW)/sizeof(WCHAR)); lstrcpyW(pPerfData[Idx].ImageName, idleW ); }
diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 4cc02f1..c16f3b0 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -466,9 +466,8 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES);
/* - * Set the title and extended window styles for the list control + * Set the extended window styles for the list control */ - SetWindowText(hProcessPageListCtrl, _T("Processes")); SendMessage(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);
AddColumns(); diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 236f848..1b98ab0 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -233,6 +233,16 @@ #define IDS_AFFINITY_ERROR_MESSAGE 32864 #define IDS_AFFINITY_ERROR_TITLE 32865 #define IDS_AFFINITY_UNABLE2ACCESS 32866 +#define IDS_SYSTEM_IDLE_PROCESS 32867 +#define IDS_APPLICATION_NOT_RESPONDING 32868 +#define IDS_APPLICATION_RUNNING 32869 +#define IDS_APPLICATION_TASK 32870 +#define IDS_APPLICATION_STATUS 32871 +#define IDS_DEBUG_CHANNEL 32872 +#define IDS_DEBUG_CHANNEL_FIXME 32873 +#define IDS_DEBUG_CHANNEL_ERR 32874 +#define IDS_DEBUG_CHANNEL_WARN 32875 +#define IDS_DEBUG_CHANNEL_TRACE 32876 #define IDC_STATIC -1
/* diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 35740dd..b1379f5 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -142,7 +142,9 @@ BOOL TrayIcon_ShellAddTrayIcon(void) NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; + WCHAR wszCPU_Usage[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR));
memset(&nid, 0, sizeof(NOTIFYICONDATAW));
@@ -187,7 +189,9 @@ BOOL TrayIcon_ShellUpdateTrayIcon(void) NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; + WCHAR wszCPU_Usage[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR));
memset(&nid, 0, sizeof(NOTIFYICONDATAW));