https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef0f6861fbcd8691c7166c603b42b5474ed40fdd

commit ef0f6861fbcd8691c7166c603b42b5474ed40fdd
Author:     Eric Kohl <eric.k...@reactos.org>
AuthorDate: Thu Apr 12 00:58:30 2018 +0200
Commit:     Eric Kohl <eric.k...@reactos.org>
CommitDate: Thu Apr 12 00:58:30 2018 +0200

    [NET] Replace remaining hard-coded strings by string resources for the NET 
STATISTICS command.
---
 base/applications/network/net/cmdStatistics.c | 84 +++++++++++++++++++--------
 base/applications/network/net/lang/en-US.rc   | 20 ++++++-
 base/applications/network/net/lang/es-ES.rc   | 20 ++++++-
 base/applications/network/net/lang/ro-RO.rc   | 20 ++++++-
 base/applications/network/net/lang/ru-RU.rc   | 20 ++++++-
 base/applications/network/net/lang/tr-TR.rc   | 20 ++++++-
 base/applications/network/net/lang/zh-CN.rc   | 20 ++++++-
 base/applications/network/net/lang/zh-TW.rc   | 20 ++++++-
 base/applications/network/net/resource.h      | 21 ++++++-
 9 files changed, 211 insertions(+), 34 deletions(-)

diff --git a/base/applications/network/net/cmdStatistics.c 
b/base/applications/network/net/cmdStatistics.c
index 23a6e5f0df..62bbca716c 100644
--- a/base/applications/network/net/cmdStatistics.c
+++ b/base/applications/network/net/cmdStatistics.c
@@ -19,7 +19,7 @@ DisplayServerStatistics(VOID)
     FILETIME FileTime, LocalFileTime;
     SYSTEMTIME SystemTime;
     WORD wHour;
-    INT nPaddedLength = 33;
+    INT nPaddedLength = 35;
     NET_API_STATUS Status;
 
     Status = NetServerGetInfo(NULL, 100, (PBYTE*)&ServerInfo);
@@ -127,6 +127,7 @@ DisplayWorkstationStatistics(VOID)
     FILETIME FileTime, LocalFileTime;
     SYSTEMTIME SystemTime;
     WORD wHour;
+    INT nPaddedLength = 47;
     NET_API_STATUS Status;
 
     Status = NetWkstaGetInfo(NULL,
@@ -166,30 +167,63 @@ DisplayWorkstationStatistics(VOID)
                  SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear,
                  wHour, SystemTime.wMinute, (SystemTime.wHour >= 1 && 
SystemTime.wHour < 13) ? L"AM" : L"PM");
 
-    printf("Bytes received %I64u\n", StatisticsInfo->BytesReceived.QuadPart);
-    printf("Server Message Blocks (SMBs) received %I64u\n", 
StatisticsInfo->SmbsReceived.QuadPart);
-    printf("Bytes transmitted %I64u\n", 
StatisticsInfo->BytesTransmitted.QuadPart);
-    printf("Server Message Blocks (SMBs) transmitted %I64u\n", 
StatisticsInfo->SmbsTransmitted.QuadPart);
-    printf("Read operations %lu\n", StatisticsInfo->ReadOperations);
-    printf("Write operations %lu\n", StatisticsInfo->WriteOperations);
-    printf("Raw reads denied %lu\n", StatisticsInfo->RawReadsDenied);
-    printf("Raw writes denied %lu\n\n", StatisticsInfo->RawWritesDenied);
-
-    printf("Network errors %lu\n", StatisticsInfo->NetworkErrors);
-    printf("Connections made %lu\n", StatisticsInfo->CoreConnects +
-                                     StatisticsInfo->Lanman20Connects +
-                                     StatisticsInfo->Lanman21Connects +
-                                     StatisticsInfo->LanmanNtConnects);
-    printf("Reconnections made %lu\n", StatisticsInfo->Reconnects);
-    printf("Server disconnects %lu\n\n", StatisticsInfo->ServerDisconnects);
-
-    printf("Sessions started %lu\n", StatisticsInfo->Sessions);
-    printf("Hung sessions %lu\n", StatisticsInfo->HungSessions);
-    printf("Failed sessions %lu\n", StatisticsInfo->FailedSessions);
-    printf("Failed operations %lu\n", 
StatisticsInfo->InitiallyFailedOperations +
-                                      
StatisticsInfo->FailedCompletionOperations);
-    printf("Use count %lu\n", StatisticsInfo->UseCount);
-    printf("Failed use count %lu\n\n", StatisticsInfo->FailedUseCount);
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESRCVD, nPaddedLength);
+    ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesReceived.QuadPart);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSRCVD, nPaddedLength);
+    ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsReceived.QuadPart);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESTRANS, nPaddedLength);
+    ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesTransmitted.QuadPart);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSTRANS, nPaddedLength);
+    ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsTransmitted.QuadPart);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_READOPS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->ReadOperations);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEOPS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->WriteOperations);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_READDENIED, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->RawReadsDenied);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEDENIED, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->RawWritesDenied);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_NETWORKERROR, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->NetworkErrors);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_CONNECTS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->CoreConnects +
+                                StatisticsInfo->Lanman20Connects +
+                                StatisticsInfo->Lanman21Connects +
+                                StatisticsInfo->LanmanNtConnects);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_RECONNECTS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Reconnects);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_DISCONNECTS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->ServerDisconnects);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_SESSIONS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Sessions);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_HUNGSESSIONS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->HungSessions);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILSESSIONS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->FailedSessions);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILEDOPS, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->InitiallyFailedOperations +
+                                StatisticsInfo->FailedCompletionOperations);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_USECOUNT, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n", StatisticsInfo->UseCount);
+
+    PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILUSECOUNT, nPaddedLength);
+    ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->FailedUseCount);
 
 done:
     if (StatisticsInfo != NULL)
