[NETSTAT] pragma once, reorder, fix pl-PL.rc

- add a pragma once into the header
- order -o options alphabetically also for the global variables, not only in usage-help
- pl-PL.rc: fix wrong alignment of IDS_ETHERNET_THEADER and its data for
- pl-PL.rc: also don't pad the data with 2 spaces here in the beginning, which
            we don't do in any other locale, and MS netstat also doesn't do that here.
            pl-PL.rc most likely got this wrong because it was created while en-US wasn't finished yet.

base/applications/mspaint/atlimagedx.h

@@ -94,7 +94,7 @@ public:
 
         // if the file type is null, get the file type from extension
         const GUID *FileType = &guidFileType;
-        if (IsGuidEqual(guidFileType, GUID_NULL))
+        if (::IsEqualGUID(guidFileType, GUID_NULL))
         {
             LPCWSTR pszExt = GetFileExtension(pszNameW);
             FileType = FileTypeFromExtension(pszExt);

base/applications/mspaint/lang/bg-BG.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Вертикален"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/cs-CZ.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/de-DE.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/en-GB.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d dots per inch"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/en-US.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d dots per inch"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/es-ES.rc

@@ -264,5 +264,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/et-EE.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/eu-ES.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/fr-FR.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/he-IL.rc

@@ -264,5 +264,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/hu-HU.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/id-ID.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/it-IT.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/nl-NL.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/no-NO.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/pl-PL.rc

@@ -264,5 +264,5 @@ BEGIN
     IDS_VERTICAL "Pionowe"
     IDS_PRINTRES "%d x %d piksel/cm"
     IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/pt-BR.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/pt-PT.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/ro-RO.rc

@@ -263,5 +263,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixeli/cm"
     IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/ru-RU.rc

@@ -265,5 +265,5 @@ BEGIN
     IDS_VERTICAL "Вертикальный"
     IDS_PRINTRES "%d x %d точек/см"
     IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s"
 END

base/applications/mspaint/lang/sk-SK.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/sq-AL.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/sv-SE.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/tr-TR.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "Düşey"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/uk-UA.rc

@@ -263,5 +263,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/vi-VN.rc

@@ -261,5 +261,5 @@ BEGIN
     IDS_VERTICAL "Vertical"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/zh-CN.rc

@@ -264,5 +264,5 @@ BEGIN
     IDS_VERTICAL "垂直"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/zh-HK.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "垂直"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/mspaint/lang/zh-TW.rc

@@ -262,5 +262,5 @@ BEGIN
     IDS_VERTICAL "垂直"
     IDS_PRINTRES "%d x %d pixel/cm"
     IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s"
+    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
 END

base/applications/network/netstat/lang/en-US.rc

@@ -52,7 +52,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_ICMP4_STAT_HEADER "\nICMPv4 Statistics\n\n"
-    IDS_ICMP_THEADER "                            Received    Sent\n"
+    IDS_ICMP_THEADER             "                            Received    Sent\n"
     IDS_ICMP_MSG                 "  Messages                  %-11lu %-10lu\n"
     IDS_ICMP_ERROR               "  Errors                    %-11lu %-10lu\n"
     IDS_ICMP_DEST_UNREACH        "  Destination Unreachable   %-11lu %-10lu\n"
@@ -104,7 +104,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_WSA_START "ERROR: WSAStartup() failed : %d\n"
+    IDS_ERROR_WSA_START "ERROR: WSAStartup() failed: %d\n"
     IDS_ERROR_ROUTE "ERROR: Cannot find 'route.exe'\n"
     IDS_ERROR_TCP_SNAPSHOT "ERROR: Failed to snapshot TCP endpoints.\n"
     IDS_ERROR_UDP_ENDPOINT "ERROR: Failed to snapshot UDP endpoints.\n"

base/applications/network/netstat/lang/pl-PL.rc

@@ -54,7 +54,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_ICMP4_STAT_HEADER "\nStatystyki ICMPv4\n\n"
-    IDS_ICMP_THEADER "                            Odebrano  Wysłano\n"
+    IDS_ICMP_THEADER             "                            Odebrano  Wysłano\n"
     IDS_ICMP_MSG                 "  Komunikaty                      %-11lu %lu\n"
     IDS_ICMP_ERROR               "  Błędy                           %-11lu %lu\n"
     IDS_ICMP_DEST_UNREACH        "  Miejsce docelowe nieosiągalne   %-11lu %lu\n"
@@ -95,18 +95,18 @@ END
 STRINGTABLE
 BEGIN
     IDS_ETHERNET_INTERFACE_STAT     "Statystyki interfejsu\n\n"
-    IDS_ETHERNET_THEADER            "                           Odebrano          Wysłano\n\n"
-    IDS_ETHERNET_BYTES              "  Bajty                               %14lu %15lu\n"
-    IDS_ETHERNET_UNICAST_PACKET     "  Pakiety emisji pojedynczej          %14lu %15lu\n"
-    IDS_ETHERNET_NON_UNICAST_PACKET "  Pakiety inne niż emisji pojedynczej %14lu %15lu\n"
-    IDS_ETHERNET_DISCARD            "  Odrzucone                           %14lu %15lu\n"
-    IDS_ETHERNET_ERROR              "  Błędy                               %14lu %15lu\n"
-    IDS_ETHERNET_UNKNOWN            "  Nieznane protokoły                  %14lu\n"
+    IDS_ETHERNET_THEADER            "                                          Odebrano         Wysłano\n\n"
+    IDS_ETHERNET_BYTES              "Bajty                               %14lu %15lu\n"
+    IDS_ETHERNET_UNICAST_PACKET     "Pakiety emisji pojedynczej          %14lu %15lu\n"
+    IDS_ETHERNET_NON_UNICAST_PACKET "Pakiety inne niż emisji pojedynczej %14lu %15lu\n"
+    IDS_ETHERNET_DISCARD            "Odrzucone                           %14lu %15lu\n"
+    IDS_ETHERNET_ERROR              "Błędy                               %14lu %15lu\n"
+    IDS_ETHERNET_UNKNOWN            "Nieznane protokoły                  %14lu\n"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się : %d\n"
+    IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się: %d\n"
     IDS_ERROR_ROUTE "BŁĄD: Nie można odnaleźć pliku 'route.exe'\n"
     IDS_ERROR_TCP_SNAPSHOT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych TCP.\n"
     IDS_ERROR_UDP_ENDPOINT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych UDP.\n"

base/applications/network/netstat/lang/ru-RU.rc

@@ -0,0 +1,121 @@
+/*
+ * PROJECT:     ReactOS netstat utility
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Russian resource file
+ * TRANSLATORS: Copyright 2023 Stanislav Motylkov <binarymaster@mail.ru>
+ */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "\nОтображение статистики протокола и текущих сетевых подключений TCP/IP.\n\n\
+NETSTAT [-a] [-b] [-e] [-n] [-o] [-p протокол] [-r] [-s] [-t] [-v] [интервал]\n\n\
+  -a            Отображение всех подключений и ожидающих портов.\n\
+  -b            FIXME (Опция допустима, но не реализована).\n\
+  -e            Отображение статистики Ethernet. Он может применяться вместе\n\
+                с параметром -s.\n\
+  -n            Отображение адресов и номеров портов в числовом формате.\n\
+  -o            Отображение кода (ID) процесса каждого подключения.\n\
+  -p протокол   Отображение подключений для протокола, задаваемых этим\n\
+                параметром. Допустимые значения: TCP или UDP.\n\
+                Используется вместе с параметром -s для отображения статистики\n\
+                по протоколам. Допустимые значения: TCP, UDP или IP.\n\
+  -r            Отображение содержимого таблицы маршрутов.\n\
+  -s            Отображение статистических данных по протоколам. По умолчанию\n\
+                данные отображаются для IP, ICMP, TCP или UDP.\n\
+                Параметр -p позволяет указать подмножество выводящихся данных.\n\
+  -t            FIXME (Опция допустима, но не реализована).\n\
+  -v            FIXME (Опция допустима, но не реализована).\n\
+  интервал      Повторный вывод статистических данных через указанный\n\
+                промежуток времени в секундах.  Для прекращения вывода данных\n\
+                нажмите клавиши CTRL+C. Если параметр не задан, сведения о\n\
+                текущей конфигурации выводятся один раз.\n"
+    IDS_DISPLAY_THEADER "\n  Имя    Локальный адрес        Внешний адрес          Состояние"
+    IDS_DISPLAY_PROCESS "       Процесс\n"
+    IDS_ACTIVE_CONNECT "\nАктивные подключения\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_IP4_STAT_HEADER "\nСтатистика IPv4\n\n"
+    IDS_IP_PACK_REC            "  Получено пакетов                   = %lu\n"
+    IDS_IP_HEAD_REC_ERROR      "  Получено ошибок в заголовках       = %lu\n"
+    IDS_IP_ADDR_REC_ERROR      "  Получено ошибок в адресах          = %lu\n"
+    IDS_IP_DATAG_FWD           "  Направлено датаграмм               = %lu\n"
+    IDS_IP_UNKNOWN_PRO_REC     "  Получено неизвестных протоколов    = %lu\n"
+    IDS_IP_REC_PACK_DISCARD    "  Отброшено полученных пакетов       = %lu\n"
+    IDS_IP_REC_PACK_DELIVER    "  Доставлено полученных пакетов      = %lu\n"
+    IDS_IP_OUT_REQUEST         "  Запросов на вывод                  = %lu\n"
+    IDS_IP_ROUTE_DISCARD       "  Отброшено маршрутов                = %lu\n"
+    IDS_IP_DISCARD_OUT_PACK    "  Отброшено выходных пакетов         = %lu\n"
+    IDS_IP_OUT_PACKET_NO_ROUTE "  Выходных пакетов без маршрута      = %lu\n"
+    IDS_IP_REASSEMBLE_REQUIRED "  Требуется сборка                   = %lu\n"
+    IDS_IP_REASSEMBLE_SUCCESS  "  Успешная сборка                    = %lu\n"
+    IDS_IP_REASSEMBLE_FAILURE  "  Сбоев при сборке                   = %lu\n"
+    IDS_IP_DATAG_FRAG_SUCCESS  "  Успешно фрагментировано датаграмм  = %lu\n"
+    IDS_IP_DATAG_FRAG_FAILURE  "  Сбоев при фрагментации датаграмм   = %lu\n"
+    IDS_IP_DATAG_FRAG_CREATE   "  Создано фрагментов                 = %lu\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ICMP4_STAT_HEADER "\nСтатистика ICMPv4\n\n"
+    IDS_ICMP_THEADER             "                            Получено   Отправлено\n"
+    IDS_ICMP_MSG                 "  Сообщений                 %-11lu %-10lu\n"
+    IDS_ICMP_ERROR               "  Ошибок                    %-11lu %-10lu\n"
+    IDS_ICMP_DEST_UNREACH        "  'Назначение недостижимо'  %-11lu %-10lu\n"
+    IDS_ICMP_TIME_EXCEED         "  Превышений времени        %-11lu %-10lu\n"
+    IDS_ICMP_PARAM_PROBLEM       "  Ошибок в параметрах       %-11lu %-10lu\n"
+    IDS_ICMP_SRC_QUENCHES        "  Просьб ""снизить скорость"" %-11lu %-10lu\n"
+    IDS_ICMP_REDIRECT            "  Переадресовано            %-11lu %-10lu\n"
+    IDS_ICMP_ECHO                "  Эхо-сообщений             %-11lu %-10lu\n"
+    IDS_ICMP_ECHO_REPLY          "  Ответных пакетов          %-11lu %-10lu\n"
+    IDS_ICMP_TIMESTAMP           "  Штампов времени           %-11lu %-10lu\n"
+    IDS_ICMP_TIMESTAMP_REPLY     "  Ответы на штампы времени  %-11lu %-10lu\n"
+    IDS_ICMP_ADDRESSS_MASK       "  Масок адресов             %-11lu %-10lu\n"
+    IDS_ICMP_ADDRESSS_MASK_REPLY "  Ответов на маски адресов  %-11lu %-10lu\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_TCP4_HEADER         "\nСтатистика TCP для IPv4\n\n"
+    IDS_TCP_ACTIVE_OPEN     "  Активных открыто                    = %lu\n"
+    IDS_TCP_PASS_OPEN       "  Пассивных открыто                   = %lu\n"
+    IDS_TCP_FAIL_CONNECT    "  Сбоев при подключении               = %lu\n"
+    IDS_TCP_RESET_CONNECT   "  Сброшено подключений                = %lu\n"
+    IDS_TCP_CURRENT_CONNECT "  Текущих подключений                 = %lu\n"
+    IDS_TCP_SEG_RECEIVE     "  Получено сегментов                  = %lu\n"
+    IDS_TCP_SEG_SENT        "  Отправлено сегментов                = %lu\n"
+    IDS_TCP_SEG_RETRANSMIT  "  Повторно отправлено сегментов       = %lu\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_UDP_IP4_HEADER    "\nСтатистика UDP для IPv4\n\n"
+    IDS_UDP_DATAG_RECEIVE "  Получено датаграмм    = %lu\n"
+    IDS_UDP_NO_PORT       "  Отсутствие портов     = %lu\n"
+    IDS_UDP_RECEIVE_ERROR "  Ошибки при получении  = %lu\n"
+    IDS_UDP_DATAG_SEND    "  Отправлено датаграмм  = %lu\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ETHERNET_INTERFACE_STAT     "Статистика интерфейса\n\n"
+    IDS_ETHERNET_THEADER            "                           Получено      Отправлено\n\n"
+    IDS_ETHERNET_BYTES              "Байт                      %14lu %15lu\n"
+    IDS_ETHERNET_UNICAST_PACKET     "Одноадресные пакеты       %14lu %15lu\n"
+    IDS_ETHERNET_NON_UNICAST_PACKET "Многоадресные пакеты      %14lu %15lu\n"
+    IDS_ETHERNET_DISCARD            "Отброшено                 %14lu %15lu\n"
+    IDS_ETHERNET_ERROR              "Ошибки                    %14lu %15lu\n"
+    IDS_ETHERNET_UNKNOWN            "Неизвестный протокол      %14lu\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR_WSA_START "ОШИБКА: Не удалось выполнить WSAStartup(): %d\n"
+    IDS_ERROR_ROUTE "ОШИБКА: Не удалось найти 'route.exe'\n"
+    IDS_ERROR_TCP_SNAPSHOT "ОШИБКА: Не удалось сделать снимок конечных точек TCP.\n"
+    IDS_ERROR_UDP_ENDPOINT "ОШИБКА: Не удалось сделать снимок конечных точек UDP.\n"
+    IDS_ERROR_UDP_ENDPOINT_TABLE "ОШИБКА: Не удалось сделать снимок таблицы конечных точек UDP.\n"
+END

base/applications/network/netstat/lang/zh-TW.rc

@@ -58,7 +58,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_ICMP4_STAT_HEADER "\nICMPv4 統計資料\n\n"
-    IDS_ICMP_THEADER "                            已接收      已傳送\n"
+    IDS_ICMP_THEADER             "                            已接收      已傳送\n"
     IDS_ICMP_MSG                 "  訊息                      %-11lu %-10lu\n"
     IDS_ICMP_ERROR               "  錯誤                      %-11lu %-10lu\n"
     IDS_ICMP_DEST_UNREACH        "  無法與目的地連線          %-11lu %-10lu\n"
@@ -110,7 +110,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗 : %d\n"
+    IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗: %d\n"
     IDS_ERROR_ROUTE "錯誤: 找不到 'route.exe'\n"
     IDS_ERROR_TCP_SNAPSHOT "錯誤: 無法取得 TCP 端點快照。\n"
     IDS_ERROR_UDP_ENDPOINT "錯誤: 無法取得 UDP 端點快照。\n"

base/applications/network/netstat/netstat.c

@@ -63,6 +63,7 @@ VOID DoFormatMessage(DWORD ErrorCode)
  */
 VOID DisplayTableHeader(VOID)
 {
+    ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
     ConResPuts(StdOut, IDS_DISPLAY_THEADER);
     if (bDoShowProcessId)
         ConResPuts(StdOut, IDS_DISPLAY_PROCESS);
@@ -115,7 +116,6 @@ BOOL ParseCmdline(int argc, wchar_t* argv[])
                         bDoShowProtoCons = TRUE;
                         if (i+1 >= argc)
                         {
-                            ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
                             DisplayTableHeader();
                             return TRUE;
                         }
@@ -173,7 +173,6 @@ BOOL DisplayOutput(VOID)
 {
     if (bNoOptions)
     {
-        ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
         DisplayTableHeader();
         return ShowTcpTable();
     }
@@ -209,13 +208,11 @@ BOOL DisplayOutput(VOID)
             case TCP:
                 if (bDoShowProtoStats)
                     ShowTcpStatistics();
-                ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
                 DisplayTableHeader();
                 return ShowTcpTable();
             case UDP:
                 if (bDoShowProtoStats)
                     ShowUdpStatistics();
-                ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
                 DisplayTableHeader();
                 return (bDoShowAllCons ? ShowUdpTable() : TRUE);
             default:
@@ -232,7 +229,6 @@ BOOL DisplayOutput(VOID)
     }
     else
     {
-        ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
         DisplayTableHeader();
         if (ShowTcpTable() && bDoShowAllCons)
             ShowUdpTable();

base/applications/network/netstat/netstat.h

@@ -1,3 +1,4 @@
+#pragma once
 
 /* Maximum string lengths for ASCII ip address and port names */
 #define HOSTNAMELEN     256
@@ -10,10 +11,10 @@ BOOL bDoShowAllCons    = FALSE; // -a
 BOOL bDoShowProcName   = FALSE; // -b
 BOOL bDoShowEthStats   = FALSE; // -e
 BOOL bDoShowNumbers    = FALSE; // -n
+BOOL bDoShowProcessId  = FALSE; // -o
 BOOL bDoShowProtoCons  = FALSE; // -p
 BOOL bDoShowRouteTable = FALSE; // -r
 BOOL bDoShowProtoStats = FALSE; // -s
-BOOL bDoShowProcessId  = FALSE; // -o
 BOOL bDoDispSeqComp    = FALSE; // -v
 BOOL bLoopOutput       = FALSE; // interval
 

base/applications/network/netstat/netstat.rc

@@ -17,6 +17,9 @@
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif