7 Apr
2019
7 Apr
'19
7:23 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5563525ad440f4f43db04…
commit 5563525ad440f4f43db04de538d808bf731b1360
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Apr 7 09:21:34 2019 +0200
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Apr 7 09:23:01 2019 +0200
[NET][MC] Move the remaining STATISTICS and USER strings from net.exe to netmsg.dll.
Translators, please check the translations!
---
base/applications/network/net/cmdStatistics.c | 53 ++++++-----
base/applications/network/net/cmdUser.c | 9 +-
base/applications/network/net/lang/en-US.rc | 27 ------
base/applications/network/net/lang/es-ES.rc | 27 ------
base/applications/network/net/lang/pl-PL.rc | 27 ------
base/applications/network/net/lang/ro-RO.rc | 27 ------
base/applications/network/net/lang/ru-RU.rc | 27 ------
base/applications/network/net/lang/tr-TR.rc | 27 ------
base/applications/network/net/lang/zh-CN.rc | 27 ------
base/applications/network/net/lang/zh-TW.rc | 27 ------
base/applications/network/net/resource.h | 26 ------
sdk/include/reactos/mc/netmsgmsg.mc | 124 +++++++++++++-------------
12 files changed, 96 insertions(+), 332 deletions(-)
diff --git a/base/applications/network/net/cmdStatistics.c
b/base/applications/network/net/cmdStatistics.c
index 799f712bf8..8d4f68db86 100644
--- a/base/applications/network/net/cmdStatistics.c
+++ b/base/applications/network/net/cmdStatistics.c
@@ -149,7 +149,8 @@ DisplayWorkstationStatistics(VOID)
if (Status != NERR_Success)
goto done;
- ConResPrintf(StdOut, IDS_STATISTICS_WKS_NAME,
WorkstationInfo->wki100_computername);
+ PrintMessageStringV(4623, WorkstationInfo->wki100_computername);
+ ConPrintf(StdOut, L"\n\n");
RtlSecondsSince1970ToTime(StatisticsInfo->StatisticsStartTime.u.LowPart,
&LargeValue);
@@ -168,66 +169,68 @@ DisplayWorkstationStatistics(VOID)
wHour = wHour - 12;
}
- ConResPrintf(StdOut, IDS_STATISTICS_SINCE,
- SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear,
- wHour, SystemTime.wMinute, (SystemTime.wHour >= 1 &&
SystemTime.wHour < 13) ? L"AM" : L"PM");
+ PrintMessageString(4600);
+ ConPrintf(StdOut, L" %d/%d/%d %d:%02d %s\n\n\n",
+ SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear,
+ wHour, SystemTime.wMinute,
+ (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ?
L"AM" : L"PM");
- PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESRCVD, nPaddedLength);
+ PrintPaddedMessageString(4630, nPaddedLength);
ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesReceived.QuadPart);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSRCVD, nPaddedLength);
+ PrintPaddedMessageString(4631, nPaddedLength);
ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsReceived.QuadPart);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESTRANS, nPaddedLength);
+ PrintPaddedMessageString(4632, nPaddedLength);
ConPrintf(StdOut, L"%I64u\n",
StatisticsInfo->BytesTransmitted.QuadPart);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSTRANS, nPaddedLength);
+ PrintPaddedMessageString(4633, nPaddedLength);
ConPrintf(StdOut, L"%I64u\n",
StatisticsInfo->SmbsTransmitted.QuadPart);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_READOPS, nPaddedLength);
+ PrintPaddedMessageString(4634, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->ReadOperations);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEOPS, nPaddedLength);
+ PrintPaddedMessageString(4635, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->WriteOperations);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_READDENIED, nPaddedLength);
+ PrintPaddedMessageString(4636, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->RawReadsDenied);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEDENIED, nPaddedLength);
+ PrintPaddedMessageString(4637, nPaddedLength);
ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->RawWritesDenied);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_NETWORKERROR, nPaddedLength);
+ PrintPaddedMessageString(4638, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->NetworkErrors);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_CONNECTS, nPaddedLength);
+ PrintPaddedMessageString(4639, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->CoreConnects +
StatisticsInfo->Lanman20Connects +
StatisticsInfo->Lanman21Connects +
StatisticsInfo->LanmanNtConnects);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_RECONNECTS, nPaddedLength);
+ PrintPaddedMessageString(4640, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Reconnects);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_DISCONNECTS, nPaddedLength);
+ PrintPaddedMessageString(4641, nPaddedLength);
ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->ServerDisconnects);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_SESSIONS, nPaddedLength);
+ PrintPaddedMessageString(4642, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Sessions);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_HUNGSESSIONS, nPaddedLength);
+ PrintPaddedMessageString(4643, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->HungSessions);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILSESSIONS, nPaddedLength);
+ PrintPaddedMessageString(4644, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->FailedSessions);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILEDOPS, nPaddedLength);
+ PrintPaddedMessageString(4645, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->InitiallyFailedOperations +
StatisticsInfo->FailedCompletionOperations);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_USECOUNT, nPaddedLength);
+ PrintPaddedMessageString(4646, nPaddedLength);
ConPrintf(StdOut, L"%lu\n", StatisticsInfo->UseCount);
- PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILUSECOUNT, nPaddedLength);
+ PrintPaddedMessageString(4647, nPaddedLength);
ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->FailedUseCount);
done:
@@ -294,7 +297,11 @@ cmdStatistics(
}
else
{
- ConResPuts(StdOut, IDS_STATISTICS_TEXT);
+ PrintMessageString(4379);
+ ConPuts(StdOut, L"\n");
+ ConPuts(StdOut, L" Server\n");
+ ConPuts(StdOut, L" Workstation\n");
+ ConPuts(StdOut, L"\n");
}
if (result == 0)
diff --git a/base/applications/network/net/cmdUser.c
b/base/applications/network/net/cmdUser.c
index 517e2c028b..1adce8858c 100644
--- a/base/applications/network/net/cmdUser.c
+++ b/base/applications/network/net/cmdUser.c
@@ -394,11 +394,11 @@ ReadPassword(
while (TRUE)
{
- ConResPuts(StdOut, IDS_USER_ENTER_PASSWORD1);
+ PrintMessageString(4358);
ReadFromConsole(szPassword1, PWLEN + 1, FALSE);
ConPuts(StdOut, L"\n");
- ConResPuts(StdOut, IDS_USER_ENTER_PASSWORD2);
+ PrintMessageString(4361);
ReadFromConsole(szPassword2, PWLEN + 1, FALSE);
ConPuts(StdOut, L"\n");
@@ -419,8 +419,7 @@ ReadPassword(
else
{
ConPuts(StdOut, L"\n");
- ConResPuts(StdOut, IDS_USER_NO_PASSWORD_MATCH);
- ConPuts(StdOut, L"\n");
+ PrintMessageString(3728);
*lpPassword = NULL;
}
}
@@ -973,7 +972,7 @@ cmdUser(
lpPassword != NULL &&
bRandomPassword == TRUE)
{
- ConPrintf(StdOut, L"The password for %s is: %s\n", lpUserName,
lpPassword);
+ PrintMessageStringV(3968, lpUserName, lpPassword);
}
done:
diff --git a/base/applications/network/net/lang/en-US.rc
b/base/applications/network/net/lang/en-US.rc
index 1bd152049d..4473e7c4cc 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -9,33 +9,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server"
IDS_ACCOUNTS_WORKSTATION "Workstation"
- 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:%02d %s\n\n\n"
- 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_ENTER_PASSWORD1 "Enter a new password for the user: "
- IDS_USER_ENTER_PASSWORD2 "Enter the password again: "
- IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!"
-
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
IDS_GENERIC_YES "Yes"
diff --git a/base/applications/network/net/lang/es-ES.rc
b/base/applications/network/net/lang/es-ES.rc
index 82db3f6566..2f9b8335bf 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -12,33 +12,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente"
IDS_ACCOUNTS_WORKSTATION "Estación de trabajo"
- 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:%02d %s\n\n\n"
- 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_ENTER_PASSWORD1 "Escriba una contraseña: "
- IDS_USER_ENTER_PASSWORD2 "Vuelva a escribir la contraseña: "
- IDS_USER_NO_PASSWORD_MATCH "Las contraseñas no coinciden."
-
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
IDS_GENERIC_YES "Sí"
diff --git a/base/applications/network/net/lang/pl-PL.rc
b/base/applications/network/net/lang/pl-PL.rc
index 6f3d50767a..54ed876756 100644
--- a/base/applications/network/net/lang/pl-PL.rc
+++ b/base/applications/network/net/lang/pl-PL.rc
@@ -8,33 +8,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny"
IDS_ACCOUNTS_WORKSTATION "Stacja robocza"
- IDS_STATISTICS_TEXT "Dostępne są statystyki dla następujących uruchomionych
obecnie usług:\n\n\
- Serwer\n Stacja robocza\n\n"
- IDS_STATISTICS_SINCE "Statystyka od %d/%d/%d %d:%02d %s\n\n\n"
- IDS_STATISTICS_WKS_NAME "Statystyka stacji roboczej dla \\\\%s\n\n\n"
- IDS_STATISTICS_WKS_BYTESRCVD "Bajty odebrane"
- IDS_STATISTICS_WKS_SMBSRCVD "Odebrane bloki komunikatów serwera (SMB)"
- IDS_STATISTICS_WKS_BYTESTRANS "Bajty przesłane"
- IDS_STATISTICS_WKS_SMBSTRANS "Przesłane bloki komunikatów serwera (SMB)"
- IDS_STATISTICS_WKS_READOPS "Operacje odczytu"
- IDS_STATISTICS_WKS_WRITEOPS "Operacje zapisu"
- IDS_STATISTICS_WKS_READDENIED "Odrzucone operacje odczytu bez
przetwarzania"
- IDS_STATISTICS_WKS_WRITEDENIED "Odrzucone operacje zapisu bez
przetwarzania"
- IDS_STATISTICS_WKS_NETWORKERROR "Błędy sieciowe"
- IDS_STATISTICS_WKS_CONNECTS "Wykonane połączenia"
- IDS_STATISTICS_WKS_RECONNECTS "Ponownie wykonane połączenia"
- IDS_STATISTICS_WKS_DISCONNECTS "Rozłączenia serwera"
- IDS_STATISTICS_WKS_SESSIONS "Sesje uruchomione"
- IDS_STATISTICS_WKS_HUNGSESSIONS "Zawieszone sesje"
- IDS_STATISTICS_WKS_FAILSESSIONS "Niepowodzenia sesji"
- IDS_STATISTICS_WKS_FAILEDOPS "Niepowodzenia operacji"
- IDS_STATISTICS_WKS_USECOUNT "Liczba pomyślnych prób użycia"
- IDS_STATISTICS_WKS_FAILUSECOUNT "Liczba niepomyślnych prób użycia"
-
- IDS_USER_ENTER_PASSWORD1 "Wpisz nowe hasło dla użytkownika: "
- IDS_USER_ENTER_PASSWORD2 "Wpisz hasło ponownie w celu potwierdzenia: "
- IDS_USER_NO_PASSWORD_MATCH "Hasła są niezgodne!"
-
IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n"
IDS_GENERIC_YES "Tak"
diff --git a/base/applications/network/net/lang/ro-RO.rc
b/base/applications/network/net/lang/ro-RO.rc
index 05c16d70e5..4623835a55 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -15,33 +15,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător"
IDS_ACCOUNTS_WORKSTATION "Stație de lucru"
- IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\
- Server\n Stație de lucru\n\n"
- IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n"
- IDS_STATISTICS_WKS_NAME "Statistici pentru stația de lucru \\\\%s\n\n\n"
- IDS_STATISTICS_WKS_BYTESRCVD "Octeți receptați"
- IDS_STATISTICS_WKS_SMBSRCVD "Blocuri Mesaje de Server (SMB) receptate"
- IDS_STATISTICS_WKS_BYTESTRANS "Octeți transmiși"
- IDS_STATISTICS_WKS_SMBSTRANS "Blocuri Mesaje de Server (SMB) transmise"
- IDS_STATISTICS_WKS_READOPS "Operații de citire"
- IDS_STATISTICS_WKS_WRITEOPS "Operații de scriere"
- IDS_STATISTICS_WKS_READDENIED "Citiri brute respinse"
- IDS_STATISTICS_WKS_WRITEDENIED "Scrieri brute respinse"
- IDS_STATISTICS_WKS_NETWORKERROR "Erori de rețea"
- IDS_STATISTICS_WKS_CONNECTS "Conexiuni realizate"
- IDS_STATISTICS_WKS_RECONNECTS "Reconectări realizate"
- IDS_STATISTICS_WKS_DISCONNECTS "Deconectări de server"
- IDS_STATISTICS_WKS_SESSIONS "Sesiuni pornite"
- IDS_STATISTICS_WKS_HUNGSESSIONS "Sesiuni suspendate"
- IDS_STATISTICS_WKS_FAILSESSIONS "Sesiuni eșuate"
- IDS_STATISTICS_WKS_FAILEDOPS "Operații eșuate"
- IDS_STATISTICS_WKS_USECOUNT "Număr de utilizări"
- IDS_STATISTICS_WKS_FAILUSECOUNT "Utilizări eșuate"
-
- IDS_USER_ENTER_PASSWORD1 "Introduceți o parolă nouă pentru utilizatorul
(curent): "
- IDS_USER_ENTER_PASSWORD2 "Introduceți din nou parola: "
- IDS_USER_NO_PASSWORD_MATCH "Parolele diferă!"
-
IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n"
IDS_GENERIC_YES "Da"
diff --git a/base/applications/network/net/lang/ru-RU.rc
b/base/applications/network/net/lang/ru-RU.rc
index a419f08957..6b43a7f1d7 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -11,33 +11,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер"
IDS_ACCOUNTS_WORKSTATION "Рабочая станция"
- IDS_STATISTICS_TEXT "Статистика доступна для следующих выполняющихся
служб:\n\n\
- Сервер\n Рабочая станция\n\n"
- IDS_STATISTICS_SINCE "Статистика после %d/%d/%d %d:%02d %s\n\n\n"
- IDS_STATISTICS_WKS_NAME "Статистика рабочей станции для \\\\%s\n\n\n"
- IDS_STATISTICS_WKS_BYTESRCVD "Получено байт"
- IDS_STATISTICS_WKS_SMBSRCVD "Принятые блоки сообщений сервера SMB"
- IDS_STATISTICS_WKS_BYTESTRANS "Передано байт"
- IDS_STATISTICS_WKS_SMBSTRANS "Переданные блоки сообщений сервера SMB"
- IDS_STATISTICS_WKS_READOPS "Операции чтения"
- IDS_STATISTICS_WKS_WRITEOPS "Операции записи"
- IDS_STATISTICS_WKS_READDENIED "Отказано в чтении"
- IDS_STATISTICS_WKS_WRITEDENIED "Отказано в записи"
- IDS_STATISTICS_WKS_NETWORKERROR "Ошибки сети"
- IDS_STATISTICS_WKS_CONNECTS "Выполненные подключения"
- IDS_STATISTICS_WKS_RECONNECTS "Повторные подключения"
- IDS_STATISTICS_WKS_DISCONNECTS "Отключений от сервера"
- IDS_STATISTICS_WKS_SESSIONS "Запущенные сеансы"
- IDS_STATISTICS_WKS_HUNGSESSIONS "Зависание сеансов"
- IDS_STATISTICS_WKS_FAILSESSIONS "Сбои в сеансах"
- IDS_STATISTICS_WKS_FAILEDOPS "Сбои в операциях"
- IDS_STATISTICS_WKS_USECOUNT "Счетчик использования"
- IDS_STATISTICS_WKS_FAILUSECOUNT "Счетчик сбоев при использовании"
-
- IDS_USER_ENTER_PASSWORD1 "Введите пароль для пользователя: "
- IDS_USER_ENTER_PASSWORD2 "Повторите ввод пароля для подтверждения: "
- IDS_USER_NO_PASSWORD_MATCH "Пароли не совпадают!"
-
IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n"
IDS_GENERIC_YES "Да"
diff --git a/base/applications/network/net/lang/tr-TR.rc
b/base/applications/network/net/lang/tr-TR.rc
index 1894af28dc..c812bc2a4a 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -11,33 +11,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu"
IDS_ACCOUNTS_WORKSTATION "İş istasyonu"
- 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:%02d %s\n\n\n"
- 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_ENTER_PASSWORD1 "Bu kullanıcı için yeni bir şifre giriniz: "
- IDS_USER_ENTER_PASSWORD2 "Şifreyi yeniden giriniz: "
- IDS_USER_NO_PASSWORD_MATCH "Şifreler uyuşmuyor!"
-
IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n"
IDS_GENERIC_YES "Evet"
diff --git a/base/applications/network/net/lang/zh-CN.rc
b/base/applications/network/net/lang/zh-CN.rc
index 576db43c22..4662ec29af 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -11,33 +11,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器"
IDS_ACCOUNTS_WORKSTATION "工作站"
- 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:%02d %s\n\n\n"
- 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_ENTER_PASSWORD1 "为用户输入新的密码: "
- IDS_USER_ENTER_PASSWORD2 "再次输入密码: "
- IDS_USER_NO_PASSWORD_MATCH "密码不匹配！"
-
IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n"
IDS_GENERIC_YES "是"
diff --git a/base/applications/network/net/lang/zh-TW.rc
b/base/applications/network/net/lang/zh-TW.rc
index 5497281115..43fdc9dab6 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -11,33 +11,6 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器"
IDS_ACCOUNTS_WORKSTATION "工作站"
- 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:%02d %s\n\n\n"
- 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_ENTER_PASSWORD1 "為使用者輸入新的密碼: "
- IDS_USER_ENTER_PASSWORD2 "再次輸入密碼: "
- IDS_USER_NO_PASSWORD_MATCH "密碼不匹配!"
-
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
IDS_GENERIC_YES "是"
diff --git a/base/applications/network/net/resource.h
b/base/applications/network/net/resource.h
index 4ce354511f..e1a58c8846 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -7,32 +7,6 @@
#define IDS_ACCOUNTS_STANDALONE_SERVER 212
#define IDS_ACCOUNTS_WORKSTATION 213
-#define IDS_STATISTICS_TEXT 320
-#define IDS_STATISTICS_SINCE 321
-#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_ENTER_PASSWORD1 490
-#define IDS_USER_ENTER_PASSWORD2 491
-#define IDS_USER_NO_PASSWORD_MATCH 492
-
#define IDS_USE_NOW_CONNECTED 500
#define IDS_GENERIC_YES 600
diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc
index 196478103d..9bb0ff92f8 100644
--- a/sdk/include/reactos/mc/netmsgmsg.mc
+++ b/sdk/include/reactos/mc/netmsgmsg.mc
@@ -17970,25 +17970,25 @@ Language=English
The passwords do not match.
.
Language=Polish
-The passwords do not match.
+Hasła są niezgodne.
.
Language=Romanian
-The passwords do not match.
+Parolele diferă.
.
Language=Russian
-The passwords do not match.
+Пароли не совпадают.
.
Language=Spanish
-The passwords do not match.
+Las contraseñas no coinciden.
.
Language=Turkish
-The passwords do not match.
+Şifreler uyuşmuyor.
.
Language=Chinese
-The passwords do not match.
+密码不匹配！.
.
Language=Taiwanese
-The passwords do not match.
+密碼不匹配.
.
MessageId=3729
@@ -20767,7 +20767,7 @@ NetWare compatible logon
;
-; apperr2.h (non-public) message difinitions (4300 - 5299 APPERR2_BASE)
+; apperr2.h (non-public) message definitions (4300 - 5299 APPERR2_BASE)
;
MessageId=4300
@@ -27174,13 +27174,13 @@ Language=English
Bytes received%0
.
Language=Polish
-Bytes received%0
+Bajty odebrane%0
.
Language=Romanian
-Bytes received%0
+Octeți receptați%0
.
Language=Russian
-Bytes received%0
+Получено байт%0
.
Language=Spanish
Bytes received%0
@@ -27203,13 +27203,13 @@ Language=English
Server Message Blocks (SMBs) received%0
.
Language=Polish
-Server Message Blocks (SMBs) received%0
+Odebrane bloki komunikatów serwera (SMB)%0
.
Language=Romanian
-Server Message Blocks (SMBs) received%0
+Blocuri Mesaje de Server (SMB) receptate%0
.
Language=Russian
-Server Message Blocks (SMBs) received%0
+Принятые блоки сообщений сервера SMB%0
.
Language=Spanish
Server Message Blocks (SMBs) received%0
@@ -27232,13 +27232,13 @@ Language=English
Bytes transmitted%0
.
Language=Polish
-Bytes transmitted%0
+Bajty przesłane%0
.
Language=Romanian
-Bytes transmitted%0
+Octeți transmiși%0
.
Language=Russian
-Bytes transmitted%0
+Передано байт%0
.
Language=Spanish
Bytes transmitted%0
@@ -27261,13 +27261,13 @@ Language=English
Server Message Blocks (SMBs) transmitted%0
.
Language=Polish
-Server Message Blocks (SMBs) transmitted%0
+Przesłane bloki komunikatów serwera (SMB)%0
.
Language=Romanian
-Server Message Blocks (SMBs) transmitted%0
+Blocuri Mesaje de Server (SMB) transmise%0
.
Language=Russian
-Server Message Blocks (SMBs) transmitted%0
+Переданные блоки сообщений сервера SMB%0
.
Language=Spanish
Server Message Blocks (SMBs) transmitted%0
@@ -27290,13 +27290,13 @@ Language=English
Read operations%0
.
Language=Polish
-Read operations%0
+Operacje odczytu%0
.
Language=Romanian
-Read operations%0
+Operații de citire%0
.
Language=Russian
-Read operations%0
+Операции чтения%0
.
Language=Spanish
Read operations%0
@@ -27319,13 +27319,13 @@ Language=English
Write operations%0
.
Language=Polish
-Write operations%0
+Operacje zapisu%0
.
Language=Romanian
-Write operations%0
+Operații de scriere%0
.
Language=Russian
-Write operations%0
+Операции записи%0
.
Language=Spanish
Write operations%0
@@ -27348,13 +27348,13 @@ Language=English
Raw reads denied%0
.
Language=Polish
-Raw reads denied%0
+Odrzucone operacje odczytu bez przetwarzania%0
.
Language=Romanian
-Raw reads denied%0
+Citiri brute respinse%0
.
Language=Russian
-Raw reads denied%0
+Отказано в чтении%0
.
Language=Spanish
Raw reads denied%0
@@ -27377,13 +27377,13 @@ Language=English
Raw writes denied%0
.
Language=Polish
-Raw writes denied%0
+Odrzucone operacje zapisu bez przetwarzania%0
.
Language=Romanian
-Raw writes denied%0
+Scrieri brute respinse%0
.
Language=Russian
-Raw writes denied%0
+Отказано в записи%0
.
Language=Spanish
Raw writes denied%0
@@ -27406,13 +27406,13 @@ Language=English
Network errors%0
.
Language=Polish
-Network errors%0
+Błędy sieciowe%0
.
Language=Romanian
-Network errors%0
+Erori de rețea%0
.
Language=Russian
-Network errors%0
+Ошибки сети%0
.
Language=Spanish
Network errors%0
@@ -27435,13 +27435,13 @@ Language=English
Connections made%0
.
Language=Polish
-Connections made%0
+Wykonane połączenia%0
.
Language=Romanian
-Connections made%0
+Conexiuni realizate%0
.
Language=Russian
-Connections made%0
+Выполненные подключения%0
.
Language=Spanish
Connections made%0
@@ -27464,13 +27464,13 @@ Language=English
Reconnections made%0
.
Language=Polish
-Reconnections made%0
+Ponownie wykonane połączenia%0
.
Language=Romanian
-Reconnections made%0
+Reconectări realizate%0
.
Language=Russian
-Reconnections made%0
+Повторные подключения%0
.
Language=Spanish
Reconnections made%0
@@ -27493,13 +27493,13 @@ Language=English
Server disconnects%0
.
Language=Polish
-Server disconnects%0
+Rozłączenia serwera%0
.
Language=Romanian
-Server disconnects%0
+Deconectări de server%0
.
Language=Russian
-Server disconnects%0
+Отключений от сервера%0
.
Language=Spanish
Server disconnects%0
@@ -27522,13 +27522,13 @@ Language=English
Sessions started%0
.
Language=Polish
-Sessions started%0
+Sesje uruchomione%0
.
Language=Romanian
-Sessions started%0
+Sesiuni pornite%0
.
Language=Russian
-Sessions started%0
+Запущенные сеансы%0
.
Language=Spanish
Sessions started%0
@@ -27551,13 +27551,13 @@ Language=English
Hung sessions%0
.
Language=Polish
-Hung sessions%0
+Zawieszone sesje%0
.
Language=Romanian
-Hung sessions%0
+Sesiuni suspendate%0
.
Language=Russian
-Hung sessions%0
+Зависание сеансов%0
.
Language=Spanish
Hung sessions%0
@@ -27580,13 +27580,13 @@ Language=English
Failed sessions%0
.
Language=Polish
-Failed sessions%0
+Niepowodzenia sesji%0
.
Language=Romanian
-Failed sessions%0
+Sesiuni eșuate%0
.
Language=Russian
-Failed sessions%0
+Сбои в сеансах%0
.
Language=Spanish
Failed sessions%0
@@ -27609,13 +27609,13 @@ Language=English
Failed operations%0
.
Language=Polish
-Failed operations%0
+Niepowodzenia operacji%0
.
Language=Romanian
-Failed operations%0
+Operații eșuate%0
.
Language=Russian
-Failed operations%0
+Сбои в операциях%0
.
Language=Spanish
Failed operations%0
@@ -27638,13 +27638,13 @@ Language=English
Use count%0
.
Language=Polish
-Use count%0
+Liczba pomyślnych prób użycia%0
.
Language=Romanian
-Use count%0
+Număr de utilizări%0
.
Language=Russian
-Use count%0
+Счетчик использования%0
.
Language=Spanish
Use count%0
@@ -27667,13 +27667,13 @@ Language=English
Failed use count%0
.
Language=Polish
-Failed use count%0
+Liczba niepomyślnych prób użycia%0
.
Language=Romanian
-Failed use count%0
+Utilizări eșuate%0
.
Language=Russian
-Failed use count%0
+Счетчик сбоев при использовании%0
.
Language=Spanish
Failed use count%0