diff --git a/base/applications/network/net/lang/en-US.rc 
b/base/applications/network/net/lang/en-US.rc
index 5d7f207b12..d4417db80f 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -193,7 +193,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -211,6 +211,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "User accounts for \\\\%s"
     IDS_USER_NAME "User name"
diff --git a/base/applications/network/net/lang/es-ES.rc 
b/base/applications/network/net/lang/es-ES.rc
index bb2a33ec6b..774c1f7c39 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -194,7 +194,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -212,6 +212,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "Cuentas de usuario en \\\\%s"
     IDS_USER_NAME "Nombre de usuario"
diff --git a/base/applications/network/net/lang/ro-RO.rc 
b/base/applications/network/net/lang/ro-RO.rc
index 6fc84bb0a9..f1869cbce8 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -197,7 +197,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -215,6 +215,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s"
     IDS_USER_NAME "Nume utilizator"
diff --git a/base/applications/network/net/lang/ru-RU.rc 
b/base/applications/network/net/lang/ru-RU.rc
index 2c1df320eb..e220767605 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -193,7 +193,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -211,6 +211,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "Учетные записи пользователей для \\\\%s"
     IDS_USER_NAME "Имя пользователя"
diff --git a/base/applications/network/net/lang/tr-TR.rc 
b/base/applications/network/net/lang/tr-TR.rc
index a27cf19e7d..9e64226ee6 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -193,7 +193,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -211,6 +211,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "\\\\%s için kullanıcı hesapları"
     IDS_USER_NAME "Kullanıcı adı"
diff --git a/base/applications/network/net/lang/zh-CN.rc 
b/base/applications/network/net/lang/zh-CN.rc
index f1650effab..7ebbc12466 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -193,7 +193,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -211,6 +211,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "\\\\%s 的用户帐户"
     IDS_USER_NAME "用户名"
diff --git a/base/applications/network/net/lang/zh-TW.rc 
b/base/applications/network/net/lang/zh-TW.rc
index 89c63d0752..b7e25be658 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -193,7 +193,7 @@ service can stop others. Some services cannot be 
stopped.\n\n"
 
     IDS_STATISTICS_TEXT "Statistics are available for the following 
services:\n\n\
    Server\n   Workstation\n\n"
-    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n"
+    IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
     IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
     IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
     IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
@@ -211,6 +211,24 @@ service can stop others. Some services cannot be 
stopped.\n\n"
     IDS_STATISTICS_SRV_BIGBUFFERS "  Big buffers"
     IDS_STATISTICS_SRV_REQBUFFERS "  Request buffers"
     IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
+    IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
+    IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
+    IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
+    IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
+    IDS_STATISTICS_WKS_READOPS "Read operations"
+    IDS_STATISTICS_WKS_WRITEOPS "Write operations"
+    IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
+    IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
+    IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
+    IDS_STATISTICS_WKS_CONNECTS "Connections made"
+    IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
+    IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
+    IDS_STATISTICS_WKS_SESSIONS "Sessions started"
+    IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
+    IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
+    IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
+    IDS_STATISTICS_WKS_USECOUNT "Use count"
+    IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
     IDS_USER_ACCOUNTS "使用者帳戶 \\\\%s"
     IDS_USER_NAME "使用者名稱"
diff --git a/base/applications/network/net/resource.h 
b/base/applications/network/net/resource.h
index 441b00a2a4..9ecf1c2dc0 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -128,8 +128,25 @@
 #define IDS_STATISTICS_SRV_BUFFERS      335
 #define IDS_STATISTICS_SRV_BIGBUFFERS   336
 #define IDS_STATISTICS_SRV_REQBUFFERS   337
-
-#define IDS_STATISTICS_WKS_NAME        342
+#define IDS_STATISTICS_WKS_NAME         338
+#define IDS_STATISTICS_WKS_BYTESRCVD    339
+#define IDS_STATISTICS_WKS_SMBSRCVD     340
+#define IDS_STATISTICS_WKS_BYTESTRANS   341
+#define IDS_STATISTICS_WKS_SMBSTRANS    342
+#define IDS_STATISTICS_WKS_READOPS      343
+#define IDS_STATISTICS_WKS_WRITEOPS     344
+#define IDS_STATISTICS_WKS_READDENIED   345
+#define IDS_STATISTICS_WKS_WRITEDENIED  346
+#define IDS_STATISTICS_WKS_NETWORKERROR 347
+#define IDS_STATISTICS_WKS_CONNECTS     348
+#define IDS_STATISTICS_WKS_RECONNECTS   349
+#define IDS_STATISTICS_WKS_DISCONNECTS  350
+#define IDS_STATISTICS_WKS_SESSIONS     351
+#define IDS_STATISTICS_WKS_HUNGSESSIONS 352
+#define IDS_STATISTICS_WKS_FAILSESSIONS 353
+#define IDS_STATISTICS_WKS_FAILEDOPS    354
+#define IDS_STATISTICS_WKS_USECOUNT     355
+#define IDS_STATISTICS_WKS_FAILUSECOUNT 356
 
 #define IDS_USER_ACCOUNTS              449
 #define IDS_USER_NAME                  450

Reply via email to